From c9b6799804822f45c4ed201d60b5d12a9abb423f Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Thu, 29 Aug 2013 16:12:04 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=82=D0=B8=D0=BB=D0=B8=D0=B7=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=B9=D1=81=D1=82=D0=B2=D0=B8=D0=B9=20=D0=BF=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=D1=8C=20annimon.com?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/drawable/action_title.9.png               | Bin 0 -> 736 bytes
 res/layout/action_row_item.xml                |   4 +++
 res/layout/action_row_title.xml               |   4 +++
 res/layout/actions.xml                        |   4 +--
 res/values/colors.xml                         |   6 ++++
 res/values/styles.xml                         |  24 +++++++++++++
 src/com/annimon/client/MainActivity.java      |  24 ++++++++++---
 .../client/adapters/ActionsAdapter.java       |  34 +++++++++++++-----
 8 files changed, 85 insertions(+), 15 deletions(-)
 create mode 100644 res/drawable/action_title.9.png
 create mode 100644 res/layout/action_row_item.xml
 create mode 100644 res/layout/action_row_title.xml
 create mode 100644 res/values/colors.xml

diff --git a/res/drawable/action_title.9.png b/res/drawable/action_title.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..85e7cbe11c20768f2c329b5556683294f976da9c
GIT binary patch
literal 736
zcmV<60w4W}P)<h;3K|Lk000e1NJLTq0015U000^Y0ssI2FT;D|00006bW%=J00961
z002|QE+GH_0+mTbK~#9!wbt)T6LB2C@%2<PwI}`oiS1E8Ac!7CJ&3?885Bx5&rnOu
z%u#Oh$F!ZwZ0<*`q34{<{Zj9?x!uI6Y^VEa5vIdU3x8!j3qpeGY2Da&$Fa@rWOlqB
zeDChV`wIsLU)Bj0>v+X4u&~bgj)ii}+T5dx13O@|-rO0c-Ay9Z!%k%!NSmEYxoel{
zY6Wr%NE;kPj^sM~{bz%8Ag!|#xzO4?P>1R+Pf8c-{$;VWHX@ZC_harb=3X1eeQ5_M
z!dK>sr_v-KjaZ2!&d{ze`U~^#TY_Kx8-MWNPU=jY!sse*k(D(|lYsP)g`k@W?N9l>
zG{`2P0X?ZviCO~R@X%h;SRA)obK~(~Dv(xN7AYh4pnL5nSE8?i-`*3)kc$T|jZ2Z=
z$aH`{N$N!G*PG;NfwT(qQYMK{$ZWI{)^bGJ3ehNu)2*$7wR+FCaUnvVRHDR9p89H&
zGA)o6jLc9}j<87o{(OBuyQZ(Cx|hU;`p8=e8dg|W=#$r4)rDp4hXHB6#zpBKUov^W
zUu=+^h2WCv7&Zi7dL%`I2VFW3HP#@v7T)g3za=^hNVjR`=@8crZ2owzuAdEwNf+uR
z16X8uc8fl9rbdxhF3up49`htY=JzIiKVFzt$UUY42guwm{p}qX&EpJYmiQp!zEmRf
zI|aTecWiW-mg&!1Mu}o*=w#*V%)pP%H-(tH(qYNxj${SWg2@jI)oB6+^@dY**(K80
zDieHkwUmz+G@?u-(zbOb%HISFo;Vl+X`y{Ht5!>-xNW|W=VAz?+wsp?U6w8vJ$Eyg
zNISPOt2IZ91dB(KNY89%Aarh*_J&Riy+;Dlz0UOvDu)9l0>@E-v&ers;`{@A25GJw
Swke?i0000<MNUMnLSTY;|5=*=

literal 0
HcmV?d00001

diff --git a/res/layout/action_row_item.xml b/res/layout/action_row_item.xml
new file mode 100644
index 0000000..e31a6ec
--- /dev/null
+++ b/res/layout/action_row_item.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="match_parent"
+          style="@style/ActionItem" />
\ No newline at end of file
diff --git a/res/layout/action_row_title.xml b/res/layout/action_row_title.xml
new file mode 100644
index 0000000..aa22e81
--- /dev/null
+++ b/res/layout/action_row_title.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="match_parent"
+          style="@style/ActionTitle" />
\ No newline at end of file
diff --git a/res/layout/actions.xml b/res/layout/actions.xml
index a39fa0b..1c2fed8 100644
--- a/res/layout/actions.xml
+++ b/res/layout/actions.xml
@@ -3,6 +3,6 @@
     android:id="@+id/actions"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/darker_gray"
-    android:cacheColorHint="@android:color/darker_gray"
+    android:background="@color/actions_background"
+    android:cacheColorHint="@android:color/transparent"
     android:divider="@null" />
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
new file mode 100644
index 0000000..7704f99
--- /dev/null
+++ b/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="actions_background">@android:color/white</color>
+    <color name="actions_item_text">#FF0E64A3</color>
+    <color name="actions_title_text">@android:color/white</color>
+</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6ce89c7..98bd962 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,5 +1,29 @@
 <resources>
 
+    <style name="ActionTitle" parent="@android:style/Widget.TextView">
+        <item name="android:textSize">15sp</item>
+        <item name="android:textColor">@color/actions_title_text</item>
+        <item name="android:textAllCaps">false</item>
+
+        <item name="android:background">@drawable/action_title</item>
+        <item name="android:layout_height">26dp</item>
+        <item name="android:gravity">center_vertical</item>
+
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="ActionItem" parent="@android:style/Widget.TextView">
+        <item name="android:textColor">@color/actions_item_text</item>
+        <item name="android:textSize">16sp</item>
+
+        <item name="android:layout_height">?android:attr/listPreferredItemHeightSmall</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:paddingLeft">16dp</item>
+
+        <item name="android:singleLine">true</item>
+        <item name="android:ellipsize">marquee</item>
+    </style>
     <!--
         Base application theme, dependent on API level. This theme is replaced
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
diff --git a/src/com/annimon/client/MainActivity.java b/src/com/annimon/client/MainActivity.java
index edba8ab..366287b 100644
--- a/src/com/annimon/client/MainActivity.java
+++ b/src/com/annimon/client/MainActivity.java
@@ -3,6 +3,7 @@ package com.annimon.client;
 import android.os.Bundle;
 import android.app.Activity;
 import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
@@ -15,7 +16,7 @@ import net.simonvt.menudrawer.Position;
 
 public class MainActivity extends Activity {
 
-    private MenuDrawer mMenuDrawer;
+    private MenuDrawer menuDrawer;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -23,10 +24,12 @@ public class MainActivity extends Activity {
 
         /*Intent intent = new Intent(this, DiaryActivity.class);
         startActivity(intent);*/
+        getActionBar().setDisplayHomeAsUpEnabled(true);
 
-        mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.BEHIND, Position.LEFT, MenuDrawer.MENU_DRAG_WINDOW);
-        mMenuDrawer.setContentView(R.layout.content);
-        mMenuDrawer.setMenuView(R.layout.actions);
+        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),
@@ -42,7 +45,7 @@ public class MainActivity extends Activity {
             }
         });
 
-        mMenuDrawer.peekDrawer();
+        menuDrawer.peekDrawer();
     }
 
 
@@ -51,5 +54,16 @@ public class MainActivity extends Activity {
         getMenuInflater().inflate(R.menu.main, menu);
         return true;
     }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                menuDrawer.toggleMenu();
+                return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
     
 }
diff --git a/src/com/annimon/client/adapters/ActionsAdapter.java b/src/com/annimon/client/adapters/ActionsAdapter.java
index 81c1161..18b9202 100644
--- a/src/com/annimon/client/adapters/ActionsAdapter.java
+++ b/src/com/annimon/client/adapters/ActionsAdapter.java
@@ -7,27 +7,32 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
+import com.annimon.client.R;
 import com.annimon.client.entities.Action;
 
 import java.util.ArrayList;
 
 public class ActionsAdapter extends BaseAdapter {
 
-    private final LayoutInflater mInflater;
+    private static final int VIEW_TYPE_ITEM = 0;
+    private static final int VIEW_TYPE_TITLE = 1;
+    private static final int VIEW_TYPES_COUNT = 2;
+
+    private final LayoutInflater inflater;
     private ArrayList<Action> actions;
 
     public ActionsAdapter(Context context) {
-        mInflater = LayoutInflater.from(context);
+        inflater = LayoutInflater.from(context);
         actions = new ArrayList<Action>();
     }
 
     public void addAction(String name, String path) {
-        actions.add( new Action(name, path) );
+        actions.add(new Action(name, path));
     }
 
     public void addActions(String[] names, String[] paths) {
         for (int i = 0; i < names.length; i++) {
-            actions.add( new Action(names[i], paths[i]) );
+            actions.add(new Action(names[i], paths[i]));
         }
     }
 
@@ -52,27 +57,40 @@ public class ActionsAdapter extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
+        final int viewType = getItemViewType(position);
+
         final ViewHolder holder;
         if (convertView == null) {
-            convertView = mInflater.inflate(android.R.layout.simple_list_item_1, parent, false);
+            int layoutId = (viewType == VIEW_TYPE_ITEM) ? R.layout.action_row_item : R.layout.action_row_title;
+            convertView = inflater.inflate(layoutId, parent, false);
 
             holder = new ViewHolder();
-            holder.text = (TextView) convertView.findViewById(android.R.id.text1);
+            holder.text = (TextView) convertView;//.findViewById(android.R.id.text1);
             convertView.setTag(holder);
         } else {
             holder = (ViewHolder) convertView.getTag();
         }
 
         final Action action = actions.get(position);
-        holder.text.setTextSize(action.isTitle() ? 18 : 14);
         holder.text.setText(action.getName());
 
         return convertView;
     }
 
+    @Override
+    public int getViewTypeCount() {
+        return VIEW_TYPES_COUNT;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (actions.get(position).isTitle()) return VIEW_TYPE_TITLE;
+        return VIEW_TYPE_ITEM;
+    }
+
     @Override
     public boolean isEnabled(int position) {
-        return !actions.get(position).isTitle();
+        return getItemViewType(position) != VIEW_TYPE_TITLE;
     }
 
     private static class ViewHolder {