From 15f73257faa7d7b38755bfede25bbe8df6147f82 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@gmail.com>
Date: Wed, 12 Aug 2015 06:40:14 +0200
Subject: [PATCH] 0.9.8-pre2

---
 .../AndroidFileChooserBinding.csproj          |   1 -
 .../JavaFileStorageBindings.csproj            |   1 -
 .../KP2AKdbLibraryBinding.csproj              |   1 -
 src/KeePass.sln                               |  32 ++-
 .../KeePassLib2Android.csproj                 |   2 +-
 .../SelectStorageLocationActivityBase.cs      |   8 +-
 src/MasterKeePlugin/MasterKeePlugin.csproj    |   1 +
 src/MaterialTest2/MainActivity.cs             | 138 ++++++++++--
 src/MaterialTest2/MaterialTest2.csproj        | 201 ++++++++++++++++--
 .../Properties/AndroidManifest.xml            |   6 +-
 src/MaterialTest2/Resources/layout/Main.axml  |  50 -----
 .../Resources/layout/toolbar2.xml             |   8 +-
 .../Resources/values-v21/styles.xml           |  17 ++
 .../Resources/values/Strings.xml              |   1 +
 src/MaterialTest2/Resources/values/styles.xml | 155 +++++++++++++-
 src/MaterialTest2/packages.config             |   5 +-
 src/PluginSdkBinding/PluginSdkBinding.csproj  |   1 -
 .../JavaFileStorage/bin/javafilestorage.jar   | Bin 535545 -> 535545 bytes
 .../KP2AKdbLibrary/bin/kp2akdblibrary.jar     | Bin 374936 -> 374936 bytes
 .../bin/keepass2androidpluginsdk.jar          | Bin 20359 -> 20359 bytes
 .../LockingPreferenceActivity.cs              | 107 +++++++++-
 .../Properties/AndroidManifest_debug.xml      |   2 +-
 .../Properties/AndroidManifest_net.xml        |   4 +-
 .../Resources/values/strings.xml              |   4 +-
 .../settings/AppSettingsActivity.cs           |   1 +
 .../MonoDroidUnitTesting.csproj               |   1 -
 26 files changed, 642 insertions(+), 105 deletions(-)
 delete mode 100644 src/MaterialTest2/Resources/layout/Main.axml

diff --git a/src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj b/src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
index 7b39d548..737d4c18 100644
--- a/src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
+++ b/src/AndroidFileChooserBinding/AndroidFileChooserBinding.csproj
@@ -10,7 +10,6 @@
     <RootNamespace>AndroidFileChooserBinding</RootNamespace>
     <AssemblyName>AndroidFileChooserBinding</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
index 12bf66f1..d96be630 100644
--- a/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
+++ b/src/JavaFileStorageBindings/JavaFileStorageBindings.csproj
@@ -10,7 +10,6 @@
     <RootNamespace>JavaFileStorageBindings</RootNamespace>
     <AssemblyName>JavaFileStorageBindings</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj b/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
index 2bb393b7..74b84473 100644
--- a/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
+++ b/src/KP2AKdbLibraryBinding/KP2AKdbLibraryBinding.csproj
@@ -10,7 +10,6 @@
     <RootNamespace>KP2AKdbLibraryBinding</RootNamespace>
     <AssemblyName>KP2AKdbLibraryBinding</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/KeePass.sln b/src/KeePass.sln
index 8a0931b9..9ec7b121 100644
--- a/src/KeePass.sln
+++ b/src/KeePass.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib2Android", "KeePassLib2Android\KeePassLib2Android.csproj", "{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "keepass2android", "keepass2android\keepass2android.csproj", "{A6CF8A86-37C1-4197-80FE-519DE2C842F5}"
@@ -41,6 +43,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialTest", "MaterialTes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialTest2", "MaterialTest2\MaterialTest2.csproj", "{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialTest3", "MaterialTest3\MaterialTest3.csproj", "{4512BF32-7443-4BF9-B46B-80E7F2D41B36}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -81,6 +85,7 @@ Global
 		{545B4A6B-8BBA-4FBE-92FC-4AC060122A54}.ReleaseNoNet|x64.ActiveCfg = ReleaseNoNet|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{A6CF8A86-37C1-4197-80FE-519DE2C842F5}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
@@ -434,6 +439,7 @@ Global
 		{83B92CEE-9923-44E6-B0B4-9930D0BFE95E}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
@@ -457,6 +463,30 @@ Global
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|Win32.Build.0 = Release|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 		{B7BBC4A2-0301-4DFF-B03C-C88CD4F1F890}.ReleaseNoNet|x64.Build.0 = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Debug|Mixed Platforms.Deploy.0 = Debug|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Release|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Release|Win32.ActiveCfg = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.Release|x64.ActiveCfg = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.ReleaseNoNet|Any CPU.ActiveCfg = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.ReleaseNoNet|Any CPU.Build.0 = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.ReleaseNoNet|Any CPU.Deploy.0 = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.ReleaseNoNet|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.ReleaseNoNet|Mixed Platforms.Build.0 = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.ReleaseNoNet|Mixed Platforms.Deploy.0 = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.ReleaseNoNet|Win32.ActiveCfg = Release|Any CPU
+		{4512BF32-7443-4BF9-B46B-80E7F2D41B36}.ReleaseNoNet|x64.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/KeePassLib2Android/KeePassLib2Android.csproj b/src/KeePassLib2Android/KeePassLib2Android.csproj
index 5518fc46..f70ba567 100644
--- a/src/KeePassLib2Android/KeePassLib2Android.csproj
+++ b/src/KeePassLib2Android/KeePassLib2Android.csproj
@@ -12,7 +12,7 @@
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
     <AssemblyName>KeePassLib2Android</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
diff --git a/src/Kp2aBusinessLogic/SelectStorageLocationActivityBase.cs b/src/Kp2aBusinessLogic/SelectStorageLocationActivityBase.cs
index 9e94df4a..c5ce53bc 100644
--- a/src/Kp2aBusinessLogic/SelectStorageLocationActivityBase.cs
+++ b/src/Kp2aBusinessLogic/SelectStorageLocationActivityBase.cs
@@ -21,10 +21,10 @@ namespace keepass2android
 			WriteDemanded = 2
 		}
 
-		protected const int RequestCodeFileStorageSelectionForPrimarySelect = 983713;
-		private const int RequestCodeFileStorageSelectionForCopyToWritableLocation = 983714;
-		private const int RequestCodeFileFileBrowseForWritableLocation = 983715;
-		private const int RequestCodeFileBrowseForOpen = 983716;
+		protected const int RequestCodeFileStorageSelectionForPrimarySelect = 33713;
+		private const int RequestCodeFileStorageSelectionForCopyToWritableLocation = 33714;
+		private const int RequestCodeFileFileBrowseForWritableLocation = 33715;
+		private const int RequestCodeFileBrowseForOpen = 33716;
 		
 
 		protected IOConnectionInfo _selectedIoc;
diff --git a/src/MasterKeePlugin/MasterKeePlugin.csproj b/src/MasterKeePlugin/MasterKeePlugin.csproj
index 032ef79b..93999f4c 100644
--- a/src/MasterKeePlugin/MasterKeePlugin.csproj
+++ b/src/MasterKeePlugin/MasterKeePlugin.csproj
@@ -15,6 +15,7 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/MaterialTest2/MainActivity.cs b/src/MaterialTest2/MainActivity.cs
index b3f1b877..0405c351 100644
--- a/src/MaterialTest2/MainActivity.cs
+++ b/src/MaterialTest2/MainActivity.cs
@@ -1,19 +1,72 @@
 using System;
 using Android.App;
 using Android.Content;
+using Android.Graphics;
 using Android.Runtime;
 using Android.Support.V4.View;
 using Android.Support.V4.Widget;
 using Android.Support.V7.App;
+
+using Android.Support.Design.Widget;
+
 using Android.Views;
 using Android.Widget;
 using Android.OS;
-
+using Android.Util;
 using Toolbar = Android.Support.V7.Widget.Toolbar;
 namespace MaterialTest2
 {
-	[Activity(Theme="@style/MyTheme", Label = "MaterialTest", MainLauncher = true, Icon = "@drawable/icon")]
-	public class MainActivity : ActionBarActivity
+    public class MyDrawerLayout : Android.Support.V4.Widget.DrawerLayout
+    {
+        private bool _fitsSystemWindows;
+
+        protected MyDrawerLayout(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+        {
+        }
+
+        public MyDrawerLayout(Context context, IAttributeSet attrs, int defStyle) : base(context, attrs, defStyle)
+        {
+        }
+
+        public MyDrawerLayout(Context context, IAttributeSet attrs) : base(context, attrs)
+        {
+        }
+
+        public MyDrawerLayout(Context context) : base(context)
+        {
+        }
+
+        private int[] mInsets = new int[4];
+
+        protected override bool FitSystemWindows(Rect insets)
+        {
+            if (Build.VERSION.SdkInt >= Build.VERSION_CODES.Kitkat)
+            {
+                // Intentionally do not modify the bottom inset. For some reason, 
+                // if the bottom inset is modified, window resizing stops working.
+                // TODO: Figure out why.
+
+                mInsets[0] = insets.Left;
+                mInsets[1] = insets.Top;
+                mInsets[2] = insets.Right;
+
+                insets.Left = 0;
+                insets.Top = 0;
+                insets.Right = 0;
+            }
+
+            return base.FitSystemWindows(insets);
+            
+        }
+        public int[] GetInsets()
+        {
+            return mInsets;
+        }
+    }
+
+
+	[Activity(Theme="@style/MyTheme", Label = "MaterialTest", MainLauncher = false, Icon = "@drawable/icon", WindowSoftInputMode = SoftInput.AdjustResize)]
+	public class MainActivity : AppCompatActivity
 	{
 		int count = 1;
 
@@ -23,6 +76,23 @@ namespace MaterialTest2
 
 		private string mDrawerTitle;
 
+		public override bool OnCreateOptionsMenu(IMenu menu)
+		{
+			MenuInflater.Inflate(Resource.Menu.menu_password, menu);
+			return true;
+		}
+
+		public override bool OnOptionsItemSelected(IMenuItem item)
+		{
+			switch (item.ItemId)
+			{
+				case Android.Resource.Id.Home:
+					mDrawerLayout.OpenDrawer(Android.Support.V4.View.GravityCompat.Start);
+					return true;
+			}
+			return base.OnOptionsItemSelected(item);
+		}
+
 		protected override void OnCreate(Bundle bundle)
 		{
 			base.OnCreate(bundle);
@@ -32,7 +102,7 @@ namespace MaterialTest2
 
 			mDrawerTitle = this.Title;
 			//mPlanetTitles = this.Resources.GetStringArray (Resource.Array.planets_array);
-			mDrawerLayout = FindViewById<DrawerLayout>(Resource.Id.drawerLayout);
+			mDrawerLayout = FindViewById<DrawerLayout>(Resource.Id.drawer_layout);
 			//mDrawerList = FindViewById<RecyclerView> (Resource.Id.left_drawer);
 
 			
@@ -40,7 +110,7 @@ namespace MaterialTest2
 			// improve performance by indicating the list if fixed size.
 			//mDrawerList.HasFixedSize = true;
 			//mDrawerList.SetLayoutManager (new LinearLayoutManager (this));
-
+			NavigationView nv;
 			// set up the drawer's list view with items and click listener
 			//mDrawerList.SetAdapter (new PlanetAdapter (mPlanetTitles, this));
 			// enable ActionBar app icon to behave as action to toggle nav drawer
@@ -59,18 +129,62 @@ namespace MaterialTest2
 			// and attach an event to it
 			Button button = FindViewById<Button>(Resource.Id.MyButton);
 
-			button.Click += delegate { button.Text = string.Format("{0} clicks!", count++); };
+			button.Click += delegate { button.Text = string.Format("{0} clicks!", count++);
+				                         FindViewById(Resource.Id.MyButton).SetMinimumHeight(30*count);
+			};
 
-			var toolbar = FindViewById<Toolbar> (Resource.Id.toolbar2);
-			//Toolbar will now take on default Action Bar characteristics
+			
+			FindViewById<ImageButton>(Resource.Id.eyebutton).Click += delegate(object sender, EventArgs args)
+				{
+					Snackbar.Make(FindViewById<ImageButton>(Resource.Id.eyebutton), "Here's a snackbar!", Snackbar.LengthLong).SetAction("Action",
+					new ClickListener(v =>
+					{
+						Console.WriteLine("Action handler");
+					})).Show();
+				};
+
+			var toolbar = FindViewById<Toolbar> (Resource.Id.toolbar);
+			//SupportActionBar.SetBackgroundDrawable(GetDrawable(Resource.Drawable.ic_keepass2android));
+				//Toolbar will now take on default Action Bar characteristics
 			SetSupportActionBar (toolbar);
 			//You can now use and reference the ActionBar
-			SupportActionBar.Title = "Hello from Toolbar";
+			//SupportActionBar.Title = "Hello from Toolbar";
 
-			SupportActionBar.SetDisplayHomeAsUpEnabled (true);
-			SupportActionBar.SetHomeButtonEnabled(true);
+			var collapsingToolbar = FindViewById<CollapsingToolbarLayout> (Resource.Id.collapsing_toolbar);
+			collapsingToolbar.SetTitle ("Unlock Database");
+			
+			//SupportActionBar.SetHomeAsUpIndicator (Resource.Drawable.ic_menu);
+			//SupportActionBar.SetDisplayHomeAsUpEnabled (true);
 
-			//var toggle = new ActionBarDrawerToggle(
+            SupportActionBar.SetDisplayHomeAsUpEnabled(true);
+            SupportActionBar.SetHomeButtonEnabled(true);
+            mDrawerToggle.SyncState();
+
+			var fab = FindViewById<FloatingActionButton> (Resource.Id.fab);
+			fab.Click += (sender, e) => {
+				Snackbar.Make (fab, "Here's a snackbar!", Snackbar.LengthLong).SetAction ("Action",
+					new ClickListener (v => {
+						Console.WriteLine ("Action handler");
+					})).Show ();
+			};
+
+		}
+
+		public class ClickListener : Java.Lang.Object, View.IOnClickListener
+		{
+			public ClickListener (Action<View> handler)
+			{
+				Handler = handler;
+			}
+
+			public Action<View> Handler { get; set; }
+
+			public void OnClick (View v)
+			{
+				var h = Handler;
+				if (h != null)
+					h (v);
+			}
 		}
 
 		internal class MyActionBarDrawerToggle : ActionBarDrawerToggle
diff --git a/src/MaterialTest2/MaterialTest2.csproj b/src/MaterialTest2/MaterialTest2.csproj
index d7ce9639..66c40b1e 100644
--- a/src/MaterialTest2/MaterialTest2.csproj
+++ b/src/MaterialTest2/MaterialTest2.csproj
@@ -42,40 +42,213 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Mono.Android" />
-    <Reference Include="Xamarin.Android.Support.v4">
-      <HintPath>..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
+    <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Xamarin.Android.Support.v4.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.v7.AppCompat">
-      <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.21.0.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+    <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+    </Reference>
+    <Reference Include="Xamarin.Android.Support.Design">
+      <HintPath>..\packages\Xamarin.Android.Support.Design.22.2.0.0\lib\MonoAndroid403\Xamarin.Android.Support.Design.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="EntryEditActivity.cs" />
+    <Compile Include="FileStorageSelect.cs" />
+    <Compile Include="GroupActivity.cs" />
+    <Compile Include="GroupEditActivity.cs" />
+    <Compile Include="GroupListFragment.cs" />
     <Compile Include="MainActivity.cs" />
+    <Compile Include="PwEntryView.cs" />
+    <Compile Include="PwGroupView.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SplashActivity.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
-    <None Include="Properties\AndroidManifest.xml" />
-    <None Include="packages.config" />
+    <None Include="Properties\AndroidManifest.xml">
+      <SubType>Designer</SubType>
+    </None>
+    <AndroidResource Include="Resources\drawable\group_icon_bkg_drawable.xml" />
+    <AndroidResource Include="Resources\layout\my_list_item.axml">
+      <SubType>AndroidResource</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\values\dimens.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\layout\nav_header.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_dashboard.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_discuss.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_done.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_event.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_forum.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_headset.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_menu.png" />
+    <AndroidResource Include="Resources\layout\Splash.axml">
+      <SubType>AndroidResource</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\layout\filestorageselect.xml">
+      <SubType>AndroidResource</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\layout\entry_edit.axml">
+      <SubType>AndroidResource</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\layout\group.axml">
+      <SubType>AndroidResource</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\layout\generate_password.axml">
+      <SubType>AndroidResource</SubType>
+    </AndroidResource>
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\layout\Main.axml" />
-    <AndroidResource Include="Resources\values\Strings.xml" />
+    <AndroidResource Include="Resources\layout\Main.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\values\Strings.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
     <AndroidResource Include="Resources\drawable\Icon.png" />
-    <AndroidResource Include="Resources\layout\toolbar2.xml" />
-    <AndroidResource Include="Resources\values\styles.xml" />
-    <AndroidResource Include="Resources\values-v21\styles.xml" />
+    <AndroidResource Include="Resources\layout\toolbar2.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\values\styles.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+    <AndroidResource Include="Resources\values-v21\styles.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <ItemGroup>
-    <XamarinComponentReference Include="xamandroidsupportv7appcompat">
-      <Version>21.0.3.0</Version>
+    <AndroidResource Include="Resources\drawable\drawer_shadow.9.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\ic_keepass2android.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\toolbar_bg.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\list_selector.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values\colors.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Resources\color\" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\menu\menu_password.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\ic_action_eye_open.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\splashlogo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\createnewdb.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\opendb.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\splash_bg_selector.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\splash_button_bg.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\storagetype_grid_bg.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\storagetype_button_bg.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\group_list_entry.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\entry_list_entry.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\grouplistitem_selector.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\checked_drawable.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\listitem_unchecked_drawable.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\colortest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\entry_icon_bkg_drawable.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\checkmark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\rightarrow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\layout\grouplistfragment.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <XamarinComponentReference Include="xamandroidsupportdesign">
       <Visible>False</Visible>
+      <Version>22.2.0.0</Version>
     </XamarinComponentReference>
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable\drawer_shadow.9.png" />
+    <AndroidResource Include="Resources\layout\group_edit.xml">
+      <SubType>Designer</SubType>
+    </AndroidResource>
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_attachments.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_comments.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_created.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_expires.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_extras.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_group.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_modified.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_password.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_tags.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_url.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_entry_username.png" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/MaterialTest2/Properties/AndroidManifest.xml b/src/MaterialTest2/Properties/AndroidManifest.xml
index c5ee03b5..80dbf137 100644
--- a/src/MaterialTest2/Properties/AndroidManifest.xml
+++ b/src/MaterialTest2/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="MaterialTest2.MaterialTest2">
-	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
-	<application android:label="MaterialTest2"></application>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="MaterialTest2.MaterialTest2" android:installLocation="auto">
+	<uses-sdk />
+	<application android:label="MaterialTest2" android:icon="@drawable/ic_discuss"></application>
 </manifest>
\ No newline at end of file
diff --git a/src/MaterialTest2/Resources/layout/Main.axml b/src/MaterialTest2/Resources/layout/Main.axml
deleted file mode 100644
index 652fb2a5..00000000
--- a/src/MaterialTest2/Resources/layout/Main.axml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:local="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-    <include
-        android:id="@+id/toolbar2"
-        layout="@layout/toolbar2" />
-    <android.support.v4.widget.DrawerLayout
-        android:layout_width="match_parent"
-        android:id="@+id/drawerLayout"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar2">
-    <!-- activity view -->
-        <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:id="@+id/main_content">
-            <Button
-                android:id="@+id/MyButton"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/Hello" />
-            <CheckBox
-                android:text="CheckBox"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/checkBox1" />
-            <EditText
-                android:inputType="textEmailAddress"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/editText1" />
-        </LinearLayout>
-    <!-- navigation drawer -->
-        <RelativeLayout
-            android:layout_gravity="left|start"
-            android:layout_width="match_parent"
-            android:background="#fff"
-            android:layout_height="match_parent">
-            <Button
-                android:id="@+id/MyButton2"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/Hello" />
-        </RelativeLayout>
-    </android.support.v4.widget.DrawerLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/src/MaterialTest2/Resources/layout/toolbar2.xml b/src/MaterialTest2/Resources/layout/toolbar2.xml
index b6dc0a2e..2b3d9a47 100644
--- a/src/MaterialTest2/Resources/layout/toolbar2.xml
+++ b/src/MaterialTest2/Resources/layout/toolbar2.xml
@@ -4,7 +4,11 @@
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+								   android:gravity="bottom"
     android:minHeight="?attr/actionBarSize"
-    android:background="?attr/colorPrimary"
+android:background="@drawable/toolbar_bg"
     local:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    local:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
\ No newline at end of file
+    local:popupTheme="@style/ThemeOverlay.AppCompat.Light" >
+	
+		
+</android.support.v7.widget.Toolbar>
\ No newline at end of file
diff --git a/src/MaterialTest2/Resources/values-v21/styles.xml b/src/MaterialTest2/Resources/values-v21/styles.xml
index 00f20009..5872772f 100644
--- a/src/MaterialTest2/Resources/values-v21/styles.xml
+++ b/src/MaterialTest2/Resources/values-v21/styles.xml
@@ -10,5 +10,22 @@
     <item name="android:windowAllowReturnTransitionOverlap">true</item>
     <item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
     <item name="android:windowSharedElementExitTransition">@android:transition/move</item>
+    <item name="android:actionModeBackground">@color/appAccentColor</item>
+  </style>
+  <style name="MyTheme_ActionBar" parent="MyTheme_ActionBar.Base">
+    <item name="android:actionModeBackground">@color/appAccentColor</item>
+    <item name="actionModeBackground">@color/appAccentColor</item>
+  </style>
+
+  <style name="EntryFieldHeader">
+    <item name="android:drawablePadding">2dp</item>
+    <item name="android:layout_marginLeft">0dip</item>
+    <item name="android:layout_marginRight">12dip</item>
+    <item name="android:layout_marginBottom">3dp</item>
+    <item name="android:layout_marginTop">8dp</item>
+    <item name="android:paddingLeft">4dp</item>
+    <item name="android:textAllCaps">false</item>
+    <item name="android:textColor">?android:attr/textColorSecondary</item>
+    <item name="android:textSize">12sp</item>
   </style>
 </resources>
diff --git a/src/MaterialTest2/Resources/values/Strings.xml b/src/MaterialTest2/Resources/values/Strings.xml
index 61c2c44f..367cf8e0 100644
--- a/src/MaterialTest2/Resources/values/Strings.xml
+++ b/src/MaterialTest2/Resources/values/Strings.xml
@@ -6,4 +6,5 @@
      <string name="action_settings">Settings</string>
     <string name="drawer_open">open</string>
     <string name="drawer_close">close</string>
+  <string name="group">Group</string>
 </resources>
diff --git a/src/MaterialTest2/Resources/values/styles.xml b/src/MaterialTest2/Resources/values/styles.xml
index 6a2c499a..43f79dff 100644
--- a/src/MaterialTest2/Resources/values/styles.xml
+++ b/src/MaterialTest2/Resources/values/styles.xml
@@ -1,29 +1,172 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <resources>
-  <style name="MyTheme" parent="MyTheme.Base">
+	<style name="BottomBarButton" parEntryEditSingleLine_ImageView="@style/Widget.AppCompat.Button.Borderless">
+		<item name="android:textSize">16sp</item>
+		<item name="android:layout_margin">6dp</item>
+		<item name="android:layout_marginLeft">4dp</item>
+		<item name="android:layout_marginRight">4dp</item>
+		<item name="android:paddingBottom">10dp</item>
+		<item name="android:paddingTop">10dp</item>
+		<item name="android:paddingLeft">8dp</item>
+		<item name="android:paddingRight">8dp</item>
+		<item name="android:textColor">#2196f3</item>
+	</style>
+	<!--
+	<style name="SplashScreenButton" parent="Widget.AppCompat.Button"> 
+		<item name="colorButtonNormal">#fff</item>
+		<item name="android:textSize">16sp</item>
+		<item name="android:layout_height">32sp</item>
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_marginTop">8dp</item>
+		<item name="android:layout_marginBottom">8dp</item>
+	</style>
+
+	-->
+
+	<style name="SplashScreenButton" parent="@style/Widget.AppCompat.Button"	>
+		<item name="android:textSize">16sp</item>
+		<item name="android:layout_height">40sp</item>
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:background">@drawable/splash_button_bg</item>
+		<item name="android:layout_marginTop">8dp</item>
+		<item name="android:layout_marginBottom">8dp</item>
+		<item name="android:paddingLeft">16dp</item>
+		<item name="android:drawablePadding">10dp</item>
+		<item name="android:textAllCaps">false</item>
+		<item name="android:gravity">left|center_vertical</item>
+		<item name="android:textColor">#737373</item>
+	</style>
+
+
+	<style name="EntryEditSingleLine_ImageView">
+		<item name="android:layout_width">40dp</item>
+    <item name="android:layout_gravity">top</item>
+    <item name="android:layout_marginRight">16dp</item>
+    <item name="android:layout_marginTop">16dp</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_weight">0</item>
+	</style>
+	<style name="EntryEditSingleLine_TextInputLayout">
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_weight">1</item>
+	</style>
+	<style name="EntryEditSingleLine_EditText">
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:paddingTop">0dp</item>
+	</style>
+	<style name="EntryEditSingleLine_container">
+		<item name="android:layout_width">fill_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_marginTop">8dp</item>
+		<item name="android:orientation">horizontal</item>
+		<item name="android:gravity">center_vertical</item>
+	</style>
+
+	<style name="MyTheme" parent="MyTheme.Base">
+    <item name="actionModeBackground">@color/appAccentColor</item>
   </style>
+
+
+  <!--style name="MyTheme.ActionMode" parent="@style/Theme.AppCompat.Light.DarkActionBar">
+    <item name="actionModeBackground">#FFFFFF</item>
+  </style-->
+  
+  
+	<style name="MyTheme_ActionBar" parent="MyTheme_ActionBar.Base">
+    <item name="actionModeBackground">@color/appAccentColor</item>
+	</style>
   <!-- Base theme applied no matter what API -->
-  <style name="MyTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+  <style name="MyTheme.Base" parent="Theme.AppCompat.Holo.Light.NoActionBar">
     <item name="android:windowNoTitle">true</item>
     <!--We will be using the toolbar so no need to show ActionBar-->
     <item name="windowActionBar">false</item>
     <!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette-->
     <!-- colorPrimary is used for the default action bar background -->
-    <item name="colorPrimary">#2196F3</item>
+    <item name="colorPrimary">@color/appPrimaryColor</item>
     <!-- colorPrimaryDark is used for the status bar -->
-    <item name="colorPrimaryDark">#1976D2</item>
+    <item name="colorPrimaryDark">@color/appPrimaryDarkColor</item>
     <!-- colorAccent is used as the default value for colorControlActivated
          which is used to tint widgets -->
-    <item name="colorAccent">#FF4081</item>
+    <item name="colorAccent">@color/appAccentColor</item>
      <!-- You can also set colorControlNormal, colorControlActivated
          colorControlHighlight and colorSwitchThumbNormal. -->
 		<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
+    
   </style>
 
+	<style name="MyTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
+		<item name="android:windowNoTitle">true</item>
+		<!--We will be using the toolbar so no need to show ActionBar-->
+		<item name="windowActionBar">false</item>
+		<!-- Set theme colors from http://www.google.com/design/spec/style/color.html#color-color-palette-->
+		<!-- colorPrimary is used for the default action bar background -->
+    <item name="colorPrimary">@color/appPrimaryColor</item>
+		<!-- colorPrimaryDark is used for the status bar -->
+    <item name="colorPrimaryDark">@color/appPrimaryDarkColor</item>
+		<!-- colorAccent is used as the default value for colorControlActivated
+         which is used to tint widgets -->
+		<item name="colorAccent">@color/appAccentColor</item>
+		<!-- You can also set colorControlNormal, colorControlActivated
+         colorControlHighlight and colorSwitchThumbNormal. -->
+		<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
+
+	</style>
+
+  
+	<style name="MyTheme_ActionBar.Base" parent="Theme.AppCompat.Light.DarkActionBar">
+		<item name="android:windowNoTitle">true</item>
+		<item name="windowActionBar">true</item>
+		<item name="colorPrimary">@color/appPrimaryColor</item>
+		<item name="colorPrimaryDark">@color/appPrimaryDarkColor</item>
+		<item name="colorAccent">@color/appAccentColor</item>
+		<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
+    
+    <item name="actionModeBackground">@color/appPrimaryDarkColor</item>
+	</style>
+
 
 	<style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
 		<item name="spinBars">true</item>
-		<item name="color">@android:color/black</item>
+		<item name="color">@android:color/white</item>
 	</style>
+
+  <style name="GroupDetailInSearchResult">
+    <item name="@android:textStyle">italic</item>
+  </style>
+
+  <style name="Base_Dialog" parent="Theme.AppCompat.Light.Dialog" />
+  <style name="Dialog" parent="Base_Dialog"></style>
+
+
+  <style name="TextAppearance_EditEntry">
+    <item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+    <item name="android:textSize">18sp</item>
+    <item name="android:textColor">?android:attr/textColorPrimary</item>
+  </style>
+
+  <style name="TextAppearance_EditEntry_Value" parent="TextAppearance_EditEntry">
+    <item name="android:gravity">center_vertical</item>
+    <item name="android:layout_gravity">center_vertical</item>
+    <item name="android:layout_marginRight">12dip</item>
+    <item name="android:layout_marginLeft">12dip</item>
+  </style>
+
+  <style name="TextAppearance_EditEntry_Small">
+    <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+    <item name="android:textSize">14sp</item>
+    <item name="android:textColor">?android:attr/textColorSecondary</item>
+    <item name="android:textAllCaps">true</item>
+  </style>
+  
+  <style name="TextAppearance_SmallHeading" parent="TextAppearance_EditEntry_Small">
+    <item name="android:minHeight">24dip</item>
+    <item name="android:layout_width">144dip</item>
+    <item name="android:layout_marginTop">12dip</item>
+    <item name="android:layout_marginRight">16dip</item>
+    <item name="android:paddingRight">8dip</item>
+    <item name="android:layout_marginBottom">-12dip</item>
+  </style>
 </resources>
 
diff --git a/src/MaterialTest2/packages.config b/src/MaterialTest2/packages.config
index 719c7701..dc4dc9e3 100644
--- a/src/MaterialTest2/packages.config
+++ b/src/MaterialTest2/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Xamarin.Android.Support.v4" version="21.0.3.0" targetFramework="MonoAndroid50" />
-  <package id="Xamarin.Android.Support.v7.AppCompat" version="21.0.3.0" targetFramework="MonoAndroid50" />
+  <package id="Xamarin.Android.Support.Design" version="22.2.0.0" targetFramework="MonoAndroid50" />
+  <package id="Xamarin.Android.Support.v4" version="22.2.0.0" targetFramework="MonoAndroid50" />
+  <package id="Xamarin.Android.Support.v7.AppCompat" version="22.2.0.0" targetFramework="MonoAndroid50" />
 </packages>
\ No newline at end of file
diff --git a/src/PluginSdkBinding/PluginSdkBinding.csproj b/src/PluginSdkBinding/PluginSdkBinding.csproj
index 30b75a9c..ba721def 100644
--- a/src/PluginSdkBinding/PluginSdkBinding.csproj
+++ b/src/PluginSdkBinding/PluginSdkBinding.csproj
@@ -10,7 +10,6 @@
     <RootNamespace>PluginSdkBinding</RootNamespace>
     <AssemblyName>PluginSdkBinding</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/src/java/JavaFileStorage/bin/javafilestorage.jar b/src/java/JavaFileStorage/bin/javafilestorage.jar
index 0a8a25d917a061648671fcb6de5733f7ee55020b..6ff73f244d0c6f7fc6cffea1f24e323ab49e960c 100644
GIT binary patch
delta 55
zcmex)UE$|-1>OK}W)=|!4h{|mnPo2<d0TlITX~sUd6`>zSz38nTY1^G^0M0;U<OKV
K_c_46HX8uUDG<v5

delta 55
zcmex)UE$|-1>OK}W)=|!4h{~6josH9d0TlITX~sUd6`>zSz38nTY1^G^0M0;U<OKV
K_c_46HX8unzY&`N

diff --git a/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar b/src/java/KP2AKdbLibrary/bin/kp2akdblibrary.jar
index de228a015f55f6ec9fb903a37111dd50f2a93ab7..6a2414110c51f68bb1cb119128ad38a3587f63e2 100644
GIT binary patch
delta 6895
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
EFX07@o&W#<

delta 6895
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
HDN*&moQDc&

diff --git a/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar b/src/java/Keepass2AndroidPluginSDK/bin/keepass2androidpluginsdk.jar
index 272dc915824458973cb1055c0e369c5fa954b1fc..d250b0a8e0a0e46fc205a077d4e89e8b810e63a6 100644
GIT binary patch
delta 33
ncmZpl&)7bnkvG7bnMH(wgM)*?XxYn+yb_+wKzg%=XFMAKl<Emr

delta 33
ncmZpl&)7bnkvG7bnMH(wgM))%_QLBMc_loVf%Ik#&v-Tfoa_nv

diff --git a/src/keepass2android/LockingPreferenceActivity.cs b/src/keepass2android/LockingPreferenceActivity.cs
index 72b6b826..17a88fae 100644
--- a/src/keepass2android/LockingPreferenceActivity.cs
+++ b/src/keepass2android/LockingPreferenceActivity.cs
@@ -16,14 +16,119 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
   */
 
 using System;
+using Android.Content.Res;
+using Android.Graphics;
 using Android.OS;
 using Android.Runtime;
 using Android.Preferences;
+using Android.Support.V7.App;
+using Android.Views;
+using Java.Lang;
+using keepass2android;
 
 namespace keepass2android
 {
+
+    public class AppCompatPreferenceActivity: PreferenceActivity
+    {
+        public AppCompatPreferenceActivity(IntPtr javaReference, JniHandleOwnership transfer)
+			: base(javaReference, transfer)
+		{
+			
+		}
+
+        public AppCompatPreferenceActivity()
+        {
+            
+        }
+
+        private AppCompatDelegate _appCompatDelegate;
+
+        AppCompatDelegate Delegate
+        {
+            get
+            {
+                if (_appCompatDelegate == null)
+                    _appCompatDelegate = AppCompatDelegate.Create(this, null);
+                return _appCompatDelegate;
+            }
+        }
+
+        protected override void OnCreate(Bundle savedInstanceState)
+        {
+            Delegate.InstallViewFactory();
+            Delegate.OnCreate(savedInstanceState);
+            base.OnCreate(savedInstanceState);
+            
+        }
+
+
+        public override MenuInflater MenuInflater
+        {
+            get { return Delegate.MenuInflater; }
+        }
+
+
+        public override void SetContentView(int layoutResId)
+        {
+            Delegate.SetContentView(layoutResId);
+            
+        }
+
+        
+    public override void SetContentView(View view) {
+        Delegate.SetContentView(view);
+    }
+    
+    public override void SetContentView(View view, ViewGroup.LayoutParams @params) {
+        Delegate.SetContentView(view, @params);
+    }
+    
+    public override void AddContentView(View view, ViewGroup.LayoutParams @params) {
+        Delegate.AddContentView(view, @params);
+    }
+
+    protected override void OnPostResume()
+    {
+        base.OnPostResume();
+        Delegate.OnPostResume();
+    }
+
+        protected override void OnTitleChanged(ICharSequence title, Color color)
+        {
+            base.OnTitleChanged(title, color);
+            Delegate.SetTitle(title);
+        }
+
+
+        public override void OnConfigurationChanged(Configuration newConfig)
+        {
+            base.OnConfigurationChanged(newConfig);
+            Delegate.OnConfigurationChanged(newConfig);
+        }
+
+
+        protected override void OnStop()
+        {
+            base.OnStop();
+            Delegate.OnStop();
+        }
+
+
+        protected override void OnDestroy()
+        {
+            base.OnDestroy();
+            Delegate.OnDestroy();
+        }
+
+        public override void InvalidateOptionsMenu()
+        {
+            Delegate.InvalidateOptionsMenu();
+        }
+    }
+
 	
-	public class LockingPreferenceActivity : PreferenceActivity {
+	public class LockingPreferenceActivity : AppCompatPreferenceActivity {
 		
 		public LockingPreferenceActivity (IntPtr javaReference, JniHandleOwnership transfer)
 			: base(javaReference, transfer)
diff --git a/src/keepass2android/Properties/AndroidManifest_debug.xml b/src/keepass2android/Properties/AndroidManifest_debug.xml
index ea637b30..08da7294 100644
--- a/src/keepass2android/Properties/AndroidManifest_debug.xml
+++ b/src/keepass2android/Properties/AndroidManifest_debug.xml
@@ -54,7 +54,7 @@
             </intent-filter>
         </activity>
  
-		<activity android:configChanges="keyboardHidden|orientation" android:label="@string/app_name" android:theme="@style/Base" android:name="keepass2android.PasswordActivity">
+		<activity android:configChanges="keyboardHidden|orientation" android:label="@string/app_name" android:theme="@style/MyTheme" android:name="keepass2android.PasswordActivity">
 			<intent-filter android:label="@string/app_name">
 				<action android:name="android.intent.action.VIEW" />
 				<category android:name="android.intent.category.DEFAULT" />
diff --git a/src/keepass2android/Properties/AndroidManifest_net.xml b/src/keepass2android/Properties/AndroidManifest_net.xml
index a35a6bd5..f7aae08c 100644
--- a/src/keepass2android/Properties/AndroidManifest_net.xml
+++ b/src/keepass2android/Properties/AndroidManifest_net.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-			android:versionCode="56" 
-			android:versionName="0.9.8 preview 1" 
+			android:versionCode="57" 
+			android:versionName="0.9.8 preview 2 (alpha)" 
 			package="keepass2android.keepass2android" 
 			android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index fad9f4d3..7a86f0e8 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -538,7 +538,9 @@
 	<string name="NoFilenameWarning">The URI you have entered does not look like a filename. Are you sure this is a valid file?</string>
 
 	<string name="ChangeLog_0_9_8">
-		Version 0.9.8\n
+		Version 0.9.8 preview 2 (alpha)\n
+    *** NOTE: This preview is meant for early testing of the new UI design. It is currently not fully functional!***
+    * Material design.
 		* Support for Storage Access Framework (allows write to SD card and Google Drive in KP2A Offline)\n
 		* Try to detect erroneous user input when entering WebDAV URLs (directory instead of file)\n
 		* Changed password font\n
diff --git a/src/keepass2android/settings/AppSettingsActivity.cs b/src/keepass2android/settings/AppSettingsActivity.cs
index 3c505ff1..1117ba32 100644
--- a/src/keepass2android/settings/AppSettingsActivity.cs
+++ b/src/keepass2android/settings/AppSettingsActivity.cs
@@ -1,3 +1,4 @@
+
 /*
 This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file is based on Keepassdroid, Copyright Brian Pellin.
 
diff --git a/src/monodroid-unittesting/MonoDroidUnitTesting/MonoDroidUnitTesting.csproj b/src/monodroid-unittesting/MonoDroidUnitTesting/MonoDroidUnitTesting.csproj
index 90b255f3..56e385fc 100644
--- a/src/monodroid-unittesting/MonoDroidUnitTesting/MonoDroidUnitTesting.csproj
+++ b/src/monodroid-unittesting/MonoDroidUnitTesting/MonoDroidUnitTesting.csproj
@@ -13,7 +13,6 @@
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidSupportedAbis>armeabi</AndroidSupportedAbis>
     <AndroidStoreUncompressedFileExtensions />
-    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
     <MandroidI18n />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">