TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 07:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

migrate nav panel items to actionbar

Browse Source 
Fixes #1819
Closes #1839
// FREEBIE
This commit is contained in:
Jake McGinty
2014-08-14 23:11:06 -07:00
committed by Moxie Marlinspike
parent dee23b266f
commit 020d61dd6e
10 changed files with 50 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/layout/conversation_list_activity.xml
View File

@@ -1,9 +1,9 @@
<?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">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<fragment
android:id="@+id/fragment_content"
@@ -11,14 +11,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<ListView android:id="@+id/left_drawer"
android:layout_width="240dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:choiceMode="singleChoice"
android:dividerHeight="1dp"
android:background="?navigation_drawer_background"/>
<!--<TextView android:id="@android:id/empty"-->
<!--android:layout_width="fill_parent"-->
<!--android:layout_height="fill_parent"-->
@@ -27,4 +19,4 @@
<!--android:textColor="?conversation_text_secondary_color"-->
<!--android:text="Empty message list" />-->
</android.support.v4.widget.DrawerLayout>
</LinearLayout>

23
res/layout/navigation_drawer_item.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:minHeight="48dp">
<ImageView android:id="@+id/navigation_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="12dip"
android:layout_marginLeft="16dip"
android:contentDescription="Navigation Image"/>
<TextView android:id="@+id/navigation_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginRight="26dp"
android:textColor="?navigation_drawer_text_color"/>
</LinearLayout>

8
res/menu/text_secure_normal.xml
View File

@@ -17,6 +17,14 @@
android:id="@+id/menu_mark_all_read"
android:icon="@android:drawable/ic_menu_set_as" />
<item android:title="@string/arrays__import_export"
android:id="@+id/menu_import_export"
android:icon="@android:drawable/ic_menu_upload" />
<item android:title="@string/arrays__my_identity_key"
android:id="@+id/menu_my_identity"
android:icon="@android:drawable/ic_menu_view" />
<item android:title="@string/text_secure_normal__menu_settings"
android:id="@+id/menu_settings"
android:icon="@android:drawable/ic_menu_preferences" />

20
res/values/arrays.xml
View File

@@ -124,24 +124,4 @@
<item>3000,3000</item>
<item>custom</item>
</string-array>
<string-array name="navigation_drawer_text">
<item>@string/arrays__import_export</item>
<item>@string/arrays__my_identity_key</item>
</string-array>
<string-array name="navigation_drawer_values" translatable="false">
<item>import_export</item>
<item>my_identity_key</item>
</string-array>
<string-array name="navigation_drawer_icons_light">
<item>@drawable/import_export_light</item>
<item>@drawable/my_identity_light</item>
</string-array>
<string-array name="navigation_drawer_icons_dark">
<item>@drawable/import_export_dark</item>
<item>@drawable/my_identity_dark</item>
</string-array>
</resources>

5
res/values/attrs.xml
View File

@@ -52,11 +52,6 @@
<attr name="contact_selection_label_text" format="reference|color" />
<attr name="conversation_selection_header_text" format="reference|color" />
<attr name="navigation_drawer_background" format="reference|color"/>
<attr name="navigation_drawer_text_color" format="color"/>
<attr name="navigation_drawer_icons" format="reference"/>
<attr name="navigation_drawer_shadow" format="reference"/>
<attr name="reminder_header_background" format="color"/>
<attr name="menu_new_conversation_icon" format="reference" />

2
res/values/strings.xml
View File

@@ -668,7 +668,7 @@
<string name="AndroidManifest__log_submit">Submit debug logs</string>
<!-- arrays.xml -->
<string name="arrays__import_export">Import / Export</string>
<string name="arrays__import_export">Import / export</string>
<string name="arrays__my_identity_key">My identity key</string>
<!-- preferences.xml -->

22
res/values/themes.xml
View File

@@ -83,17 +83,6 @@
<item name="reminder_header_background">#ff5a8800</item>
</style>
<style name="TextSecure.LightTheme.NavigationDrawer"
parent="@style/TextSecure.LightTheme"
tools:ignore="NewApi">
<item name="android:homeAsUpIndicator">@drawable/ic_drawer</item>
<item name="homeAsUpIndicator">@drawable/ic_drawer</item>
<item name="navigation_drawer_background">@color/abs__background_holo_light</item>
<item name="navigation_drawer_text_color">#ff333333</item>
<item name="navigation_drawer_icons">@array/navigation_drawer_icons_light</item>
<item name="navigation_drawer_shadow">@drawable/drawer_shadow_light</item>
</style>
<style name="TextSecure.DarkTheme" parent="@style/TextSecure.Dark">
<item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_dark</item>
<item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_dark</item>
@@ -166,17 +155,6 @@
<item name="reminder_header_background">#ff385400</item>
</style>
<style name="TextSecure.DarkTheme.NavigationDrawer"
parent="@style/TextSecure.DarkTheme"
tools:ignore="NewApi">
<item name="android:homeAsUpIndicator">@drawable/ic_drawer</item>
<item name="homeAsUpIndicator">@drawable/ic_drawer</item>
<item name="navigation_drawer_background">#ff333333</item>
<item name="navigation_drawer_text_color">#ffdddddd</item>
<item name="navigation_drawer_icons">@array/navigation_drawer_icons_dark</item>
<item name="navigation_drawer_shadow">@drawable/drawer_shadow_dark</item>
</style>
<style name="TextSecure.LightTheme.ConversationActivity"
parent="@style/TextSecure.LightTheme">
<item name="android:windowBackground">@null</item>