From 0d88e5b5e812d6df6e899d4600cdd1fb681bb858 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <crocoapps@googlemail.com>
Date: Tue, 22 Apr 2014 06:16:10 +0200
Subject: [PATCH] moved icons to correct folder

---
 src/keepass2android/Resources/Resource.designer.cs  |   2 +-
 .../collections_collection_holodark.png             | Bin
 .../collections_new_label_holodark.png              | Bin
 .../device_access_new_account_holodark.png          | Bin
 .../location_web_site_holodark.png                  | Bin
 src/keepass2android/keepass2android.csproj          |  12 ++++++------
 src/keepass2android/views/TextWithHelp.cs           |   2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename src/keepass2android/Resources/{drawable-hdpi => drawable}/collections_collection_holodark.png (100%)
 rename src/keepass2android/Resources/{drawable-hdpi => drawable}/collections_new_label_holodark.png (100%)
 rename src/keepass2android/Resources/{drawable-hdpi => drawable}/device_access_new_account_holodark.png (100%)
 rename src/keepass2android/Resources/{drawable-hdpi => drawable}/location_web_site_holodark.png (100%)

diff --git a/src/keepass2android/Resources/Resource.designer.cs b/src/keepass2android/Resources/Resource.designer.cs
index 4b3016f3..e0cb5f80 100644
--- a/src/keepass2android/Resources/Resource.designer.cs
+++ b/src/keepass2android/Resources/Resource.designer.cs
@@ -7509,7 +7509,7 @@ namespace keepass2android
 					16843055,
 					16843056,
 					16843057,
-					16843754};
+					16843788};
 			
 			// aapt resource value: 4
 			public const int MenuView_android_headerBackground = 4;
diff --git a/src/keepass2android/Resources/drawable-hdpi/collections_collection_holodark.png b/src/keepass2android/Resources/drawable/collections_collection_holodark.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-hdpi/collections_collection_holodark.png
rename to src/keepass2android/Resources/drawable/collections_collection_holodark.png
diff --git a/src/keepass2android/Resources/drawable-hdpi/collections_new_label_holodark.png b/src/keepass2android/Resources/drawable/collections_new_label_holodark.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-hdpi/collections_new_label_holodark.png
rename to src/keepass2android/Resources/drawable/collections_new_label_holodark.png
diff --git a/src/keepass2android/Resources/drawable-hdpi/device_access_new_account_holodark.png b/src/keepass2android/Resources/drawable/device_access_new_account_holodark.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-hdpi/device_access_new_account_holodark.png
rename to src/keepass2android/Resources/drawable/device_access_new_account_holodark.png
diff --git a/src/keepass2android/Resources/drawable-hdpi/location_web_site_holodark.png b/src/keepass2android/Resources/drawable/location_web_site_holodark.png
similarity index 100%
rename from src/keepass2android/Resources/drawable-hdpi/location_web_site_holodark.png
rename to src/keepass2android/Resources/drawable/location_web_site_holodark.png
diff --git a/src/keepass2android/keepass2android.csproj b/src/keepass2android/keepass2android.csproj
index 2afe8427..62735481 100644
--- a/src/keepass2android/keepass2android.csproj
+++ b/src/keepass2android/keepass2android.csproj
@@ -900,19 +900,16 @@
     <AndroidResource Include="Resources\drawable-hdpi\btn_new_group_holodark.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\collections_collection_holodark.png" />
+    <AndroidResource Include="Resources\drawable\collections_collection_holodark.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\collections_new_label_holodark.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\device_access_new_account_holodark.png" />
+    <AndroidResource Include="Resources\drawable\device_access_new_account_holodark.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-hdpi\ic_menu_remove_field_holodark.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidResource Include="Resources\drawable-hdpi\location_web_site_holodark.png" />
+    <AndroidResource Include="Resources\drawable\location_web_site_holodark.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\values-v14\styles_dark.xml">
@@ -957,4 +954,7 @@
   <ItemGroup>
     <TransformFile Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\collections_new_label_holodark.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/keepass2android/views/TextWithHelp.cs b/src/keepass2android/views/TextWithHelp.cs
index 641a537f..f6573f15 100644
--- a/src/keepass2android/views/TextWithHelp.cs
+++ b/src/keepass2android/views/TextWithHelp.cs
@@ -42,7 +42,7 @@ namespace keepass2android.views
 			_kp2AShortHelpView.HelpText = a.GetString(Resource.Styleable.TextWithHelp_help_text);
 
 			const string xmlns = "http://schemas.android.com/apk/res/android";
-			((TextView)FindViewById(Resource.Id.text)).Text = Context.GetString(attrs.GetAttributeResourceValue(xmlns, "text",Resource.String.ellipsis));
+			((TextView)FindViewById(Resource.Id.text)).Text = Context.GetString(attrs.GetAttributeResourceValue(xmlns, "text", Resource.String.ellipsis));
 
 		}