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

@@ -55,8 +55,9 @@ namespace keepass2android
 
 		protected override void OnCreate(Bundle bundle)
 		{
-			base.OnCreate(bundle);
 			_design.ApplyTheme(); 
+			base.OnCreate(bundle);
+			
 
             SupportActionBar.SetDisplayHomeAsUpEnabled(true);
             SupportActionBar.SetHomeButtonEnabled(true);

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()

src/keepass2android/FileStorageSelectionActivity.cs

@@ -200,8 +200,9 @@ namespace keepass2android
 
 		protected override void OnCreate(Bundle bundle)
 		{
-			base.OnCreate(bundle);
 			_design.ApplyTheme(); 
+			base.OnCreate(bundle);
+			
 
 			SetContentView(Resource.Layout.filestorage_selection);
 

src/keepass2android/GeneratePasswordActivity.cs

@@ -53,8 +53,9 @@ namespace keepass2android
 
 		
 		protected override void OnCreate(Bundle savedInstanceState) {
-			base.OnCreate(savedInstanceState);
 			_design.ApplyTheme(); 
+			base.OnCreate(savedInstanceState);
+			
 			SetContentView(Resource.Layout.generate_password);
 			SetResult(KeePass.ExitNormal);
 

src/keepass2android/GroupBaseActivity.cs

@@ -218,8 +218,9 @@ namespace keepass2android
 	    }
 
 	    protected override void OnCreate(Bundle savedInstanceState) {
-			base.OnCreate(savedInstanceState);
 			_design.ApplyTheme(); 
+			base.OnCreate(savedInstanceState);
+			
 			Android.Util.Log.Debug("KP2A", "Creating GBA");
 
 			AppTask = AppTask.GetTaskInOnCreate(savedInstanceState, Intent);

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.

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))

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))

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);

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(

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();
 

src/keepass2android/Resources/drawable/splash_button_bg.xml

@@ -9,13 +9,13 @@
 	<item android:state_focused="true">
 		<shape android:shape="rectangle"  >
 			<corners android:radius="2dip" />
-			<solid android:color="?activityBackgroundColor"/>
+			<solid android:color="#fff"/>
 		</shape>
 	</item>
 	<item >
 		<shape android:shape="rectangle"  >
 			<corners android:radius="2dip" />
-			<solid android:color="?activityBackgroundColor" />
+			<solid android:color="#fff" />
 		</shape>
 	</item>
 </selector>

src/keepass2android/Resources/layout/image_list_preference_row.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/image_list_view_row_table_layout"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingLeft="6dip"
+    android:paddingRight="?android:attr/scrollbarSize" >
+    <TextView
+        android:id="@+id/image_list_view_row_text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:paddingRight="40dip"
+        android:singleLine="true"
+        android:textColor="@android:color/black"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    <RadioButton
+        android:id="@+id/image_list_view_row_radio_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:checked="false"
+        android:gravity="right" />
+</RelativeLayout>

src/keepass2android/Resources/values/colors.xml

@@ -20,8 +20,7 @@
 <resources>
 
   <color name="bgColorLight">#fff</color>
-  <color name="bgColorDark">#000</color>
+  <color name="bgColorDark">#0000</color>
-  <color name="bgColor">#000</color>
   
   <color name="appPrimaryColor">#8bc34a</color>
   <color name="appPrimaryDarkColor">#548a2e</color>

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");

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<ActivityAttribute>().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,8 +103,16 @@ 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;
+			}
 		}
 
 		public bool UseDarkTheme

src/keepass2android/fileselect/FileSelectActivity.cs

@@ -77,8 +77,9 @@ namespace keepass2android
 
 		protected override void OnCreate(Bundle savedInstanceState)
 		{
-			base.OnCreate(savedInstanceState);
 			_design.ApplyTheme(); 
+			base.OnCreate(savedInstanceState);
+			
 
 			Kp2aLog.Log("FileSelect.OnCreate");
 			Kp2aLog.Log("FileSelect:apptask="+Intent.GetStringExtra("KP2A_APPTASK"));

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);
 

src/keepass2android/keepass2android.csproj

@@ -545,9 +545,17 @@
     <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_download.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_share.png" />
     <AndroidResource Include="Resources\drawable-xhdpi\ic_menu_upload.png" />
+    <AndroidResource Include="Resources\drawable-mdpi-v4\ic_launcher.png" />
+    <AndroidResource Include="Resources\drawable-mdpi-v4\ic_launcher_offline.png" />
+    <AndroidResource Include="Resources\drawable-mdpi-v4\ic_launcher_online.png" />
+    <AndroidResource Include="Resources\drawable-hdpi-v4\ic_launcher.png" />
+    <AndroidResource Include="Resources\drawable-hdpi-v4\ic_launcher_offline.png" />
+    <AndroidResource Include="Resources\drawable-hdpi-v4\ic_launcher_online.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi-v4\ic_launcher.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable\ic99_blank.png" />
+    <AndroidResource Include="Resources\drawable\ic_launcher.png" />
     <AndroidResource Include="Resources\layout\about.xml">
       <SubType>Designer</SubType>
     </AndroidResource>
@@ -708,6 +716,9 @@
     <Folder Include="Resources\drawable-ldpi\" />
     <Folder Include="Resources\drawable-xxhdpi\" />
     <Folder Include="SupportLib\" />
+    <Folder Include="Resources\drawable-mdpi-v4\" />
+    <Folder Include="Resources\drawable-hdpi-v4\" />
+    <Folder Include="Resources\drawable-xhdpi-v4\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\JavaFileStorageBindings\JavaFileStorageBindings.csproj">

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);
 

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);