From 52bf5b615166b730a713d023b650febfa7b22e92 Mon Sep 17 00:00:00 2001
From: Michael Demetriou <mike@d-e.gr>
Date: Wed, 25 Jul 2018 14:02:45 +0300
Subject: [PATCH 1/8] Merge toolbar and action bar, change toolbar text/icons
 to white

This minimizes wasted space. Also replace undo/redo/share icons
to match android material design.
---
 .idea/gradle.xml                              |   4 +-
 .idea/vcs.xml                                 |   1 -
 app/build.gradle                              |  10 +--
 .../info/aario/snotepad/EditorFragment.java   |  15 ++++-
 .../info/aario/snotepad/ListFragment.java     |  12 +++-
 .../info/aario/snotepad/MainActivity.java     |   5 ++
 app/src/main/res/drawable-hdpi/ic_redo.png    | Bin 458 -> 573 bytes
 app/src/main/res/drawable-hdpi/ic_share.png   | Bin 0 -> 723 bytes
 app/src/main/res/drawable-hdpi/ic_undo.png    | Bin 450 -> 561 bytes
 app/src/main/res/drawable-mdpi/ic_redo.png    | Bin 324 -> 449 bytes
 app/src/main/res/drawable-mdpi/ic_share.png   | Bin 0 -> 558 bytes
 app/src/main/res/drawable-mdpi/ic_undo.png    | Bin 322 -> 444 bytes
 app/src/main/res/drawable-xhdpi/ic_redo.png   | Bin 558 -> 779 bytes
 app/src/main/res/drawable-xhdpi/ic_share.png  | Bin 0 -> 1030 bytes
 app/src/main/res/drawable-xhdpi/ic_undo.png   | Bin 554 -> 771 bytes
 app/src/main/res/drawable-xxhdpi/ic_redo.png  | Bin 906 -> 1035 bytes
 app/src/main/res/drawable-xxhdpi/ic_share.png | Bin 0 -> 1508 bytes
 app/src/main/res/drawable-xxhdpi/ic_undo.png  | Bin 924 -> 1022 bytes
 app/src/main/res/layout/activity_main.xml     |   9 ---
 app/src/main/res/layout/editor_fragment.xml   |  29 +++++----
 app/src/main/res/layout/list_fragment.xml     |   1 +
 app/src/main/res/values/colors.xml            |   1 +
 build.gradle                                  |   8 +++
 icon_src/baseline-redo-24px.svg               |  61 ++++++++++++++++++
 icon_src/baseline-share-24px.svg              |  61 ++++++++++++++++++
 icon_src/baseline-undo-24px.svg               |  61 ++++++++++++++++++
 26 files changed, 247 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_share.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_share.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_share.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_share.png
 create mode 100644 icon_src/baseline-redo-24px.svg
 create mode 100644 icon_src/baseline-share-24px.svg
 create mode 100644 icon_src/baseline-undo-24px.svg

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2c14154..7ac24c7 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,8 +7,8 @@
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
-            <option value="/data/aario-debian-8-home/Documents/Projects/Computer/Android/snotepad" />
-            <option value="/data/aario-debian-8-home/Documents/Projects/Computer/Android/snotepad/app" />
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index cb8da0b..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
-    <mapping directory="/data/aario-debian-8-home/Documents/Projects/Computer/Android/snotepad" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index fb1cb8f..ee7cb76 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 27
+    buildToolsVersion "27.0.3"
     defaultConfig {
         applicationId "info.aario.snotepad"
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 27
         versionCode 2
         versionName "1.2.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -23,9 +23,9 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:appcompat-v7:27.1.1'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    compile 'com.android.support:design:25.2.0'
+    compile 'com.android.support:design:27.1.1'
     testCompile 'junit:junit:4.12'
     compile 'com.nononsenseapps:filepicker:4.0.0'
 }
diff --git a/app/src/main/java/info/aario/snotepad/EditorFragment.java b/app/src/main/java/info/aario/snotepad/EditorFragment.java
index 3b7fc5b..3dba463 100644
--- a/app/src/main/java/info/aario/snotepad/EditorFragment.java
+++ b/app/src/main/java/info/aario/snotepad/EditorFragment.java
@@ -5,8 +5,11 @@
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextWatcher;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -86,6 +89,15 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         setHasOptionsMenu(true);
         activity = (MainActivity) getActivity();
         View view = inflater.inflate(R.layout.editor_fragment, container, false);
+
+        Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
+
+        //Set global action bar to this fragment's actions
+        AppCompatActivity rootActivity = (AppCompatActivity) getActivity();
+        rootActivity.setSupportActionBar(toolbar);
+        rootActivity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        rootActivity.getSupportActionBar().setDisplayShowTitleEnabled(false);
+
         FloatingActionButton fab = (FloatingActionButton) activity.findViewById(R.id.fab);
         fab.setVisibility(View.INVISIBLE);
         etTitle = (EditText) view.findViewById(R.id.etTitle);
@@ -99,7 +111,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         textUndoHistory.clear();
         selectionStartUndoHistory.clear();
         selectionEndUndoHistory.clear();
-        btUndo = (Button) view.findViewById(R.id.btUndo);
+        View rootView = view.getRootView();
+        btUndo = (Button) rootView.findViewById(R.id.btUndo);
         btUndo.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/app/src/main/java/info/aario/snotepad/ListFragment.java b/app/src/main/java/info/aario/snotepad/ListFragment.java
index 766ad68..29ce9c7 100644
--- a/app/src/main/java/info/aario/snotepad/ListFragment.java
+++ b/app/src/main/java/info/aario/snotepad/ListFragment.java
@@ -4,6 +4,8 @@
 import android.support.design.widget.FloatingActionButton;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
@@ -129,8 +131,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         setHasOptionsMenu(true);
         activity = (MainActivity) getActivity();
-        View view = inflater.inflate(R.layout.list_fragment, container, false);
         // Inflate the layout for this fragment
+        View view = inflater.inflate(R.layout.list_fragment, container, false);
+
+        Toolbar toolbar = (Toolbar) view.findViewById(R.id.listToolbar);
+
+        //Set global action bar to this fragment's actions
+        AppCompatActivity rootActivity = (AppCompatActivity) getActivity();
+        rootActivity.setSupportActionBar(toolbar);
+        rootActivity.getSupportActionBar().setDisplayShowTitleEnabled(false);
+
         lvFiles = (ListView) view.findViewById(R.id.filesList);
         lvFiles.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
diff --git a/app/src/main/java/info/aario/snotepad/MainActivity.java b/app/src/main/java/info/aario/snotepad/MainActivity.java
index cbd8447..b0c3546 100644
--- a/app/src/main/java/info/aario/snotepad/MainActivity.java
+++ b/app/src/main/java/info/aario/snotepad/MainActivity.java
@@ -156,6 +156,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
             return true;
         }
 
+        if (id == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+
         return super.onOptionsItemSelected(item);
     }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_redo.png b/app/src/main/res/drawable-hdpi/ic_redo.png
index bd705ed958b85e0b9550b1780187b084c17ec666..8dc239263f401b32fac872bae8cc544db3e9aa4f 100644
GIT binary patch
delta 549
zcmV+=0^0q`1HA;0BYyw{b3#c}2nYxWd<bNS00009a7bBm0013_0013_0gvVJWdHyG
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10lG;<K~!jg?Up}l6hRz@
zp9%3Kh^Z9+kZ7kMq99@+grp1jQPN9nH0jh%t^5==YGoy<M1LZdV$vu`QUt`PM2+UL
zIE!<g-P_w+Il<r4-QLYR&%1LoyAT9H5ClOG1VIhd<xx8{MqO4dULS8EcpSI@%mSBz
zY2Yw$2<QMGflXiycmb>cD=DSjLF9p@VO@)%r_{UZdk1Gry|13FBi}o)4e`_JV|A~A
zc#enanL6@A6@O6osf+5Dmc)D6Rd1>LtK=IOP>-vte?h#+s(P|aK35>skUtMR0;Vc{
zwhcT1o&wM4ZrZJ1`A2~xz$IXw?q;8;$odQ%DEl&{)YthpdG$lZ9eb@Vs0RngoK&x=
zn@yHz5cy;3+mf6e^}5=r9r$PdgnC>3(Ru;3qdqUmcz>gwYbu_ZYfjy6TA=Jfb``jo
zx&9Kkl2Y1es{k+u)cy<h#qKHaDO3KPTD6gz%vE~Y)LnsG=!49-9lNK|Nagz$P*14e
zGvjXj3-Wae+{}zwx915tO8H!YvBKwXKyicKNhy78OP;phDl?OesWa+5^_4o=QtnW9
nzH9}8ARY*UAP9mW_<#8c=5DVq*EbK000000NkvXXu0mjf55xRd

delta 433
zcmV;i0Z#tC1j+-DBYy#rNkl<Zc-rlk&q~8U5QnS9+6wk09`vH(AMhY5K1)$SP>>cZ
zcvJBe#DZ_&K~eGIMZ{{U5=F%NPVo!Op@cTcHdA|<AAFZ&XEML+>~50Dm`o;<$z(E_
zOr{w5zCQ#zF!~=4%R)}bDivP=5Axc@21TyJKAgiHyuceY;eQ!!;SBa*Er@X}z6`&r
z21v9Br_hk(F4W-|W)l|QQZqn;1-NKSnuZ^lnVE>TX&>LafglhL;aj2bFkkYfa~;|y
zy#a!z;HnRWhq;8wP}`(4K)^D*#yt2PYOoC}Fb!kDmIo7Ztt4Z-m|R}Wy}WDj&4`2#
zun9$noJH7zr+*%1D7gV?n|eggR?-|QGDB6zHI>YO?CsZGk~{`msNy-Y3Ln}A4!R_`
z2^N|1=RsL@1{g3WEz;@D_oMihwt-rQz)x6GF216^h`Bj0r(-y<JixYbGH}#otIQ3s
zZJZ2L<?FFMs5IcVab5!>umLA<593M(c4c!&L&NnX9x7Js{em1`X(-sgsmWwAnM@{=
b$)u(~I~-E(9LDyy00000NkvXXu0mjfC^g6?

diff --git a/app/src/main/res/drawable-hdpi/ic_share.png b/app/src/main/res/drawable-hdpi/ic_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..8302403a05a0be8e5161efaca4e87b905bd412ae
GIT binary patch
literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10#HdrK~!jg?b*Ff6j2z5@fl6P#IM*9rG`Rl424RKUIV3x3fgFF
zy#+4-`S2Eq7hu6hDAWQItgNKbL;{5|x<89^R#u$Z*^|H?NcKrK+3cB}Jnzgo@A>a+
zQ4AO`AS*bBC)mJ#e68a#hI9LM1*7<&p7$8d?O92@^4;V+i#U0AB2JrLnal0_A92q2
z%39rd%6>|Bg1w?BF7$Z#ep!|ms|L;-ol-Kt5{_-v4P+?*6Ga!P3O*i}OA;8t0)8jV
zf0)fJK7^;(O%#WB7|JO>jqM7t78bGDAb%~F_!w4d#MXs%(7rnlu`0xfz4(4M%azA@
zyugnN@h`ZKoZYV)l$gOzh4@dr#HAc!RcUbzkJ`5w6LDHpv4XL_i$}4hw74lO#8$=F
zHm0+PNBLgU;$e1$mYJ{h#R5{&B4Kk{z(`i{Hqz4KH?b}Do7yxgEiHa8%ks+6D5Y`o
z`f(!N3P?$Stz1*67U8MDsb0jx!Vl_HcJWN^HX4f<Z75<BOR6`rPq>@AhW4G96XL_3
z5G7Xez(JI_slM&L!FcXE8qr&ryPVsz5#8hTS7C=go7=MyjK}Fyw{|8wj=hEXI1M-O
z3R4;N55T>+pbyi+Yaz|nvFs!~Rume+bD;^OvYgxhFSr`7YE|3q#+}^m|A0w+PAFi$
z?p#^ITv?WDMN#Y|eC0;nK+ZIp(n{40<Sbz8n2zlam`Yd!w{!beB6OrC7IS;nBJ2;{
zidfXJk!AabrW2vh&lE**J$|%R6va|mmT&V}4H$4b_yaj!KO@-vF`WPa002ovPDHLk
FV1k4@OC$gQ

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_undo.png b/app/src/main/res/drawable-hdpi/ic_undo.png
index 2b40260e9d778072a07885abcccd85b4ccca46e8..8531dd97ec90f17585f2334c31ed2ecfb23c3caa 100644
GIT binary patch
delta 537
zcmV+!0_Od~1F-~<BYyw{b3#c}2nYxWd<bNS00009a7bBm0013_0013_0gvVJWdHyG
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10j^0zK~!jg?UpfX6j2mL
z&l4jnqBa(;76C)7B&dyzB$b_i#a5eu!6pF<(av9CAr_VjHh+o=sVub6ZB|r7!LWoZ
z$6`{fo0)NU^Bx+wr<{4b?>lq%?F<A#5ClOG1i^oUy78|&><cRnjKtxF>$lWFN@;D<
zjnp|{8Mq2u1{Q(Sz;R$3_zHXhdcX_dIq)W>v@>)2h9aZ<RX|-*AFAJ+p6}{Cb+ME{
zql9`veKJGoI)8@hWA%Iq0UbFLYDe8rcQTb9WqWt;PHq9!HFaKnTcG$juhlb?^i6dF
zE$e>)$6D@h0ndP^z$@T0&<6xg0bSq<umW78I^a$8fa@ux&6YKLnemDB)thQtq4As(
z>J9aM%f3I<rIG?ebzMC=Rmh)t9jl+`pdsU<+ASgQQ-58VwRlbLMYY$E^-?{OTR<mx
zPfRIsR^4pKS}h@<nLj(!uKKAaXG>iuA)xsuamo5K@u-x5=AXo!nv9`(u9SdgoP^cC
z(}$XjyQAw4<qF*8b}osO(g3(WcDYaWW!ua?Cy;d#>PhvT`aoS)b3gDP2!bF8f*=SE
bFuwtjpc4NfY$&gg00000NkvXXu0mjfsIl#^

delta 425
zcmV;a0apI81i}N5BYy#jNkl<Zc-rlkUn>M*6vmg$pCu7jR=L0xA$%4tP-Je{y~kHT
zd;}M6h#M_gNw#PyJKt$Mr_R(i&Hp(^)OqT6HS?Zxp5~eNohg+}CX>lzGMP-KKOxWa
zDq#CR8yEs@;0V<#gMOy`TLwNs2ke2K3~On~RbF=nZoo5m1Ai^>0<QU*16F8_mI2o{
zkz&mZIOYM}jL@1RFsEU_H{rw#e!=&+1^EW&U|QOM8;lc2<sjrf2|mDX?r23A=r%D4
zt`r6jatS6R4frPB6B^U?Q?L$}Xb3O>hQSnA23s7xq*@J%sic889>E3}$<S+*%`{@_
zzJggz17BdD4u8Ochi9E@h4r`x;~EAi0*iuM_&j)uc_;d$4P-v-QuL=y;x?k+jz)x1
z9d<cPG$WpPRpTY@NPRnX&9M+M$BEW1q!FiD#HLZzFd!Z$)EWd2A${sv2E^lpTAP9T
z^lsFW47AupUfNPWMW{0d?!X~fOWaB+!)&4`6~U*_Ya;*3CX>lzGMP*!lZt)-{x&_z
TR070)00000NkvXXu0mjfewDhb

diff --git a/app/src/main/res/drawable-mdpi/ic_redo.png b/app/src/main/res/drawable-mdpi/ic_redo.png
index ad6d1090457b494675cb2c6e309c14fd1577274e..8c42c9e0e404a83ba8425e4abad53213ab22b2d6 100644
GIT binary patch
delta 424
zcmV;Z0ayOS0>J~2BYyw{b3#c}2nYxWd<bNS00009a7bBm000xO000xO0b}Nl!vFvP
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10X|7YK~z|U?UcPr13?r<
zzbmFtf@on1Q`;m2#7a9`E3xnmEbN6mfQ6+`5D`Iq2Q9^)!hcfiEEEJ~g*2jIiai$D
zKpc169U+a*>2|qu&o`ILNRdb+^4|cafac(P{1*)-CCy8kl~k3KNP3d=U}kBNT+)f8
zJxRAA(ivbII0rt+CjpLtHDD}H4qRrn8)d~4z%KCSk@~m+);;oa0e}VIE>P@p0L(e^
z;sC%Z@ah~&fqzqA3upn;Kn17+EA%IIpA({&^UoguSOVUi17|?1#MCOlCeSUIOnv~M
z20S~r-T|yg?(}KkU)CQ396E*V5OLPSUAS@qfW_>_1CB=|_XgM>D(C{W5y`&<7=AFW
zC0$5LC3Va!36ZP+!Yzk{mZWdX1=J<=%<Lr~KvPm9z#)5OW{&~&kw_%+hxr6caG<H(
S?P*~E0000<MNUMnLSTZTQLW?v

delta 298
zcmV+_0oDG&1H=N5BYy!4Nkl<Zc-muN7zLwX6pVtA2LAv5&ke*%lo-GX#2P?s4a5#W
zYzD-#K+Hs><@15qnN&*!fjAC`7Xa}oAU=Zy?+4;8sH2$hSbm0R2LKgv0dX!6AHiWM
zF1!wi9dTGroCAQ0G=X>{i58>dHXs&5vz)L4pz(VYP19*0o__(vVL+?~#QZ?a3dBM{
zYy`xaK)eZyBaUMcbH-;m$gpE*8s>s5B_h<AfY=X+_YepfXIut=e6tHpaTX9Wl9*@}
zf%pVD4roVHm_TMepHFfK00p(6@eEHuG_oA016tAYv=EIf$LWADXh8!Cg?t)XPB0fp
wfJ#0R9iRflZX+aM@zGjw6pVsVFbZG*09i!#R#VW@rT_o{07*qoM6N<$f{xI0#sB~S

diff --git a/app/src/main/res/drawable-mdpi/ic_share.png b/app/src/main/res/drawable-mdpi/ic_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..d58dca4e8315bff7f3ae948ddf8b34935d6a5d61
GIT binary patch
literal 558
zcmV+}0@3}6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000xO000xO0b}Nl!vFvP8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10jo(wK~z|U<<~uH6+sk$;WLU65kERV3Okb^*jWUvv=qyTo%#dB
zN~~?Q@&^ROP8$gt>?{=ou@DPmkw)->jV1=X5xI{=1{^PY7r~he;(>)_=Ip-j?wLKy
zMEviOTHP22BVr*UM8wOK(wA1OF8Fn9`W2hFHZAxilVfoj0<U`nUXABhUjrCM#O?{x
z!<5pVa$rYg_~D4y>Ph)DK2SvfGq@2Es}ZrkCv~X?ZybIet3{pH@w}t{Pq3>dcor)K
zV1#?Q41q-~<>O*a@Lt@)uw30ZT@x~oWo+c*A&%iH1_k&duAtu6l;NK{YWSl#-@<L|
zs|GFvmOJ2Otl)Tca3QeK1F!x=soIEY2|Vk`Kafi>+e#=f_lJw{4*I&@UrRi)-PP9d
zK=)@j$YawhrOA!x%+w^Z$Q+&)5+mHl(L8?&H?!<QOOXqBUx<9g<1AFl-EAo`lb^P)
zhrs1#5?SO3KJ*B@7{8|K>P;yPBI0{b%AuwLIo|fny=lPvJ#YfwI$r+}Cz}goiE~&h
w;A=SBmD_S_wlgB;V|#1%E~PYT#rn77Ct%6eGw6pkTL1t607*qoM6N<$f}@P_#sB~S

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_undo.png b/app/src/main/res/drawable-mdpi/ic_undo.png
index c09d74106e1e161ccb1acaf84e7a7e0d5c186f5a..eb39dd12f19caea7f744c5fe0698827e7d6cd7eb 100644
GIT binary patch
delta 419
zcmV;U0bKsV0=xr|BYyw{b3#c}2nYxWd<bNS00009a7bBm000xO000xO0b}Nl!vFvP
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10Xa!TK~z|U?UTJq13?r<
zzq=U3Moi%kVqqP@6oO!7nN|c}z|PXvTHhi?EG&EkAzeZWTYu3eg^eI8f`kx=#U6`n
zWL!78JAw$#sfL}o-#v4gl>&i4;I9Cz0kgl|cgk5;B-MeMnf1OZ0wPJPl9nVbNa{;^
zlGHV`ftLxe$B0hWB!CFm0nUI&vKay`;1HPe75F3p>;hL4nogn*90M~x0%M6~pi!`K
znl4cF5de72_<wc_oB-R2U<oJ#>%alf1maXp52*PFxI6><Kq<#%sz5tcKL9p;1%^Q7
z+cAF3vt&{(_rSdG1Tz1Q93n@loKs(cpGcfL88NWoE8ryoECMf1Mq|7e6}^q5ElC$e
zB+TqVQe9FksUzv~eb2F6Ny77TV`kTR4>Njv(`I&8pd3da5D5GO-T-$RpNLy<7A^n)
N002ovPDHLkV1jBOr5peN

delta 296
zcmV+@0oVS#1HuB3BYy!2Nkl<Zc-rliy$ZrG6h>80#Kj*(ojMdzaddET5eGL%og76s
z2Oq#$d<3ER2BMqbq9};yJJm0cLWvC|*FlH-!CA^p?n$_9V=)eg!}*u^zVCv}F9rI*
zGm$_|0yv-zx}XE<ApNbtOD7?l_P`pPWv$8sY{3}hr~)4nvVZYj(^SV5OhJkw5J;53
z%CfP_4pb=uf_ucX1DJsp$b%%vf*KfsO~jgum=}sbm=hR?Sui+EL(W2Y{S7p!0^%kd
z%b5~GJ6HBOYKPO{20Y4l0&6D9K1-?qNdon8`RWFHJjFMIDnOMe%0blMf`tH8Vj)j2
uhI1HIP>~X*xFMDT1yJU{E{DV6sCffG-T5!`eNavS0000<MNUMnLSTY*rhfeZ

diff --git a/app/src/main/res/drawable-xhdpi/ic_redo.png b/app/src/main/res/drawable-xhdpi/ic_redo.png
index 6c95856520a9b989e87d08c34212a01fa18541e0..410550d513ee41c5c500aecb77936f34e1454465 100644
GIT binary patch
delta 756
zcmV<Q0t@}F1d9fcBYyw{b3#c}2nYxWd<bNS00009a7bBm001Xn001Xn0Ud_AY5)KL
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10*FaOK~#90?U+r7PGJ~^
zuXhGzVvH<gM3aS(vam6hWF=7+vM{l;wz2fHva)7pWrQr)kbg+oNMdR>Y8Ir_#N;oL
z@pD<6kH++!Z_YW+`9^xKI;-=Y^W69SJ@50r9SDLT2!bF8f*=TjAP9p0619K6HOw38
zR`q<ldp+G2({0pY;4ZMd-Teh!5U>E)2y6z1fYrcaU@7pqb-e<f0TaMjO6g-wwYLE`
zf!y|QBmi{?*nbD?2DSrzB_98#jsbUot0|>N6*UYqhxuAjd({K#UG<0cF`*t)mzB^m
ztiGT1p36-c?@>ouLYw4+dRkpt!F)3Tm`&G*4I7`$q<W~Nd95=5vvxnBPIt$1Tdu1s
z3!2xQ07?%*bp<dA?5ZANE$jgvtNVdO#er8U0CgR38-G|=;<0zYec&GO1b7WhwXQ|L
z60+@aJ+KYfLAGrcVX*byX|ip#In)j6%YyCsO}(b>R7)SW)J^Icb*kFxD82-W3R<JS
zC{X0PdR|>yx!9j|`_$v=n|TXBU80T`C@`*Wufup74J*}4^A$jm!spb5HT!O-<%s&J
z&Hy^DPk;3=aG=vqfKw@@qba4Y)vXogDbS5Npbn~UJ0$u;9qEb~3hnciI-pa*3v;~i
zWHVOVYWZ99<pNN*m`(INE~=?P&oi~uVZL+#od(~eI?$l!nL6q+UpxSH$m}4K$H9hu
z|I$&X`P=~7?E)h}Z;q~eDW%ccT;^bbFFAG5E^UBS<Zm@+8`J{)Hh+t5eaXoYF<|zQ
z<A(aB)k4qJyw0er?pEtL_7+|Ob53%zfwvd<lv27<x9J&m`pG)1sek@KN~!S<4uT*E
mf*=TjAP9mW2!bH^r}+tVrZ1Nip*n>C0000<MNUMnLSTXuU0`qk

delta 534
zcmV+x0_pvW2Cf8<BYy$)Nkl<Zc-rlm%_{_99LE<4tM!tsP|5)pk(-N)muwE3BquMm
zwY6uC;-E|pYzYS!SA`_X!2!F4F#pr~KJ^^-z|QmR%=1iRzn}V)!_05y`<v&Pd7c%E
z5kd$dgb+dqA%qa}FDaEut+gC}3~twQ_yTmox`BE)2xs6L+<z2L1Ma~cxCOH?1xI0%
zf$*-?2H;{na0MQh-GHhe@B-%Ga6sYBH$Xn=X?P01G(%VNS~fH8BfPl=pl}_Whc^L+
z{>>Mdfz4HfH`4$yMCEXGE&2#&HNywn06E+<a=yADc>p^U!w1&@6l#MfAqFq^0gfny
z52gVq(hF}jZ-25NzXt1YQcjzsn9JhDCjTCXY594))2#mniweg%e!~yQ`KNMI;wzAs
zfg7rPw}|z^Yk;H0@e@8Nhnv?$zUAVkKcMLrmy4ugXbr%LE$~v|0#|Ut(5JQ=9);C_
zeTCv;?lxLjVJ^dWYYo6j3kpMi!}7+aXr%!-p$k5Hgnv(mu&Z-zHDK4HU@k)8^%{VK
zhdeekj@Sc4D7<z9oC<}WU?O7S)f<2V`#he0DuUs)8j!6}<lM&4HxOQ{0b(Wh`A3nd
zh=$jG2Xw+EcvjYod$A3UXn0>M!FIR^=M0BW$RA1%4Y|tyju1i!A%qY@2qA<JLTa8L
Y<^?MtrVkGWIRF3v07*qoM6N<$f~%?WF#rGn

diff --git a/app/src/main/res/drawable-xhdpi/ic_share.png b/app/src/main/res/drawable-xhdpi/ic_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..c0a0b3f014763eb8bd578783d3e6bd3026d593a2
GIT binary patch
literal 1030
zcmV+h1o``kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm001Xn001Xn0Ud_AY5)KL8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11A|FKK~#90?c2+XTtyVe@w$UXFhq@sIuT!plBkIbMTJ2GU!b6Z
zizo<2k+@dzfr$S=zz04M7ovjTM!}7sI3huijNr<Q57dnri4Rm_oCFh{`M9V%ni(?p
z(bYZGSNjVMP4_v~=XY-1I#s8;Ll`k)#EAbfMeYFFg0T?7L<r%!5W?Bz%io3&CPN6j
zilUg$72CkU^_aFiyK!yqI0phA#9W2=1?KQT?s)qO?!bHl@e9o3_S|vz1)PLmT8LlZ
zSFEiYe{3a0Byw*E;p86t)`k%7sWa+A0&W?kZx<4<X^_5MNWkg@-xKQ$x{!dG1m7R(
z430?{e4wBRA>0{4I5lCIsXm3Xvfy$|^-%hja%*lat-v^5)@;XD$CNmWh94Y@`>?MM
z!igKF^K$EI1a8Ea4X);G4ea0>T$Ec^EjS-<*NEARyOdKItMM3Sj$*q9k0YgQ4j!z*
z4jifweyFrrQ!&m3;_SJhd_LUwI|^(quT&M2xG;CTeFc}|qZ;8~;ilZN)`E-i3_inb
z`IyGj*tEoU9IvP@Yro+ktjeXS5jYMn)`<BFPl=1w!=<?8m=kOMcy4XAl;U?*PT<8H
zsCj=EF3YW}G2)f)2Ya#2u&>xhBHr_<ThrRIHniZ`MDg7&YvO9(E1%|$zm6sik+TxU
zKQqC1Md(6DXrMGnz@CKhQ`%W8LX!kcCXB!3zpw~y5qEegbhiwK5CUFEOuz!)<8EEr
z2!-&^R``P!LhH7|ALEMLx>|u%cwY7G@F$-1?_p?vh3!0E#fIG4T7k{t(RUiZi^t*J
z;wf<B659=>$f~cl_u~=6ejH9gvxdmm*qS@mfg!fUwuuX274Ktn?sx|VPQVj5T#<ys
z;#yMq<tEl+-AcvYSFjQ9)Xat-v0eOS*n;1cc*Eiab{22q>YSQ-0ymfUe-)qL8nM4v
z$Llygx2{%*`;14$s?ra3>S9&F>3B`MUxY2kj@){B1{316PvH-oky}g8U`$*9e@aNg
z{dJ!+v<;D>DCUczcqxSNUcxXFbp}J5fFnqm#;4U8bRhw=3BLR447!kj&l7yVs59t7
z0^Z8xJ3NSe#kRbgJMO-Lb6S?epK)&PxciFOQ~0id_!(T1JKlkSQ^dC1!J`O2fakEj
z&6wTl&X$O$y{p3FKTUmD6ve@OQH>ZeVnhe|8=L0k_^Um28~^|S07*qoM6N<$g3~<l
ADgXcg

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_undo.png b/app/src/main/res/drawable-xhdpi/ic_undo.png
index b3b7f337558c153c971503f9e1b76ec1e68f85d5..150ea78dff1f4dd9d93ce89fd1a94baca79d28d2 100644
GIT binary patch
delta 748
zcmV<I0u%kJ1cL^UBYyw{b3#c}2nYxWd<bNS00009a7bBm001Xn001Xn0Ud_AY5)KL
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10)R<GK~#90?U+4l6j2n0
z-<y?4TwN7p2_pCbie(}QS|r*8e}SD6L~AV+?5q^A@E-^^f`6D!4fuhgpu!ebN)&>K
z3u#0oXchvAo5x}TE9=h3ot?R>a2}XuE_3dCUe5hEBN>Ka7=~dOhG7_nVHk#h+MqQI
z6yO$cWY9W7FckB?Cg~Y48B)w3*pM(*mGlre;hbv}F&VH~(wL<ElJ-ifOBz{!mLx4p
zT9DL~^j^|O=YL$gh`D`*&d}ipaI}wDhk+ZwTVNGGTEJ7_0<gQt9MeS4bP4e?0oVpy
z1U`8toJ1RV4x9wymTochFd&l&z!u;tuvB2;y_g410WPEgi6#Kkz}J!!@1_Bahcp1X
zOaMlK*$~;rumW5GDxnO3Xmgqb4gt-Q6U@p>pzfP%(tk0SL{-wPq+v-LJ-(Zh^g>cY
z(!8SMt|e(j(vJ0~E@@oSaY+-Bwq}fdOwt=*$~pJNL(|`oUI9LQ1Fi!HbLgl5Q^0+q
zQy>cqz=40kfbYO1V5BcG9Zh?PuIOtS=57MJ25G<}V6=$DduW>g<}zq_2UPP;lGlJ`
z;5=oW&wm|#!$j4P#@)OV<Tap0zy^xwik!ALOy>#Q&l2dXcgUgjY>J*mV5e`;e)oXT
zm2fRZ&u!m;MVtb`DgkgQn%lsbPr#z?0l_K(*iLdUa?dANkr$zmm2f&i$1h-C_c!JC
z)e$vGj|uaS@s6ZdF=G`;XS!d8FhGh-cv7|r&Sg0y-HaJtm6Yu?D0m5UFNac10EU3i
zf0X@eqWeP6PBE?<EaWF>4CjCk&bgmu1b5D@0hc9hlJvkiw^+tJhG7_nVHk#C7=~dO
ehG7{0CBFfu9*-b?r)O~h0000<MNUMnLSTY~xk6O{

delta 530
zcmV+t0`2{S2C4**BYy$$Nkl<Zc-rlm%_~Gv7{<rYWQedp78DCbER~XcY@`?q7A6Ze
z78aUhHIt^SC?7>xnmr{8DGSC&Wbi*-&(%>kbndy_`yMsVuYNVn$GPV`_uluMGdC6^
zgb+dqA%qY@2q7fqI8JT32atz7<s85cES7BuDuB1JLqJ>AuzwFu!ezJ)H{d4B!8N!5
z$6yDnupPjkL%?sl;R-CkXHUB(-okx23!7~P5I6+4h{Abz7I45iU*G{8hH>ctj6%TY
zHR{s73vu8-c>+hJ1JH(m_b1?0!~_589&D8i;9CfI-Q@HAsJ(~jP;U!^0eyr3d*P+U
z!F%0;38?@+D}VG;z)reFF$<?)zgyW=-AKX~HDe6IC3vXLZjknmVWU(4rry9+*!7Ek
zRKX!t{a+1_cMjYBLjXl}CX*pumF;T5WOD3NSZ6bUZMQf^G(!y-t}l+<D@ZzkN0<^=
zs3i=qhMaT&VjC!TpP&|9ezjpl`W6t~MdDa<KK;3HXMY;$8Xz4)#-~3STeE=F?GT5%
zn!c1^r;T-hWC#uLTGN-Tt%Z<e2q{fJ9*oxp5o~TmLQpe9LDP@4tpFrL7}wN+oXr44
zLO}bKo*imQZK`GhZIbZiMHNC6=A(Y@p#GehhV^{PLkJ;+5JCtcgb+dqAs*fV)G8{c
UiLgXm01E&B07*qoM6N<$g77Nmxc~qF

diff --git a/app/src/main/res/drawable-xxhdpi/ic_redo.png b/app/src/main/res/drawable-xxhdpi/ic_redo.png
index 93eacdf0006c9d6a03caea85a61996957bab03df..82b02a847cf6db8d697fbcb74501310fd505c37c 100644
GIT binary patch
delta 1014
zcmeBT@8+1GT+hH#?Bp530R%N1DIE+944efXk;M!Q)_fq$cxKzeW}u*CiEBhjaDG}z
zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa~t9iA?ZAr*7p-tx_m4V5_d@p(&9@D@S)
z3~jflBVDZ85xas49y%>eSQr)ayD|Ij%XN`rEZ+6vx+Tg=OONKqXs`;#bTlp14v!Lb
z>EcTA3H9>2R4-o4>^P}9{n?)MG_QH`F-)E(D$jjBx3^raSk)LCn9VWcwe{gP)-#M>
z<|aEwY2Igkaq!ir*E|Wq;tOXnrK!H1z9syUo~O0yS+7|WO>BQv)%#xBKS|Gfm(t5g
zOXjQmwWz9@9klC8;X6xD_gyi@EE{+$<SO`o^jg?6zh}^ADi^tT_)Zj~*SeXkGZ^F8
z_AyOk_KrUv`ruB6gz>@Z$jyHo`5106?_vFO-SOq?NQOSf?`&_<?|w>jU}lhGvs*HI
z@!oZ*4`LI_PuuqD%Ci|TJkYCuAhIE3+i9Kfl}35_8`gI|b?#?oSk@5UP=D&HSe{(P
z!ejTcrt;hJGTh*-30$#6Zw~Xj$n^ZJr`zS&7-SYzP2PR+FRRQ6O?fLBh6xSVC9ciR
zS(kkvaMkq7$DSU3!nkC?Cv$Hr?Uw;Z?o0m+y;SKbuJTvm<@Af+#Z+}YW=+~s`lbGc
z;!8Wv-J!9L_DV0m9niVIa+g-V&Qg<YkKZsdZ1?!(a_RBTdap~@C)rK<lIivGcaM+f
zCFfOq9qFpJGiI*c>dAb9DTj66$(mW``{zAdd+uoVvpepkAInvZvy+#8Q%NxXQ0ca<
z@<D0Se_aE`&t?xSHq406wOwjv#JcCc(Pg0mrurS5J$6+6EN7HwFSQ9<$t#mN^SRQ8
zjEMod4DF5g7oUpr?!3UBQNF5DYKNswfLa3kht!mpt6kgo&VI$Tv{UuL)e8y-8+;G^
zeDO)Kj$yuOOub-*o{0<NmOUp{DH}cU=Di-rGLMTpfP?jP`vRbc80*a<%4hP{Jz3wu
zRki2guIBo>v(tBJ$}_Ps-0?3xyl9;<<6jY1_ovQh81Ch5xaZ1Nv1+H3>@@zF%nWHO
z>u>Jku@SoxELaj__k{n!S+?xCJg-)ARB6Z?0kymQHJ;BZb?3r6Dch<1li3YSpQW>_
zUj1uw^Wv0C@}~9MgYO)W7yq;1*#z;1=-=mdi&fct3V+g)f1k;Qc@Cpqf8^ud1LqDI
zG<;Hg=aeH=G3!<Hy88e5z3fh6oJSl^wKJJNZOrua_ps8*toC|&QcPC#@PW9`-S>pe
huw?^d<IRpc_)ZwuS%@kmlmYWEgQu&X%Q~loCIIjNv-|)6

delta 884
zcmV-)1B?8N2#N=gBYy)?Nkl<Zc-rlnNoy2A7=|-ZW1L`?F>V1xFM<~ZmrD+!fw+KZ
zK!_(16h%eE4HOlkA`=%>G@{_m<sc#=xZoaljhX)x--7QDhN$VD>gnp4=Yi)q-PPY$
z{dRTrG&BGJ00000000000000000000002N17#kbQQHAu1-+w6kWh>Q4r}(?&YuQdk
zs$2Xia=#pvZ)&Cix{xM0L$<iv+RV%8a%u>9Yct;!e?*ot+W-x^AiL#Gc|zWh59DL{
zOujUq%182^yeW^#?e^RDlwxPpil3bZXpmiUqdYHPlwCwze_O*&%k^@0m13uqi3Zp#
z-z@LQVNXT>n}6=u@8vbQ!Dmq>h@G$-paCtEC*|7&3;sXdU3O5;Ng#H@Yk+$|%BAw6
z{FP$i%l#n-<RXu;6IKH>fcf&2{2EZ<%l%|`M5l+?38MivL$;+HHBo);9@rJePWlb7
zoFB?i;ma+`c`;)ry$0CqSS#OUxcKAmhVB@#lTHKdZGUvHJ=jV$;&<Cnn-(E<s^0*e
zq*-3_yq0(C_S^D++$z_|Wpcr|ZHR)!-3qzI9;CPAE6-zj81s0^H$W$7vlpC7FY>3n
zZ+FouD{f=V7;Lp>9kRFKw3fcfHb4iTX|uG_!e5XpU5q6#Mi(Ee<)EFbHX2~DGgM*3
z?5p%`G=Jil=gKqkOQsuOTf=8#4$8&BRm<{R3QJ@cQA^}?+px=I19ruHD7ihDUbmhO
z<ikl{!b@iV4bTDC#aL>N+A1j@=vMgMOf<l~9a?rrjhw^o%T>VNBU<dkPPh%Q)x?z;
zA4U2@h#XIQJE=CHFXABG?q^SiKA?viL2jvNZ-1AQJ@JUm{9NEOKkD92Y7ICV@x({!
zIClItKnGYH@m2nEoGpYJiXDFqu$eLt;e=0QN1exx*9N$^)z1-DJUzsY-v%6yaI(Qr
zbHB>5<EH_(r90V`kGo5{h#kKT=#8*hwTIa8-+<yIPx5i157>1aJKh>lu)p!SW#xx|
zTy4lXVkh|*u}-<k{@M1eY~{0@*s1Pzbl#p1Mf<SQ6j<?hSS$_)p!@rLTT&P6{_oiw
z*z9*>>X5Snu@LgE00000000000000000000000000002g41WMZ?hxKUoP$090000<
KMNUMnLSTY7W2nXe

diff --git a/app/src/main/res/drawable-xxhdpi/ic_share.png b/app/src/main/res/drawable-xxhdpi/ic_share.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9e0861cfc0558ee2ba16dc3c654bafe6b6b9f41
GIT binary patch
literal 1508
zcmV<A1snQ_P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00004b3#c}2nYxW
zd<bNS00009a7bBm0027<0027<0nE0cg8%>k8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11z|}<K~#90?VU|%T}2dt&!}ys+NdaMo3sY)A8xgRRt2G=O+y=n
zZo6<H*iu_52yR5(_=ljNLKGF;l*Ub=ydYYvB3eOQsMy4|2CKC{G@B+78{^C8V(uet
zc>3O%cjwK$Z|2*EId9H6_ue^k&Y6iwB9TZW5{X12k%$cwdICiPSRo=?L}ZhQ^omGN
z_NS8~@~encL}b4)=Jycu>sWvuU=a9+##DhJpf~iqI|ATQV5$kj&u0=C2tEH&13U%H
zIvD@rw_$f^JxU4iNM^uRnFY3n)~8ee%W?bc{1=lzx652E%UijU@Pde3m7~0?MdW#x
zfzgGb*ids!L@v)+bX7!pjWH)RgJOIG1|)yuOD1!Rc2JBC*yvIAChdS29k9})>|3=1
zVsyaG9%ZW|p%@+D<NIG@Ry!a@2b}dN`?PjIj1D;NQT8v|0ns=BSP2Y?$Oex;Q}HOf
zoB&IJmw*d7rXK1s1N1bWQ6vBc*b1ERZ1@_3p>-|{z&hY?n+y*y0W1rxcW{8~fj4Nb
zvXvKAU~_2Qg90oB_5kOV#v7-#nm`rU6<YtG02_f(rQxQ5SAZ_y;mi?QCW!gT2UY<G
z91K?hR?m~Q6nHChOe1E1cZl_yj}0qdZqis6^E1%bKz28<J#*41wrVyBi~z&H4q^>8
znF}j_QyP8>cn(+;T8GjC+yQ*0H2f^^A>cFn+1UU$V8cpnr1C9rPw4rV7GMFe3w>C5
z3V0ldCdYLNzzSd|@G*0X*c5P-CKoZF54&J$n8q&5OWLJtp}_XpyiapG&}rapVCg&=
ztFh6CmIJ`5P`U>P_uk5J>?WuSyD8F!m7{>q0(<cxpWaICF7!M$?XWPk{y`zX-pXc4
zVPy^S@2zaaVPIWoy$b{IL7NO8cUV~uY^dow-+lpGM(p^o@(PDBzIrQb92Ai!jWHu0
zf1@zCIKXG<chDH~phx+I!{ytm?td(Z>_VbG9{@~>J&@pozl<@9J;^R4MT;)fy_IFh
z#Q~>spT!(L`!)-Sivz}TpGA9Q7ZMi-4Cg+JIW_>F0=IkojdFucL-^i^O~<kka{_qJ
zvjb|RR75?nms?D>$q4}80C$DfyHEfFv_Bm^1S}7&dtm@}x99|yg3JW)G_e<CYGB_4
zm(S5T;2~^D@>TRD$)iAjX#EQTwx#b~nlH+~$-K%Ium;;Xp=B6Y6H50&felf2WJVdm
zz8O>40(u2_f(EyW0R7q1t>JIrHQ<_d>DtlY-k3F>jq_QrhzD%j_#pa){yX5_(DUyY
zfIES&l}-TLv~^49`F8}^_VjJQ8Ko2c#I~nj8Cr*Wl<vYN>_Ypji0l-R1&X0#BC^LA
zv%i7-8%3l~MAnK(t$p&eh#V7<iZSMldeWT;uol|{tfg+Y6}TJtg#TY}s=(*K{ULNN
zB*13ixY7wT*mDQh0gG|#bNYyst+fD)fM?L}$j<>s9E@M%N9-MR2@w%s8Mc44m4;z0
zM@SpMO99qn_X6!=Uuc~R2kv33D-VR$xsU+Y0<UB9MLszcTGv8@Jp$#DZEcn+^Nw95
z>Hxgx(Fu=f=M!VG+vkaS^<lvn9pLkblll`BqXT9<%0@dNMhB?x_Eezmn~l){$2`hb
z-$`1!babl#H;H{x^M3edMWkDsu8!^vFvgq}kuN=n{vy>1ngqDd!yX{jpfzCg`FXK7
zv_7Q+d-vQAIT-&ZpewXKr38EEycH*WPihu!jqFX>=V1K3fUnb{@qt~K57D?N{~548
zuiuSsAJ7QwKA~SkZj-tH3G;{8O;#lfV-tx)B9TZW5{X2@nSTMKx(*KE>X*j=0000<
KMNUMnLSTYBrLMaG

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_undo.png b/app/src/main/res/drawable-xxhdpi/ic_undo.png
index bf47f8cfacc4f085950a570a7dd326cf320cbcdb..5cc75358a2eda6ed5bf2c06984887fa3e2a7c170 100644
GIT binary patch
delta 1001
zcmV<F0~Y+82mS|;BYyw{b3#c}2nYxWd<bNS00009a7bBm0027<0027<0nE0cg8%>k
z8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11A9qCK~#90?b=U>l~o+Z
z@#jbw)-)xWWl}B_OCf4eL9}R}1SzzTpiQ)F+iWD>c7hZwTz{#nXk$501c4&7DBRde
zTV{WVEP|NErWm#H+v1Gm40FBjpWk`!D?T5%+|9k`Jm+`r`=0y0=atON%*@Qp%*@Qp
z%*@Qp%*@Qp%*^bL0UVlihC3RWCt*_fpC@4wSjm$R?5>8Np8*zAN>zz4qX63^Jtt}B
zO|M5JZICoAX@5%6I!Tu$EiS+REa@jnKT5hF>6?_&FMZ|?!P=_AeQpNc06qkM7?Gik
zOTY=>bzn=$F@(9rV5;DLrk9I;3b+<n^ih_8ua^6qjvPy<F@vZA+TQ_u0L&LI_^m7e
z$AQNKN*1d|_^M^QyMRx~zr>+f0!{)?1(&hCn!#)TJAVQ;0f&GqrK%WUiM;+iT(Y)x
z3szS(rkzAS-~L&mVuf4=-U3oj<zBOJO{{q&09%32!pqa2uYsL?*ZxNFnyOZPe=jf>
zTaSsD2VS`yCIIp|J^?cfYmx2hI(cmCqUt;L+y>CH?F*8gZ28@_{2}SAq;rzKlXOwi
zZ<796et%t;bibs#B|Ro-yQE!`o{{vdq-}v&W+lCrQo7Q$p^_62;k=}il0KF6ZAz(i
z7GRI0mn7|%^n5_JGm`eDlokTo8f^lH`9I`~qNfXv=?UO4-7o&m0#l`O-U!>5Mc{ql
z!J-3NIkpFYgLIpS)4=+YA^R{3Y%ey5@nhTq9Dk+#ABGbIF3hXLmGmpHzew;FfER)9
zTaM+OQlU!u5_qUc=njA>@-MonC17ufKqZ_5nr;U5hI|e4HqB2-bHJm~VM-bN_9k!u
zxY}@BXNbIa6kqohs<5Di058*g65fmqP}=QsBs4i4%>kREI`2aj61E`nn$X0NsE+$m
zg?|JtguF0+++aM{fZY)t_o?b$s&at)Xm*|OQADSG8}yn0yg>c+;9p=z*A6G4iYZqa
zz_A8n>9!V>s&Ea1Jrc<Gj_U4h&ja_2YOBl*q!=>{^hii4{VwUfnjfE5-h*hT*zdc(
zs&)8+fQ{s*ChGX2OGiUc#g#4&dH-UR1!D3|y;p&IyL2)XgIg1TJ*zVQ4SY_1__x+h
z+0gfdS9`bbN8`r<PAfkgFe~X)N@;Pzk<84@%*@Qp%*@Qp%*@Qp%*@Qp%*@QptY`lL
Xy#7=i*Zo2)00000NkvXXu0mjfJfY{~

delta 902
zcmV;119|-Z2b>3xBYy*9Nkl<Zc-rlo$!k<W5Qh`95ycQk7!?;p@!~=B5H%nQ9yG=X
zUIay4Pb%U98gW4(3PKQr%gLL&2r9TQ7>!8AOy++Ye+4xlql|Cq_quENeej)<nR(sy
zy1KgFOiK$Pgb+dqA%qY@2qA<JLI@#*5JCtcgb+eVepIW~R)5Zdzsc`~yWkAYhMxe;
zh2wB9gWxX!-(VRYVi5cVpaM&w1VQ#C*bckkOxUB&g59vA83Rz!m5_Tn!siv>2Dk^F
zg}31Y_zb>;@6=cDIeZAm;5oP-_RD_O3<0R*k&f`*MYs)KhA-fB-8Cdp-s3gA0=K~V
zRs)bpI?}s*JAb?dzdD-qM!}Hc;w~J3bF2lxSvtb&7r;~SeTEbMKR>`TaG|9Dq)JD4
z&2o4R{_;5S|618s;ff#*pb-KPJ00Qw=E2kOM?e!_?{|0v&bAPM$ms}w-{Cpc#8oP)
zK5wfbMgSV7Bgw7shM|eCAJ>SNswrjw{z^xBVA^Etu77W|QLoK)H6#eYpXsOr?t_y}
zF!?oQ-x>-%0JR`Ic3ii=)f4bBJuj?=i}n0aYey`BtKdes6CQ{6wB~npEmL|8Z6OE1
zg|c#<YBjP_CpbyD+ot1?^l=nEaZvio4R%R-Pt6#BN!|3;NW(3IF?GWAa8xHU&9&Z?
z=3lb}V1EJ*%V*}8V&xQmBIOuIGV6=w6o4tc8<+WLb!(+2pM59cije*3a3<HDLjXR(
z!9bodNYyq3KPGHp3|I?*bRvrZHXwVn+L}&KqV`z{!2L`&uk_=Vvi5v}lq9RCU?BkI
z&>!^cBhLc~f^gB<xH3*bCLZ+bp)by9Ud|Zntbc66rO<;Q*Op)<JaTeK%c%^tl8!FK
zEKLtuI*64Gtb}$wD?}aBPq@g^N!UU<D(W{YqK;`eRr}gQFUUeV8jNv9_?)UN_0)_D
zIvweWc`U|wc3W&mmjVyMQqA#E#v<+SPK(b2f=)-cu9GpEjr|q_5Og}yr*9KcTh>+s
z5Pxhs(l+*JgLA+a{rlF$8*v~32sRx_%b~6!l6~R2e)+fH;sfM?_Ztm@Z^!lLQmp|6
zpi5iV@)gU?&O5x?2Px=E2*KU}_kwQzkdY8V2qA<JLI@#*5JCtcgb+dqA%qY@2qA<J
cLWpO611Mn+veMmSMF0Q*07*qoM6N<$f^I#ay#N3J

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 124b08d..0bb35f0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,17 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
     </android.support.design.widget.AppBarLayout>
 
-
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="fill_parent"
diff --git a/app/src/main/res/layout/editor_fragment.xml b/app/src/main/res/layout/editor_fragment.xml
index 7341c47..89ccc03 100644
--- a/app/src/main/res/layout/editor_fragment.xml
+++ b/app/src/main/res/layout/editor_fragment.xml
@@ -8,39 +8,44 @@
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <android.support.v7.widget.Toolbar
-        android:id="@+id/editorToolbar"
+        android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
-        app:popupTheme="@style/AppTheme.PopupOverlay"
-        android:weightSum="1">
+        android:elevation="4dp"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
 
         <Button
             android:id="@+id/btUndo"
-            android:layout_width="48dp"
-            android:layout_height="wrap_content"
+            android:layout_width="32dp"
+            android:layout_margin="4dp"
+            android:layout_height="32dp"
             android:background="@drawable/ic_undo"
             android:enabled="false" />
 
         <Button
             android:id="@+id/btRedo"
-            android:layout_width="48dp"
-            android:layout_height="wrap_content"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_margin="4dp"
             android:background="@drawable/ic_redo"
             android:enabled="false" />
 
         <Button
             android:id="@+id/btSave"
-            android:layout_width="48dp"
-            android:layout_height="wrap_content"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_margin="4dp"
             android:background="@android:drawable/ic_menu_save"
             android:enabled="true" />
 
         <Button
             android:id="@+id/btShare"
-            android:layout_width="48dp"
-            android:layout_height="wrap_content"
-            android:background="@android:drawable/ic_menu_share"
+            android:layout_width="32dp"
+            android:layout_marginLeft="20dp"
+            android:layout_height="32dp"
+            android:background="@drawable/ic_share"
             android:enabled="true" />
 
     </android.support.v7.widget.Toolbar>
diff --git a/app/src/main/res/layout/list_fragment.xml b/app/src/main/res/layout/list_fragment.xml
index 62129da..90448ab 100644
--- a/app/src/main/res/layout/list_fragment.xml
+++ b/app/src/main/res/layout/list_fragment.xml
@@ -12,6 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
         app:popupTheme="@style/AppTheme.PopupOverlay">
 
         <SearchView
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ab3e9c..ddc59ea 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,5 @@
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
+    <color name="colorWhite">#FFFFFF</color>
 </resources>
diff --git a/build.gradle b/build.gradle
index c2eea8e..4fc4083 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
@@ -15,6 +19,10 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
 
diff --git a/icon_src/baseline-redo-24px.svg b/icon_src/baseline-redo-24px.svg
new file mode 100644
index 0000000..dd77c2d
--- /dev/null
+++ b/icon_src/baseline-redo-24px.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="baseline-redo-24px.svg"
+   inkscape:export-filename="ic_redo.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   inkscape:version="0.92.3 (unknown)">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="744"
+     inkscape:window-height="480"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M0 0h24v24H0z"
+     fill="none"
+     id="path2" />
+  <path
+     d="M18.4 10.6C16.55 8.99 14.15 8 11.5 8c-4.65 0-8.58 3.03-9.96 7.22L3.9 16c1.05-3.19 4.05-5.5 7.6-5.5 1.95 0 3.73.72 5.12 1.88L13 16h9V7l-3.6 3.6z"
+     id="path4"
+     style="fill:#ffffff" />
+</svg>
diff --git a/icon_src/baseline-share-24px.svg b/icon_src/baseline-share-24px.svg
new file mode 100644
index 0000000..87357bd
--- /dev/null
+++ b/icon_src/baseline-share-24px.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="baseline-share-24px.svg"
+   inkscape:export-filename="ic_share.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192"
+   inkscape:version="0.92.3 (unknown)">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="744"
+     inkscape:window-height="480"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="0.15254237"
+     inkscape:cy="12"
+     inkscape:window-x="75"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M0 0h24v24H0z"
+     fill="none"
+     id="path2" />
+  <path
+     d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11c.54.5 1.25.81 2.04.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 .24.04.47.09.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05.21-.08.43-.08.65 0 1.61 1.31 2.92 2.92 2.92 1.61 0 2.92-1.31 2.92-2.92s-1.31-2.92-2.92-2.92z"
+     id="path4"
+     style="fill:#ffffff" />
+</svg>
diff --git a/icon_src/baseline-undo-24px.svg b/icon_src/baseline-undo-24px.svg
new file mode 100644
index 0000000..2148dc1
--- /dev/null
+++ b/icon_src/baseline-undo-24px.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="svg6"
+   sodipodi:docname="baseline-undo-24px.svg"
+   inkscape:version="0.92.3 (unknown)"
+   inkscape:export-filename="ic_undo.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="992"
+     inkscape:window-height="937"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="13.118644"
+     inkscape:cy="12"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg6" />
+  <path
+     d="M0 0h24v24H0z"
+     fill="none"
+     id="path2" />
+  <path
+     d="M12.5 8c-2.65 0-5.05.99-6.9 2.6L2 7v9h9l-3.62-3.62c1.39-1.16 3.16-1.88 5.12-1.88 3.54 0 6.55 2.31 7.6 5.5l2.37-.78C21.08 11.03 17.15 8 12.5 8z"
+     id="path4"
+     style="fill:#ffffff" />
+</svg>

From 2a0c52fca98ed65f0197d10998e499a505a0ab87 Mon Sep 17 00:00:00 2001
From: Michael Demetriou <mike@d-e.gr>
Date: Thu, 26 Jul 2018 17:14:05 +0300
Subject: [PATCH 2/8] WIP settings page works

Permissions seem to work on device (needs more testing)
Both internal and shared works
---
 app/src/main/AndroidManifest.xml              |   8 +-
 .../info/aario/snotepad/AboutFragment.java    |   2 +-
 .../info/aario/snotepad/EditorFragment.java   |   8 +-
 .../info/aario/snotepad/ListFragment.java     |  20 +-
 .../info/aario/snotepad/MainActivity.java     |  99 +++++++--
 .../info/aario/snotepad/SettingsActivity.java |  21 ++
 .../info/aario/snotepad/SettingsFragment.java | 135 +++++++++---
 app/src/main/res/layout/activity_main.xml     |  16 +-
 app/src/main/res/layout/activity_settings.xml |  43 ++++
 app/src/main/res/layout/list_fragment.xml     |  71 ++++---
 app/src/main/res/layout/settings_fragment.xml |  28 ---
 app/src/main/res/values/strings.xml           |  19 +-
 app/src/main/res/xml/preferences.xml          |  71 +++++++
 temp.txt                                      | 196 ++++++++++++++++++
 todo.org                                      |   6 +
 15 files changed, 613 insertions(+), 130 deletions(-)
 create mode 100644 app/src/main/java/info/aario/snotepad/SettingsActivity.java
 create mode 100644 app/src/main/res/layout/activity_settings.xml
 delete mode 100644 app/src/main/res/layout/settings_fragment.xml
 create mode 100644 app/src/main/res/xml/preferences.xml
 create mode 100644 temp.txt
 create mode 100644 todo.org

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ef5b6b6..5ab0b0e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,16 +32,22 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/nnf_provider_paths" />
         </provider>
+
         <activity
             android:name="com.nononsenseapps.filepicker.FilePickerActivity"
             android:label="@string/app_name"
             android:theme="@style/FilePickerTheme">
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-
+        <activity
+            android:name=".SettingsActivity"
+            android:parentActivityName=".MainActivity"
+            android:theme="@style/AppTheme.NoActionBar"
+            ></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/info/aario/snotepad/AboutFragment.java b/app/src/main/java/info/aario/snotepad/AboutFragment.java
index 2204e7c..ed3635e 100644
--- a/app/src/main/java/info/aario/snotepad/AboutFragment.java
+++ b/app/src/main/java/info/aario/snotepad/AboutFragment.java
@@ -5,7 +5,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
+import android.app.Fragment;
 import android.support.v4.content.ContextCompat;
 import android.text.Html;
 import android.view.LayoutInflater;
diff --git a/app/src/main/java/info/aario/snotepad/EditorFragment.java b/app/src/main/java/info/aario/snotepad/EditorFragment.java
index 3dba463..a21e97d 100644
--- a/app/src/main/java/info/aario/snotepad/EditorFragment.java
+++ b/app/src/main/java/info/aario/snotepad/EditorFragment.java
@@ -3,7 +3,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
+import android.app.Fragment;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -25,6 +25,7 @@
 public class EditorFragment extends Fragment {
     private MainActivity activity;
     private String name;
+    private View view;
     private EditText etEditor;
     private EditText etTitle;
     private String path;
@@ -88,7 +89,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         setHasOptionsMenu(true);
         activity = (MainActivity) getActivity();
-        View view = inflater.inflate(R.layout.editor_fragment, container, false);
+        view = inflater.inflate(R.layout.editor_fragment, container, false);
 
         Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
 
@@ -98,8 +99,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         rootActivity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         rootActivity.getSupportActionBar().setDisplayShowTitleEnabled(false);
 
-        FloatingActionButton fab = (FloatingActionButton) activity.findViewById(R.id.fab);
-        fab.setVisibility(View.INVISIBLE);
+
         etTitle = (EditText) view.findViewById(R.id.etTitle);
         path = activity.getOpenedFilePath();
         name = activity.filer.getFileNameWithoutExtension(path);
diff --git a/app/src/main/java/info/aario/snotepad/ListFragment.java b/app/src/main/java/info/aario/snotepad/ListFragment.java
index 29ce9c7..1f68bc6 100644
--- a/app/src/main/java/info/aario/snotepad/ListFragment.java
+++ b/app/src/main/java/info/aario/snotepad/ListFragment.java
@@ -2,7 +2,7 @@
 
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
+import android.app.Fragment;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
@@ -35,6 +35,7 @@ public class ListFragment extends Fragment {
     private String path;
     private final String extension = ".txt";
     private boolean sortByDate = true;
+    private FloatingActionButton fab;
     ListView lvFiles;
     SearchView svSearch;
     ArrayList<String> fileNameList = new ArrayList<String>();
@@ -106,12 +107,16 @@ private void search(String text) {
         populateFilesList();
     }
 
-    public void refresh() {
-        path = activity.getPath();
+    public void refresh(boolean requestPermissions) {
+        path = activity.getPath(requestPermissions);
         contentsCache.clear();
         svSearch.setQuery("", true);
     }
 
+    public void refresh(){
+        refresh(true);
+    }
+
     public void sort(boolean byDate) {
         sortByDate = byDate;
         populateFilesList();
@@ -163,7 +168,8 @@ public boolean onQueryTextChange(String newText) {
                 return true;
             }
         });
-        FloatingActionButton fab = (FloatingActionButton) activity.findViewById(R.id.fab);
+        activity = (MainActivity) getActivity();
+        fab = (FloatingActionButton) view.findViewById(R.id.fab);
         fab.setVisibility(View.VISIBLE);
         fab.setImageDrawable(ContextCompat.getDrawable(activity, android.R.drawable.ic_input_add));
         fab.setOnClickListener(new View.OnClickListener() {
@@ -196,4 +202,10 @@ public boolean onContextItemSelected(final MenuItem item) {
 
         return true;
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refresh();
+    }
 }
diff --git a/app/src/main/java/info/aario/snotepad/MainActivity.java b/app/src/main/java/info/aario/snotepad/MainActivity.java
index b0c3546..1c3dd9d 100644
--- a/app/src/main/java/info/aario/snotepad/MainActivity.java
+++ b/app/src/main/java/info/aario/snotepad/MainActivity.java
@@ -1,18 +1,23 @@
 package info.aario.snotepad;
 
+import android.Manifest;
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
@@ -22,35 +27,75 @@
 public class MainActivity extends AppCompatActivity {
     private SharedPreferences sharedPref;
     private SharedPreferences.Editor sharedPrefEditor;
-    private FloatingActionButton fab;
     private EditorFragment currentEditorFragment;
     CoordinatorLayout coordinatorLayoutForSnackBar;
     ListFragment listFragment = new ListFragment();
     public Filer filer;
     public boolean editor_modified;
 
-    public void setPath(String path) {
-        sharedPrefEditor.putString("PATH", path);
-        sharedPrefEditor.commit();
-        listFragment.refresh();
-    }
-
     private String getDefaultPath() {
         return getExternalFilesDir(null).getAbsolutePath();
     }
 
-    public String getPath() {
-        String path = sharedPref.getString("PATH", getDefaultPath());
+    public String getPath(){
+        return getPath(true);
+    }
+
+    public String getPath(boolean requestPermissions) {
+        String path;
+
+        if (sharedPref.getString("saveLocation", "internal").equals("internal")){
+            path = getDefaultPath();
+            Log.d("storage:", "internal");
+            Log.d("path:", path);
+        } else {
+            path = sharedPref.getString("PATH", getString(R.string.default_shared_path));
+            if (requestPermissions) requestStoragePermission();
+            Log.d("storage:", "shared");
+            Log.d("path:", path);
+        }
+
         File file = new File(path);
+
+        if (!file.exists()) {
+            if (file.mkdirs()) {
+                Log.d("createDir", "Successfully created the parent dir:" + file.getName());
+            } else {
+                Log.d("createDir", "Failed to create the parent dir:" + file.getName());
+            }
+        }
+
         if (!file.canWrite()) {
             String old_path = path;
             path = getDefaultPath();
             toast("The path " + old_path + " was not writable. Falling back to default path: " + path);
-            setPath(path);
         }
         return path;
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        listFragment.refresh(false);
+    }
+
+    public  boolean requestStoragePermission() {
+        if (Build.VERSION.SDK_INT >= 23) {
+            if (checkSelfPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+                Log.v("permission","Permission is granted");
+                return true;
+            } else {
+                Log.v("permission","Permission is revoked");
+                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 1);
+                return false;
+            }
+        }
+        else { //permission is automatically granted on sdk<23 upon installation
+            Log.v("permission","Permission is granted");
+            return true;
+        }
+    }
+
     public void setLastOpenedFilePath(String filePath) {
         sharedPrefEditor.putString("CURRENT_OPENED_FILE_PATH", filePath);
         sharedPrefEditor.commit();
@@ -70,7 +115,7 @@ public void makeSnackBar(String text) {
     }
 
     private void changeFragment(Fragment f, boolean allowBack) {
-        FragmentManager fragmentManager = getSupportFragmentManager();
+        FragmentManager fragmentManager = getFragmentManager();
 
         // Prune the stack, so "back" always leads home.
         if (fragmentManager.getBackStackEntryCount() > 0) {
@@ -91,7 +136,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         coordinatorLayoutForSnackBar = (CoordinatorLayout) findViewById(R.id.co_ordinated_layout_main);
-        sharedPref = getPreferences(Context.MODE_PRIVATE);
+        sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
         sharedPrefEditor = sharedPref.edit();
         filer = new Filer(this);
         changeFragment(listFragment, false); //Show list of files to setLastOpenedFilePath
@@ -103,7 +148,7 @@ protected void onCreate(Bundle savedInstanceState) {
         }
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        fab = (FloatingActionButton) findViewById(R.id.fab);
+        getSupportActionBar().hide();
     }
 
     @Override
@@ -141,7 +186,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_settings) {
-            changeFragment(new SettingsFragment(), true);
+            Intent intent = new Intent(this, SettingsActivity.class);
+            startActivity(intent);
+            //changeFragment(new SettingsFragment(), true);
             return true;
         }
 
@@ -167,7 +214,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     public void onBackPressed() {
 
-        int count = getSupportFragmentManager().getBackStackEntryCount();
+        int count = getFragmentManager().getBackStackEntryCount();
 
         if (count == 0) {
             super.onBackPressed();
@@ -182,14 +229,14 @@ public void onClick(DialogInterface dialog, int which) {
                             break;
                         case DialogInterface.BUTTON_NEGATIVE:
                             //No button clicked
-                            getSupportFragmentManager().popBackStack();
+                            getFragmentManager().popBackStack();
                             break;
                         case DialogInterface.BUTTON_NEUTRAL:
                             //Cancel button clicked
                             return;
                     }
                     setLastOpenedFilePath("");//Clear last opened file path
-                    getSupportFragmentManager().popBackStack();
+                    getFragmentManager().popBackStack();
                 }
             };
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -200,7 +247,13 @@ public void onClick(DialogInterface dialog, int which) {
                     .show();
         } else {
             setLastOpenedFilePath("");//Clear last opened file path
-            getSupportFragmentManager().popBackStack();
+            getFragmentManager().popBackStack();
         }
     }
+
 }
+
+//TODO disable settings
+//TODO fix icons
+//TODO Refresh list after location change
+//TODO move from internal to shared
\ No newline at end of file
diff --git a/app/src/main/java/info/aario/snotepad/SettingsActivity.java b/app/src/main/java/info/aario/snotepad/SettingsActivity.java
new file mode 100644
index 0000000..f51987c
--- /dev/null
+++ b/app/src/main/java/info/aario/snotepad/SettingsActivity.java
@@ -0,0 +1,21 @@
+package info.aario.snotepad;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.MenuItem;
+
+public class SettingsActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+    }
+
+}
diff --git a/app/src/main/java/info/aario/snotepad/SettingsFragment.java b/app/src/main/java/info/aario/snotepad/SettingsFragment.java
index bdb811a..cd69b1a 100644
--- a/app/src/main/java/info/aario/snotepad/SettingsFragment.java
+++ b/app/src/main/java/info/aario/snotepad/SettingsFragment.java
@@ -2,16 +2,14 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 
 import com.nononsenseapps.filepicker.FilePickerActivity;
 
@@ -21,24 +19,30 @@
  * Created by aario on 3/16/17.
  */
 
-public class SettingsFragment extends Fragment {
-    private MainActivity activity;
-    private Button btChangePath;
-    private TextView tvPath;
+public class SettingsFragment extends PreferenceFragment {
+    private AppCompatActivity activity;
+//    private Button btChangePath;
+//    private TextView tvPath;
+    private SharedPreferences preferences;
     private static final int FILE_CODE = 1;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        setHasOptionsMenu(true);
-        activity = (MainActivity) getActivity();
-        View view = inflater.inflate(R.layout.settings_fragment, container, false);
-        tvPath = (TextView) view.findViewById(R.id.tvPath);
-        tvPath.setText(activity.getPath());
-        btChangePath = (Button) view.findViewById(R.id.btChangePath);
-        btChangePath.setOnClickListener(new View.OnClickListener() {
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        activity = (AppCompatActivity) getActivity();
+        Toolbar toolbar = (Toolbar) activity.findViewById(R.id.toolbar);
+        activity.setSupportActionBar(toolbar);
+
+        // Load the preferences from an XML resource
+        addPreferencesFromResource(R.xml.preferences);
+
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+        Preference savePathPref = (Preference) findPreference("PATH");
+
+        savePathPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
-            public void onClick(View view) {
+            public boolean onPreferenceClick(Preference preference){
                 // This always works
                 Intent i = new Intent(activity, FilePickerActivity.class);
                 // This works if you defined the intent filter
@@ -53,24 +57,75 @@ public void onClick(View view) {
                 // You could specify a String like "/storage/emulated/0/", but that can
                 // dangerous. Always use Android's API calls to get paths to the SD-card or
                 // internal memory.
-                i.putExtra(FilePickerActivity.EXTRA_START_PATH, activity.getPath());
+                SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+                i.putExtra(FilePickerActivity.EXTRA_START_PATH, preferences.getString("PATH", activity.getString(R.string.default_shared_path)));
 
                 startActivityForResult(i, FILE_CODE);
+
+                return true;
             }
         });
-        FloatingActionButton fab = (FloatingActionButton) activity.findViewById(R.id.fab);
-        fab.setImageDrawable(ContextCompat.getDrawable(activity, android.R.drawable.ic_menu_save));
-        fab.setOnClickListener(new View.OnClickListener() {
+
+        Preference saveLocation = (Preference) findPreference("saveLocation");
+
+        saveLocation.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
-            public void onClick(View view) {
-                activity.setPath(tvPath.getText().toString());
-                getFragmentManager().popBackStack();
+            public boolean onPreferenceClick(Preference preference){
+
+
+                return true;
             }
         });
 
-        return view;
+        Preference pref = findPreference("PATH");
+        pref.setSummary(preferences.getString("PATH", activity.getString(R.string.default_shared_path)));
+
     }
 
+//    @Override
+//    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+//                             Bundle savedInstanceState) {
+//        setHasOptionsMenu(true);
+//        activity = (MainActivity) getActivity();
+//        View view = inflater.inflate(R.layout.settings_fragment, container, false);
+//        tvPath = (TextView) view.findViewById(R.id.tvPath);
+//        tvPath.setText(activity.getPath());
+//        btChangePath = (Button) view.findViewById(R.id.btChangePath);
+//        btChangePath.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                // This always works
+//                Intent i = new Intent(activity, FilePickerActivity.class);
+//                // This works if you defined the intent filter
+//                // Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+//
+//                // Set these depending on your use case. These are the defaults.
+//                i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
+//                i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true);
+//                i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR);
+//
+//                // Configure initial directory by specifying a String.
+//                // You could specify a String like "/storage/emulated/0/", but that can
+//                // dangerous. Always use Android's API calls to get paths to the SD-card or
+//                // internal memory.
+//                i.putExtra(FilePickerActivity.EXTRA_START_PATH, activity.getPath());
+//
+//                startActivityForResult(i, FILE_CODE);
+//            }
+//        });
+//        FloatingActionButton fab = (FloatingActionButton) activity.findViewById(R.id.fab);
+//        fab.setImageDrawable(ContextCompat.getDrawable(activity, android.R.drawable.ic_menu_save));
+//        fab.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                activity.setPath(tvPath.getText().toString());
+//                getFragmentManager().popBackStack();
+//            }
+//        });
+//
+//        return view;
+//    }
+
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
         if (requestCode == FILE_CODE && resultCode == Activity.RESULT_OK) {
@@ -80,7 +135,25 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
             File file = com.nononsenseapps.filepicker.Utils.getFileForUri(uri);
             // If you want a URI which matches the old return value, you can do
             Uri fileUri = Uri.fromFile(file);
-            tvPath.setText(fileUri.getPath());
+
+            SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+            SharedPreferences.Editor editor = preferences.edit();
+            editor.putString("PATH", fileUri.getPath());
+            editor.commit();
+
+            Preference pref = findPreference("PATH");
+            pref.setSummary(preferences.getString("PATH", activity.getString(R.string.default_shared_path)));
         }
     }
+
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        AppCompatActivity rootActivity = (AppCompatActivity) getActivity();
+//        Toolbar toolbar = (Toolbar) rootActivity.findViewById(R.id.toolbar);
+//        rootActivity.getSupportActionBar().hide();
+//        rootActivity.setSupportActionBar(toolbar);
+//        rootActivity.getSupportActionBar().show();
+    }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0bb35f0..71f3468 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -10,6 +10,14 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:popupTheme="@style/AppTheme.PopupOverlay">
+        </android.support.v7.widget.Toolbar>
     </android.support.design.widget.AppBarLayout>
 
     <FrameLayout
@@ -17,12 +25,4 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_input_add" />
 </android.support.design.widget.CoordinatorLayout>
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..27a60f5
--- /dev/null
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".SettingsActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <android.support.design.widget.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:theme="@style/AppTheme.AppBarOverlay">
+
+            <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                app:title="@string/pref_title_settings"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="?attr/colorPrimary"
+                app:navigationIcon="?homeAsUpIndicator"
+                android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+                app:popupTheme="@style/AppTheme.PopupOverlay">
+            </android.support.v7.widget.Toolbar>
+
+        </android.support.design.widget.AppBarLayout>
+
+        <fragment
+            android:id="@+id/mainImagesList"
+            android:name="info.aario.snotepad.SettingsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="62dp"
+            android:layout_below="@+id/addimagebutton"
+            android:layout_weight="1"
+            android:paddingTop="55dp" />
+
+    </LinearLayout>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_fragment.xml b/app/src/main/res/layout/list_fragment.xml
index 90448ab..b698b62 100644
--- a/app/src/main/res/layout/list_fragment.xml
+++ b/app/src/main/res/layout/list_fragment.xml
@@ -1,36 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/listFragment"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/co_ordinated_layout_main"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/listFragment"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/listToolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:popupTheme="@style/AppTheme.PopupOverlay">
-
-        <SearchView
-            android:id="@+id/searchView"
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/listToolbar"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1" >
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:popupTheme="@style/AppTheme.PopupOverlay">
 
-        </SearchView>
-    </android.support.v7.widget.Toolbar>
+            <SearchView
+                android:id="@+id/searchView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="1" >
 
-    <ListView
-        android:id="@+id/filesList"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:footerDividersEnabled="false"
-        android:headerDividersEnabled="false"
-        android:keepScreenOn="false"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+            </SearchView>
+        </android.support.v7.widget.Toolbar>
 
-</LinearLayout>
\ No newline at end of file
+        <ListView
+            android:id="@+id/filesList"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:footerDividersEnabled="false"
+            android:headerDividersEnabled="false"
+            android:keepScreenOn="false"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+    </LinearLayout>
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:srcCompat="@android:drawable/ic_input_add" />
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
deleted file mode 100644
index 13e6541..0000000
--- a/app/src/main/res/layout/settings_fragment.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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:id="@+id/settingsFragment"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/saving_path" />
-
-    <TextView
-        android:id="@+id/tvPath"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fontFamily="serif-monospace"
-        android:text="saving path here"
-        android:textSize="24sp" />
-
-    <Button
-        android:id="@+id/btChangePath"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/btChangePath_title" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index af23c80..c3623f4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,7 +10,9 @@
     <string name="action_delete">Delete</string>
     <string name="btUndo_title">Undo</string>
     <string name="btRedo_text">Redo</string>
-    <string name="saving_path">Saving path:</string>
+    <string name="saving_path">Path to save notes:</string>
+    <string name="default_path">/storage/emulated/0/Android/data/info.aario.snotepad/files</string>
+    <string name="default_shared_path">/storage/emulated/0/Notes</string>
     <string name="btChangePath_title">Select Folder</string>
     <string name="tvVersion_text">Version: </string>
     <string name="tvAbout_text">Copyright (C) 2017 Aario Shahbany&lt;br/&gt;&lt;br/&gt;
@@ -33,4 +35,19 @@
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="cancel">Cancel</string>
+    <string name="preferences_file_key">info.aario.snotepad.PREFERENCES</string>
+    <string name="pref_title_settings">Settings</string>
+    <string name="pref_title_system_settings">System Settings</string>
+    <string name="save_location">Save Location</string>
+    <string-array
+        name="save_location_names">
+        <item>internal (deleted with uninstall)</item>
+        <item>shared (needs storage permission)</item>
+    </string-array>
+    <string-array
+        name="save_location_values">
+        <item>internal</item>
+        <item>shared</item>
+    </string-array>
+
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
new file mode 100644
index 0000000..3935a1c
--- /dev/null
+++ b/app/src/main/res/xml/preferences.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/pref_title_system_settings">
+        <!--<TextView-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:text="@string/saving_path" />-->
+
+        <!--<TextView-->
+        <!--android:id="@+id/tvPath"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:fontFamily="serif-monospace"-->
+        <!--android:text="saving path here"-->
+        <!--android:textSize="24sp" />-->
+
+        <!--<Button-->
+        <!--android:id="@+id/btChangePath"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:text="@string/btChangePath_title" />-->
+        <!--<ListPreference-->
+        <!--android:defaultValue="night"-->
+        <!--android:entries="@array/app_theme_names"-->
+        <!--android:entryValues="@array/app_theme_values"-->
+        <!--android:key="appTheme"-->
+        <!--android:summary="%s"-->
+        <!--android:title="@string/pref_title_app_theme" />-->
+
+        <!--<com.keylesspalace.tusky.EmojiPreference-->
+        <!--android:defaultValue="@string/system_default"-->
+        <!--android:key="emojiCompat"-->
+        <!--android:summary="@string/system_default"-->
+        <!--android:title="@string/emoji_style"/>-->
+        <ListPreference
+            android:defaultValue="internal"
+            android:entries="@array/save_location_names"
+            android:entryValues="@array/save_location_values"
+            android:key="saveLocation"
+            android:summary="%s"
+            android:title="@string/save_location" />
+
+        <Preference
+            android:defaultValue="@string/default_shared_path"
+            android:key="PATH"
+            android:summary="@string/default_shared_path"
+            android:title="@string/saving_path" />
+
+        <!--<CheckBoxPreference-->
+        <!--android:defaultValue="false"-->
+        <!--android:key="fabHide"-->
+        <!--android:title="@string/pref_title_hide_follow_button" />-->
+
+        <!--<CheckBoxPreference-->
+        <!--android:defaultValue="true"-->
+        <!--android:key="mediaPreviewEnabled"-->
+        <!--android:title="@string/pref_title_show_media_preview" />-->
+
+        <!--<CheckBoxPreference-->
+        <!--android:defaultValue="false"-->
+        <!--android:dependency="mediaPreviewEnabled"-->
+        <!--android:key="alwaysShowSensitiveMedia"-->
+        <!--android:title="@string/pref_title_alway_show_sensitive_media" />-->
+
+    </PreferenceCategory>
+
+    <!--<PreferenceCategory android:title="@string/pref_test">-->
+
+    <!--</PreferenceCategory>-->
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/temp.txt b/temp.txt
new file mode 100644
index 0000000..a8ad559
--- /dev/null
+++ b/temp.txt
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:key="@string/preferences_file_key">
+
+    <PreferenceCategory android:title="@string/pref_title_appearance_settings">
+        <!--<TextView-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:text="@string/saving_path" />-->
+
+        <!--<TextView-->
+        <!--android:id="@+id/tvPath"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:fontFamily="serif-monospace"-->
+        <!--android:text="saving path here"-->
+        <!--android:textSize="24sp" />-->
+
+        <!--<Button-->
+        <!--android:id="@+id/btChangePath"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="wrap_content"-->
+        <!--android:text="@string/btChangePath_title" />-->
+        <!--<ListPreference-->
+        <!--android:defaultValue="night"-->
+        <!--android:entries="@array/app_theme_names"-->
+        <!--android:entryValues="@array/app_theme_values"-->
+        <!--android:key="appTheme"-->
+        <!--android:summary="%s"-->
+        <!--android:title="@string/pref_title_app_theme" />-->
+
+        <!--<com.keylesspalace.tusky.EmojiPreference-->
+        <!--android:defaultValue="@string/system_default"-->
+        <!--android:key="emojiCompat"-->
+        <!--android:summary="@string/system_default"-->
+        <!--android:title="@string/emoji_style"/>-->
+
+        <StringPreference
+            android:defaultValue="@string/saving_path"
+            android:key="PATH"
+            android:summary="%s"
+            android:title="@string/saving_path" />
+
+        <!--<CheckBoxPreference-->
+        <!--android:defaultValue="false"-->
+        <!--android:key="fabHide"-->
+        <!--android:title="@string/pref_title_hide_follow_button" />-->
+
+        <!--<CheckBoxPreference-->
+        <!--android:defaultValue="true"-->
+        <!--android:key="mediaPreviewEnabled"-->
+        <!--android:title="@string/pref_title_show_media_preview" />-->
+
+        <!--<CheckBoxPreference-->
+        <!--android:defaultValue="false"-->
+        <!--android:dependency="mediaPreviewEnabled"-->
+        <!--android:key="alwaysShowSensitiveMedia"-->
+        <!--android:title="@string/pref_title_alway_show_sensitive_media" />-->
+
+    </PreferenceCategory>
+
+    <!--<PreferenceCategory android:title="@string/pref_test">-->
+    <!--<ListPreference-->
+    <!--android:defaultValue="public"-->
+    <!--android:entries="@array/post_privacy_names"-->
+    <!--android:entryValues="@array/post_privacy_values"-->
+    <!--android:key="defaultPostPrivacy"-->
+    <!--android:summary="%s"-->
+    <!--android:title="@string/pref_default_post_privacy" />-->
+    <!--</PreferenceCategory>-->
+
+</PreferenceScreen>
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/listToolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+    </android.support.v7.widget.Toolbar>
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        AppCompatActivity rootActivity = (AppCompatActivity) getActivity();
+        Toolbar toolbar = (Toolbar) rootActivity.findViewById(R.id.toolbar);
+//        rootActivity.setSupportActionBar(toolbar);
+        rootActivity.getSupportActionBar().hide();
+    }
+
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        AppCompatActivity rootActivity = (AppCompatActivity) getActivity();
+        Toolbar toolbar = (Toolbar) view.findViewById(R.id.toolbar);
+        rootActivity.setSupportActionBar(toolbar);
+        rootActivity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        rootActivity.getSupportActionBar().show();
+        activity.toast("resume");
+    }
+
+
+
+
+package info.aario.snotepad;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+public class SettingsActivity extends PreferenceActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+
+        LinearLayout root = (LinearLayout)findViewById(android.R.id.list).getParent().getParent().getParent();
+        Toolbar bar = (Toolbar) LayoutInflater.from(this).inflate(R.layout.activity_settings, root, false);
+        root.addView(bar, 0); // insert at top
+        bar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                finish();
+            }
+        });
+
+        addPreferencesFromResource(R.xml.preferences);
+
+    }
+}
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+package info.aario.snotepad;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.view.MenuItem;
+
+public class SettingsActivity extends PreferenceActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+
+        addPreferencesFromResource(R.xml.preferences);
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+
+        if (id == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+}
+
+        <ListView
+            android:id="@android:id/list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"></ListView>
+
+
+//        getSupportActionBar().setTitle(this.getString(R.string.pref_title_settings));
diff --git a/todo.org b/todo.org
new file mode 100644
index 0000000..3858f64
--- /dev/null
+++ b/todo.org
@@ -0,0 +1,6 @@
+** tasks
+* autosave
+* themes
+* pygments
+* open intent
+* save as

From e5e716b3542d514da05fd5fdf50ea52f2f851a5f Mon Sep 17 00:00:00 2001
From: Michael Demetriou <mike@d-e.gr>
Date: Mon, 30 Jul 2018 16:20:25 +0300
Subject: [PATCH 3/8] General cosmetic fixes

Icon appearance and layout
About Screen is now an activity
Donate button is a regular button, not fab
Irrelevant menu items do not show when editorFragment is visible (sort/refresh)
---
 app/src/main/AndroidManifest.xml              |   9 +++-
 ...{AboutFragment.java => AboutActivity.java} |  33 ++++++++-------
 .../info/aario/snotepad/EditorFragment.java   |  12 ++++++
 .../info/aario/snotepad/ListFragment.java     |  11 ++++-
 .../info/aario/snotepad/MainActivity.java     |   3 +-
 app/src/main/res/drawable-hdpi/ic_redo.png    | Bin 573 -> 0 bytes
 app/src/main/res/drawable-hdpi/ic_share.png   | Bin 723 -> 0 bytes
 app/src/main/res/drawable-hdpi/ic_undo.png    | Bin 561 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_redo.png    | Bin 449 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_share.png   | Bin 558 -> 0 bytes
 app/src/main/res/drawable-mdpi/ic_undo.png    | Bin 444 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_redo.png   | Bin 779 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_share.png  | Bin 1030 -> 0 bytes
 app/src/main/res/drawable-xhdpi/ic_undo.png   | Bin 771 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/ic_redo.png  | Bin 1035 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/ic_share.png | Bin 1508 -> 0 bytes
 app/src/main/res/drawable-xxhdpi/ic_undo.png  | Bin 1022 -> 0 bytes
 .../main/res/drawable/ic_add_white_24dp.xml   |   9 ++++
 .../main/res/drawable/ic_redo_white_24dp.xml  |   5 +++
 .../main/res/drawable/ic_save_white_24dp.xml  |   5 +++
 .../main/res/drawable/ic_share_white_24dp.xml |   5 +++
 .../main/res/drawable/ic_undo_white_24dp.xml  |   5 +++
 app/src/main/res/layout/about_fragment.xml    |  23 ----------
 app/src/main/res/layout/activity_about.xml    |  37 ++++++++++++++++
 app/src/main/res/layout/editor_fragment.xml   |  40 +++++++++---------
 app/src/main/res/layout/list_fragment.xml     |   3 +-
 app/src/main/res/values/strings.xml           |   1 +
 27 files changed, 138 insertions(+), 63 deletions(-)
 rename app/src/main/java/info/aario/snotepad/{AboutFragment.java => AboutActivity.java} (54%)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_redo.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_share.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_undo.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_redo.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_share.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_undo.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_redo.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_share.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_undo.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_redo.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_share.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_undo.png
 create mode 100644 app/src/main/res/drawable/ic_add_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_redo_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_save_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_share_white_24dp.xml
 create mode 100644 app/src/main/res/drawable/ic_undo_white_24dp.xml
 delete mode 100644 app/src/main/res/layout/about_fragment.xml
 create mode 100644 app/src/main/res/layout/activity_about.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5ab0b0e..75fd675 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,8 +46,13 @@
         <activity
             android:name=".SettingsActivity"
             android:parentActivityName=".MainActivity"
-            android:theme="@style/AppTheme.NoActionBar"
-            ></activity>
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
+        <activity
+            android:name=".AboutActivity"
+            android:parentActivityName=".MainActivity"
+            android:theme="@style/AppTheme.NoActionBar">
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/info/aario/snotepad/AboutFragment.java b/app/src/main/java/info/aario/snotepad/AboutActivity.java
similarity index 54%
rename from app/src/main/java/info/aario/snotepad/AboutFragment.java
rename to app/src/main/java/info/aario/snotepad/AboutActivity.java
index ed3635e..b9feedc 100644
--- a/app/src/main/java/info/aario/snotepad/AboutFragment.java
+++ b/app/src/main/java/info/aario/snotepad/AboutActivity.java
@@ -1,8 +1,10 @@
 package info.aario.snotepad;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.support.design.widget.FloatingActionButton;
 import android.app.Fragment;
@@ -11,6 +13,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Button;
 import android.widget.TextView;
 
 import com.nononsenseapps.filepicker.FilePickerActivity;
@@ -21,44 +25,41 @@
  * Created by aario on 3/16/17.
  */
 
-public class AboutFragment extends Fragment {
-    private MainActivity activity;
+public class AboutActivity extends Activity {
+//    private MainActivity activity;
     private TextView tvAbout;
     private static final int FILE_CODE = 1;
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        setHasOptionsMenu(true);
-        activity = (MainActivity) getActivity();
-        View view = inflater.inflate(R.layout.about_fragment, container, false);
-        tvAbout = (TextView) view.findViewById(R.id.tvAbout);
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_about);
+        tvAbout = (TextView) findViewById(R.id.tvAbout);
         String aboutHtml = getResources().getString(R.string.tvAbout_text);
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             tvAbout.setText(Html.fromHtml(aboutHtml, Html.FROM_HTML_MODE_COMPACT));
         } else {
             tvAbout.setText(Html.fromHtml(aboutHtml));
         }
 
-        TextView tvVersion = (TextView) view.findViewById(R.id.tvVersion);
+        TextView tvVersion = (TextView) findViewById(R.id.tvVersion);
         try {
-            tvVersion.setText(tvVersion.getText() + activity.getPackageManager().getPackageInfo(activity.getPackageName(), 0).versionName);
+            tvVersion.setText(tvVersion.getText() + getPackageManager().getPackageInfo(getPackageName(), 0).versionName);
         } catch (PackageManager.NameNotFoundException e) {
             tvVersion.setVisibility(View.INVISIBLE);
         }
 
-        FloatingActionButton fab = (FloatingActionButton) activity.findViewById(R.id.fab);
-        fab.setImageDrawable(ContextCompat.getDrawable(activity, android.R.drawable.ic_dialog_info));
-        fab.setOnClickListener(new View.OnClickListener() {
+        Button bt_donate = (Button) findViewById(R.id.bt_donate);
+        bt_donate.setOnClickListener(new View.OnClickListener() {
+
             @Override
-            public void onClick(View view) {
+            public void onClick(View v) {
                 Intent i = new Intent(Intent.ACTION_VIEW);
                 i.setData(Uri.parse(getResources().getString(R.string.donate_url)));
                 startActivity(i);
             }
         });
 
-        return view;
     }
 
 }
diff --git a/app/src/main/java/info/aario/snotepad/EditorFragment.java b/app/src/main/java/info/aario/snotepad/EditorFragment.java
index a21e97d..5a22df6 100644
--- a/app/src/main/java/info/aario/snotepad/EditorFragment.java
+++ b/app/src/main/java/info/aario/snotepad/EditorFragment.java
@@ -11,6 +11,8 @@
 import android.text.TextWatcher;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -84,6 +86,15 @@ private void updateUndoRedoButtons() {
         btRedo.setEnabled(textUndoHistory.size() > 0 && undoHistoryCursor < textUndoHistory.size() - 1);
     }
 
+    public void onPrepareOptionsMenu(Menu menu) {
+        if (menu != null) {
+            menu.findItem(R.id.action_refresh).setVisible(false);
+            menu.findItem(R.id.action_sort_by_name).setVisible(false);
+            menu.findItem(R.id.action_sort_by_date).setVisible(false);
+            activity.invalidateOptionsMenu();
+        }
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -99,6 +110,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         rootActivity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         rootActivity.getSupportActionBar().setDisplayShowTitleEnabled(false);
 
+        setHasOptionsMenu(true);
 
         etTitle = (EditText) view.findViewById(R.id.etTitle);
         path = activity.getOpenedFilePath();
diff --git a/app/src/main/java/info/aario/snotepad/ListFragment.java b/app/src/main/java/info/aario/snotepad/ListFragment.java
index 1f68bc6..c305da3 100644
--- a/app/src/main/java/info/aario/snotepad/ListFragment.java
+++ b/app/src/main/java/info/aario/snotepad/ListFragment.java
@@ -8,6 +8,7 @@
 import android.support.v7.widget.Toolbar;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
@@ -171,7 +172,6 @@ public boolean onQueryTextChange(String newText) {
         activity = (MainActivity) getActivity();
         fab = (FloatingActionButton) view.findViewById(R.id.fab);
         fab.setVisibility(View.VISIBLE);
-        fab.setImageDrawable(ContextCompat.getDrawable(activity, android.R.drawable.ic_input_add));
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -203,6 +203,15 @@ public boolean onContextItemSelected(final MenuItem item) {
         return true;
     }
 
+    public void onPrepareOptionsMenu(Menu menu) {
+        if (menu != null) {
+            menu.findItem(R.id.action_refresh).setVisible(true);
+            menu.findItem(R.id.action_sort_by_name).setVisible(true);
+            menu.findItem(R.id.action_sort_by_date).setVisible(true);
+            activity.invalidateOptionsMenu();
+        }
+    }
+
     @Override
     public void onResume() {
         super.onResume();
diff --git a/app/src/main/java/info/aario/snotepad/MainActivity.java b/app/src/main/java/info/aario/snotepad/MainActivity.java
index 1c3dd9d..35a92fd 100644
--- a/app/src/main/java/info/aario/snotepad/MainActivity.java
+++ b/app/src/main/java/info/aario/snotepad/MainActivity.java
@@ -199,7 +199,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
 
         if (id == R.id.action_about) {
-            changeFragment(new AboutFragment(), true);
+            Intent intent = new Intent(this, AboutActivity.class);
+            startActivity(intent);
             return true;
         }
 
diff --git a/app/src/main/res/drawable-hdpi/ic_redo.png b/app/src/main/res/drawable-hdpi/ic_redo.png
deleted file mode 100644
index 8dc239263f401b32fac872bae8cc544db3e9aa4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 573
zcmV-D0>b@?P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10lG;<K~!jg?Up}l6hRz@p9%3Kh^Z9+kZ7kMq99@+grp1jQPN9n
zH0jh%t^5==YGoy<L?V`A(kMt$1jMLBjpng9i*udb+uK_?!Qa!}-pxDDyK^(U5ClOG
z1VIo4K@HU9Q9Cq7T~;k#A8#Re9Jm0?0+)el;4p9q=l~yqO<)ap0jvNkDW%;(<bkDO
zU5lZo)Vu0?2WLyYub!<V-#f4k@zd&Kb+3VVj)&@*I`TsmQ1_{e>X(+pd)ZZQsr#$s
z8y8TItE+!OyvVA0vP?c#Ak~mR4?F^<Dt@*NJOQ2p&**O2tzY>^fg`{rV4m(~pQy<C
z3>+x?GNshl`8Rp>L&Y6?tuCks2gsaMuc@0&mS_<9W9r+IoE`PL+NmA*Xa0nGTm8{`
z0kxw(FUfeLo@*+enQKnnZd#!1L3S0mn7RHExRO%ZXsZA)2h{!x_Qmcg@F`RNom#b#
zo6J>u+SFZvT<C+$xE;Hv(MaX{7En*9-!tQG{0s7R3f#<$S-0m2IZF9lfw98pZ$NQ_
z-bpEaZA+fE-zqbcjHxr~J@u73*;4LMcfM=|f*=TjAP9mW_<#8c=5DVq*EbK000000
LNkvXXu0mjfgme8M

diff --git a/app/src/main/res/drawable-hdpi/ic_share.png b/app/src/main/res/drawable-hdpi/ic_share.png
deleted file mode 100644
index 8302403a05a0be8e5161efaca4e87b905bd412ae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 723
zcmV;^0xbQBP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10#HdrK~!jg?b*Ff6j2z5@fl6P#IM*9rG`Rl424RKUIV3x3fgFF
zy#+4-`S2Eq7hu6hDAWQItgNKbL;{5|x<89^R#u$Z*^|H?NcKrK+3cB}Jnzgo@A>a+
zQ4AO`AS*bBC)mJ#e68a#hI9LM1*7<&p7$8d?O92@^4;V+i#U0AB2JrLnal0_A92q2
z%39rd%6>|Bg1w?BF7$Z#ep!|ms|L;-ol-Kt5{_-v4P+?*6Ga!P3O*i}OA;8t0)8jV
zf0)fJK7^;(O%#WB7|JO>jqM7t78bGDAb%~F_!w4d#MXs%(7rnlu`0xfz4(4M%azA@
zyugnN@h`ZKoZYV)l$gOzh4@dr#HAc!RcUbzkJ`5w6LDHpv4XL_i$}4hw74lO#8$=F
zHm0+PNBLgU;$e1$mYJ{h#R5{&B4Kk{z(`i{Hqz4KH?b}Do7yxgEiHa8%ks+6D5Y`o
z`f(!N3P?$Stz1*67U8MDsb0jx!Vl_HcJWN^HX4f<Z75<BOR6`rPq>@AhW4G96XL_3
z5G7Xez(JI_slM&L!FcXE8qr&ryPVsz5#8hTS7C=go7=MyjK}Fyw{|8wj=hEXI1M-O
z3R4;N55T>+pbyi+Yaz|nvFs!~Rume+bD;^OvYgxhFSr`7YE|3q#+}^m|A0w+PAFi$
z?p#^ITv?WDMN#Y|eC0;nK+ZIp(n{40<Sbz8n2zlam`Yd!w{!beB6OrC7IS;nBJ2;{
zidfXJk!AabrW2vh&lE**J$|%R6va|mmT&V}4H$4b_yaj!KO@-vF`WPa002ovPDHLk
FV1k4@OC$gQ

diff --git a/app/src/main/res/drawable-hdpi/ic_undo.png b/app/src/main/res/drawable-hdpi/ic_undo.png
deleted file mode 100644
index 8531dd97ec90f17585f2334c31ed2ecfb23c3caa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm0013_0013_0gvVJWdHyG8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10j^0zK~!jg?UpfX6j2mL&l4jnqBa(;76C)7B&dyzB$b_i#a5eu
z!6pF<(av9CAr_VjHi`<VEVR&VR#Zg6u!JnfVp6P|nQ?dX9vZl(oO!(OJ9GE#3<N<C
z1VIo4!GD9g@vl4V3o8zc#NmePx70yOX>HPt)Hz@oxC&eb7J<{iabO$x3VZ>2zzg6x
z@Fu0SGjscfBBT6OKwVNFs^6TR@9I5uv6MiggnB`JGDGP)hU#PWd<g*^ITLC}-B5Qj
zl^<n$ckfPa0o65iUVU4j_&BfCGn4d9bpkExe*wo@?r#ClfTzGK;4{z%1Wo~6;0mw;
zT%$VRP4s~4DW%PpHG7%yiS^Z+YFnZ4oD=E|^?l2}Kh&j?0z-9OJvvp$pLrdtpXZ<<
z<D=RwA@EaOnYDOL?nSlNko8hMl3PG0cu!0zaaP@I$XYESpqW2A)UNueCTB}sC?TNv
zCvnO8Gx4aDfaagXotliHdajg!W}Jl8zte}BjJu=j4&@5m<#sNKl+pmWKX$oK^<~@4
zJ|~cM66#6yo%%psR&zh_AP9mW2!bF84lus~k)Zz}Y$&gg00000NkvXXu0mjfQVs5z

diff --git a/app/src/main/res/drawable-mdpi/ic_redo.png b/app/src/main/res/drawable-mdpi/ic_redo.png
deleted file mode 100644
index 8c42c9e0e404a83ba8425e4abad53213ab22b2d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 449
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zgx7;GWAd}U!$3jF64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&?L1u^
zLn2z=PTA|l>?q>4Uwc_VQ$`|J@NE^ABVN|g+8aOc>bz;SX=q*QFCgex!>)UD{-K~Z
zIwCBottN{Sx@^U6I>?mYkyY$H_p)qf@p<#<r#&WmsC>H5u&m+PgX%xxylSdvy=P4g
znL5RzYSNd4w9JVympYf&dTv*|B$*&>!ESd#ow2XMG(pFoFD7lPbm~#z19~5xP5iZk
z@tW<YBE|;R2YLZ-iWtsVetN`kK<mRR8L!6R1nvyR%MPq7n6<yCm(CYnH2w2=d4>q4
zdvlr79abN?qIE#+g6<5TI)(*oHrCtkF|P4=_a*Z|{55%I8LQT}0)^KO$L;`{eDuvR
z=010o?`${ZwO%l76+F40MWW7NoocLymul%59nOiX{~ywAZ<)3v|1|3r)vssXs46%F
n2Pq$@PEG4){0j19`%f0{f(0w@zRgSo1~-GJtDnm{r-UW|VH2;9

diff --git a/app/src/main/res/drawable-mdpi/ic_share.png b/app/src/main/res/drawable-mdpi/ic_share.png
deleted file mode 100644
index d58dca4e8315bff7f3ae948ddf8b34935d6a5d61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 558
zcmV+}0@3}6P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000xO000xO0b}Nl!vFvP8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10jo(wK~z|U<<~uH6+sk$;WLU65kERV3Okb^*jWUvv=qyTo%#dB
zN~~?Q@&^ROP8$gt>?{=ou@DPmkw)->jV1=X5xI{=1{^PY7r~he;(>)_=Ip-j?wLKy
zMEviOTHP22BVr*UM8wOK(wA1OF8Fn9`W2hFHZAxilVfoj0<U`nUXABhUjrCM#O?{x
z!<5pVa$rYg_~D4y>Ph)DK2SvfGq@2Es}ZrkCv~X?ZybIet3{pH@w}t{Pq3>dcor)K
zV1#?Q41q-~<>O*a@Lt@)uw30ZT@x~oWo+c*A&%iH1_k&duAtu6l;NK{YWSl#-@<L|
zs|GFvmOJ2Otl)Tca3QeK1F!x=soIEY2|Vk`Kafi>+e#=f_lJw{4*I&@UrRi)-PP9d
zK=)@j$YawhrOA!x%+w^Z$Q+&)5+mHl(L8?&H?!<QOOXqBUx<9g<1AFl-EAo`lb^P)
zhrs1#5?SO3KJ*B@7{8|K>P;yPBI0{b%AuwLIo|fny=lPvJ#YfwI$r+}Cz}goiE~&h
w;A=SBmD_S_wlgB;V|#1%E~PYT#rn77Ct%6eGw6pkTL1t607*qoM6N<$f}@P_#sB~S

diff --git a/app/src/main/res/drawable-mdpi/ic_undo.png b/app/src/main/res/drawable-mdpi/ic_undo.png
deleted file mode 100644
index eb39dd12f19caea7f744c5fe0698827e7d6cd7eb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 444
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8wRq
zgx7;GWAd}U!$3jF64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<_&Ej?Wv
zLn2z=PTuRq>?q>4f49UDH=l?6Nr|!tMVb;)XNIxFA2@gETGV|dR~?-i7R6X6uIP(u
zt-T6bO)UZ)N9DS6Qew<^SvPT<TiG^u=Y8AanNyh>9UiP_Si`t^|K0Lak>M&=8)wb@
zx=)Kq$#eCjX)3xNue_@!T`}F<IGuCD@eaRhDh(Vr7|%7hZ<1uveIPL7v*-^M#y3pi
z!n6Dq@yjq9+c70~rY;EFP&i93;Hw}*#n~Ta+;bRicP4OZFuy*)c!A|nh%f(&pBy`E
zn14HH9#386U>$1DU{=f8=J52kVcnU{DM5PQ5A1o*V)VaHM#+8UoZ$Gz`5tquB@H(`
z)PA7KsKcc1=a#%jTy$^m5?xPmSCunw9D`zmbXF?A{8W2>V~ppa&qc{;*DLvrt7<N%
km4z>GR}kR%!+ejSTxxztbb**2Fr*ngUHx3vIVCg!05Pkk(*OVf

diff --git a/app/src/main/res/drawable-xhdpi/ic_redo.png b/app/src/main/res/drawable-xhdpi/ic_redo.png
deleted file mode 100644
index 410550d513ee41c5c500aecb77936f34e1454465..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 779
zcmV+m1N8ifP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm001Xn001Xn0Ud_AY5)KL8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10*FaOK~#90?U+r7PGJ~^uXhGzVvH<gM3aS(vam6hWF=7+vM{l;
zwz2fHva)7pWrQr)kVx4`Vrn*O7Npd~<S&u&b6K2^#`K+U&N<HcMtZI~tMi@n-1q%G
z@AJML2!bF8f*=TjAP9mW2!j6-wST@f%p2-f^?bW~J>3@5ZPa1lF0j1a{RLeRumIQy
zYzBsa)xct4De$><y#k&A6TnzX>0?c`w*fbS-1cuI0Cfo12kZv61AQeP|E7)scYv!Y
zrAHMt3^RxMT2Xt|1L|G%hxIX`9#fZ<&@!yPpY@*0O&RY|M_NLg<b!%zU0T6>GXa=Q
z*M|)opUtFtsHAzVGXS%8KcP-{$8%e*t1And*PH-K4?%SWFbeFd9$_u)0UoRSfkefD
zS1JH?9dH|1SK_gEz<uBz@C0}bOtr2>z!I|UaXqjN*g>{!7GbdU-f6OJwK>!c>dS)d
z`Axm1?o>-3w$x4P8Fi}K>L|VhiV9kzz9>-SyLw(-Te;Yub^Fxg>YI5BKwYAa7bq~U
zZm+|58x1SfOY;>#k;3QHg*E$br{#$Hsm=g8u21zaaG=vqfKw@@qba4Y)vXogDbS5N
zpbn~UJ0$u;9qEb~3hnciI-pa*3v;~iWHVOVYWZ99<pNN*m`(INE~=?P&oi~uVZL+#
zod(~eI?$l!nL6q+UpxSH$m}4K$H9hu|I$&X`P=~7?E)h}Z;q~eDW%ccT;^bbFFAG5
zE`U|!Z#8Ed)B^lAe~WH?$;lBhVD^#YhWe$|LeJH_&Zw*IR_i(T7G45#PI9w>w-@-7
zQo2&N=^1tU$vUj5fBr#AsqqdDf*=TjAP9mW2!bF8f*|;(`3ZEUFP9XdI)wlL002ov
JPDHLkV1h-^VP60M

diff --git a/app/src/main/res/drawable-xhdpi/ic_share.png b/app/src/main/res/drawable-xhdpi/ic_share.png
deleted file mode 100644
index c0a0b3f014763eb8bd578783d3e6bd3026d593a2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1030
zcmV+h1o``kP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00004b3#c}2nYxW
zd<bNS00009a7bBm001Xn001Xn0Ud_AY5)KL8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11A|FKK~#90?c2+XTtyVe@w$UXFhq@sIuT!plBkIbMTJ2GU!b6Z
zizo<2k+@dzfr$S=zz04M7ovjTM!}7sI3huijNr<Q57dnri4Rm_oCFh{`M9V%ni(?p
z(bYZGSNjVMP4_v~=XY-1I#s8;Ll`k)#EAbfMeYFFg0T?7L<r%!5W?Bz%io3&CPN6j
zilUg$72CkU^_aFiyK!yqI0phA#9W2=1?KQT?s)qO?!bHl@e9o3_S|vz1)PLmT8LlZ
zSFEiYe{3a0Byw*E;p86t)`k%7sWa+A0&W?kZx<4<X^_5MNWkg@-xKQ$x{!dG1m7R(
z430?{e4wBRA>0{4I5lCIsXm3Xvfy$|^-%hja%*lat-v^5)@;XD$CNmWh94Y@`>?MM
z!igKF^K$EI1a8Ea4X);G4ea0>T$Ec^EjS-<*NEARyOdKItMM3Sj$*q9k0YgQ4j!z*
z4jifweyFrrQ!&m3;_SJhd_LUwI|^(quT&M2xG;CTeFc}|qZ;8~;ilZN)`E-i3_inb
z`IyGj*tEoU9IvP@Yro+ktjeXS5jYMn)`<BFPl=1w!=<?8m=kOMcy4XAl;U?*PT<8H
zsCj=EF3YW}G2)f)2Ya#2u&>xhBHr_<ThrRIHniZ`MDg7&YvO9(E1%|$zm6sik+TxU
zKQqC1Md(6DXrMGnz@CKhQ`%W8LX!kcCXB!3zpw~y5qEegbhiwK5CUFEOuz!)<8EEr
z2!-&^R``P!LhH7|ALEMLx>|u%cwY7G@F$-1?_p?vh3!0E#fIG4T7k{t(RUiZi^t*J
z;wf<B659=>$f~cl_u~=6ejH9gvxdmm*qS@mfg!fUwuuX274Ktn?sx|VPQVj5T#<ys
z;#yMq<tEl+-AcvYSFjQ9)Xat-v0eOS*n;1cc*Eiab{22q>YSQ-0ymfUe-)qL8nM4v
z$Llygx2{%*`;14$s?ra3>S9&F>3B`MUxY2kj@){B1{316PvH-oky}g8U`$*9e@aNg
z{dJ!+v<;D>DCUczcqxSNUcxXFbp}J5fFnqm#;4U8bRhw=3BLR447!kj&l7yVs59t7
z0^Z8xJ3NSe#kRbgJMO-Lb6S?epK)&PxciFOQ~0id_!(T1JKlkSQ^dC1!J`O2fakEj
z&6wTl&X$O$y{p3FKTUmD6ve@OQH>ZeVnhe|8=L0k_^Um28~^|S07*qoM6N<$g3~<l
ADgXcg

diff --git a/app/src/main/res/drawable-xhdpi/ic_undo.png b/app/src/main/res/drawable-xhdpi/ic_undo.png
deleted file mode 100644
index 150ea78dff1f4dd9d93ce89fd1a94baca79d28d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 771
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zsK<jaqiox*ETEudiEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$QVa}C4W2HJ
zAr*7p&allE2^49&KYOZ2Osr@Mr_v9`u2dzCD3x0*^^J3dT(WgV-mDSX_(7h-tZ9ZH
z?~les3l52ed5JW2aA&%xWQZ|!&OV;Rr2YEb@wsz%t}c+9k)~Jtt~&1AUkhc)wnPa8
zYPhw)lt<)&SV77KD<=by&->I~N*YK8ol&?k!60nv7XgchbFxJYB{xJ~nz7{Xq;FoU
zyrm-Rr>W?AM@_gg<xAWp_vbOYJ9gH#p1bgny<kg!M0=z3f#?KL`=|rK512OWJ|T12
z<$MX}M<d1?Y%wf$m1=Wbq$~L5usoWUXZXcHVKV0du?JckLJ}VBox$$MsJDc%Q;p&B
zf$Nim-!EhAX*Xfm<-_3CcvIl!u?<Wyj9LqM8ZwG!vG6gTog{qbl=p&nv$HQ5&Tt96
zv}Q@7r?l<9*^|FG1vy{Zv*__U)lAn*eP5UBWyV}8^c0@7Ev={4=aO{7Da-FioiE>?
z5XWd&!@Q1}z4*lnhTsFWi-HxnxeqkfA8dGkKs8~BzM-sdb;r6F*^<xln0B*e9#Br$
z(s86ZV>ZJxql^mnkk5XTt~aDUut}YJUbgnI%hd_T?(PwOV!FWf09)6Kt~uMxeV%jP
zIWP2Lb@_>fUvs+Vxh5>nzfkwR;lk7cUDxxu_ZwX2FdfulEYO^F`@jtU1B>1<0(m$5
ziu8-lt4B-}UpQfEftBNN{e<}M=1;#}6*Tqi=ltCNv2RJZVX~-a`mXpk1BWi3ilA+r
z=PXt3_DIG}o$}U1qk^+Uzdgv8p{?P3{gl7ii+($u_cL54t@A`ZgXehz|GAy>Q(4N-
wt!139nmg&s0n6<X$7~SE0GuTLtL|r9F4wP6w>-TNm|z(^UHx3vIVCg!02+2fSO5S3

diff --git a/app/src/main/res/drawable-xxhdpi/ic_redo.png b/app/src/main/res/drawable-xxhdpi/ic_redo.png
deleted file mode 100644
index 82b02a847cf6db8d697fbcb74501310fd505c37c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1035
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zSo47}<C$#>n}LFoC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)lcX+xu
zhE&XXd&@UNHdNx+$LB3c!CM6FGql~Jj&!kVN9+nJc<8h=VPRCv@5b!AFV{tiv3QH?
zmMAMNJ(?e*!73Qj(X>=MJWAB1iz~?|)XVEqy?8OR<D}~JXM57qyynTrFnOM+JoowB
z-g32KRby;mHph(D)`#0z&oF+Oo9rB=d7t^k!B?MN^CSd|FPz1cruugJmhek@p4O^o
zy=F}`vHex$dujh9J?~vgFDEUTukzQTs%Cc3t}BJ_EIr+K#Tc_};H{9W;Q!HUVbA=Y
zL7%By<lf;sQH);eX0py;jAPr!G>zFi{(R_zI~fwj2dg7D|8eAFxWT-K_0M(3m#-rk
z`WU~ny-C0ODbazML5|IC$?U~@*QGv)O(;KY+p8<jX29@3?}5mMkZq@R!dDvQ<!@Nu
z`P8|enPFK&cticEuVQ&}6$_8u%bLn>%gb<svnFuG61_Rh?;_Llx1Mg7V`Gq6R5f|`
z#lNgFCp6`)WEdtiT$i{uJ7-<?fxuPMFCTk)_zB~Z1)t2lt+ZbT9Jw$3GxSoWr?|>r
zg_qMWeiu{K^_VqjOX-&ziZAUvcZbG0+AF>Mc0lL;%3WIdI!jHqJ$}Q;u-)UA%caLV
z>%A^rpJX@bOQzS$-#tE_mz-Deb)>7>&X~D&t0(gbrX1FNCu?S%@1OT<?YX1b&+fRF
zek@lt&Q4zXO(ntjL#5lc$_J%Q|8)%%Kbt+U*f1kL*LJCy5$m4&Mwf*On09RT*irSf
zoKc>=)Fx~tuT195=Sm+kCI;v-v^U;gd@9bn^8$ND`Kn5(9hNo$Y6<KgQd3^8c5UA~
z`xVpDPSpojFDM*r@ICPJ#V5r&hWVy3^@0_8CN7Ly_MBLyZ1lvN_j(-5JTC444%XA{
z3xNJ%tT&4&pUGSIWPJx$)t-mDn(NL^-=!(f#Kv&Pzx42;b;gW;MO@vVI-g;<m$%`b
zD_g~?ol>&X_-8URq^+#KxsS(2>`Jg;NsQeS{s(8-vgh)=TFFtRA#ViK?()}oKC9H7
z3-6?Cr}9r`H!yvc&aQg(ugT4eQ!dGy)^88Kb3k7F&w^(Y#2cc2pW7`~W%DWgNy~jE
z8|FETdi{})dk>sDWYF+Q@tsqSRK=`U&Fkv_=l8NZiE$orIMvQ%{<JaE)8E5NC$rk?
u<w-GF(ZdJgK6l>}Hp7+yjEy%t?%+FNU}qt!kWdE9xD1}IelF{r5}E*20JISR

diff --git a/app/src/main/res/drawable-xxhdpi/ic_share.png b/app/src/main/res/drawable-xxhdpi/ic_share.png
deleted file mode 100644
index e9e0861cfc0558ee2ba16dc3c654bafe6b6b9f41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1508
zcmV<A1snQ_P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00004b3#c}2nYxW
zd<bNS00009a7bBm0027<0027<0nE0cg8%>k8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11z|}<K~#90?VU|%T}2dt&!}ys+NdaMo3sY)A8xgRRt2G=O+y=n
zZo6<H*iu_52yR5(_=ljNLKGF;l*Ub=ydYYvB3eOQsMy4|2CKC{G@B+78{^C8V(uet
zc>3O%cjwK$Z|2*EId9H6_ue^k&Y6iwB9TZW5{X12k%$cwdICiPSRo=?L}ZhQ^omGN
z_NS8~@~encL}b4)=Jycu>sWvuU=a9+##DhJpf~iqI|ATQV5$kj&u0=C2tEH&13U%H
zIvD@rw_$f^JxU4iNM^uRnFY3n)~8ee%W?bc{1=lzx652E%UijU@Pde3m7~0?MdW#x
zfzgGb*ids!L@v)+bX7!pjWH)RgJOIG1|)yuOD1!Rc2JBC*yvIAChdS29k9})>|3=1
zVsyaG9%ZW|p%@+D<NIG@Ry!a@2b}dN`?PjIj1D;NQT8v|0ns=BSP2Y?$Oex;Q}HOf
zoB&IJmw*d7rXK1s1N1bWQ6vBc*b1ERZ1@_3p>-|{z&hY?n+y*y0W1rxcW{8~fj4Nb
zvXvKAU~_2Qg90oB_5kOV#v7-#nm`rU6<YtG02_f(rQxQ5SAZ_y;mi?QCW!gT2UY<G
z91K?hR?m~Q6nHChOe1E1cZl_yj}0qdZqis6^E1%bKz28<J#*41wrVyBi~z&H4q^>8
znF}j_QyP8>cn(+;T8GjC+yQ*0H2f^^A>cFn+1UU$V8cpnr1C9rPw4rV7GMFe3w>C5
z3V0ldCdYLNzzSd|@G*0X*c5P-CKoZF54&J$n8q&5OWLJtp}_XpyiapG&}rapVCg&=
ztFh6CmIJ`5P`U>P_uk5J>?WuSyD8F!m7{>q0(<cxpWaICF7!M$?XWPk{y`zX-pXc4
zVPy^S@2zaaVPIWoy$b{IL7NO8cUV~uY^dow-+lpGM(p^o@(PDBzIrQb92Ai!jWHu0
zf1@zCIKXG<chDH~phx+I!{ytm?td(Z>_VbG9{@~>J&@pozl<@9J;^R4MT;)fy_IFh
z#Q~>spT!(L`!)-Sivz}TpGA9Q7ZMi-4Cg+JIW_>F0=IkojdFucL-^i^O~<kka{_qJ
zvjb|RR75?nms?D>$q4}80C$DfyHEfFv_Bm^1S}7&dtm@}x99|yg3JW)G_e<CYGB_4
zm(S5T;2~^D@>TRD$)iAjX#EQTwx#b~nlH+~$-K%Ium;;Xp=B6Y6H50&felf2WJVdm
zz8O>40(u2_f(EyW0R7q1t>JIrHQ<_d>DtlY-k3F>jq_QrhzD%j_#pa){yX5_(DUyY
zfIES&l}-TLv~^49`F8}^_VjJQ8Ko2c#I~nj8Cr*Wl<vYN>_Ypji0l-R1&X0#BC^LA
zv%i7-8%3l~MAnK(t$p&eh#V7<iZSMldeWT;uol|{tfg+Y6}TJtg#TY}s=(*K{ULNN
zB*13ixY7wT*mDQh0gG|#bNYyst+fD)fM?L}$j<>s9E@M%N9-MR2@w%s8Mc44m4;z0
zM@SpMO99qn_X6!=Uuc~R2kv33D-VR$xsU+Y0<UB9MLszcTGv8@Jp$#DZEcn+^Nw95
z>Hxgx(Fu=f=M!VG+vkaS^<lvn9pLkblll`BqXT9<%0@dNMhB?x_Eezmn~l){$2`hb
z-$`1!babl#H;H{x^M3edMWkDsu8!^vFvgq}kuN=n{vy>1ngqDd!yX{jpfzCg`FXK7
zv_7Q+d-vQAIT-&ZpewXKr38EEycH*WPihu!jqFX>=V1K3fUnb{@qt~K57D?N{~548
zuiuSsAJ7QwKA~SkZj-tH3G;{8O;#lfV-tx)B9TZW5{X2@nSTMKx(*KE>X*j=0000<
KMNUMnLSTYBrLMaG

diff --git a/app/src/main/res/drawable-xxhdpi/ic_undo.png b/app/src/main/res/drawable-xxhdpi/ic_undo.png
deleted file mode 100644
index 5cc75358a2eda6ed5bf2c06984887fa3e2a7c170..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1022
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zSo47}<C$#>n}LFoC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NHH)lS9`iR
zhE&XXd&|FLYN*VykIy|Mu9>LLN)6Hz@m9<Vblj3LpG9-agay7^a&G6S+$(Dm(T!QT
zIwRRKfTdAsi^iQBUeRgw9Xd@jjxCee`tkOoo+muTd*9E$U-@3!PJYLovwNT0JTHIu
zd*1JT&!?Wj0^am7%FHThvzD5vo*49FzIvii#L3A5Z`QTVpU)^3>=oK+u$bYtimiI)
zbKmvuD!CI(bThp!S$R%Z)z#boU+1N|r@hxMg_pCZT+*+7#&_`6szbGTZ1))KSn4Du
zF6{L_!1<sw!TY3P%g&<-s~*%Xo8Dc=wL>i8OW?GI_0xXO>67tZVc5Ka>DGP58iq6C
zdOz0cFdT0@&g><&+U>`x)ZM!q{7>vZvM_?lkIA2P`o_Jp4rc$iW-?=JZ_r-4N+O|i
z&p(@(P1{Pj!@^CM&2_Q6|1WY;Qfmy`J*FW4r*WGLeAiT}Fhn<=KXm%?{Pm4<Yp?%v
z`#5V=SZ%$&fp~O(=M46^ow8~SpDgVdjd`*szI|m?ne%$lE9-A}*e+~(%ROmc&d<AB
z|0up(v!r;^zR4wlm+~k5i>iyAUb275ZdF^g%-u_3C(WDqWzCY@#>h0)z0-nrUD~>E
zlCZ$TJxeA}vYYxP*K1{|SVI4j=_+rhf2ncUW<2TJ(kWt0x1@5J+JD+V>0Y#)yYD6E
z1B1Kz|IRT5FD<&qaeKP!gW3lN7coa!Zewp~E}7kN`M|G9ioXrGbM(zRJ|^E`l3Ds!
zzD<}#@677MQ@?0$*zfT{tU<i-eRSW`xj_rPehO8r@OZ)3p!rFE*Gkod{7wheIn1;2
z*uJ*a@P0Ns>+e~7VDZI7FUddO)Cw4O+$xAk@7Pl=68~Lv)rJMF4EmRAgzok51l)RC
zq+((zdzNwbVypMgqC(pgKFzvtWa5gx-$AV`dM$el>hC1jTyMB5DEocotGHD~4ZkzW
z=6(otSzassWfsF8hreGR#3#64=Tl$Ur5P@HU?W@d%WYy)Ru%9z+X|id-uLQV?s?|#
zJz1;I@Gg-s=K12`q4`(u<=$EH^TX~nXDq+*e)qmrr9YY)dY>#;d-Y?Hx4Uz|(W!cT
zmH(5buzvF08{SyGyTnMOIa;{EcD2zz-WtEUAKS0_-MsL<CA@n3d-uo38U3{FWel`m
ohInNb9-4?H&4Yy2r2l8!^Dji^`d=p<U|wbLboFyt=akR{0RIi=fdBvi

diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml
new file mode 100644
index 0000000..b9b8eca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_redo_white_24dp.xml b/app/src/main/res/drawable/ic_redo_white_24dp.xml
new file mode 100644
index 0000000..8fe5509
--- /dev/null
+++ b/app/src/main/res/drawable/ic_redo_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml
new file mode 100644
index 0000000..74ca299
--- /dev/null
+++ b/app/src/main/res/drawable/ic_save_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml
new file mode 100644
index 0000000..045bbc0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_undo_white_24dp.xml b/app/src/main/res/drawable/ic_undo_white_24dp.xml
new file mode 100644
index 0000000..3798c37
--- /dev/null
+++ b/app/src/main/res/drawable/ic_undo_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z"/>
+</vector>
diff --git a/app/src/main/res/layout/about_fragment.xml b/app/src/main/res/layout/about_fragment.xml
deleted file mode 100644
index f87e51b..0000000
--- a/app/src/main/res/layout/about_fragment.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:id="@+id/aboutFragment"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-    <TextView
-        android:id="@+id/tvVersion"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/tvVersion_text"
-        android:textSize="14sp" />
-
-    <TextView
-        android:id="@+id/tvAbout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="about text here"
-        android:textSize="18sp" />
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
new file mode 100644
index 0000000..7a2c0e6
--- /dev/null
+++ b/app/src/main/res/layout/activity_about.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".AboutActivity">
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="vertical"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <TextView
+            android:id="@+id/tvVersion"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/tvVersion_text"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/tvAbout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="about text here"
+            android:textSize="18sp" />
+
+        <Button
+            android:id="@+id/bt_donate"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="30dp"
+            android:text="@string/donate_call_to_action" />
+    </LinearLayout>
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/editor_fragment.xml b/app/src/main/res/layout/editor_fragment.xml
index 89ccc03..5cbf364 100644
--- a/app/src/main/res/layout/editor_fragment.xml
+++ b/app/src/main/res/layout/editor_fragment.xml
@@ -18,35 +18,37 @@
 
         <Button
             android:id="@+id/btUndo"
-            android:layout_width="32dp"
-            android:layout_margin="4dp"
-            android:layout_height="32dp"
-            android:background="@drawable/ic_undo"
-            android:enabled="false" />
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_margin="8dp"
+            android:background="@drawable/ic_undo_white_24dp"
+            android:enabled="false"
+            android:padding="8dp" />
 
         <Button
             android:id="@+id/btRedo"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
             android:layout_margin="4dp"
-            android:background="@drawable/ic_redo"
+            android:background="@drawable/ic_redo_white_24dp"
             android:enabled="false" />
-
+        <Button
+            android:id="@+id/btShare"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginLeft="20dp"
+            android:background="@drawable/ic_share_white_24dp"
+            android:enabled="true" />
         <Button
             android:id="@+id/btSave"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
             android:layout_margin="4dp"
-            android:background="@android:drawable/ic_menu_save"
+            android:layout_gravity="right"
+            android:background="@drawable/ic_save_white_24dp"
             android:enabled="true" />
 
-        <Button
-            android:id="@+id/btShare"
-            android:layout_width="32dp"
-            android:layout_marginLeft="20dp"
-            android:layout_height="32dp"
-            android:background="@drawable/ic_share"
-            android:enabled="true" />
+
 
     </android.support.v7.widget.Toolbar>
 
diff --git a/app/src/main/res/layout/list_fragment.xml b/app/src/main/res/layout/list_fragment.xml
index b698b62..a817bc0 100644
--- a/app/src/main/res/layout/list_fragment.xml
+++ b/app/src/main/res/layout/list_fragment.xml
@@ -39,11 +39,12 @@
             android:keepScreenOn="false"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
     </LinearLayout>
+
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_input_add" />
+        app:srcCompat="@drawable/ic_add_white_24dp" />
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3623f4..8a41e45 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,6 +39,7 @@
     <string name="pref_title_settings">Settings</string>
     <string name="pref_title_system_settings">System Settings</string>
     <string name="save_location">Save Location</string>
+    <string name="donate_call_to_action">Donate now via PayPal</string>
     <string-array
         name="save_location_names">
         <item>internal (deleted with uninstall)</item>

From 368992a4fe0df5e7511d62c07a90fff015e68801 Mon Sep 17 00:00:00 2001
From: Michael Demetriou <mike@d-e.gr>
Date: Mon, 30 Jul 2018 16:53:15 +0300
Subject: [PATCH 4/8] Setting internal/shared storage option correctly toggles
 editability of path

---
 .../info/aario/snotepad/SettingsFragment.java | 79 +++++--------------
 app/src/main/res/xml/preferences.xml          | 55 +------------
 2 files changed, 21 insertions(+), 113 deletions(-)

diff --git a/app/src/main/java/info/aario/snotepad/SettingsFragment.java b/app/src/main/java/info/aario/snotepad/SettingsFragment.java
index cd69b1a..104b83a 100644
--- a/app/src/main/java/info/aario/snotepad/SettingsFragment.java
+++ b/app/src/main/java/info/aario/snotepad/SettingsFragment.java
@@ -30,16 +30,25 @@ public class SettingsFragment extends PreferenceFragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // Load the preferences from an XML resource
+        addPreferencesFromResource(R.xml.preferences);
+
         activity = (AppCompatActivity) getActivity();
         Toolbar toolbar = (Toolbar) activity.findViewById(R.id.toolbar);
         activity.setSupportActionBar(toolbar);
-
-        // Load the preferences from an XML resource
-        addPreferencesFromResource(R.xml.preferences);
+        final Preference pathPref = findPreference("PATH");
+        Preference saveLocation = (Preference) findPreference("saveLocation");
 
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getContext());
         Preference savePathPref = (Preference) findPreference("PATH");
 
+        //check if path to save notes should be enabled
+        if (preferences.getString("saveLocation", "internal").equals("internal")){
+            pathPref.setEnabled(false);
+        } else {
+            pathPref.setEnabled(true);
+        }
+
         savePathPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference){
@@ -66,66 +75,22 @@ public boolean onPreferenceClick(Preference preference){
             }
         });
 
-        Preference saveLocation = (Preference) findPreference("saveLocation");
-
-        saveLocation.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+        saveLocation.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             @Override
-            public boolean onPreferenceClick(Preference preference){
-
-
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (newValue.equals("shared")) {
+                    pathPref.setEnabled(true);
+                } else {
+                    pathPref.setEnabled(false);
+                }
                 return true;
             }
         });
 
-        Preference pref = findPreference("PATH");
-        pref.setSummary(preferences.getString("PATH", activity.getString(R.string.default_shared_path)));
+        pathPref.setSummary(preferences.getString("PATH", activity.getString(R.string.default_shared_path)));
 
     }
 
-//    @Override
-//    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-//                             Bundle savedInstanceState) {
-//        setHasOptionsMenu(true);
-//        activity = (MainActivity) getActivity();
-//        View view = inflater.inflate(R.layout.settings_fragment, container, false);
-//        tvPath = (TextView) view.findViewById(R.id.tvPath);
-//        tvPath.setText(activity.getPath());
-//        btChangePath = (Button) view.findViewById(R.id.btChangePath);
-//        btChangePath.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                // This always works
-//                Intent i = new Intent(activity, FilePickerActivity.class);
-//                // This works if you defined the intent filter
-//                // Intent i = new Intent(Intent.ACTION_GET_CONTENT);
-//
-//                // Set these depending on your use case. These are the defaults.
-//                i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
-//                i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true);
-//                i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR);
-//
-//                // Configure initial directory by specifying a String.
-//                // You could specify a String like "/storage/emulated/0/", but that can
-//                // dangerous. Always use Android's API calls to get paths to the SD-card or
-//                // internal memory.
-//                i.putExtra(FilePickerActivity.EXTRA_START_PATH, activity.getPath());
-//
-//                startActivityForResult(i, FILE_CODE);
-//            }
-//        });
-//        FloatingActionButton fab = (FloatingActionButton) activity.findViewById(R.id.fab);
-//        fab.setImageDrawable(ContextCompat.getDrawable(activity, android.R.drawable.ic_menu_save));
-//        fab.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                activity.setPath(tvPath.getText().toString());
-//                getFragmentManager().popBackStack();
-//            }
-//        });
-//
-//        return view;
-//    }
-
     public void onActivityResult(int requestCode, int resultCode, Intent intent) {
         super.onActivityResult(requestCode, resultCode, intent);
         if (requestCode == FILE_CODE && resultCode == Activity.RESULT_OK) {
@@ -151,9 +116,5 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) {
     public void onPause() {
         super.onPause();
         AppCompatActivity rootActivity = (AppCompatActivity) getActivity();
-//        Toolbar toolbar = (Toolbar) rootActivity.findViewById(R.id.toolbar);
-//        rootActivity.getSupportActionBar().hide();
-//        rootActivity.setSupportActionBar(toolbar);
-//        rootActivity.getSupportActionBar().show();
     }
 }
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 3935a1c..485e198 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,37 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
     <PreferenceCategory android:title="@string/pref_title_system_settings">
-        <!--<TextView-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:text="@string/saving_path" />-->
-
-        <!--<TextView-->
-        <!--android:id="@+id/tvPath"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:fontFamily="serif-monospace"-->
-        <!--android:text="saving path here"-->
-        <!--android:textSize="24sp" />-->
-
-        <!--<Button-->
-        <!--android:id="@+id/btChangePath"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:text="@string/btChangePath_title" />-->
-        <!--<ListPreference-->
-        <!--android:defaultValue="night"-->
-        <!--android:entries="@array/app_theme_names"-->
-        <!--android:entryValues="@array/app_theme_values"-->
-        <!--android:key="appTheme"-->
-        <!--android:summary="%s"-->
-        <!--android:title="@string/pref_title_app_theme" />-->
-
-        <!--<com.keylesspalace.tusky.EmojiPreference-->
-        <!--android:defaultValue="@string/system_default"-->
-        <!--android:key="emojiCompat"-->
-        <!--android:summary="@string/system_default"-->
-        <!--android:title="@string/emoji_style"/>-->
         <ListPreference
             android:defaultValue="internal"
             android:entries="@array/save_location_names"
@@ -39,33 +8,11 @@
             android:key="saveLocation"
             android:summary="%s"
             android:title="@string/save_location" />
-
         <Preference
             android:defaultValue="@string/default_shared_path"
             android:key="PATH"
+            android:enabled="false"
             android:summary="@string/default_shared_path"
             android:title="@string/saving_path" />
-
-        <!--<CheckBoxPreference-->
-        <!--android:defaultValue="false"-->
-        <!--android:key="fabHide"-->
-        <!--android:title="@string/pref_title_hide_follow_button" />-->
-
-        <!--<CheckBoxPreference-->
-        <!--android:defaultValue="true"-->
-        <!--android:key="mediaPreviewEnabled"-->
-        <!--android:title="@string/pref_title_show_media_preview" />-->
-
-        <!--<CheckBoxPreference-->
-        <!--android:defaultValue="false"-->
-        <!--android:dependency="mediaPreviewEnabled"-->
-        <!--android:key="alwaysShowSensitiveMedia"-->
-        <!--android:title="@string/pref_title_alway_show_sensitive_media" />-->
-
     </PreferenceCategory>
-
-    <!--<PreferenceCategory android:title="@string/pref_test">-->
-
-    <!--</PreferenceCategory>-->
-
 </PreferenceScreen>
\ No newline at end of file

From 22ad2e3a9c943c100db7adf19b2af21bbb8a0f3e Mon Sep 17 00:00:00 2001
From: Michael Demetriou <mike@d-e.gr>
Date: Tue, 31 Jul 2018 13:33:21 +0300
Subject: [PATCH 5/8] Remove save functionality and autosave after each
 keystroke.

---
 .../info/aario/snotepad/EditorFragment.java     | 17 ++---------------
 app/src/main/res/layout/editor_fragment.xml     | 10 ----------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/info/aario/snotepad/EditorFragment.java b/app/src/main/java/info/aario/snotepad/EditorFragment.java
index 5a22df6..56343b1 100644
--- a/app/src/main/java/info/aario/snotepad/EditorFragment.java
+++ b/app/src/main/java/info/aario/snotepad/EditorFragment.java
@@ -46,12 +46,14 @@ public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2)
 
         @Override
         public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+
             saveUndoRedo();
         }
 
         @Override
         public void afterTextChanged(Editable editable) {
             activity.editor_modified = true;
+            save();
         }
     };
 
@@ -141,20 +143,6 @@ public void onClick(View view) {
             }
         });
         saveUndoRedo();
-        btSave = (Button) view.findViewById(R.id.btSave);
-        btSave.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                save();
-            }
-        });
-        btShare = (Button) view.findViewById(R.id.btShare);
-        btShare.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                share();
-            }
-        });
         return view;
     }
 
@@ -172,7 +160,6 @@ public void save() {
         }
 
         if (activity.filer.writeToFile(path, getEditorText())) {
-            activity.makeSnackBar("Changes saved to " + path);
             if (rename)
                 activity.filer.delete(oldPath);
             activity.editor_modified = false;
diff --git a/app/src/main/res/layout/editor_fragment.xml b/app/src/main/res/layout/editor_fragment.xml
index 5cbf364..9a47c71 100644
--- a/app/src/main/res/layout/editor_fragment.xml
+++ b/app/src/main/res/layout/editor_fragment.xml
@@ -39,16 +39,6 @@
             android:layout_marginLeft="20dp"
             android:background="@drawable/ic_share_white_24dp"
             android:enabled="true" />
-        <Button
-            android:id="@+id/btSave"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_margin="4dp"
-            android:layout_gravity="right"
-            android:background="@drawable/ic_save_white_24dp"
-            android:enabled="true" />
-
-
 
     </android.support.v7.widget.Toolbar>
 

From 8d1d0e22c993317ff5cbc2e0dd463bc103b20bbd Mon Sep 17 00:00:00 2001
From: Michael Demetriou <mike@d-e.gr>
Date: Tue, 31 Jul 2018 13:38:34 +0300
Subject: [PATCH 6/8] Remove "Save and Exit?" dialog

---
 .../info/aario/snotepad/MainActivity.java     | 34 +------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/app/src/main/java/info/aario/snotepad/MainActivity.java b/app/src/main/java/info/aario/snotepad/MainActivity.java
index 35a92fd..67ba04c 100644
--- a/app/src/main/java/info/aario/snotepad/MainActivity.java
+++ b/app/src/main/java/info/aario/snotepad/MainActivity.java
@@ -219,42 +219,10 @@ public void onBackPressed() {
 
         if (count == 0) {
             super.onBackPressed();
-        } else if (editor_modified) {
-            DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    switch (which) {
-                        case DialogInterface.BUTTON_POSITIVE:
-                            //Yes button clicked
-                            currentEditorFragment.save();
-                            break;
-                        case DialogInterface.BUTTON_NEGATIVE:
-                            //No button clicked
-                            getFragmentManager().popBackStack();
-                            break;
-                        case DialogInterface.BUTTON_NEUTRAL:
-                            //Cancel button clicked
-                            return;
-                    }
-                    setLastOpenedFilePath("");//Clear last opened file path
-                    getFragmentManager().popBackStack();
-                }
-            };
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setMessage(getResources().getString(R.string.save_dialog_question))
-                    .setPositiveButton(getResources().getString(R.string.yes), dialogClickListener)
-                    .setNegativeButton(getResources().getString(R.string.no), dialogClickListener)
-                    .setNeutralButton(getResources().getString(R.string.cancel), dialogClickListener)
-                    .show();
         } else {
             setLastOpenedFilePath("");//Clear last opened file path
             getFragmentManager().popBackStack();
         }
     }
 
-}
-
-//TODO disable settings
-//TODO fix icons
-//TODO Refresh list after location change
-//TODO move from internal to shared
\ No newline at end of file
+}
\ No newline at end of file

From 329699809d7c4321be55498eef22696fa429d602 Mon Sep 17 00:00:00 2001
From: Michael Demetriou <mike@d-e.gr>
Date: Tue, 31 Jul 2018 14:54:07 +0300
Subject: [PATCH 7/8] Undo grouping

---
 .../info/aario/snotepad/EditorFragment.java   | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/info/aario/snotepad/EditorFragment.java b/app/src/main/java/info/aario/snotepad/EditorFragment.java
index 56343b1..89a3913 100644
--- a/app/src/main/java/info/aario/snotepad/EditorFragment.java
+++ b/app/src/main/java/info/aario/snotepad/EditorFragment.java
@@ -10,6 +10,7 @@
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -38,16 +39,22 @@ public class EditorFragment extends Fragment {
     private Button btRedo;
     private Button btSave;
     private Button btShare;
+    private long tLastEdit;
     private int undoHistoryCursor = 0;
     TextWatcher textWatcher = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+            if (System.currentTimeMillis() - tLastEdit > 1000 ||
+                Math.abs(etEditor.getText().length() - textUndoHistory.get(undoHistoryCursor).toString().length()) > 8 ||
+                charSequence.charAt(charSequence.length() - 2) == ' '   ) {
+
+                saveUndoRedo();
+            }
         }
 
         @Override
         public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-            saveUndoRedo();
+            tLastEdit = System.currentTimeMillis();
         }
 
         @Override
@@ -122,6 +129,13 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         if (activity.filer.exists(path))
             etEditor.setText(activity.filer.getStringFromFile(path));
         etEditor.addTextChangedListener(textWatcher);
+        etEditor.setOnKeyListener(new View.OnKeyListener() {
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                Log.i("KEY", Integer.toString(keyCode));
+                if(event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_SPACE) saveUndoRedo();
+                return false;
+            }
+        });
         textUndoHistory.clear();
         selectionStartUndoHistory.clear();
         selectionEndUndoHistory.clear();
@@ -142,6 +156,7 @@ public void onClick(View view) {
                 retrieveUndoRedo();
             }
         });
+        tLastEdit = System.currentTimeMillis();
         saveUndoRedo();
         return view;
     }

From bbf671c3ef679aad543817168be63246b92efbe3 Mon Sep 17 00:00:00 2001
From: Michael Demetriou <mike@d-e.gr>
Date: Tue, 31 Jul 2018 16:53:30 +0300
Subject: [PATCH 8/8] Group undo by time. Break groups when space is pressed.

While the user is typing an new Undo history entry is created when:

* 1000ms pass from the last time an undo entry was created or
* The user types a space
* The user deletes a space
---
 .../info/aario/snotepad/EditorFragment.java   | 46 +++++++++++++++----
 build.gradle                                  |  3 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 3 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/info/aario/snotepad/EditorFragment.java b/app/src/main/java/info/aario/snotepad/EditorFragment.java
index 89a3913..bc120d5 100644
--- a/app/src/main/java/info/aario/snotepad/EditorFragment.java
+++ b/app/src/main/java/info/aario/snotepad/EditorFragment.java
@@ -40,21 +40,23 @@ public class EditorFragment extends Fragment {
     private Button btSave;
     private Button btShare;
     private long tLastEdit;
+    private String previousText;
     private int undoHistoryCursor = 0;
     TextWatcher textWatcher = new TextWatcher() {
         @Override
         public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             if (System.currentTimeMillis() - tLastEdit > 1000 ||
-                Math.abs(etEditor.getText().length() - textUndoHistory.get(undoHistoryCursor).toString().length()) > 8 ||
-                charSequence.charAt(charSequence.length() - 2) == ' '   ) {
-
+                Math.abs(etEditor.getText().length() - textUndoHistory.get(undoHistoryCursor).toString().length()) > 8 ) {
                 saveUndoRedo();
             }
+            previousText = new String(charSequence.toString());
         }
 
         @Override
         public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
             tLastEdit = System.currentTimeMillis();
+//            activity.toast(lastChar(previousText,charSequence.toString()) + "");
+            if (lastChar(previousText, charSequence.toString()) == ' ') saveUndoRedo();
         }
 
         @Override
@@ -95,6 +97,31 @@ private void updateUndoRedoButtons() {
         btRedo.setEnabled(textUndoHistory.size() > 0 && undoHistoryCursor < textUndoHistory.size() - 1);
     }
 
+    public char lastChar(String oldStr, String newStr){
+        String shorter, longer;
+//        Log.d("string",oldStr+"");
+//        Log.d("string",newStr+"");
+
+        //find which string is shorter so that we don't end up out of bounds
+        if (oldStr.length()<newStr.length() ) {
+            shorter = oldStr;
+            longer = newStr;
+        } else {
+            shorter = newStr;
+            longer = oldStr;
+        }
+
+        //find the first character that is different and return it
+        for (int i = 0; i < shorter.length(); i++) {
+            if (longer.charAt(i) != shorter.charAt(i)) return longer.charAt(i);
+        }
+
+        //if no characters are different then return the last char of the longer string
+        //this means that the undo will be saved if the last char the user erased is a space
+        Log.d("longer",longer);
+        return(longer.charAt(longer.length()-1));
+    }
+
     public void onPrepareOptionsMenu(Menu menu) {
         if (menu != null) {
             menu.findItem(R.id.action_refresh).setVisible(false);
@@ -129,13 +156,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         if (activity.filer.exists(path))
             etEditor.setText(activity.filer.getStringFromFile(path));
         etEditor.addTextChangedListener(textWatcher);
-        etEditor.setOnKeyListener(new View.OnKeyListener() {
-            public boolean onKey(View v, int keyCode, KeyEvent event) {
-                Log.i("KEY", Integer.toString(keyCode));
-                if(event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_SPACE) saveUndoRedo();
-                return false;
-            }
-        });
+
         textUndoHistory.clear();
         selectionStartUndoHistory.clear();
         selectionEndUndoHistory.clear();
@@ -144,6 +165,10 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
         btUndo.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                //due to grouping the last few keystrokes might not have been saved
+                //save them now except if we are in the middle of an undo streak
+                //(we don't want to reset the undo stack on every undo)
+                if (undoHistoryCursor == textUndoHistory.size() - 1) saveUndoRedo();
                 undoHistoryCursor--;
                 retrieveUndoRedo();
             }
@@ -158,6 +183,7 @@ public void onClick(View view) {
         });
         tLastEdit = System.currentTimeMillis();
         saveUndoRedo();
+        previousText = (String)etEditor.getText().toString();
         return view;
     }
 
diff --git a/build.gradle b/build.gradle
index 4fc4083..4e56319 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,9 +7,10 @@ buildscript {
             url 'https://maven.google.com/'
             name 'Google'
         }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e26d23f..10a6d45 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 15 15:01:03 CET 2017
+#Tue Jul 31 15:32:41 EEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip