Skip to content

Commit 020d61d

Browse files
mcgintymoxie0
mcginty
authored and
moxie0
committed
migrate nav panel items to actionbar
Fixes signalapp#1819 Closes signalapp#1839 // FREEBIE
1 parent dee23b2 commit 020d61d

10 files changed

Lines changed: 50 additions & 228 deletions

File tree

‎res/layout/conversation_list_activity.xml‎

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.v4.widget.DrawerLayout
3-
xmlns:android="http://schemas.android.com/apk/res/android"
4-
android:id="@+id/drawer_layout"
5-
android:layout_width="match_parent"
6-
android:layout_height="match_parent">
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/drawer_layout"
4+
android:orientation="vertical"
5+
android:layout_width="match_parent"
6+
android:layout_height="match_parent">
77

88
<fragment
99
android:id="@+id/fragment_content"
1010
android:name="org.thoughtcrime.securesms.ConversationListFragment"
1111
android:layout_width="match_parent"
1212
android:layout_height="match_parent"/>
1313

14-
<ListView android:id="@+id/left_drawer"
15-
android:layout_width="240dp"
16-
android:layout_height="match_parent"
17-
android:layout_gravity="start"
18-
android:choiceMode="singleChoice"
19-
android:dividerHeight="1dp"
20-
android:background="?navigation_drawer_background"/>
21-
2214
<!--<TextView android:id="@android:id/empty"-->
2315
<!--android:layout_width="fill_parent"-->
2416
<!--android:layout_height="fill_parent"-->
@@ -27,4 +19,4 @@
2719
<!--android:textColor="?conversation_text_secondary_color"-->
2820
<!--android:text="Empty message list" />-->
2921

30-
</android.support.v4.widget.DrawerLayout>
22+
</LinearLayout>

‎res/layout/navigation_drawer_item.xml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎res/menu/text_secure_normal.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,14 @@
1717
android:id="@+id/menu_mark_all_read"
1818
android:icon="@android:drawable/ic_menu_set_as" />
1919

20+
<item android:title="@string/arrays__import_export"
21+
android:id="@+id/menu_import_export"
22+
android:icon="@android:drawable/ic_menu_upload" />
23+
24+
<item android:title="@string/arrays__my_identity_key"
25+
android:id="@+id/menu_my_identity"
26+
android:icon="@android:drawable/ic_menu_view" />
27+
2028
<item android:title="@string/text_secure_normal__menu_settings"
2129
android:id="@+id/menu_settings"
2230
android:icon="@android:drawable/ic_menu_preferences" />

‎res/values/arrays.xml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -124,24 +124,4 @@
124124
<item>3000,3000</item>
125125
<item>custom</item>
126126
</string-array>
127-
128-
<string-array name="navigation_drawer_text">
129-
<item>@string/arrays__import_export</item>
130-
<item>@string/arrays__my_identity_key</item>
131-
</string-array>
132-
133-
<string-array name="navigation_drawer_values" translatable="false">
134-
<item>import_export</item>
135-
<item>my_identity_key</item>
136-
</string-array>
137-
138-
<string-array name="navigation_drawer_icons_light">
139-
<item>@drawable/import_export_light</item>
140-
<item>@drawable/my_identity_light</item>
141-
</string-array>
142-
143-
<string-array name="navigation_drawer_icons_dark">
144-
<item>@drawable/import_export_dark</item>
145-
<item>@drawable/my_identity_dark</item>
146-
</string-array>
147127
</resources>

‎res/values/attrs.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@
5252
<attr name="contact_selection_label_text" format="reference|color" />
5353
<attr name="conversation_selection_header_text" format="reference|color" />
5454

55-
<attr name="navigation_drawer_background" format="reference|color"/>
56-
<attr name="navigation_drawer_text_color" format="color"/>
57-
<attr name="navigation_drawer_icons" format="reference"/>
58-
<attr name="navigation_drawer_shadow" format="reference"/>
59-
6055
<attr name="reminder_header_background" format="color"/>
6156

6257
<attr name="menu_new_conversation_icon" format="reference" />

‎res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@
668668
<string name="AndroidManifest__log_submit">Submit debug logs</string>
669669

670670
<!-- arrays.xml -->
671-
<string name="arrays__import_export">Import / Export</string>
671+
<string name="arrays__import_export">Import / export</string>
672672
<string name="arrays__my_identity_key">My identity key</string>
673673

674674
<!-- preferences.xml -->

‎res/values/themes.xml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,6 @@
8383
<item name="reminder_header_background">#ff5a8800</item>
8484
</style>
8585

86-
<style name="TextSecure.LightTheme.NavigationDrawer"
87-
parent="@style/TextSecure.LightTheme"
88-
tools:ignore="NewApi">
89-
<item name="android:homeAsUpIndicator">@drawable/ic_drawer</item>
90-
<item name="homeAsUpIndicator">@drawable/ic_drawer</item>
91-
<item name="navigation_drawer_background">@color/abs__background_holo_light</item>
92-
<item name="navigation_drawer_text_color">#ff333333</item>
93-
<item name="navigation_drawer_icons">@array/navigation_drawer_icons_light</item>
94-
<item name="navigation_drawer_shadow">@drawable/drawer_shadow_light</item>
95-
</style>
96-
9786
<style name="TextSecure.DarkTheme" parent="@style/TextSecure.Dark">
9887
<item name="conversation_list_item_background_read">@drawable/conversation_list_item_background_read_dark</item>
9988
<item name="conversation_list_item_background_unread">@drawable/conversation_list_item_background_unread_dark</item>
@@ -166,17 +155,6 @@
166155
<item name="reminder_header_background">#ff385400</item>
167156
</style>
168157

169-
<style name="TextSecure.DarkTheme.NavigationDrawer"
170-
parent="@style/TextSecure.DarkTheme"
171-
tools:ignore="NewApi">
172-
<item name="android:homeAsUpIndicator">@drawable/ic_drawer</item>
173-
<item name="homeAsUpIndicator">@drawable/ic_drawer</item>
174-
<item name="navigation_drawer_background">#ff333333</item>
175-
<item name="navigation_drawer_text_color">#ffdddddd</item>
176-
<item name="navigation_drawer_icons">@array/navigation_drawer_icons_dark</item>
177-
<item name="navigation_drawer_shadow">@drawable/drawer_shadow_dark</item>
178-
</style>
179-
180158
<style name="TextSecure.LightTheme.ConversationActivity"
181159
parent="@style/TextSecure.LightTheme">
182160
<item name="android:windowBackground">@null</item>

0 commit comments

Comments
 (0)