From 1b90b46b00802c07f68843897fb9e7b5afa29460 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Thu, 26 Jun 2014 21:33:42 +0200 Subject: Swapped out FontawesomeText with normal ImageView --- OpenKeychain/src/main/res/layout/drawer_list_item.xml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/OpenKeychain/src/main/res/layout/drawer_list_item.xml b/OpenKeychain/src/main/res/layout/drawer_list_item.xml index 72f4fec50..158e72c01 100644 --- a/OpenKeychain/src/main/res/layout/drawer_list_item.xml +++ b/OpenKeychain/src/main/res/layout/drawer_list_item.xml @@ -3,17 +3,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - + android:layout_centerVertical="true" /> + android:layout_alignParentTop="true" /> -- cgit v1.2.3 From 567e5cc6a52277dce4f3e1214ff3b247ca26f68f Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Fri, 27 Jun 2014 21:03:19 +0200 Subject: Added unlock icon, fixed drawer items, switched to icons from resource in drawer --- .../keychain/ui/DrawerActivity.java | 26 ++++++++++++--------- .../res/drawable-hdpi/ic_action_not_secure.png | Bin 0 -> 373 bytes .../res/drawable-mdpi/ic_action_not_secure.png | Bin 0 -> 321 bytes .../res/drawable-xhdpi/ic_action_not_secure.png | Bin 0 -> 483 bytes .../res/drawable-xxhdpi/ic_action_not_secure.png | Bin 0 -> 619 bytes .../src/main/res/layout/drawer_list_item.xml | 8 ++++--- 6 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java index 9a5050eba..586442bb0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java @@ -37,8 +37,7 @@ import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.TextView; - -import com.beardedhen.androidbootstrap.FontAwesomeText; +import android.widget.ImageView; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; @@ -79,10 +78,10 @@ public class DrawerActivity extends ActionBarActivity { } NavItem mItemIconTexts[] = new NavItem[]{ - new NavItem("fa-user", getString(R.string.nav_keys)), - new NavItem("fa-lock", getString(R.string.nav_encrypt)), - new NavItem("fa-unlock", getString(R.string.nav_decrypt)), - new NavItem("fa-android", getString(R.string.nav_apps))}; + new NavItem(R.drawable.ic_action_person, getString(R.string.nav_keys)), + new NavItem(R.drawable.ic_action_secure, getString(R.string.nav_encrypt)), + new NavItem(R.drawable.ic_action_not_secure, getString(R.string.nav_decrypt)), + new NavItem(R.drawable.ic_action_view_as_list, getString(R.string.nav_apps))}; mDrawerList.setAdapter(new NavigationDrawerAdapter(this, R.layout.drawer_list_item, mItemIconTexts)); @@ -239,10 +238,15 @@ public class DrawerActivity extends ActionBarActivity { } private class NavItem { - public String icon; + public int icon; // res-id public String title; - public NavItem(String icon, String title) { + /** + * NavItem constructor + * @param icon The icons resource-id + * @param title The title of the menu entry + */ + public NavItem(int icon, String title) { super(); this.icon = icon; this.title = title; @@ -271,7 +275,7 @@ public class DrawerActivity extends ActionBarActivity { row = inflater.inflate(mLayoutResourceId, parent, false); holder = new NavItemHolder(); - holder.mImg = (FontAwesomeText) row.findViewById(R.id.drawer_item_icon); + holder.mImg = (ImageView) row.findViewById(R.id.drawer_item_icon); holder.mTxtTitle = (TextView) row.findViewById(R.id.drawer_item_text); row.setTag(holder); @@ -281,7 +285,7 @@ public class DrawerActivity extends ActionBarActivity { NavItem item = mData[position]; holder.mTxtTitle.setText(item.title); - holder.mImg.setIcon(item.icon); + holder.mImg.setImageResource(item.icon); return row; } @@ -289,7 +293,7 @@ public class DrawerActivity extends ActionBarActivity { } static class NavItemHolder { - FontAwesomeText mImg; + ImageView mImg; TextView mTxtTitle; } diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png new file mode 100644 index 000000000..5ee148080 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png new file mode 100644 index 000000000..dd5289ee4 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png new file mode 100644 index 000000000..312a230e7 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_not_secure.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png new file mode 100644 index 000000000..4aa9dc85c Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_not_secure.png differ diff --git a/OpenKeychain/src/main/res/layout/drawer_list_item.xml b/OpenKeychain/src/main/res/layout/drawer_list_item.xml index 158e72c01..4719483da 100644 --- a/OpenKeychain/src/main/res/layout/drawer_list_item.xml +++ b/OpenKeychain/src/main/res/layout/drawer_list_item.xml @@ -4,9 +4,10 @@ android:layout_height="wrap_content"> + android:layout_alignParentTop="true" + android:layout_toRightOf="@id/drawer_item_icon"/> -- cgit v1.2.3 From d19c97a714410493fa89166c83aac774b435c866 Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Sat, 28 Jun 2014 12:25:41 +0200 Subject: Switched to the dark icons --- .../main/res/drawable-hdpi/ic_action_view_as_list.png | Bin 308 -> 309 bytes .../main/res/drawable-mdpi/ic_action_view_as_list.png | Bin 246 -> 245 bytes .../main/res/drawable-xhdpi/ic_action_view_as_list.png | Bin 337 -> 341 bytes .../main/res/drawable-xxhdpi/ic_action_view_as_list.png | Bin 431 -> 441 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png index 86da228e9..e08afae85 100644 Binary files a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png and b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png index ccb4c7d7b..4fe0edfa3 100644 Binary files a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png and b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png index b9c93c8c2..a38638e4d 100644 Binary files a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png index 460041640..b00a85f6d 100644 Binary files a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png differ -- cgit v1.2.3