From fe57c0557922f2db31f520c8570869c7714e9ef5 Mon Sep 17 00:00:00 2001
From: Philipp Crocoll <philipp@crocoll.net>
Date: Wed, 12 Jan 2022 08:11:18 +0100
Subject: [PATCH] prototype implementation using the "Sign in with Google"
 button

---
 .../FileStorageSelectionActivity.cs           |  55 +++++++++++++-----
 .../drawable-mdpi/ic_storage_gdrive.png       | Bin 15889 -> 0 bytes
 .../drawable-xhdpi/ic_storage_gdrive.png      | Bin 16595 -> 12830 bytes
 .../layout/filestorage_selection.xml          |   4 +-
 .../Resources/values/strings.xml              |   1 -
 .../keepass2android-app.csproj                |   7 +--
 6 files changed, 44 insertions(+), 23 deletions(-)
 delete mode 100644 src/keepass2android/Resources/drawable-mdpi/ic_storage_gdrive.png

diff --git a/src/keepass2android/FileStorageSelectionActivity.cs b/src/keepass2android/FileStorageSelectionActivity.cs
index 1d922972..1741e35c 100644
--- a/src/keepass2android/FileStorageSelectionActivity.cs
+++ b/src/keepass2android/FileStorageSelectionActivity.cs
@@ -117,20 +117,34 @@ namespace keepass2android
 
                 Button btn;
 
-                if (convertView == null)
+                var protocolId = _displayedProtocolIds[position];
+                string firstProtocolInList = protocolId.Split(",").First();
+				String title =
+                    protocolId == "kp2a" ? App.Kp2a.GetResourceString("get_regular_version")
+                        :
+                        App.Kp2a.GetStorageMainTypeDisplayName(firstProtocolInList);
+
+				if (convertView == null)
                 {  // if it's not recycled, initialize some attributes
 
                     btn = new Button(_context);
-                    btn.LayoutParameters = new GridView.LayoutParams((int)convertDpToPixel(90, _context), (int)convertDpToPixel(110, _context));
-                    btn.SetBackgroundResource(Resource.Drawable.storagetype_button_bg);
-					btn.SetPadding((int)convertDpToPixel(4, _context),
-						(int)convertDpToPixel(20, _context),
+                    btn.LayoutParameters = new GridView.LayoutParams((int)convertDpToPixel(250, _context), (int)convertDpToPixel(45, _context));
+                    btn.SetBackgroundColor(Color.White);
+					if (title == "Google Drive")
+                        btn.SetPadding((int)convertDpToPixel(0, _context),
+                            (int)convertDpToPixel(0, _context),
+                            (int)convertDpToPixel(0, _context),
+                            (int)convertDpToPixel(0, _context));
+					else
+
+					btn.SetPadding((int)convertDpToPixel(12, _context),
+						(int)convertDpToPixel(12, _context),
 						(int)convertDpToPixel(4, _context),
 						(int)convertDpToPixel(4, _context));
-                    btn.SetTextSize(ComplexUnitType.Sp, 11);
+                    btn.SetTextSize(ComplexUnitType.Sp, 14);
                     btn.SetTextColor(new Color(115, 115, 115));
-                    btn.SetSingleLine(false);
-					btn.Gravity = GravityFlags.Center;
+                    btn.SetSingleLine(true);
+					btn.Gravity = GravityFlags.Left;
                     btn.Click += (sender, args) => _context.OnItemSelected( (string) ((Button)sender).Tag);
                 }
                 else
@@ -138,23 +152,32 @@ namespace keepass2android
                     btn = (Button)convertView;
                 }
 			    
-			    var protocolId = _displayedProtocolIds[position];
                 btn.Tag = protocolId;
 
-			    string firstProtocolInList = protocolId.Split(",").First();
+			    
 
 
                 Drawable drawable = App.Kp2a.GetStorageIcon(firstProtocolInList);
 
-				String title =
-					protocolId == "kp2a" ? App.Kp2a.GetResourceString("get_regular_version")
-						:
-						App.Kp2a.GetStorageMainTypeDisplayName(firstProtocolInList);
-                var str = new SpannableString(title);
+                bool isdrive = (title == "Google Drive");
+
+
+				if (title == "Google Drive")
+                    title = "";
+
+                var str = new SpannableString("  " + title);
+
 
 			    btn.TextFormatted = str;
                 //var drawable = ContextCompat.GetDrawable(context, Resource.Drawable.Icon);
-                btn.SetCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null);
+                if (!isdrive)
+                {
+                    drawable.SetBounds(0, 0, 75, 75);
+                    btn.SetCompoundDrawables(drawable, null, null, null);
+				}
+				else
+
+                btn.SetCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
 
                 return btn;
 			}
diff --git a/src/keepass2android/Resources/drawable-mdpi/ic_storage_gdrive.png b/src/keepass2android/Resources/drawable-mdpi/ic_storage_gdrive.png
deleted file mode 100644
index a68d5a39e17e20eaabaf9b86d074fa1076021f86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15889
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
S`=k0x+a0Z)p2N-SxBeTJk%q7U

diff --git a/src/keepass2android/Resources/drawable-xhdpi/ic_storage_gdrive.png b/src/keepass2android/Resources/drawable-xhdpi/ic_storage_gdrive.png
index 3b72f661b86b5e7550c9205c79a4cbd5bd43b3c2..2327b873fa9b050c75cb6d074e97d610cadf8877 100644
GIT binary patch
literal 12830
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

literal 16595
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
alYwQ1;w|DiEMoTq0F^RDaUwo@&3^%#G~><y

diff --git a/src/keepass2android/Resources/layout/filestorage_selection.xml b/src/keepass2android/Resources/layout/filestorage_selection.xml
index 57e20855..233f26ec 100644
--- a/src/keepass2android/Resources/layout/filestorage_selection.xml
+++ b/src/keepass2android/Resources/layout/filestorage_selection.xml
@@ -26,8 +26,8 @@
 		android:layout_marginRight="16dp"
 		android:layout_marginBottom="16dp"
 		android:layout_marginTop="0dp"
-        android:columnWidth="90dp"
-        android:numColumns="auto_fit"
+        android:columnWidth="500dp"
+        android:numColumns="1"
         android:verticalSpacing="10dp"
         android:horizontalSpacing="10dp"
         android:stretchMode="columnWidth"
diff --git a/src/keepass2android/Resources/values/strings.xml b/src/keepass2android/Resources/values/strings.xml
index cf9865ab..3010b013 100644
--- a/src/keepass2android/Resources/values/strings.xml
+++ b/src/keepass2android/Resources/values/strings.xml
@@ -594,7 +594,6 @@
 	<string name="filestoragename_dropboxKP2A">Dropbox (KP2A folder)</string>
 	<string name="filestoragehelp_dropboxKP2A">If you do not want to give KP2A access to your full Dropbox, you may select this option. It will request only access to the folder Apps/Keepass2Android. This is especially suited when creating a new database. If you already have a database, select this option to create the folder, then place your file inside the folder (from your PC) and then select this option again for opening the file.</string>
 	<string name="filestoragename_gdrive">Google Drive</string>
-  <string name="filestoragehelp_gdrive">Please note: I have requested verification of the app by Google, but nothing has happened since months. If you see a message saying that the app is blocked because it is not verified, please use Android filebrowser - Google Drive instead of this option.</string>
   <string name="filestoragename_pcloud">PCloud</string>
 	<string name="filestoragehelp_pcloud">This storage type will only request access to the pCloud folder "Applications/Keepass2Android". If you want to use an existing database from your pCloud account, please make sure the file is placed in this pCloud folder.</string>
   <string name="filestoragename_onedrive">OneDrive</string>
diff --git a/src/keepass2android/keepass2android-app.csproj b/src/keepass2android/keepass2android-app.csproj
index 40d5ce74..573dc7a2 100644
--- a/src/keepass2android/keepass2android-app.csproj
+++ b/src/keepass2android/keepass2android-app.csproj
@@ -454,7 +454,6 @@
     <AndroidResource Include="Resources\drawable-mdpi\ic_storage_file.png" />
     <AndroidResource Include="Resources\drawable-mdpi\ic_storage_ftp.png" />
     <AndroidResource Include="Resources\drawable-mdpi\ic_storage_ftps.png" />
-    <AndroidResource Include="Resources\drawable-mdpi\ic_storage_gdrive.png" />
     <AndroidResource Include="Resources\drawable-mdpi\ic_storage_http.png" />
     <AndroidResource Include="Resources\drawable-mdpi\ic_storage_https.png" />
     <AndroidResource Include="Resources\drawable-mdpi\ic_storage_owncloud.png" />
@@ -1075,9 +1074,6 @@
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\ic_storage_ftps.png" />
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\drawable-xhdpi\ic_storage_gdrive.png" />
-  </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\drawable-xhdpi\ic_storage_http.png" />
   </ItemGroup>
@@ -1918,6 +1914,9 @@
       <Name>ZlibAndroid</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\ic_storage_gdrive.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
     Other similar extension points exist, see Microsoft.Common.targets.