Add Holo green (dark variant) color from system and fix instance choice

OpenVK · Jun 18, 2023 · 426e3e7 · 426e3e7
1 parent 6af2ec1
commit 426e3e7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/AuthActivity.java b/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/AuthActivity.java
@@ -268,10 +268,14 @@ private void showInstancesDialog() {
 
     public void clickInstancesItem(int position) {
         EditTextAction instance_edit = (EditTextAction) findViewById(R.id.instance_name);
+        String regexp = Pattern.quote("|");
+        String server;
         if(position >= getResources().getStringArray(R.array.official_instances_list).length) {
-            instance_edit.setText(getResources().getStringArray(R.array.instances_list)[position - 3]);
+            server = getResources().getStringArray(R.array.instances_list)[position - 3].split(regexp)[0];
+            instance_edit.setText(server);
         } else {
-            instance_edit.setText(getResources().getStringArray(R.array.official_instances_list)[position]);
+            server = getResources().getStringArray(R.array.official_instances_list)[position].split(regexp)[0];
+            instance_edit.setText(server);
         }
         if(alertDialog != null) {
             alertDialog.cancel();

diff --git a/app/src/main/res/drawable/ssl_chip_shape.xml b/app/src/main/res/drawable/ssl_chip_shape.xml
@@ -2,8 +2,8 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item><layer-list>
         <item><shape>
-            <corners android:radius="6dp"></corners>
-            <solid android:color="@android:color/holo_green_dark"></solid>
+            <corners android:radius="6dp"/>
+            <solid android:color="@color/holo_green_dark"/>
             <padding android:left="6dp" android:right="6dp" />
         </shape>
         </item>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -22,6 +22,7 @@
     <color name="api_v8_ll_subtitle_color">#88ffffff</color>
     <color name="holo_blue_dark">#ff33b5e5</color>
     <color name="holo_red_light">#cc0000</color>
+    <color name="holo_green_dark">#669900</color>
     <color name="timestamp_color">#6f6f6f</color>
     <color name="statusbar_color">#5480af</color>
     <color name="timestamp_block">#99000000</color>