From b856e1ec1589116cc195f1ef3329491bd326690a Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Tue, 15 Sep 2015 06:25:17 +0200 Subject: [PATCH] implemented design improvements as suggested by Stefano --- .../SetupMasterEntryActivity.cs | 4 + src/keepass2android/CreateDatabaseActivity.cs | 5 +- src/keepass2android/EntryEditActivity.cs | 3 + src/keepass2android/GroupBaseActivity.cs | 6 +- src/keepass2android/KeePass.cs | 2 +- src/keepass2android/PasswordActivity.cs | 4 + .../Properties/AndroidManifest_debug.xml | 2 +- .../Properties/AndroidManifest_net.xml | 2 +- .../Properties/AndroidManifest_nonet.xml | 2 +- .../drawable/grouplistitem_selector.xml | 2 +- .../Resources/layout/entry_edit.xml | 528 ++++++++---------- .../Resources/layout/entry_view.xml | 45 +- .../Resources/layout/group.xml | 175 +++--- src/keepass2android/Resources/menu/entry.xml | 2 +- .../Resources/values/strings.xml | 3 + .../Resources/values/styles_material.xml | 2 +- src/keepass2android/keepass2android.csproj | 7 + src/keepass2android/views/PwGroupView.cs | 25 +- 18 files changed, 405 insertions(+), 414 deletions(-) diff --git a/src/MasterKeePlugin/SetupMasterEntryActivity.cs b/src/MasterKeePlugin/SetupMasterEntryActivity.cs index 4f052d5e..b2ac4133 100644 --- a/src/MasterKeePlugin/SetupMasterEntryActivity.cs +++ b/src/MasterKeePlugin/SetupMasterEntryActivity.cs @@ -71,6 +71,10 @@ namespace MasterKeePlugin _showPassword = !_showPassword; MakePasswordMaskedOrVisible(); }; + Android.Graphics.PorterDuff.Mode mMode = Android.Graphics.PorterDuff.Mode.SrcAtop; + Android.Graphics.Color color = new Android.Graphics.Color (224, 224, 224); + btnTogglePassword.SetColorFilter (color, mMode); + FindViewById(Resource.Id.button_ok).Click += delegate(object sender, EventArgs args) { diff --git a/src/keepass2android/CreateDatabaseActivity.cs b/src/keepass2android/CreateDatabaseActivity.cs index bd04a99e..f24f3f32 100644 --- a/src/keepass2android/CreateDatabaseActivity.cs +++ b/src/keepass2android/CreateDatabaseActivity.cs @@ -144,7 +144,10 @@ namespace keepass2android _showPassword = !_showPassword; MakePasswordMaskedOrVisible(); }; - + Android.Graphics.PorterDuff.Mode mMode = Android.Graphics.PorterDuff.Mode.SrcAtop; + Android.Graphics.Color color = new Android.Graphics.Color (224, 224, 224); + btnTogglePassword.SetColorFilter (color, mMode); + } diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android/EntryEditActivity.cs index 97fe20d2..aa7f545a 100644 --- a/src/keepass2android/EntryEditActivity.cs +++ b/src/keepass2android/EntryEditActivity.cs @@ -249,6 +249,9 @@ namespace keepass2android State.ShowPassword = !State.ShowPassword; MakePasswordVisibleOrHidden(); }; + Android.Graphics.PorterDuff.Mode mMode = Android.Graphics.PorterDuff.Mode.SrcAtop; + Android.Graphics.Color color = new Android.Graphics.Color (189,189,189); + btnTogglePassword.SetColorFilter (color, mMode); Button addButton = (Button) FindViewById(Resource.Id.add_advanced); diff --git a/src/keepass2android/GroupBaseActivity.cs b/src/keepass2android/GroupBaseActivity.cs index e22a6866..3cc8dc17 100644 --- a/src/keepass2android/GroupBaseActivity.cs +++ b/src/keepass2android/GroupBaseActivity.cs @@ -715,15 +715,17 @@ namespace keepass2android ListView.ItemClick += (sender, args) => ((GroupListItemView) args.View).OnClick(); - StyleScrollBars(); + StyleListView(); } - protected void StyleScrollBars() + protected void StyleListView() { ListView lv = ListView; lv.ScrollBarStyle =ScrollbarStyles.InsideInset; lv.TextFilterEnabled = true; + + lv.Divider = null; } public bool OnActionItemClicked(ActionMode mode, IMenuItem item) diff --git a/src/keepass2android/KeePass.cs b/src/keepass2android/KeePass.cs index e81051a1..084076b8 100644 --- a/src/keepass2android/KeePass.cs +++ b/src/keepass2android/KeePass.cs @@ -71,7 +71,7 @@ namespace keepass2android /// /// Launcher activity of Keepass2Android. This activity usually forwards to FileSelect but may show the revision dialog after installation or updates. /// - [Activity(Label = AppNames.AppName, MainLauncher = true, Theme = "@style/MyTheme_ActionBar")] + [Activity(Label = AppNames.AppName, MainLauncher = true, Theme = "@style/MyTheme_Blue")] public class KeePass : LifecycleDebugActivity { public const Result ExitNormal = Result.FirstUser; diff --git a/src/keepass2android/PasswordActivity.cs b/src/keepass2android/PasswordActivity.cs index 441488db..6754a304 100644 --- a/src/keepass2android/PasswordActivity.cs +++ b/src/keepass2android/PasswordActivity.cs @@ -38,6 +38,7 @@ using Android.Graphics; using Android.Support.Design.Widget; using Android.Support.V4.Widget; using Android.Support.V7.App; +using Android.Util; using keepass2android; using KeePassLib.Keys; using KeePassLib.Serialization; @@ -1003,6 +1004,9 @@ namespace keepass2android _showPassword = !_showPassword; MakePasswordMaskedOrVisible(); }; + Android.Graphics.PorterDuff.Mode mMode = Android.Graphics.PorterDuff.Mode.SrcAtop; + Color color = new Color (224, 224, 224); + btnTogglePassword.SetColorFilter (color, mMode); } private void InitializeKeyfileBrowseButton() diff --git a/src/keepass2android/Properties/AndroidManifest_debug.xml b/src/keepass2android/Properties/AndroidManifest_debug.xml index 18afa666..5447f533 100644 --- a/src/keepass2android/Properties/AndroidManifest_debug.xml +++ b/src/keepass2android/Properties/AndroidManifest_debug.xml @@ -54,7 +54,7 @@ - + diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml index f7aae08c..43e70011 100644 --- a/src/keepass2android/Properties/AndroidManifest_net.xml +++ b/src/keepass2android/Properties/AndroidManifest_net.xml @@ -57,7 +57,7 @@ - + diff --git a/src/keepass2android/Properties/AndroidManifest_nonet.xml b/src/keepass2android/Properties/AndroidManifest_nonet.xml index b0a1badc..6816083d 100644 --- a/src/keepass2android/Properties/AndroidManifest_nonet.xml +++ b/src/keepass2android/Properties/AndroidManifest_nonet.xml @@ -40,7 +40,7 @@ - + diff --git a/src/keepass2android/Resources/drawable/grouplistitem_selector.xml b/src/keepass2android/Resources/drawable/grouplistitem_selector.xml index de98e7a5..b13f5617 100644 --- a/src/keepass2android/Resources/drawable/grouplistitem_selector.xml +++ b/src/keepass2android/Resources/drawable/grouplistitem_selector.xml @@ -3,7 +3,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_width="fill_parent" + android:layout_height="wrap_content"> - - - - - - - + android:id="@+id/icon_button" + android:layout_width="40dp" + android:layout_height="40dp" + android:padding="8dp" + android:layout_margin="0dp" + android:scaleType="fitXY" + android:layout_alignParentRight="true" + android:src="@drawable/ic00" /> + + + - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + + + + + + - + + + + + + + + + + + + + -