From e204e0d0b67bb4680fe0deb1c3ef15854ce3aff6 Mon Sep 17 00:00:00 2001
From: Dmitry Isaenko <developer.su@gmail.com>
Date: Mon, 3 Aug 2020 19:15:10 +0300
Subject: [PATCH] Cosmetic updates for RU-strings, buttons representations,
 vector assets

---
 .../ns_usbloader/AboutActivity.java           |  2 +-
 app/src/main/res/drawable/ic_select_file.xml  | 43 +++---------
 app/src/main/res/drawable/ic_upload_btn.xml   | 27 +++-----
 app/src/main/res/layout/content_main.xml      | 69 +++++++++----------
 app/src/main/res/values-ru/strings.xml        |  4 +-
 app/src/main/res/values/colors.xml            |  2 +
 app/src/main/res/values/styles.xml            |  5 --
 7 files changed, 54 insertions(+), 98 deletions(-)

diff --git a/app/src/main/java/com/blogspot/developersu/ns_usbloader/AboutActivity.java b/app/src/main/java/com/blogspot/developersu/ns_usbloader/AboutActivity.java
index 9a8c686..c8115a1 100644
--- a/app/src/main/java/com/blogspot/developersu/ns_usbloader/AboutActivity.java
+++ b/app/src/main/java/com/blogspot/developersu/ns_usbloader/AboutActivity.java
@@ -24,7 +24,7 @@ public class AboutActivity extends AppCompatActivity {
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         final TextView t1 = findViewById(R.id.textView1);
-        t1.append(" v."+BuildConfig.VERSION_NAME);
+        t1.append(" v"+BuildConfig.VERSION_NAME);
         final TextView t2 = findViewById(R.id.textView2);
         t2.setMovementMethod(LinkMovementMethod.getInstance());
         final TextView t4 = findViewById(R.id.textView4);
diff --git a/app/src/main/res/drawable/ic_select_file.xml b/app/src/main/res/drawable/ic_select_file.xml
index f5ec4b3..573a6f2 100644
--- a/app/src/main/res/drawable/ic_select_file.xml
+++ b/app/src/main/res/drawable/ic_select_file.xml
@@ -1,41 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:width="16dp"
+    android:height="20dp"
+    android:viewportWidth="16"
+    android:viewportHeight="20">
   <path
-      android:pathData="M20.5,4V15.5C20.5,15.8057 20.3194,16 20.0139,16 15.9953,15.99 12.0324,16.0059 8.0139,16 7.6853,16 7.5,15.8074 7.5,15.5V4c4.5216,-0.0068 8.7421,0 13,0z"
-      android:strokeAlpha="1"
-      android:strokeWidth="0.03780191"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M8,0C6.8954,0 6,0.8954 6,2L6,18C6,19.1 6.89,20 8,20L20,20C21.1046,20 22,19.1046 22,18L22,2C22,0.9048 21.0898,0 20,0L8,0zM8,2L20,2C20.3112,2 20.5,2.2044 20.5,2.5L20.5,15.5C20.5,15.79 20.2984,16 20,16L8,16C7.7044,16 7.5,15.8034 7.5,15.5L7.5,2.5C7.5,2.2083 7.7122,2 8,2z"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m10.0996,1.1992h7.8008c0.1,0.0021 0.0996,0.0018 0.0996,0.1016v0.0996C18,1.4962 18.0004,1.4979 17.9004,1.5H10.0996C9.9996,1.5057 10,1.504 10,1.4004v-0.0996c0,-0.0997 -0.0004,-0.1034 0.0996,-0.1016z"
+      android:pathData="M2,0C0.8954,0 0,0.8954 0,2v16c0,1.1 0.89,2 2,2h12c1.1046,0 2,-0.8954 2,-2L16,2C16,0.9048 15.0898,0 14,0ZM3.0996,1.1992L12.9004,1.1992C13.0004,1.2013 13,1.201 13,1.3008L13,1.5c0,0.0958 0.0004,0.0975 -0.0996,0.0996L3.0996,1.5996C2.9996,1.6053 3,1.6036 3,1.5L3,1.3008c0,-0.0997 0.1925,-0.0644 0.0996,-0.1016zM2,3h12c0.3112,0 0.5,0.2044 0.5,0.5v12C14.5,15.79 14.2984,16 14,16L2,16C1.7044,16 1.5,15.8034 1.5,15.5L1.5,3.5C1.5,3.2083 1.7122,3 2,3ZM5,17h6l-3,2z"
       android:fillColor="#ffffff"
       android:strokeColor="#00000000"/>
   <path
-      android:pathData="m11,17h6l-3,2z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m2,4v18c0,1.1046 0.8954,2 2,2H20V22H4V4Z"
-      android:fillColor="#1c1c1c"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M7.5,4V2.5C7.5,2.2294 7.6945,2 8,2c4.0186,0.01 7.9815,-0.0059 12,0 0.3325,0 0.5022,0.2203 0.5,0.5V4c-4.5216,0.0068 -8.7421,-0 -13,0z"
-      android:strokeAlpha="1"
-      android:strokeWidth="0.03780191"
-      android:fillColor="#ec0000"
-      android:strokeColor="#00000000"
-      android:fillAlpha="1"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M12.297,15 L8.7125,11.4154 10.346,9.7819 12.297,11.7387 18,6.0299 19.6335,7.6635Z"
-      android:strokeWidth="0.57722491"/>
+      android:pathData="M6.297,14 L2.7125,10.4155 4.346,8.7819 6.297,10.7387 12,5.03 13.6335,6.6635Z"
+      android:strokeWidth="0.577225"
+      android:fillColor="#ffffff"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_upload_btn.xml b/app/src/main/res/drawable/ic_upload_btn.xml
index 7cf3627..dbbb239 100644
--- a/app/src/main/res/drawable/ic_upload_btn.xml
+++ b/app/src/main/res/drawable/ic_upload_btn.xml
@@ -1,25 +1,16 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="26dp"
-    android:height="24dp"
+    android:height="20dp"
     android:viewportWidth="26"
-    android:viewportHeight="24">
+    android:viewportHeight="20">
   <path
-      android:pathData="M4.0078,0C1.5078,0 0,1.4883 0,3.9844V15.9883C0,18.418 1.4927,20 4.0078,20H6.5V0Z"
-      android:fillColor="#00b3c7"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="M3.1016,2.957C4.1485,2.9562 4.9978,3.8046 4.998,4.8516 4.9988,5.8993 4.1493,6.7488 3.1016,6.748 2.0546,6.7478 1.2062,5.8985 1.207,4.8516 1.2073,3.8054 2.0554,2.9573 3.1016,2.957Z"
-      android:fillColor="#fffafa"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="m19.5,0v20c1.0041,-0.0007 1.6599,0 2.4922,0C24.4141,20 26,18.4961 26,15.9961V3.9766C26,1.5195 24.5087,0 22.0039,0Z"
-      android:fillColor="#ec0000"
-      android:fillAlpha="1"/>
-  <path
-      android:pathData="m22.8652,11.1484c1.0477,-0.0008 1.8973,0.8488 1.8965,1.8965 -0.0003,1.047 -0.8495,1.8953 -1.8965,1.8945 -1.0462,-0.0003 -1.8942,-0.8483 -1.8945,-1.8945 -0.0008,-1.047 0.8476,-1.8962 1.8945,-1.8965z"
+      android:pathData="M4.0078,0C1.5078,0 0,1.4883 0,3.9844L0,15.9883C0,18.418 1.4927,20 4.0078,20L6.5,20L6.5,0L4.0078,0zM3.1016,2.957C4.1485,2.9562 4.9978,3.8046 4.998,4.8516C4.9988,5.8993 4.1493,6.7488 3.1016,6.748C2.0546,6.7478 1.2062,5.8985 1.207,4.8516C1.2073,3.8054 2.0554,2.9573 3.1016,2.957z"
       android:fillColor="#ffffff"/>
   <path
-      android:fillColor="#FF000000"
-      android:pathData="m13,3 l-6.4512,9.5195h4.0313c0,1.5664 -0.0077,5.8901 -0.0078,6.6113h4.8477v-6.6113h4.0313zM8.334,20v1.334h9.332L17.666,20ZM8.334,22.666L8.334,24h9.332v-1.334z"
-      android:strokeWidth="0.80649775"/>
+      android:pathData="M19.5,0L19.5,20C20.5041,19.9993 21.1599,20 21.9922,20C24.4141,20 26,18.4961 26,15.9961L26,3.9766C26,1.5195 24.5087,0 22.0039,0L19.5,0zM22.8652,11.1484C23.913,11.1477 24.7625,11.9972 24.7617,13.0449C24.7614,14.0919 23.9122,14.9402 22.8652,14.9395C21.819,14.9392 20.971,14.0911 20.9707,13.0449C20.9699,11.998 21.8183,11.1487 22.8652,11.1484z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,2.5341 L7.6683,10.4017h3.3317c0,1.2945 -0.0063,6.4681 -0.0063,7.0642h4.0064v-7.0642h3.3317z"
+      android:strokeWidth="0.666547"
+      android:fillColor="#ffffff"/>
 </vector>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 042ef7a..e39f4f8 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -30,50 +30,45 @@
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:visibility="visible"
         android:max="100"
-        app:layout_constraintBottom_toTopOf="@+id/buttonSelect"
+        android:visibility="visible"
+        app:layout_constraintBottom_toTopOf="@+id/buttonsBoxLayout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <Button
-        android:id="@+id/buttonSelect"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginLeft="8dp"
-        android:layout_marginEnd="4dp"
-        android:layout_marginRight="4dp"
-        android:layout_marginBottom="8dp"
-        app:drawableTopCompat="@drawable/ic_select_file"
-        android:text="@string/select_file_btn"
-        android:theme="@style/ControlButton"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/guideline2"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Button
-        android:id="@+id/buttonUpload"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginLeft="4dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginBottom="8dp"
-        app:drawableTopCompat="@drawable/ic_upload_btn"
-        android:text="@string/upload_btn"
-        android:theme="@style/ControlButton"
+    <LinearLayout
+        android:id="@+id/buttonsBoxLayout"
+        style="?android:attr/buttonBarStyle"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="@color/lightAccent"
+        android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/guideline2" />
+        app:layout_constraintStart_toStartOf="parent">
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.5" />
+        <Button
+            android:id="@+id/buttonSelect"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="@string/select_file_btn"
+            android:textAllCaps="false"
+            android:textColor="#ffffff"
+            app:drawableTopCompat="@drawable/ic_select_file" />
+
+        <Button
+            android:id="@+id/buttonUpload"
+            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="@string/upload_btn"
+            android:textAllCaps="false"
+            android:textColor="#ffffff"
+            app:drawableTopCompat="@drawable/ic_upload_btn" />
+    </LinearLayout>
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 831d56a..7f0c138 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="select_file_btn">Выбрать файлы</string>
+    <string name="select_file_btn">Выбрать</string>
     <string name="popup_non_supported_format">Тип файла не поддерживается</string>
     <string name="popup_error">Ошибка</string>
-    <string name="upload_btn">Отправить в NS</string>
+    <string name="upload_btn">Отправить</string>
     <string name="install_file_explorer">Не установлено ни одного файлового менеджера.\nПожалуйста установите один. Например Total Commander.</string>
     <string name="ns_connected_info">NS подключён</string>
     <string name="notification_chan_name_usb">Устройство подключено</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 64b4065..fa241fc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,6 @@
     <color name="colorPrimary">#ec0000</color>
     <color name="colorPrimaryDark">#ce0000</color>
     <color name="colorAccent">#00c8fc</color>
+    <color name="lightAccent">#52acff</color>
+    <color name="goldReliable">#eea11e</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4340674..8a84ead 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,11 +12,6 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="ControlButton" parent="Widget.AppCompat.Button">
-        <item name="colorControlHighlight">@color/colorAccent</item>
-        <item name="colorButtonNormal">#65e4fb</item>
-
-    </style>
     <!--######################################### -->
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">