android-projects/aNMClient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MenuDrawer заменён на Navigation Drawer. Поддержка API v8

Browse Source
This commit is contained in:
Victor 2014-01-09 22:35:19 +02:00
parent 805bf33dbc
commit c306efc912
9 changed files with 176 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project.properties
View File

@ -12,4 +12,4 @@
# Project target.
target=android-19
android.library.reference.1=../menudrawer
android.library.reference.1=../android-support-v7-appcompat

8
res/layout/actions.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/actions"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/actions_background"
android:cacheColorHint="@android:color/transparent"
android:divider="@null" />

24
res/layout/activity_main.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white" />
<ListView
android:id="@+id/left_drawer"
android:layout_width="240dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:choiceMode="singleChoice"
android:background="@color/actions_background"
android:cacheColorHint="@android:color/transparent"
android:divider="@null"
android:dividerHeight="0dp" />
</android.support.v4.widget.DrawerLayout>

6
res/layout/content.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white" />

5
res/values/strings.xml
View File

@ -19,5 +19,10 @@
<string name="mail">Почта</string>
<string name="notepad">Блокнот</string>
<!-- No translate -->
<string name="version_name">1.1</string>
<string name="drawer_open">Открыть панель навигации</string>
<string name="drawer_close">Закрыть панель навигации</string>
</resources>

187
src/com/annimon/client/MainActivity.java
View File

@ -1,9 +1,17 @@
package com.annimon.client;
import android.app.Fragment;
import android.app.FragmentTransaction;
import android.os.Bundle;
import android.app.Activity;
import android.content.res.Configuration;
import android.support.v4.app.ActionBarDrawerToggle;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarActivity;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@ -17,65 +25,133 @@ import com.annimon.client.fragments.DiaryFragment;
import com.annimon.client.fragments.ForumFragment;
import com.annimon.client.fragments.MailFragment;
import net.simonvt.menudrawer.MenuDrawer;
import net.simonvt.menudrawer.Position;
public class MainActivity extends Activity {
private MenuDrawer menuDrawer;
public class MainActivity extends ActionBarActivity {
private static final String STATE_CURRENT_DRAWER_INDEX = "cur_drawer_index";
private DrawerLayout mDrawerLayout;
private ListView mDrawerList;
private ActionBarDrawerToggle mDrawerToggle;
private CharSequence mTitle;
private ActionsAdapter mAdapter;
private int mCurrentDrawerIndex;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
mTitle = getTitle();
mCurrentDrawerIndex = -1;
mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
mDrawerList = (ListView) findViewById(R.id.left_drawer);
getActionBar().setDisplayHomeAsUpEnabled(true);
getActionBar().setHomeButtonEnabled(true);
menuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.BEHIND, Position.LEFT, MenuDrawer.MENU_DRAG_WINDOW);
menuDrawer.setContentView(R.layout.content);
menuDrawer.setMenuView(R.layout.actions);
menuDrawer.setMenuSize(300);
final ActionsAdapter adapter = new ActionsAdapter(this);
adapter.addActions(getResources().getStringArray(R.array.main_actions),
// Fill navigation drawer menu
mAdapter = new ActionsAdapter(this);
mAdapter.addActions(getResources().getStringArray(R.array.main_actions),
getResources().getStringArray(R.array.main_actions_path));
final ListView viewActionsList = (ListView) findViewById(R.id.actions);
viewActionsList.setAdapter(adapter);
viewActionsList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> av, View v, int position, long flags) {
showFragment(adapter.getAction(position));
Toast.makeText(getApplicationContext(), adapter.getAction(position).getName(), Toast.LENGTH_SHORT).show();
}
});
menuDrawer.peekDrawer();
mDrawerList.setAdapter(mAdapter);
mDrawerList.setOnItemClickListener(mItemClickListener);
if (mDrawerLayout != null) {
mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
}
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setHomeButtonEnabled(true);
if (mDrawerLayout != null) {
mDrawerToggle = new ActionBarDrawerToggle(
MainActivity.this, /* host Activity */
mDrawerLayout, /* DrawerLayout object */
R.drawable.ic_drawer, /* nav drawer image to replace 'Up' caret */
R.string.drawer_open, /* "open drawer" description for accessibility */
R.string.drawer_close /* "close drawer" description for accessibility */
) {
public void onDrawerClosed(View view) {
getSupportActionBar().setTitle(mTitle);
// Creates call to onPrepareOptionsMenu()
ActivityCompat.invalidateOptionsMenu(MainActivity.this);
}
public void onDrawerOpened(View drawerView) {
getSupportActionBar().setTitle(R.string.app_name);
ActivityCompat.invalidateOptionsMenu(MainActivity.this);
}
};
mDrawerLayout.setDrawerListener(mDrawerToggle);
}
if (savedInstanceState == null) {
selectMenuItem(0);
}
}
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.main, menu);
return true;
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putInt(STATE_CURRENT_DRAWER_INDEX, mCurrentDrawerIndex);
}
@Override
public void onRestoreInstanceState(Bundle savedInstanceState) {
mCurrentDrawerIndex = savedInstanceState.getInt(STATE_CURRENT_DRAWER_INDEX, -1);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
menuDrawer.toggleMenu();
changeDrawerOpeningState();
return true;
}
return super.onOptionsItemSelected(item);
}
private void showFragment(Action action) {
Fragment fragment = null;
final String path = action.getPath();
@Override
protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState);
// Sync the toggle state after onRestoreInstanceState has occurred.
if (mDrawerToggle != null) {
mDrawerToggle.syncState();
}
}
@Override
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
// Pass any configuration change to the drawer toggles
if (mDrawerToggle != null) {
mDrawerToggle.onConfigurationChanged(newConfig);
}
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_MENU) {
changeDrawerOpeningState();
return true;
}
return super.onKeyDown(keyCode, event);
}
private void changeDrawerOpeningState() {
if (mDrawerLayout == null) return;
boolean drawerOpen = mDrawerLayout.isDrawerOpen(mDrawerList);
if (drawerOpen) mDrawerLayout.closeDrawer(mDrawerList);
else mDrawerLayout.openDrawer(mDrawerList);
}
private void selectMenuItem(int position) {
Action action = mAdapter.getAction(position);
if (action == null) return;
final String path = action.getPath();
Fragment fragment = null;
if ("forum".equals(path)) {
fragment = new ForumFragment();
} else if ("diary".equals(path)) {
@ -85,10 +161,31 @@ public class MainActivity extends Activity {
}
if (fragment == null) return;
final FragmentTransaction tr = getFragmentManager().beginTransaction();
tr.replace(R.id.content, fragment);
tr.commit();
FragmentManager fragmentManager = getSupportFragmentManager();
fragmentManager.beginTransaction().replace(R.id.content_frame, fragment).commit();
// Update selected item and title, then close the drawer
mDrawerList.setItemChecked(position, true);
mTitle = action.getName();
setTitle(mTitle);
getSupportActionBar().setTitle(mTitle);
if (mDrawerLayout != null) {
mDrawerLayout.closeDrawer(mDrawerList);
}
}
private AdapterView.OnItemClickListener mItemClickListener = new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
if (position != mCurrentDrawerIndex) {
mCurrentDrawerIndex = position;
selectMenuItem(position);
} else {
changeDrawerOpeningState();
}
}
};
}

2
src/com/annimon/client/fragments/DiaryFragment.java
View File

@ -1,7 +1,7 @@
package com.annimon.client.fragments;
import android.app.Fragment;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

3
src/com/annimon/client/fragments/ForumFragment.java
View File

@ -1,8 +1,9 @@
package com.annimon.client.fragments;
import java.util.List;
import android.app.ListFragment;
import android.os.Bundle;
import android.support.v4.app.ListFragment;
import com.annimon.client.adapters.ForumPostAdapter;
import com.annimon.client.entities.ForumPost;
import com.annimon.client.tasks.ForumPostLoader;

4
src/com/annimon/client/fragments/MailFragment.java
View File

@ -1,10 +1,8 @@
package com.annimon.client.fragments;
import android.app.ListFragment;
import android.os.Bundle;
import android.support.v4.app.ListFragment;
import com.annimon.client.utils.MoreListHelper;
import java.util.ArrayList;
public class MailFragment extends ListFragment {