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" />
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:orientation="vertical">
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+ android:id="@+id/entry_binaries_label"
+ style="@style/EntryEditSingleLine_container">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/entry_view.xml b/src/keepass2android/Resources/layout/entry_view.xml
index a430cad5..3aab1b45 100644
--- a/src/keepass2android/Resources/layout/entry_view.xml
+++ b/src/keepass2android/Resources/layout/entry_view.xml
@@ -1,26 +1,25 @@
-
-
-
+
+
+
+
-
-
-
+ android:layout_gravity="end|bottom|right"
+ android:layout_margin="16dp"
+ android:src="@drawable/ic_fab_edit" />
\ No newline at end of file
diff --git a/src/keepass2android/Resources/layout/group.xml b/src/keepass2android/Resources/layout/group.xml
index 404666fa..b01878ca 100644
--- a/src/keepass2android/Resources/layout/group.xml
+++ b/src/keepass2android/Resources/layout/group.xml
@@ -1,106 +1,91 @@
-
-
-
+ android:fitsSystemWindows="true"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="#fff">
-
-
+ android:id="@+id/bottom_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:layout_alignParentBottom="true"
+ android:baselineAligned="false">
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+ android:layout_height="match_parent"
+ android:layout_above="@id/divider2"
+ android:layout_below="@id/top"
+ android:fitsSystemWindows="true">
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/keepass2android/Resources/menu/entry.xml b/src/keepass2android/Resources/menu/entry.xml
index 9a08360c..e23a23f0 100644
--- a/src/keepass2android/Resources/menu/entry.xml
+++ b/src/keepass2android/Resources/menu/entry.xml
@@ -24,7 +24,7 @@
/>
- Sorry! Keepass2Android cannot handle the returned URI %1$s. Please contact the developer!
+ One entry
+ %1$d entries
+
Security
Display
Password entry access
diff --git a/src/keepass2android/Resources/values/styles_material.xml b/src/keepass2android/Resources/values/styles_material.xml
index 5ef71d36..e9caf04e 100644
--- a/src/keepass2android/Resources/values/styles_material.xml
+++ b/src/keepass2android/Resources/values/styles_material.xml
@@ -99,7 +99,7 @@
- @color/appAccentColor
- - @color/appPrimaryColor
+ - @color/appAccentColor
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index df3b6ae3..cb4e27e7 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -137,6 +137,8 @@
+
+
@@ -1276,4 +1278,9 @@
+
+
+ Designer
+
+
\ No newline at end of file
diff --git a/src/keepass2android/views/PwGroupView.cs b/src/keepass2android/views/PwGroupView.cs
index ab71a99e..577ddad7 100644
--- a/src/keepass2android/views/PwGroupView.cs
+++ b/src/keepass2android/views/PwGroupView.cs
@@ -30,7 +30,7 @@ namespace keepass2android.view
{
private PwGroup _pwGroup;
private readonly GroupBaseActivity _groupBaseActivity;
- private readonly TextView _textview;
+ private readonly TextView _textview, _label;
private int? _defaultTextColor;
private const int MenuOpen = Menu.First;
@@ -59,8 +59,8 @@ namespace keepass2android.view
float size = PrefsUtil.GetListTextSize(act);
_textview.TextSize = size;
- TextView label = (TextView) gv.FindViewById(Resource.Id.group_label);
- label.TextSize = size-8;
+ _label = (TextView) gv.FindViewById(Resource.Id.group_label);
+ _label.TextSize = size-8;
PopulateView(gv, pw);
@@ -88,7 +88,24 @@ namespace keepass2android.view
else
_textview.SetTextColor(new Color((int)_defaultTextColor));
-
+ _label.Text = _groupBaseActivity.GetString (Resource.String.group)+" - ";
+ uint numEntries = CountEntries (pw);
+ if (numEntries == 1)
+ _label.Text += Context.GetString (Resource.String.Entry_singular);
+ else
+ _label.Text += Context.GetString (Resource.String.Entry_plural, new Java.Lang.Object[] { numEntries });
+ }
+
+ uint CountEntries(PwGroup g)
+ {
+ uint n = g.Entries.UCount;
+
+ foreach (PwGroup subgroup in g.Groups)
+ {
+ n += CountEntries(subgroup);
+ }
+
+ return n;
}
public void ConvertView(PwGroup pw) {