bepass-org · d7coders · Jul 4, 2024
diff --git a/app/src/main/java/org/bepass/oblivion/LocaleHandler.java b/app/src/main/java/org/bepass/oblivion/LocaleHandler.java
@@ -76,13 +76,13 @@ private String[] getAvailableLanguagesNames() {
     private String getLanguageName(String languageCode) {
         switch (languageCode) {
             case "fa":
-                return "Persian";
+                return "پارسی";
             case "en":
                 return "English";
             case "ru":
-                return "Russian";
+                return "Русский";
             case "zh":
-                return "Chinese";
+                return "中文";
             default:
                 return languageCode;
         }

diff --git a/app/src/main/java/org/bepass/oblivion/SplitTunnelOptionsAdapter.java b/app/src/main/java/org/bepass/oblivion/SplitTunnelOptionsAdapter.java
@@ -9,7 +9,7 @@
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.switchmaterial.SwitchMaterial;
+import com.google.android.material.materialswitch.MaterialSwitch;
 
 public class SplitTunnelOptionsAdapter extends RecyclerView.Adapter<SplitTunnelOptionsAdapter.ViewHolder> {
 
@@ -70,7 +70,7 @@ public interface OnSettingsChanged {
    }
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
-        SwitchMaterial showSystemApps;
+        MaterialSwitch showSystemApps;
         RadioButton disabled;
         RadioButton blacklist;
 

diff --git a/app/src/main/res/drawable-anydpi/about_item.xml b/app/src/main/res/drawable-anydpi/about_item.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
 
-  <solid android:color="#EEEEEE" />
+  <solid android:color="?attr/colorSurface" />
   <corners android:radius="24dp" />
 </shape>
diff --git a/app/src/main/res/drawable-anydpi/edittext_back.xml b/app/src/main/res/drawable-anydpi/edittext_back.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
 
-  <stroke android:color="#A3A3A3" android:width="1dp" />
+  <stroke android:color="?attr/colorOnSurface" android:width="2dp" />
   <corners android:radius="8dp" />
 </shape>
diff --git a/app/src/main/res/drawable-anydpi/ic_back.xml b/app/src/main/res/drawable-anydpi/ic_back.xml
@@ -3,8 +3,7 @@
   android:height="24dp"
   android:viewportWidth="24"
   android:viewportHeight="24"
-  android:tint="#5E5E5E"
-  android:alpha="0.6"
+  android:alpha="1"
   android:autoMirrored="true">
   <path
     android:fillColor="@android:color/white"

diff --git a/app/src/main/res/drawable-anydpi/ic_bug.xml b/app/src/main/res/drawable-anydpi/ic_bug.xml
@@ -3,8 +3,7 @@
   android:height="24dp"
   android:viewportWidth="24"
   android:viewportHeight="24"
-  android:tint="#5E5E5E"
-  android:alpha="0.6">
+  android:alpha="1">
   <path
     android:fillColor="@android:color/white"
     android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z" />

diff --git a/app/src/main/res/drawable-anydpi/ic_info.xml b/app/src/main/res/drawable-anydpi/ic_info.xml
@@ -3,8 +3,7 @@
   android:height="24dp"
   android:viewportWidth="24"
   android:viewportHeight="24"
-  android:tint="#5E5E5E"
-  android:alpha="0.6">
+  android:alpha="1">
   <path
     android:fillColor="@android:color/white"
     android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z" />

diff --git a/app/src/main/res/drawable-anydpi/ic_settings.xml b/app/src/main/res/drawable-anydpi/ic_settings.xml
@@ -3,8 +3,7 @@
   android:height="24dp"
   android:viewportWidth="24"
   android:viewportHeight="24"
-  android:tint="#5E5E5E"
-  android:alpha="0.6">
+  android:alpha="1">
   <path
     android:fillColor="@android:color/white"
     android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />

diff --git a/app/src/main/res/drawable-hdpi/ic_back.png b/app/src/main/res/drawable-hdpi/ic_back.png
diff --git a/app/src/main/res/drawable-hdpi/ic_bug.png b/app/src/main/res/drawable-hdpi/ic_bug.png
diff --git a/app/src/main/res/drawable-hdpi/ic_info.png b/app/src/main/res/drawable-hdpi/ic_info.png
diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png
diff --git a/app/src/main/res/drawable-hdpi/ic_translate.png b/app/src/main/res/drawable-hdpi/ic_translate.png
diff --git a/app/src/main/res/drawable-hdpi/rounded_bottom_sheet.xml b/app/src/main/res/drawable-hdpi/rounded_bottom_sheet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
   android:shape="rectangle">
-  <solid android:color="@color/white" />
+  <solid android:color="?attr/colorSurface" />
   <corners
     android:topLeftRadius="24dp"
     android:topRightRadius="24dp" />

diff --git a/app/src/main/res/drawable-mdpi/ic_back.png b/app/src/main/res/drawable-mdpi/ic_back.png
diff --git a/app/src/main/res/drawable-mdpi/ic_bug.png b/app/src/main/res/drawable-mdpi/ic_bug.png
diff --git a/app/src/main/res/drawable-mdpi/ic_info.png b/app/src/main/res/drawable-mdpi/ic_info.png
diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png
diff --git a/app/src/main/res/drawable-mdpi/ic_translate.png b/app/src/main/res/drawable-mdpi/ic_translate.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_back.png b/app/src/main/res/drawable-xhdpi/ic_back.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_bug.png b/app/src/main/res/drawable-xhdpi/ic_bug.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_info.png b/app/src/main/res/drawable-xhdpi/ic_info.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_translate.png b/app/src/main/res/drawable-xhdpi/ic_translate.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_back.png b/app/src/main/res/drawable-xxhdpi/ic_back.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_bug.png b/app/src/main/res/drawable-xxhdpi/ic_bug.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_info.png b/app/src/main/res/drawable-xxhdpi/ic_info.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings.png b/app/src/main/res/drawable-xxhdpi/ic_settings.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_translate.png b/app/src/main/res/drawable-xxhdpi/ic_translate.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_translate.png b/app/src/main/res/drawable-xxxhdpi/ic_translate.png
diff --git a/app/src/main/res/drawable/background_gradient.xml b/app/src/main/res/drawable/background_gradient.xml
@@ -3,7 +3,7 @@
   android:shape="rectangle">
   <gradient
     android:angle="90"
-    android:endColor="#FCF6D4"
-    android:centerColor="#FFFFFF"
-    android:startColor="#FFFFFF" />
+    android:endColor="?attr/colorGradiantEnd"
+    android:centerColor="?attr/colorGradiantStart"
+    android:startColor="?attr/colorGradiantStart" />
 </shape>
diff --git a/app/src/main/res/drawable/btn_gray.xml b/app/src/main/res/drawable/btn_gray.xml
@@ -0,0 +1,6 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_enabled="true" android:drawable="@drawable/btn_gray_pressed"/>
+    <item android:state_pressed="true" android:state_enabled="true" android:drawable="@drawable/btn_gray_pressed" />
+    <item android:state_pressed="true" android:state_enabled="false" android:drawable="@drawable/btn_gray_pressed" />
+    <item android:drawable="@drawable/btn_gray_normal" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_gray_normal.xml b/app/src/main/res/drawable/btn_gray_normal.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="#EAEAEA"/>
+    <padding
+        android:left="5dp"
+        android:top="5dp"
+        android:right="5dp"
+        android:bottom="5dp" />
+
+    <corners android:radius="20dp" />
+
+</shape>
diff --git a/app/src/main/res/drawable/btn_gray_pressed.xml b/app/src/main/res/drawable/btn_gray_pressed.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="#CCCCCC"/>
+    <padding
+        android:left="5dp"
+        android:top="5dp"
+        android:right="5dp"
+        android:bottom="5dp" />
+
+    <corners android:radius="20dp" />
+
+</shape>
diff --git a/app/src/main/res/drawable/btn_primary.xml b/app/src/main/res/drawable/btn_primary.xml
@@ -0,0 +1,6 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:state_enabled="true" android:drawable="@drawable/btn_primary_pressed"/>
+    <item android:state_pressed="true" android:state_enabled="true" android:drawable="@drawable/btn_primary_pressed" />
+    <item android:state_pressed="true" android:state_enabled="false" android:drawable="@drawable/btn_primary_pressed" />
+    <item android:drawable="@drawable/btn_primary_normal" />
+</selector>
diff --git a/app/src/main/res/drawable/btn_primary_normal.xml b/app/src/main/res/drawable/btn_primary_normal.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="?attr/colorPrimary"/>
+    <padding
+        android:left="10dp"
+        android:top="10dp"
+        android:right="10dp"
+        android:bottom="10dp" />
+
+    <corners android:radius="20dp" />
+
+</shape>
diff --git a/app/src/main/res/drawable/btn_primary_pressed.xml b/app/src/main/res/drawable/btn_primary_pressed.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid
+        android:color="?attr/colorPrimaryDark"/>
+    <padding
+        android:left="10dp"
+        android:top="10dp"
+        android:right="10dp"
+        android:bottom="10dp" />
+
+    <corners android:radius="20dp" />
+
+</shape>
diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#ffa200" />
-    <stroke
-        android:width="0dp"
-    android:color="#00FFFFFF" />
-    <corners android:topLeftRadius="6dp" android:topRightRadius="6dp" />
+    <solid android:color="?attr/colorPrimary" />
+    <corners android:radius="8dp" />
 </shape>
diff --git a/app/src/main/res/drawable/ic_translate.xml b/app/src/main/res/drawable/ic_translate.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:viewportHeight="96" android:viewportWidth="96" android:width="24dp">
+
+    <path android:fillAlpha="1" android:fillColor="#fff" android:pathData="M10.31,10.38C12.49,7.93 15.99,7.97 19,7.96C28.98,8.02 38.97,8.02 48.95,7.96C51.95,7.98 55.44,7.9 57.63,10.32C59.78,12.23 60.03,15.25 60.03,17.94C60.04,23.96 59.96,29.98 60,36C67.01,36.14 74.02,35.73 81.01,36.15C84.9,36.41 88.03,40.05 87.94,43.9C88.15,54.59 87.88,65.29 88.04,75.98C87.99,79.28 88.34,83.19 85.65,85.65C83.48,88.08 79.99,88.02 77,88.04C67.01,87.98 57.01,87.98 47.02,88.04C44.02,88.03 40.54,88.07 38.34,85.65C35.64,83.21 36.1,79.28 35.87,76C33.25,75.99 30.64,76 28.02,76C25.34,73.34 22.66,70.66 20,67.98C20,65.36 20,62.75 20,60.13C16.71,59.91 12.8,60.35 10.34,57.65C7.93,55.48 7.97,52.02 7.96,49.04C8.02,39.03 8.02,29.01 7.96,19C7.98,16.03 7.91,12.56 10.31,10.38M16,16C16,28 16,40 16,52C22.67,52 29.33,52 35.99,52C36,48.94 36.01,45.89 36.03,42.83C35.04,42.16 34.05,41.49 33.05,40.83C29.57,43.44 26.12,46.28 21.92,47.63C20.69,47.15 20.04,46.25 19.96,44.94C23.06,42.43 26.67,40.63 29.83,38.19C27.14,35.25 24.5,32.06 23.72,28.02C22.48,28.01 21.24,27.99 20,27.98C20,26.66 20,25.33 20,24C23.99,23.99 27.99,24.01 31.98,24C31.99,22.66 32.01,21.33 32.02,20C33.34,20 34.66,20 35.98,20C35.99,21.33 36,22.66 36.02,24C40.01,24.01 44.01,23.99 48,24C48,25.33 48,26.66 48,27.98C46.37,28 44.74,28.01 43.11,28.03C41.26,31.37 38.71,34.23 36.61,37.39C36.61,37.89 36.61,38.9 36.62,39.4C40.83,35.46 46.64,35.77 52,36C52,29.33 52,22.67 52,16C40,16 28,16 16,16M27.37,28.08C28.87,30.77 30.68,33.27 32.72,35.59C34.71,33.15 36.58,30.63 38.36,28.04C34.7,27.99 31.03,27.98 27.37,28.08M59.36,48.01C55.59,58.68 51.78,69.34 48,80.01C49.5,80 51.01,79.99 52.52,79.98C53.47,77.07 54.41,74.17 55.37,71.26C59.71,71.25 64.05,71.25 68.38,71.27C69.38,74.17 70.36,77.08 71.36,79.99C72.91,79.99 74.45,80 76,80C72.22,69.34 68.41,58.68 64.64,48.01C62.88,48 61.12,48 59.36,48.01M28,60C28,62.67 28,65.33 28,68C30.67,68 33.33,68 36,68C36,65.33 36,62.67 36,60C33.33,60 30.67,60 28,60Z" android:strokeAlpha="1"/>
+
+    <path android:fillAlpha="1" android:fillColor="#fff" android:pathData="M61.8,51.5C63.58,57.01 65.42,62.5 67.24,67.99C63.7,68 60.17,68 56.63,68C58.38,62.51 60.12,57.01 61.8,51.5Z" android:strokeAlpha="1"/>
+
+</vector>
diff --git a/app/src/main/res/drawable/light_shadow_bottom.xml b/app/src/main/res/drawable/light_shadow_bottom.xml
@@ -5,6 +5,6 @@
     <gradient
         android:startColor="@android:color/transparent"
         android:centerColor="@android:color/transparent"
-        android:endColor="#BEFFFFFF"
+        android:endColor="?attr/colorGradiantStart"
         android:angle="270"/>
 </shape>