From 2bfedea38b556c8d31a16b4b00c4cf9087539985 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Tue, 22 Dec 2015 13:23:21 +0100 Subject: [PATCH] add ic_launcher in v4 folders to overwrite robot icon from app compat library which is displayed in some places fix dark theme background color in some activities by applying theme before base.OnCreate add missing files to version control --- src/keepass2android/CreateDatabaseActivity.cs | 3 +- src/keepass2android/EntryActivity.cs | 8 +++-- .../FileStorageSelectionActivity.cs | 3 +- .../GeneratePasswordActivity.cs | 3 +- src/keepass2android/GroupBaseActivity.cs | 3 +- src/keepass2android/KeePass.cs | 3 +- src/keepass2android/LockCloseActivity.cs | 3 +- src/keepass2android/LockCloseListActivity.cs | 3 +- src/keepass2android/NfcOtpActivity.cs | 3 +- src/keepass2android/PasswordActivity.cs | 3 +- src/keepass2android/QuickUnlock.cs | 4 +++ .../drawable-hdpi-v4/ic_launcher.png | Bin 0 -> 2018 bytes .../drawable-hdpi-v4/ic_launcher_offline.png | Bin 0 -> 3339 bytes .../drawable-hdpi-v4/ic_launcher_online.png | Bin 0 -> 3475 bytes .../drawable-mdpi-v4/ic_launcher.png | Bin 0 -> 2018 bytes .../drawable-mdpi-v4/ic_launcher_offline.png | Bin 0 -> 1963 bytes .../drawable-mdpi-v4/ic_launcher_online.png | Bin 0 -> 2018 bytes .../drawable-xhdpi-v4/ic_launcher.png | Bin 0 -> 3028 bytes .../drawable-xhdpi-v4/ic_launcher_online.png | Bin 0 -> 3028 bytes .../drawable-xhdpi/ic_launcher_online.png | Bin 0 -> 3028 bytes .../drawable-xxxhdpi/ic_launcher_online.png | Bin 0 -> 4802 bytes .../Resources/drawable/ic_launcher.png | Bin 0 -> 2018 bytes .../drawable/ic_launcher_offline.png | Bin 0 -> 1963 bytes .../Resources/drawable/ic_launcher_online.png | Bin 0 -> 2018 bytes .../Resources/drawable/splash_button_bg.xml | 4 +-- .../layout/image_list_preference_row.xml | 29 ++++++++++++++++++ .../Resources/values/colors.xml | 3 +- .../SelectStorageLocationActivity.cs | 3 +- src/keepass2android/Utils/ActivityDesign.cs | 20 +++++++++++- .../fileselect/FileSelectActivity.cs | 3 +- .../fileselect/FileStorageSetupActivity.cs | 3 +- src/keepass2android/keepass2android.csproj | 11 +++++++ .../pluginhost/PluginDetailsActivity.cs | 3 +- .../pluginhost/PluginListActivity.cs | 3 +- 34 files changed, 100 insertions(+), 21 deletions(-) create mode 100644 src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher.png create mode 100644 src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher_offline.png create mode 100644 src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher_online.png create mode 100644 src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher.png create mode 100644 src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher_offline.png create mode 100644 src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher_online.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi-v4/ic_launcher.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi-v4/ic_launcher_online.png create mode 100644 src/keepass2android/Resources/drawable-xhdpi/ic_launcher_online.png create mode 100644 src/keepass2android/Resources/drawable-xxxhdpi/ic_launcher_online.png create mode 100644 src/keepass2android/Resources/drawable/ic_launcher.png create mode 100644 src/keepass2android/Resources/drawable/ic_launcher_offline.png create mode 100644 src/keepass2android/Resources/drawable/ic_launcher_online.png create mode 100644 src/keepass2android/Resources/layout/image_list_preference_row.xml diff --git a/src/keepass2android/CreateDatabaseActivity.cs b/src/keepass2android/CreateDatabaseActivity.cs index f24f3f32..983d6f4c 100644 --- a/src/keepass2android/CreateDatabaseActivity.cs +++ b/src/keepass2android/CreateDatabaseActivity.cs @@ -55,8 +55,9 @@ namespace keepass2android protected override void OnCreate(Bundle bundle) { + _design.ApplyTheme(); base.OnCreate(bundle); - _design.ApplyTheme(); + SupportActionBar.SetDisplayHomeAsUpEnabled(true); SupportActionBar.SetHomeButtonEnabled(true); diff --git a/src/keepass2android/EntryActivity.cs b/src/keepass2android/EntryActivity.cs index 5a39c32a..a1a1f23f 100644 --- a/src/keepass2android/EntryActivity.cs +++ b/src/keepass2android/EntryActivity.cs @@ -78,7 +78,7 @@ namespace keepass2android public EntryActivity() { - + _activityDesign = new ActivityDesign(this); } protected PwEntry Entry; @@ -102,6 +102,7 @@ namespace keepass2android private Timer _timer; private PluginActionReceiver _pluginActionReceiver; private PluginFieldReceiver _pluginFieldReceiver; + private ActivityDesign _activityDesign; protected void SetEntryView() @@ -309,10 +310,12 @@ namespace keepass2android !prefs.GetBoolean(GetString(Resource.String.maskpass_key), Resources.GetBoolean(Resource.Boolean.maskpass_default)); RequestWindowFeature(WindowFeatures.IndeterminateProgress); + + _activityDesign.ApplyTheme(); base.OnCreate(savedInstanceState); - new ActivityDesign(this).ApplyTheme(); + SetEntryView(); @@ -934,6 +937,7 @@ namespace keepass2android { ClearCache(); base.OnResume(); + _activityDesign.ReapplyTheme(); } public void ClearCache() diff --git a/src/keepass2android/FileStorageSelectionActivity.cs b/src/keepass2android/FileStorageSelectionActivity.cs index c7dfdbd9..c9023df5 100644 --- a/src/keepass2android/FileStorageSelectionActivity.cs +++ b/src/keepass2android/FileStorageSelectionActivity.cs @@ -200,8 +200,9 @@ namespace keepass2android protected override void OnCreate(Bundle bundle) { + _design.ApplyTheme(); base.OnCreate(bundle); - _design.ApplyTheme(); + SetContentView(Resource.Layout.filestorage_selection); diff --git a/src/keepass2android/GeneratePasswordActivity.cs b/src/keepass2android/GeneratePasswordActivity.cs index 52cac8e0..ac6df565 100644 --- a/src/keepass2android/GeneratePasswordActivity.cs +++ b/src/keepass2android/GeneratePasswordActivity.cs @@ -53,8 +53,9 @@ namespace keepass2android protected override void OnCreate(Bundle savedInstanceState) { + _design.ApplyTheme(); base.OnCreate(savedInstanceState); - _design.ApplyTheme(); + SetContentView(Resource.Layout.generate_password); SetResult(KeePass.ExitNormal); diff --git a/src/keepass2android/GroupBaseActivity.cs b/src/keepass2android/GroupBaseActivity.cs index a74a94c1..60bc6aa6 100644 --- a/src/keepass2android/GroupBaseActivity.cs +++ b/src/keepass2android/GroupBaseActivity.cs @@ -218,8 +218,9 @@ namespace keepass2android } protected override void OnCreate(Bundle savedInstanceState) { + _design.ApplyTheme(); base.OnCreate(savedInstanceState); - _design.ApplyTheme(); + Android.Util.Log.Debug("KP2A", "Creating GBA"); AppTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent); diff --git a/src/keepass2android/KeePass.cs b/src/keepass2android/KeePass.cs index fde3bdfe..d5037450 100644 --- a/src/keepass2android/KeePass.cs +++ b/src/keepass2android/KeePass.cs @@ -91,8 +91,9 @@ namespace keepass2android protected override void OnCreate(Bundle savedInstanceState) { - base.OnCreate(savedInstanceState); _design.ApplyTheme(); + base.OnCreate(savedInstanceState); + //see comment to this in PasswordActivity. //Note that this activity is affected even though it's finished when the app is closed because it //seems that the "app launch intent" is re-delivered, so this might end up here. diff --git a/src/keepass2android/LockCloseActivity.cs b/src/keepass2android/LockCloseActivity.cs index 245502be..83b773be 100644 --- a/src/keepass2android/LockCloseActivity.cs +++ b/src/keepass2android/LockCloseActivity.cs @@ -52,8 +52,9 @@ namespace keepass2android protected override void OnCreate(Bundle savedInstanceState) { - base.OnCreate(savedInstanceState); _design.ApplyTheme(); + base.OnCreate(savedInstanceState); + if (PreferenceManager.GetDefaultSharedPreferences(this).GetBoolean( GetString(Resource.String.ViewDatabaseSecure_key), true)) diff --git a/src/keepass2android/LockCloseListActivity.cs b/src/keepass2android/LockCloseListActivity.cs index 8390e5e8..8aafde53 100644 --- a/src/keepass2android/LockCloseListActivity.cs +++ b/src/keepass2android/LockCloseListActivity.cs @@ -41,8 +41,9 @@ namespace keepass2android protected override void OnCreate(Bundle savedInstanceState) { - base.OnCreate(savedInstanceState); _design.ApplyTheme(); + base.OnCreate(savedInstanceState); + if (PreferenceManager.GetDefaultSharedPreferences(this).GetBoolean( GetString(Resource.String.ViewDatabaseSecure_key), true)) diff --git a/src/keepass2android/NfcOtpActivity.cs b/src/keepass2android/NfcOtpActivity.cs index cefefc78..976bd3ef 100644 --- a/src/keepass2android/NfcOtpActivity.cs +++ b/src/keepass2android/NfcOtpActivity.cs @@ -62,8 +62,9 @@ namespace keepass2android protected override void OnCreate(Bundle bundle) { - base.OnCreate(bundle); _design.ApplyTheme(); + base.OnCreate(bundle); + Intent i = new Intent(this, typeof (PasswordActivity)); i.SetAction(Intents.StartWithOtp); diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs index cbd6efbc..c3d7d7c8 100644 --- a/src/keepass2android/PasswordActivity.cs +++ b/src/keepass2android/PasswordActivity.cs @@ -740,8 +740,9 @@ namespace keepass2android protected override void OnCreate(Bundle savedInstanceState) { - base.OnCreate(savedInstanceState); _activityDesign.ApplyTheme(); + base.OnCreate(savedInstanceState); + //use FlagSecure to make sure the last (revealed) character of the master password is not visible in recent apps if (PreferenceManager.GetDefaultSharedPreferences(this).GetBoolean( diff --git a/src/keepass2android/QuickUnlock.cs b/src/keepass2android/QuickUnlock.cs index 45ee5448..09b356ce 100644 --- a/src/keepass2android/QuickUnlock.cs +++ b/src/keepass2android/QuickUnlock.cs @@ -40,13 +40,16 @@ namespace keepass2android { private IOConnectionInfo _ioc; private QuickUnlockBroadcastReceiver _intentReceiver; + private ActivityDesign _design; public QuickUnlock() { + _design = new ActivityDesign(this); } protected override void OnCreate(Bundle bundle) { + _design.ApplyTheme(); base.OnCreate(bundle); //use FlagSecure to make sure the last (revealed) character of the password is not visible in recent apps @@ -160,6 +163,7 @@ namespace keepass2android protected override void OnResume() { base.OnResume(); + _design.ReapplyTheme(); CheckIfUnloaded(); diff --git a/src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher.png b/src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..0b310c63e698a9c43ffdd24f53eadf1cd376f80b GIT binary patch literal 2018 zcmV<82Oao{P)we1GcoEYwc-66WXvepKhz0(ZNyQ z%xOaHJ$G~zNF|4@4}=qu+&Lvxdi~vVE=t4)_ z!>MTl1&{>{+p*cX@MS_;2t{GMNjJ$49)E%H#<+s`Br=}>fb>2M&EUxA@3L#bkFk2J z)O7_)DwI^XuA81psxNpI%o;t5X@RM9{WF5E$4JF@ukX%nLXtu(2nAQ}e$K_N%RD#f zyBxay4l^grprWjtpb=zjs0@W7=_a`o?;vVL`SAKFY{%k93%9fLKs7$ohk4fo*^5cP1dvLlGlq9l7QA_WKL^+Cr*h6}0)Btq=QoybASsiazFbRJZxqw;p@bq74uXVu zaiSo9GP0#RuauNYmP}Yo)e|oQ^xJ$#w1b-+H?eGsF{NXeTs9fMFLmFi`S@DJa;A=( z!k$0<8pm}|C_<4SN-7d1mS-U{HQx~3z9 zKuU=#T@2k|?YuRts8~*Mu!Kj(KEi7+yvoo1@N-(ittm}J1E8R{B<^V|{Ve`_?`}K} ztoCy9TfVx9Z%khUK%^(aoxd6v;Qm5B< z0zwGZEqsP?Bgb*#{7GIt@>=@c+rP7oUaL11#ZZL0gM^|%q{`gWJ>`Lz9b?DhZ20P<*J%y6WoSS{5Q%jG z5KF{T8DGJL#)~wxGy<^l@fBFM-H$KWg z83dpu+``TS)o4PaGuD}Dy8;fMdWX8kI<7W1U>F7ph0pNu!KWWk_4HN(W`MDy%810i z0BlM?AfAd|(bDb=s52l6$-JJQlnzrzP66Pv8&@(gP}hG>I2X1tb(4nX#?<{jd{>(r z(!VE;op~XqjB`|`7UG3P(9ZTDVB*tt#xV0jY8d@yYFT zxScLaJosW?2tjjaizojw^7UN$hQL!zr>X0yqbLy?bm6{D0i_f|h_oh^N5H5FEzMT| zn9J_ON-8R+uVQA|42rCxybJntgM%jzlSn35TE2v7mb<#bYcfe~QhOn*dl=v6PL!+(LIe#=l_SU3OQ#!m_E} z64{G;s<4w5^B$cCz~b49XlQO=!>aXE&Ry+kjRPm%ruI^8;Tp&_EhpjW#gSNqSUg7g z)Qa@ACuc1nkxcN(zdrTs1CE3ozkLC-*BmsFU2MFBX_%CTO8NM+vw*-f ze2gd>LH)IQKDzu@9O(?216n)V3a^P*{`TuxYhob;u5uY2A4N&BIBy~oLLdI_HBPd%rmZr9A_ouNXrDXo3 zCs;GHa>&5kjXO7JYAsNJzPM!|8r8L-{pg_y&65vg2#_uN2?V>3*6_RD*U{927eoPm zpP99w85Bt<8 literal 0 HcmV?d00001 diff --git a/src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher_offline.png b/src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..9a62b44923f12f40b1d140a1967bbb4371da3cfd GIT binary patch literal 3339 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 VmvKZ{RdxUX002ovPDHLkV1hMEdzb(K literal 0 HcmV?d00001 diff --git a/src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher_online.png b/src/keepass2android/Resources/drawable-hdpi-v4/ic_launcher_online.png new file mode 100644 index 0000000000000000000000000000000000000000..83b006339f24597fecee8f8dbb65f5edc8b9f279 GIT binary patch literal 3475 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 literal 0 HcmV?d00001 diff --git a/src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher_offline.png b/src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..aa121437702cc8e891b166d974e78a8acad86fed GIT binary patch literal 1963 zcmV;c2UPfpP)F(2RKPY zK~!ko?U{RwRaX_pe|z6^-*W*eLn~5-hT+{%q*QsBDguLPv{oq<0=1Qt*fdgOMWeP> z(~{I^+L)%+(jXd(nyPJ(Flrev(n3o`ULCMPXMkZW12YB2GWT)r*$@91W;*xYb6;vF zQ{zf@a&zw4d#|;>wbr-RKJb4TLUQX@*1zX;6n#Gyuew*%TwObU+y`&mX@j9_5MpR) zZY{#go;-c<#f3fXU8kBhKW=jj0JwAGwo|E4yiSUtdHTjeESqfm*FKW!rH1gdkpatH{etM=tbUf9o5%RfrQ2~eAemVCGE z!X-w=!hGT9J8=Z)D)%dcfUXJwPiy8)ct77ulK7OvsVgN(@jX3{b{^Dvy9NhVR@ww_o{V zXD{;T_P=tt{jGkV4h>9?0=knKb{uV^@$d=e*NzcChxBe%emh4`;D7Egz{8HIutcPX^mE@=LnTxSZ8*>E!*Nv?u>nXI>-2dE*0K6|Ap<#L*s>J?U zDO5QgphOnRc#2QYst2I)P%CFI_Vl~ULtFN6z9&uNp;jCrPE}oZ%M?;KC#Ci=l_yz*opVoTPnn$+2 zj4V-xA3W8;{*z~N-f^Vh4~JWsF>W*yuNsL_8ZG_eS!!s3*hzOlpk9VsS4o9&!RDPrIr*-&nF* zgN1O=K|s+8*SKj~p8RUCuNo~t!1}~M##20Y`(iSlVlX5Ubhz)CCL%$nY#Plqz-WvQ z6Q|rPx6Pe4sLjjW8yj(a=){^5F<_KN1_}`{N-@}Cl)`Es1WJ_>Mr-hKlSI&A?3y18 zssV|hgYnVD=rRZ({WE~8G?j#`lmbUetOfTna(#j6X@j-pOEwEdxu7%xMu91``k$!` zso$(GASXZh?Ve`VKK(mBKBJzWtX)dRQ!M-5FF1UvgDv-eo_SO1%C6xAB(Y@=FgzCV z$ylm*DPfesc-nXLEnIHAbmRnXCdl`TwNWt)Ul*2#%Iv0A9%=z*Udy6+?P^N;m#ahBX9MFr5OZV2t z{E5sejS+=GthAxw`pFf=K-%?q_3v#sHG)JeOe`EEopv$Ca^s8%6|uJykTmT-=G#|T zRjwzNg|PMXq}hV{mU-9q-j)RQS`k@tOHE`kyUdFbiP}FZ|_5HP;Un>Eh(Ki^3xoCh zzARnTg|POW3(ed##B~$K4sJE4w7)KS&zy=cL4lq@LZBuZuGn2GLZBudL40HlgZA0U zT594E|H7{n0=D>i#C!^?ceNj|#Vgh7V_+yro_><|xX4_Z_J+K|`8wu&rL>p2I&A;t zt{7qitTEV2T^;y+r4-VU+4kn8K{vI9U}Q8y?Q^RIyiBLp*}7CnN7~E1Lav%Z#;_&= xgoj{!7{Eoy4A!LlYN3H{HB^J!Tps^B@-H1igO%VuQZN7j002ovPDHLkV1f_|xIO>? literal 0 HcmV?d00001 diff --git a/src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher_online.png b/src/keepass2android/Resources/drawable-mdpi-v4/ic_launcher_online.png new file mode 100644 index 0000000000000000000000000000000000000000..0b310c63e698a9c43ffdd24f53eadf1cd376f80b GIT binary patch literal 2018 zcmV<82Oao{P)we1GcoEYwc-66WXvepKhz0(ZNyQ z%xOaHJ$G~zNF|4@4}=qu+&Lvxdi~vVE=t4)_ z!>MTl1&{>{+p*cX@MS_;2t{GMNjJ$49)E%H#<+s`Br=}>fb>2M&EUxA@3L#bkFk2J z)O7_)DwI^XuA81psxNpI%o;t5X@RM9{WF5E$4JF@ukX%nLXtu(2nAQ}e$K_N%RD#f zyBxay4l^grprWjtpb=zjs0@W7=_a`o?;vVL`SAKFY{%k93%9fLKs7$ohk4fo*^5cP1dvLlGlq9l7QA_WKL^+Cr*h6}0)Btq=QoybASsiazFbRJZxqw;p@bq74uXVu zaiSo9GP0#RuauNYmP}Yo)e|oQ^xJ$#w1b-+H?eGsF{NXeTs9fMFLmFi`S@DJa;A=( z!k$0<8pm}|C_<4SN-7d1mS-U{HQx~3z9 zKuU=#T@2k|?YuRts8~*Mu!Kj(KEi7+yvoo1@N-(ittm}J1E8R{B<^V|{Ve`_?`}K} ztoCy9TfVx9Z%khUK%^(aoxd6v;Qm5B< z0zwGZEqsP?Bgb*#{7GIt@>=@c+rP7oUaL11#ZZL0gM^|%q{`gWJ>`Lz9b?DhZ20P<*J%y6WoSS{5Q%jG z5KF{T8DGJL#)~wxGy<^l@fBFM-H$KWg z83dpu+``TS)o4PaGuD}Dy8;fMdWX8kI<7W1U>F7ph0pNu!KWWk_4HN(W`MDy%810i z0BlM?AfAd|(bDb=s52l6$-JJQlnzrzP66Pv8&@(gP}hG>I2X1tb(4nX#?<{jd{>(r z(!VE;op~XqjB`|`7UG3P(9ZTDVB*tt#xV0jY8d@yYFT zxScLaJosW?2tjjaizojw^7UN$hQL!zr>X0yqbLy?bm6{D0i_f|h_oh^N5H5FEzMT| zn9J_ON-8R+uVQA|42rCxybJntgM%jzlSn35TE2v7mb<#bYcfe~QhOn*dl=v6PL!+(LIe#=l_SU3OQ#!m_E} z64{G;s<4w5^B$cCz~b49XlQO=!>aXE&Ry+kjRPm%ruI^8;Tp&_EhpjW#gSNqSUg7g z)Qa@ACuc1nkxcN(zdrTs1CE3ozkLC-*BmsFU2MFBX_%CTO8NM+vw*-f ze2gd>LH)IQKDzu@9O(?216n)V3a^P*{`TuxYhob;u5uY2A4N&BIBy~oLLdI_HBPd%rmZr9A_ouNXrDXo3 zCs;GHa>&5kjXO7JYAsNJzPM!|8r8L-{pg_y&65vg2#_uN2?V>3*6_RD*U{927eoPm zpP99w85Bt<8 literal 0 HcmV?d00001 diff --git a/src/keepass2android/Resources/drawable-xhdpi-v4/ic_launcher.png b/src/keepass2android/Resources/drawable-xhdpi-v4/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..825a1e4e553327d3b971a678fe6254e0440e3a9a GIT binary patch literal 3028 zcmV;_3oG=AP) zXAHd(78hl`D;NMmHtjhGEEMxjm7C4BR zR9*V^U(Bz3eU|LQVydA`9JrLu;Q*=nbc+O)K65tfa@Ie{hyR1>pT8}D_<=-7&&EJ< zHk!jhqR+{ZbTQ?<2z_QTv4C`aR#2Kg1JbiG5TBtq81nVtKBNz2JtY?~lu60XD?A=x zEs%6E1;hg4&L>hLT@*N+M|NI8Eo5UDN(BhPN&+o8j&Q$TpHh>AERf~)Cx&;tWa0*5s}%@8DYSY#;*joQX~_h8WnMDlopAv#7hd7^uXm7txzMu5p`jd@m&~{` zbr<`?EM`qOR9y_>T;Y)9*j;SKIS zzlTNBA`B)2(i<}%SH~@nCJv%zDXZBS2?*_pfV&9m5g<>04D*J0R))S@y`Fy!?RWKv zuTa{TppJv6Ny=J21_HvV(C!GhgT%A@arMzPmk$1qHSuHu*=_a8sNxsh{d9BjhTj$8}%7aGuawI6q;?qX(c2JaT%t+=Ln z$&BXjTcJ?LyIcaXfZ)z>Dx@nMt|GKM0z*FyuQ;S9Gfz;`TWT3nY`J1Zl-I_z2SK(-B*yV4dXJ6b#%NgxPFc z#Ke<_h}S6Xt|8J&8RcdmAe0K~3IBRwj2jWqoSQ%+1(5$IZ!G zD}H~ZR)U}ovfRW1cqc-sppG!GN%jvpHbcLB`wEBKvS~r%Gzo~WP&zg2*m4Dwm5H>k zr)X30{PlC2=V|`FWyN)cbrPcNj0Egy4+UEUckuD-%`;k9gVBKWh78C`e|3`0XG;r)1;lHVE3Pl9kvg28fq-C& z*B%14I5Tn1=GAtn^)O;eW38w;TZ^ToC9A%!p>A5AJ(6ovXisk^o;;-WC06alf?MdmKL)8QYU1ka$2bA7t=PcN)iE0gUvRDD=QOe zy+u96Hha_R(;eDNSS?v`2E+maTZ5_HZNXrJ(kp6OxS6>b$jcOnDT$>qIyp+~pZaCW zX76%T>Z)xHHBOyiv;W@IJzDRDn-?73PgpGhuPtQR8F);73e3Ew7y7OA%b%d1?+8l@l z_&4*YfR;UQmf|1FXrWpLTM=C>TXhuml+ez4`l^o6T4IgVY7UG9__y%jES-0|XrXf3 z^FS5HtUA)PD%x3ZJiN(xJ&{_9faX2$Z{aZ%(9DCg)Q!|*Yz}VgxiX{Rv<}fPXU&{3?ORhwDj%8U}C7@^1*Fb~Wt=TL{a=po(JtvJeaK zYY3!vHU)xB1Zp9oilYCLFcZ)i2vYXyk}$tGzh=2RbZ=BSkg`vg?CBY~w8p0=AT6YbAs3+ar+n*ofs{mD63k2H zHOtuJaW@Lk?gA;h8g?VRO^C#beQS~g_1BOdqljT3z>nIY-3g|IsQHi_i{khVasjn| z)Q-BHa0Y&vz~jMJ3&aAp*ZNUk*7<=H{{|jndgK-kG^RmSpW!r0O(HE+yjlsB*7jpD zC9$mR`$v*%QrsoLm)d^(E0FSa|322Ad6>*5?5j$GxIhYVffP}N(P$lPv+DVN^de%4 zV=XZh*3aTL z0Y0_9)V5k*kfQ9{%X;XGqd!=MdGn6`4hsMY-b;TshO;$3J#JZ_1V#dUYIcAWR|x3RcSDpf zu`oAp`=d(+qXDuKxus9jSHb#O#-_)u&f+Kx1Z<~#s&{}1ywYGshjf%~eUHuI4FBgx zm+tEfj0Aj9{Uw;PyEMq9fd+04S`Gi!TYt{r>ew}x?86p}1Z=I`22$cq+JBb9 zwDQ{vtOCuxnYDU+!LWenBAMm!)Z=L`Img)axVr@SFcZ+jzJNvJBE_y7CAX5X{fU#$8n`m0z!i(3V3)_eg{Tp=K? zEWr{)RxDrkRH?$r zzQ>2~rxNf<;YJx-0zTmBA^fQXY%1N7@X4_aV3S=r0SG%B{+EPUz=lHappOgIgKd0s zc6xjmZs$k@`K=6h)CK56G2-9~Df> z>*UOD==`Bn7gQhZJRWd(Tjf_ewh329>cr*LTB9>ot8o67=3H^b6<1tw#T8d;w*Cia WAr^q59X<~L0000 zXAHd(78hl`D;NMmHtjhGEEMxjm7C4BR zR9*V^U(Bz3eU|LQVydA`9JrLu;Q*=nbc+O)K65tfa@Ie{hyR1>pT8}D_<=-7&&EJ< zHk!jhqR+{ZbTQ?<2z_QTv4C`aR#2Kg1JbiG5TBtq81nVtKBNz2JtY?~lu60XD?A=x zEs%6E1;hg4&L>hLT@*N+M|NI8Eo5UDN(BhPN&+o8j&Q$TpHh>AERf~)Cx&;tWa0*5s}%@8DYSY#;*joQX~_h8WnMDlopAv#7hd7^uXm7txzMu5p`jd@m&~{` zbr<`?EM`qOR9y_>T;Y)9*j;SKIS zzlTNBA`B)2(i<}%SH~@nCJv%zDXZBS2?*_pfV&9m5g<>04D*J0R))S@y`Fy!?RWKv zuTa{TppJv6Ny=J21_HvV(C!GhgT%A@arMzPmk$1qHSuHu*=_a8sNxsh{d9BjhTj$8}%7aGuawI6q;?qX(c2JaT%t+=Ln z$&BXjTcJ?LyIcaXfZ)z>Dx@nMt|GKM0z*FyuQ;S9Gfz;`TWT3nY`J1Zl-I_z2SK(-B*yV4dXJ6b#%NgxPFc z#Ke<_h}S6Xt|8J&8RcdmAe0K~3IBRwj2jWqoSQ%+1(5$IZ!G zD}H~ZR)U}ovfRW1cqc-sppG!GN%jvpHbcLB`wEBKvS~r%Gzo~WP&zg2*m4Dwm5H>k zr)X30{PlC2=V|`FWyN)cbrPcNj0Egy4+UEUckuD-%`;k9gVBKWh78C`e|3`0XG;r)1;lHVE3Pl9kvg28fq-C& z*B%14I5Tn1=GAtn^)O;eW38w;TZ^ToC9A%!p>A5AJ(6ovXisk^o;;-WC06alf?MdmKL)8QYU1ka$2bA7t=PcN)iE0gUvRDD=QOe zy+u96Hha_R(;eDNSS?v`2E+maTZ5_HZNXrJ(kp6OxS6>b$jcOnDT$>qIyp+~pZaCW zX76%T>Z)xHHBOyiv;W@IJzDRDn-?73PgpGhuPtQR8F);73e3Ew7y7OA%b%d1?+8l@l z_&4*YfR;UQmf|1FXrWpLTM=C>TXhuml+ez4`l^o6T4IgVY7UG9__y%jES-0|XrXf3 z^FS5HtUA)PD%x3ZJiN(xJ&{_9faX2$Z{aZ%(9DCg)Q!|*Yz}VgxiX{Rv<}fPXU&{3?ORhwDj%8U}C7@^1*Fb~Wt=TL{a=po(JtvJeaK zYY3!vHU)xB1Zp9oilYCLFcZ)i2vYXyk}$tGzh=2RbZ=BSkg`vg?CBY~w8p0=AT6YbAs3+ar+n*ofs{mD63k2H zHOtuJaW@Lk?gA;h8g?VRO^C#beQS~g_1BOdqljT3z>nIY-3g|IsQHi_i{khVasjn| z)Q-BHa0Y&vz~jMJ3&aAp*ZNUk*7<=H{{|jndgK-kG^RmSpW!r0O(HE+yjlsB*7jpD zC9$mR`$v*%QrsoLm)d^(E0FSa|322Ad6>*5?5j$GxIhYVffP}N(P$lPv+DVN^de%4 zV=XZh*3aTL z0Y0_9)V5k*kfQ9{%X;XGqd!=MdGn6`4hsMY-b;TshO;$3J#JZ_1V#dUYIcAWR|x3RcSDpf zu`oAp`=d(+qXDuKxus9jSHb#O#-_)u&f+Kx1Z<~#s&{}1ywYGshjf%~eUHuI4FBgx zm+tEfj0Aj9{Uw;PyEMq9fd+04S`Gi!TYt{r>ew}x?86p}1Z=I`22$cq+JBb9 zwDQ{vtOCuxnYDU+!LWenBAMm!)Z=L`Img)axVr@SFcZ+jzJNvJBE_y7CAX5X{fU#$8n`m0z!i(3V3)_eg{Tp=K? zEWr{)RxDrkRH?$r zzQ>2~rxNf<;YJx-0zTmBA^fQXY%1N7@X4_aV3S=r0SG%B{+EPUz=lHappOgIgKd0s zc6xjmZs$k@`K=6h)CK56G2-9~Df> z>*UOD==`Bn7gQhZJRWd(Tjf_ewh329>cr*LTB9>ot8o67=3H^b6<1tw#T8d;w*Cia WAr^q59X<~L0000 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

=3H0=l<~Dr4i-bn+Wct=48ghDmr0!* zfWEA>clVRM>4l)ppu#Y*VYaQ84*kB~E`noAJSBpj!|cnS%(8kYeUBbQ>%3cI%L;2@ z4R*e-4nZ1irpsQbAM+*+4o+tDZ(0U_dG-mz=Ki~ta%WTc9FcWv=TB8t-~9dC8o1Vc zH3@VUO3NFN6$)u^KRT9fxL;thwd2sEr(1S)BfESmz-40h8e7bCsVuRp2XRoO0{)R9m6or+hA<_a2Sp6xO9P0Uc?4v{`N-AA2;)Z0f+6{mvm+{K`mIGXYxx7&ceZkdq?vXmU1QM^KbnKDWKqg1S48n`0 z0MVEW$X5S$W|x_~oFs*Q_-94Vl_{8G3P^%F*W?t5FJt=iM-}af6T)R~BP~i@ddDYK zoXyr@2LGJeP&d)#CzW}X4=Y(kp1^Og@xhgTLdf$Q8F~kn?>25(7jV>+e0=SFWt`PL zHA^6##5vBO>*@as6+s{T?or;#vx>8TqBU8oTU!~*-IuU5(XcdWOH}hY#r546>v{_= zmVem*9tkcbQ>Iq-rv4O~kp~Vb7;iWixIi3a1Ih(>X#gIe_A|y95qh!8p8BcHvu7l9 z@&_IDP&WDYNy6Np#RRTaPeiYO0JK)}id_hWXp9gF&O&+=4h2O-6SRW=0R{phNX<&U z5OA7E^EGXTU|PVE2++4sIQEnN1^m1xBkpT_sLd=^t3zAwP=5C8#~a;W1Rfu~2{kIH$5?bh$E+Ow9l^3<2@d z@R63AE%Z(yVWkvqcQMtiEXe?i5kOCoq)+q3cTh}f-%Y|aGJL(y^Y1Tg1;)Qg@yFHM z(?RMA$+Ku4*f&Ff9VPFt{@@xV1D`2Vu`3PV?IgSl8wYD?U)Qa*PoBCQe|4<)Mo>-z zfeiQu6`Vtp5o;I$HCl?XIJ#AH;7##+EnO7XbD*HZp_662V!g%#3^IR>h0Q}@75M5pQMTmtxNsk7ld}{P`c9 zZxdgqnWeE$DZAK!GVATN?`OYqWQ}&d*eJX0bS$6mTipHl(t~ca7sDh0MP<{vg;YxC0@V(9O^3C*it3S GkpBUcrRbFa literal 0 HcmV?d00001 diff --git a/src/keepass2android/Resources/drawable/ic_launcher.png b/src/keepass2android/Resources/drawable/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..0b310c63e698a9c43ffdd24f53eadf1cd376f80b GIT binary patch literal 2018 zcmV<82Oao{P)we1GcoEYwc-66WXvepKhz0(ZNyQ z%xOaHJ$G~zNF|4@4}=qu+&Lvxdi~vVE=t4)_ z!>MTl1&{>{+p*cX@MS_;2t{GMNjJ$49)E%H#<+s`Br=}>fb>2M&EUxA@3L#bkFk2J z)O7_)DwI^XuA81psxNpI%o;t5X@RM9{WF5E$4JF@ukX%nLXtu(2nAQ}e$K_N%RD#f zyBxay4l^grprWjtpb=zjs0@W7=_a`o?;vVL`SAKFY{%k93%9fLKs7$ohk4fo*^5cP1dvLlGlq9l7QA_WKL^+Cr*h6}0)Btq=QoybASsiazFbRJZxqw;p@bq74uXVu zaiSo9GP0#RuauNYmP}Yo)e|oQ^xJ$#w1b-+H?eGsF{NXeTs9fMFLmFi`S@DJa;A=( z!k$0<8pm}|C_<4SN-7d1mS-U{HQx~3z9 zKuU=#T@2k|?YuRts8~*Mu!Kj(KEi7+yvoo1@N-(ittm}J1E8R{B<^V|{Ve`_?`}K} ztoCy9TfVx9Z%khUK%^(aoxd6v;Qm5B< z0zwGZEqsP?Bgb*#{7GIt@>=@c+rP7oUaL11#ZZL0gM^|%q{`gWJ>`Lz9b?DhZ20P<*J%y6WoSS{5Q%jG z5KF{T8DGJL#)~wxGy<^l@fBFM-H$KWg z83dpu+``TS)o4PaGuD}Dy8;fMdWX8kI<7W1U>F7ph0pNu!KWWk_4HN(W`MDy%810i z0BlM?AfAd|(bDb=s52l6$-JJQlnzrzP66Pv8&@(gP}hG>I2X1tb(4nX#?<{jd{>(r z(!VE;op~XqjB`|`7UG3P(9ZTDVB*tt#xV0jY8d@yYFT zxScLaJosW?2tjjaizojw^7UN$hQL!zr>X0yqbLy?bm6{D0i_f|h_oh^N5H5FEzMT| zn9J_ON-8R+uVQA|42rCxybJntgM%jzlSn35TE2v7mb<#bYcfe~QhOn*dl=v6PL!+(LIe#=l_SU3OQ#!m_E} z64{G;s<4w5^B$cCz~b49XlQO=!>aXE&Ry+kjRPm%ruI^8;Tp&_EhpjW#gSNqSUg7g z)Qa@ACuc1nkxcN(zdrTs1CE3ozkLC-*BmsFU2MFBX_%CTO8NM+vw*-f ze2gd>LH)IQKDzu@9O(?216n)V3a^P*{`TuxYhob;u5uY2A4N&BIBy~oLLdI_HBPd%rmZr9A_ouNXrDXo3 zCs;GHa>&5kjXO7JYAsNJzPM!|8r8L-{pg_y&65vg2#_uN2?V>3*6_RD*U{927eoPm zpP99w85Bt<8 literal 0 HcmV?d00001 diff --git a/src/keepass2android/Resources/drawable/ic_launcher_offline.png b/src/keepass2android/Resources/drawable/ic_launcher_offline.png new file mode 100644 index 0000000000000000000000000000000000000000..aa121437702cc8e891b166d974e78a8acad86fed GIT binary patch literal 1963 zcmV;c2UPfpP)F(2RKPY zK~!ko?U{RwRaX_pe|z6^-*W*eLn~5-hT+{%q*QsBDguLPv{oq<0=1Qt*fdgOMWeP> z(~{I^+L)%+(jXd(nyPJ(Flrev(n3o`ULCMPXMkZW12YB2GWT)r*$@91W;*xYb6;vF zQ{zf@a&zw4d#|;>wbr-RKJb4TLUQX@*1zX;6n#Gyuew*%TwObU+y`&mX@j9_5MpR) zZY{#go;-c<#f3fXU8kBhKW=jj0JwAGwo|E4yiSUtdHTjeESqfm*FKW!rH1gdkpatH{etM=tbUf9o5%RfrQ2~eAemVCGE z!X-w=!hGT9J8=Z)D)%dcfUXJwPiy8)ct77ulK7OvsVgN(@jX3{b{^Dvy9NhVR@ww_o{V zXD{;T_P=tt{jGkV4h>9?0=knKb{uV^@$d=e*NzcChxBe%emh4`;D7Egz{8HIutcPX^mE@=LnTxSZ8*>E!*Nv?u>nXI>-2dE*0K6|Ap<#L*s>J?U zDO5QgphOnRc#2QYst2I)P%CFI_Vl~ULtFN6z9&uNp;jCrPE}oZ%M?;KC#Ci=l_yz*opVoTPnn$+2 zj4V-xA3W8;{*z~N-f^Vh4~JWsF>W*yuNsL_8ZG_eS!!s3*hzOlpk9VsS4o9&!RDPrIr*-&nF* zgN1O=K|s+8*SKj~p8RUCuNo~t!1}~M##20Y`(iSlVlX5Ubhz)CCL%$nY#Plqz-WvQ z6Q|rPx6Pe4sLjjW8yj(a=){^5F<_KN1_}`{N-@}Cl)`Es1WJ_>Mr-hKlSI&A?3y18 zssV|hgYnVD=rRZ({WE~8G?j#`lmbUetOfTna(#j6X@j-pOEwEdxu7%xMu91``k$!` zso$(GASXZh?Ve`VKK(mBKBJzWtX)dRQ!M-5FF1UvgDv-eo_SO1%C6xAB(Y@=FgzCV z$ylm*DPfesc-nXLEnIHAbmRnXCdl`TwNWt)Ul*2#%Iv0A9%=z*Udy6+?P^N;m#ahBX9MFr5OZV2t z{E5sejS+=GthAxw`pFf=K-%?q_3v#sHG)JeOe`EEopv$Ca^s8%6|uJykTmT-=G#|T zRjwzNg|PMXq}hV{mU-9q-j)RQS`k@tOHE`kyUdFbiP}FZ|_5HP;Un>Eh(Ki^3xoCh zzARnTg|POW3(ed##B~$K4sJE4w7)KS&zy=cL4lq@LZBuZuGn2GLZBudL40HlgZA0U zT594E|H7{n0=D>i#C!^?ceNj|#Vgh7V_+yro_><|xX4_Z_J+K|`8wu&rL>p2I&A;t zt{7qitTEV2T^;y+r4-VU+4kn8K{vI9U}Q8y?Q^RIyiBLp*}7CnN7~E1Lav%Z#;_&= xgoj{!7{Eoy4A!LlYN3H{HB^J!Tps^B@-H1igO%VuQZN7j002ovPDHLkV1f_|xIO>? literal 0 HcmV?d00001 diff --git a/src/keepass2android/Resources/drawable/ic_launcher_online.png b/src/keepass2android/Resources/drawable/ic_launcher_online.png new file mode 100644 index 0000000000000000000000000000000000000000..0b310c63e698a9c43ffdd24f53eadf1cd376f80b GIT binary patch literal 2018 zcmV<82Oao{P)we1GcoEYwc-66WXvepKhz0(ZNyQ z%xOaHJ$G~zNF|4@4}=qu+&Lvxdi~vVE=t4)_ z!>MTl1&{>{+p*cX@MS_;2t{GMNjJ$49)E%H#<+s`Br=}>fb>2M&EUxA@3L#bkFk2J z)O7_)DwI^XuA81psxNpI%o;t5X@RM9{WF5E$4JF@ukX%nLXtu(2nAQ}e$K_N%RD#f zyBxay4l^grprWjtpb=zjs0@W7=_a`o?;vVL`SAKFY{%k93%9fLKs7$ohk4fo*^5cP1dvLlGlq9l7QA_WKL^+Cr*h6}0)Btq=QoybASsiazFbRJZxqw;p@bq74uXVu zaiSo9GP0#RuauNYmP}Yo)e|oQ^xJ$#w1b-+H?eGsF{NXeTs9fMFLmFi`S@DJa;A=( z!k$0<8pm}|C_<4SN-7d1mS-U{HQx~3z9 zKuU=#T@2k|?YuRts8~*Mu!Kj(KEi7+yvoo1@N-(ittm}J1E8R{B<^V|{Ve`_?`}K} ztoCy9TfVx9Z%khUK%^(aoxd6v;Qm5B< z0zwGZEqsP?Bgb*#{7GIt@>=@c+rP7oUaL11#ZZL0gM^|%q{`gWJ>`Lz9b?DhZ20P<*J%y6WoSS{5Q%jG z5KF{T8DGJL#)~wxGy<^l@fBFM-H$KWg z83dpu+``TS)o4PaGuD}Dy8;fMdWX8kI<7W1U>F7ph0pNu!KWWk_4HN(W`MDy%810i z0BlM?AfAd|(bDb=s52l6$-JJQlnzrzP66Pv8&@(gP}hG>I2X1tb(4nX#?<{jd{>(r z(!VE;op~XqjB`|`7UG3P(9ZTDVB*tt#xV0jY8d@yYFT zxScLaJosW?2tjjaizojw^7UN$hQL!zr>X0yqbLy?bm6{D0i_f|h_oh^N5H5FEzMT| zn9J_ON-8R+uVQA|42rCxybJntgM%jzlSn35TE2v7mb<#bYcfe~QhOn*dl=v6PL!+(LIe#=l_SU3OQ#!m_E} z64{G;s<4w5^B$cCz~b49XlQO=!>aXE&Ry+kjRPm%ruI^8;Tp&_EhpjW#gSNqSUg7g z)Qa@ACuc1nkxcN(zdrTs1CE3ozkLC-*BmsFU2MFBX_%CTO8NM+vw*-f ze2gd>LH)IQKDzu@9O(?216n)V3a^P*{`TuxYhob;u5uY2A4N&BIBy~oLLdI_HBPd%rmZr9A_ouNXrDXo3 zCs;GHa>&5kjXO7JYAsNJzPM!|8r8L-{pg_y&65vg2#_uN2?V>3*6_RD*U{927eoPm zpP99w85Bt<8 literal 0 HcmV?d00001 diff --git a/src/keepass2android/Resources/drawable/splash_button_bg.xml b/src/keepass2android/Resources/drawable/splash_button_bg.xml index 83857ced..e97dc9ca 100644 --- a/src/keepass2android/Resources/drawable/splash_button_bg.xml +++ b/src/keepass2android/Resources/drawable/splash_button_bg.xml @@ -9,13 +9,13 @@ - + - + \ No newline at end of file diff --git a/src/keepass2android/Resources/layout/image_list_preference_row.xml b/src/keepass2android/Resources/layout/image_list_preference_row.xml new file mode 100644 index 00000000..29125e26 --- /dev/null +++ b/src/keepass2android/Resources/layout/image_list_preference_row.xml @@ -0,0 +1,29 @@ + + + + + + \ No newline at end of file diff --git a/src/keepass2android/Resources/values/colors.xml b/src/keepass2android/Resources/values/colors.xml index 558528af..6eb70dc7 100644 --- a/src/keepass2android/Resources/values/colors.xml +++ b/src/keepass2android/Resources/values/colors.xml @@ -20,8 +20,7 @@ #fff - #000 - #000 + #0000 #8bc34a #548a2e diff --git a/src/keepass2android/SelectStorageLocationActivity.cs b/src/keepass2android/SelectStorageLocationActivity.cs index 38ed009b..30d23c23 100644 --- a/src/keepass2android/SelectStorageLocationActivity.cs +++ b/src/keepass2android/SelectStorageLocationActivity.cs @@ -27,9 +27,10 @@ namespace keepass2android protected override void OnCreate(Bundle bundle) { + _design.ApplyTheme(); base.OnCreate(bundle); - _design.ApplyTheme(); + Kp2aLog.Log("SelectStorageLocationActivity.OnCreate"); diff --git a/src/keepass2android/Utils/ActivityDesign.cs b/src/keepass2android/Utils/ActivityDesign.cs index ad892af9..2da11687 100644 --- a/src/keepass2android/Utils/ActivityDesign.cs +++ b/src/keepass2android/Utils/ActivityDesign.cs @@ -15,6 +15,8 @@ namespace keepass2android private readonly string _attributeTheme; + private bool _secureWindow; + public ActivityDesign(Activity activity) { _activity = activity; @@ -24,6 +26,7 @@ namespace keepass2android x => x is Android.App.ActivityAttribute ).Cast().First(); _attributeTheme = activityAttr.Theme; + } catch (Exception e) { @@ -32,6 +35,12 @@ namespace keepass2android } + private bool SecureWindowPref() + { + return (PreferenceManager.GetDefaultSharedPreferences(_activity).GetBoolean( + _activity.GetString(Resource.String.ViewDatabaseSecure_key), true)); + } + public void ApplyTheme() { if (HasThemes()) @@ -40,6 +49,7 @@ namespace keepass2android int newTheme = dark ? DarkTheme : LightTheme; _activity.SetTheme(newTheme); _currentThemeId = newTheme; + _secureWindow = SecureWindowPref(); } _currentIconSet = PreferenceManager.GetDefaultSharedPreferences(_activity) .GetString("IconSetKey", _activity.PackageName); @@ -93,7 +103,15 @@ namespace keepass2android { Kp2aLog.Log("recreating due to icon set change."); _activity.Recreate(); - + return; + + } + + if (SecureWindowPref() != _secureWindow) + { + Kp2aLog.Log("recreating due to secure window change."); + _activity.Recreate(); + return; } } diff --git a/src/keepass2android/fileselect/FileSelectActivity.cs b/src/keepass2android/fileselect/FileSelectActivity.cs index d80060bb..9cbda966 100644 --- a/src/keepass2android/fileselect/FileSelectActivity.cs +++ b/src/keepass2android/fileselect/FileSelectActivity.cs @@ -77,8 +77,9 @@ namespace keepass2android protected override void OnCreate(Bundle savedInstanceState) { + _design.ApplyTheme(); base.OnCreate(savedInstanceState); - _design.ApplyTheme(); + Kp2aLog.Log("FileSelect.OnCreate"); Kp2aLog.Log("FileSelect:apptask="+Intent.GetStringExtra("KP2A_APPTASK")); diff --git a/src/keepass2android/fileselect/FileStorageSetupActivity.cs b/src/keepass2android/fileselect/FileStorageSetupActivity.cs index a47cf322..ce686e87 100644 --- a/src/keepass2android/fileselect/FileStorageSetupActivity.cs +++ b/src/keepass2android/fileselect/FileStorageSetupActivity.cs @@ -35,8 +35,9 @@ namespace keepass2android.fileselect protected override void OnCreate(Bundle bundle) { - base.OnCreate(bundle); _design.ApplyTheme(); + base.OnCreate(bundle); + SetContentView(Resource.Layout.file_storage_setup); diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj index abc57440..a0796270 100644 --- a/src/keepass2android/keepass2android.csproj +++ b/src/keepass2android/keepass2android.csproj @@ -545,9 +545,17 @@ + + + + + + + + Designer @@ -708,6 +716,9 @@ + + + diff --git a/src/keepass2android/pluginhost/PluginDetailsActivity.cs b/src/keepass2android/pluginhost/PluginDetailsActivity.cs index c9c52772..f8983c25 100644 --- a/src/keepass2android/pluginhost/PluginDetailsActivity.cs +++ b/src/keepass2android/pluginhost/PluginDetailsActivity.cs @@ -30,8 +30,9 @@ namespace keepass2android protected override void OnCreate(Bundle bundle) { - base.OnCreate(bundle); new ActivityDesign(this).ApplyTheme(); + base.OnCreate(bundle); + _pluginPackageName = Intent.GetStringExtra(Strings.ExtraPluginPackage); diff --git a/src/keepass2android/pluginhost/PluginListActivity.cs b/src/keepass2android/pluginhost/PluginListActivity.cs index 1e9dcd73..82acbad8 100644 --- a/src/keepass2android/pluginhost/PluginListActivity.cs +++ b/src/keepass2android/pluginhost/PluginListActivity.cs @@ -18,9 +18,10 @@ namespace keepass2android protected override void OnCreate(Bundle bundle) { + new ActivityDesign(this).ApplyTheme(); base.OnCreate(bundle); - new ActivityDesign(this).ApplyTheme(); + SetContentView(Resource.Layout.plugin_list);