From bf1eb02b96c9d8084fe3cdb9a5138ede88f43d5c Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Tue, 11 Nov 2014 04:34:43 +0000
Subject: [PATCH] Toolbar for settings

---
 .../bote/android/config/SettingsActivity.java |  26 ++++++++++++++++++
 .../ic_arrow_back_white_24dp.png              | Bin 0 -> 287 bytes
 .../ic_arrow_back_white_24dp.png              | Bin 0 -> 240 bytes
 .../ic_arrow_back_white_24dp.png              | Bin 0 -> 336 bytes
 .../ic_arrow_back_white_24dp.png              | Bin 0 -> 410 bytes
 app/src/main/res/layout/activity_settings.xml |  21 ++++++++++++++
 6 files changed, 47 insertions(+)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
 create mode 100644 app/src/main/res/layout/activity_settings.xml

diff --git a/app/src/main/java/i2p/bote/android/config/SettingsActivity.java b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
index fd17dea..37387ed 100644
--- a/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
+++ b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
@@ -32,6 +32,7 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
+import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -49,6 +50,8 @@ public class SettingsActivity extends PreferenceActivity {
 
     static final int ALTER_IDENTITY_LIST = 1;
 
+    private Toolbar mToolbar;
+
     // Preference Header vars
     private Header[] mIdentityListHeaders;
 
@@ -78,6 +81,29 @@ public class SettingsActivity extends PreferenceActivity {
             // Load the legacy preferences headers
             buildLegacyHeaders();
         }
+
+        mToolbar.setTitle(getTitle());
+    }
+
+    @Override
+    public void setContentView(int layoutResID) {
+        ViewGroup contentView = (ViewGroup) LayoutInflater.from(this).inflate(
+                R.layout.activity_settings,
+                (ViewGroup) getWindow().getDecorView().getRootView(), false);
+
+        mToolbar = (Toolbar) contentView.findViewById(R.id.main_toolbar);
+        mToolbar.setNavigationIcon(getResources().getDrawable(R.drawable.ic_arrow_back_white_24dp));
+        mToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onBackPressed();
+            }
+        });
+
+        ViewGroup contentWrapper = (ViewGroup) contentView.findViewById(R.id.content_wrapper);
+        LayoutInflater.from(this).inflate(layoutResID, contentWrapper, true);
+
+        getWindow().setContentView(contentView);
     }
 
     @Override
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fa4948788afb7189dd55faae57aa7d0600921ee
GIT binary patch
literal 287
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;Lb6AYF9SoB8UsT^3j@P1pisjL
z28L1t28LG&3=CE?7#PG0=Ijcz0ZK3>dAqwX{BQ3+vmeOgEbxddW?<k3n!+v2$S`Y;
z1W<6gr;B5V$MLsUy}23;cvvnpEtoF$#_Rm!=Q(-DLjyMEE?d^rarWQEDQS-$oSO1`
zVY#E+K9(np4$CdrBmyHB%w4H#E|hj@rpT0|M-&s&`Z^tN`bg|L*rJd)P39RF=jKK2
z;o4lBhvz+Cn4I0bbnEA2^J@}2U6<OYur2N7@O|m*9puv!AR?Z_a@6f@QunR7S*O=5
feiwi9ev4VZ_=1=?v&TRmGB9|$`njxgN@xNAuY6_(

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e662f6d498a7a3863f702e2f29b53b66db8fddc
GIT binary patch
literal 240
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1g=CK)Uj~LMH3o);76yi2K%s^g
z3=E|P3=FRl7#OT(FffQ0%-I!a1C(G&@^*J&_}|`tW<QX}S>O=~G=W<fgc%uT%>kL6
z;pyTSVsSe8$9V^-6bUOSsfGzGyuAN`;BS0)1h2qT#Ur;E0_D8c$a848Uk9?>ax@yJ
z{6Dx}CX(61(#~Ng+l<MFJUcU$wj^+e?TOmpE+ePAV-lO6?hfJm@{fe&UA*s3IKRk3
ZkwHwTLElx!^)}E>22WQ%mvv4FO#tcCM$7;J

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..addbfc886115c892c3e634d5589866d29f35210b
GIT binary patch
literal 336
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tg=CK)Uj~LMH3o);76yi2K%s^g
z3=E|}g|8AA7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kaj^+;1OBOz`!jG!i)^F=12eq
zPk6dGhD02Gd)=0+*+HP~q5p}ydnQg$3(R4%j5tx~RCQg6QSi##{5pk}$PKmgo$g4^
zZn|+<Wx|2~jDNp#GF8Pe^6(sFm~X={r|>iTv_IUs^X@em>9by`luS6`%@DkgPvW!b
zfjRbUGN0TVyzAr(PQ7Q$`<a_?a&?#KfocC)6MRK{R0<x&eUjFd6I8z3JE0~+&8aL@
zg5zcCa<wPdw@yl6>+5>pwyY_k-Ol$zHn(Snn10uVwSBVhCZ2xJn*8KfoWT=$KPJwC
abT&1XX2zgueSe^z7(8A5T-G@yGywn<Ep)R0

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4057cc5453f9df8a14d5f424ba0d8ab4e30eca98
GIT binary patch
literal 410
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw6p}rHd>I(3)EF2VS{N990fib~
zFff!FFfhDIU|_JC!N4G1FlSew4N!t9$=lt9;eUJonf*W>XMsm#F#`j)FbFd;%$g&?
zz`!Wv>EalYaqsP|i+oK6JggTIYrb)R@xQ9`Z`m*1uaaViZ{5A!x8(8G?Up@)5{VOy
zu3NY=3r$(TqN*V^VSz?~uILp{0e4ZsiCr&RA2)b-@U^r&?b!2Fh%?Lb`Uy#;0yhVd
zK3SJX5soH(ye>~7976i!T%Kh(mh|yGIdHKd#^SGnx}W}u-plMoPrfw7SpHT>KPQ)Q
z+L4dB<D_B3jyd}myfo`#-<2Y)_lh(BH$#yB#gu-&^q~BQ)4p`p{w+|+?27f+Rm48Y
z?82nHjS5yLg%(Z9F;qG!b!XB(jY+m%O1&+bOEy|GnpC;zYJS;V;JwTJ{DoOxI^vwO
zF9~0K&2w|tm7uOE;)||M`d_D_;mGL~(8S00i%~4`$PV9WhChKp#^CAd=d#Wzp$PyC
C&YVyH

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
new file mode 100644
index 0000000..2ba4d42
--- /dev/null
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/main_toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/>
+
+    <FrameLayout
+        android:id="@+id/content_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"/>
+</LinearLayout>
\ No newline at end of file