From adcf9c5c9780af929c969450c14714a640778b20 Mon Sep 17 00:00:00 2001
From: AnGgIt86 <jarbull86@gmail.com>
Date: Sun, 29 Sep 2024 09:57:29 +0700
Subject: [PATCH] Little fix and change

---
 .../kotlin/com/neko/v2ray/ui/MainActivity.kt  |  4 --
 .../com/neko/v2ray/ui/UserAssetActivity.kt    |  2 +-
 .../main/res/drawable/uwu_switch_track.xml    |  4 +-
 .../main/res/layout/activity_routing_edit.xml | 12 ++----
 .../layout/item_recycler_routing_setting.xml  | 22 +++-------
 .../layout/uwu_menu_tools_bottom_sheet.xml    | 41 -------------------
 6 files changed, 11 insertions(+), 74 deletions(-)

diff --git a/app/src/main/kotlin/com/neko/v2ray/ui/MainActivity.kt b/app/src/main/kotlin/com/neko/v2ray/ui/MainActivity.kt
index bb58649d..547f0a6d 100644
--- a/app/src/main/kotlin/com/neko/v2ray/ui/MainActivity.kt
+++ b/app/src/main/kotlin/com/neko/v2ray/ui/MainActivity.kt
@@ -874,10 +874,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         requestSubSettingActivity.launch(Intent(this,SubSettingActivity::class.java))
     }
 
-    fun userAssetSetting(view: View) {
-        startActivity(Intent(this, UserAssetActivity::class.java))
-    }
-
     fun UwuAbout(view: View) {
         startActivity(Intent(this, NekoAboutActivity::class.java))
     }
diff --git a/app/src/main/kotlin/com/neko/v2ray/ui/UserAssetActivity.kt b/app/src/main/kotlin/com/neko/v2ray/ui/UserAssetActivity.kt
index 51850be6..ee255f1a 100644
--- a/app/src/main/kotlin/com/neko/v2ray/ui/UserAssetActivity.kt
+++ b/app/src/main/kotlin/com/neko/v2ray/ui/UserAssetActivity.kt
@@ -25,7 +25,7 @@ import com.tbruyelle.rxpermissions3.RxPermissions
 import com.neko.v2ray.AppConfig
 import com.neko.v2ray.AppConfig.LOOPBACK
 import com.neko.v2ray.R
-import com.neko.v2ray.databinding.ActivitySubSettingBinding
+import com.neko.v2ray.databinding.ActivityUserAssetBinding
 import com.neko.v2ray.databinding.ItemRecyclerUserAssetBinding
 import com.neko.v2ray.databinding.LayoutProgressBinding
 import com.neko.v2ray.dto.AssetUrlItem
diff --git a/app/src/main/res/drawable/uwu_switch_track.xml b/app/src/main/res/drawable/uwu_switch_track.xml
index 8e9b1352..7c6552b0 100644
--- a/app/src/main/res/drawable/uwu_switch_track.xml
+++ b/app/src/main/res/drawable/uwu_switch_track.xml
@@ -10,7 +10,7 @@
                     android:shape="rectangle"
                     android:useLevel="false">
                     <stroke
-                        android:width="1.5dip"
+                        android:width="2.0dip"
                         android:color="?attr/colorThemeUwu" />
                     <solid
                         android:color="@color/uwu_switch_on_bg" />
@@ -39,7 +39,7 @@
                     android:shape="rectangle"
                     android:useLevel="false">
                     <stroke
-                        android:width="1.5dip"
+                        android:width="2.0dip"
                         android:color="?attr/colorOutline" />
                     <solid
                         android:color="@color/uwu_switch_off_bg" />
diff --git a/app/src/main/res/layout/activity_routing_edit.xml b/app/src/main/res/layout/activity_routing_edit.xml
index 26596389..b7bd7607 100644
--- a/app/src/main/res/layout/activity_routing_edit.xml
+++ b/app/src/main/res/layout/activity_routing_edit.xml
@@ -301,17 +301,11 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="8.0dip"
                             android:layout_marginBottom="8.0dip">
-                            <TextView
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:text="@string/routing_settings_locked" />
-                            <com.neko.switchbutton.SwitchButton
+                            <com.google.android.material.materialswitch.MaterialSwitch
                                 android:id="@+id/chk_locked"
+                                android:text="@string/routing_settings_locked"
                                 android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                app:kswAnimationDuration="300"
-                                app:kswBackDrawable="@drawable/uwu_switch_track"
-                                app:kswThumbDrawable="@drawable/uwu_switch_thumb" />
+                                android:layout_height="wrap_content" />
                         </LinearLayout>
                         <LinearLayout
                             android:orientation="vertical"
diff --git a/app/src/main/res/layout/item_recycler_routing_setting.xml b/app/src/main/res/layout/item_recycler_routing_setting.xml
index f886f39f..c74ca01d 100644
--- a/app/src/main/res/layout/item_recycler_routing_setting.xml
+++ b/app/src/main/res/layout/item_recycler_routing_setting.xml
@@ -35,37 +35,24 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1.0"
                 android:paddingStart="@dimen/padding_start">
-<<<<<<< HEAD:app/src/main/res/layout/item_recycler_routing_setting.xml
-                <TextView
-                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                    android:id="@+id/remarks"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="10.0dip" />
-=======
-
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="10.0dip"
                     android:orientation="horizontal">
-
                     <TextView
                         android:id="@+id/remarks"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
-
                     <ImageView
                         android:id="@+id/img_locked"
                         android:layout_gravity="center"
                         android:layout_marginStart="@dimen/padding_start"
-                        android:layout_width="@dimen/padding"
-                        android:layout_height="@dimen/padding"
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
                         app:srcCompat="@drawable/ic_lock_24dp" />
-
                 </LinearLayout>
-
->>>>>>> 9b86ba9e (Add routing rule lock, keep this rule when import presets):V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml
                 <TextView
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:id="@+id/domainIp"
@@ -103,7 +90,8 @@
                     <ImageView
                         android:layout_width="@dimen/png_height"
                         android:layout_height="@dimen/png_height"
-                        app:srcCompat="@drawable/ic_edit_24dp" />
+                        app:srcCompat="@drawable/ic_edit_24dp"
+                        app:tint="?android:textColorPrimary" />
                 </LinearLayout>
                 <LinearLayout
                     android:orientation="horizontal"
diff --git a/app/src/main/res/layout/uwu_menu_tools_bottom_sheet.xml b/app/src/main/res/layout/uwu_menu_tools_bottom_sheet.xml
index 6934c74e..a70cd539 100644
--- a/app/src/main/res/layout/uwu_menu_tools_bottom_sheet.xml
+++ b/app/src/main/res/layout/uwu_menu_tools_bottom_sheet.xml
@@ -484,47 +484,6 @@
                         android:backgroundTint="@color/uwu_bg_dialog_bottomshet"
                         app:tint="?android:textColorPrimary" />
                 </LinearLayout>
-                <LinearLayout
-                    android:gravity="center|right"
-                    android:orientation="horizontal"
-                    android:background="@drawable/uwu_bg_mid_bottomsheet"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16.0dip"
-                    android:layout_marginEnd="16.0dip"
-                    android:layout_marginTop="1.0dip"
-                    android:layout_marginBottom="1.0dip"
-                    android:onClick="userAssetSetting">
-                    <ImageView
-                        android:background="@drawable/uwu_google_shape"
-                        android:padding="12.0dip"
-                        android:layout_width="45.0dip"
-                        android:layout_height="45.0dip"
-                        android:layout_margin="16.0dip"
-                        android:src="@drawable/ic_file_24dp"
-                        android:scaleType="fitCenter"
-                        android:backgroundTint="?attr/colorThemeUwu"
-                        app:tint="?attr/colorIcon" />
-                    <TextView
-                        android:textSize="16.0sp"
-                        android:textColor="?android:textColorPrimary"
-                        android:gravity="left"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/title_user_asset_setting"
-                        android:layout_weight="1.0" />
-                    <ImageView
-                        android:background="@drawable/uwu_bg_circle_arrow"
-                        android:padding="2.0dip"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="10.0dip"
-                        android:src="@drawable/uwu_arrow"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentEnd="true"
-                        android:backgroundTint="@color/uwu_bg_dialog_bottomshet"
-                        app:tint="?android:textColorPrimary" />
-                </LinearLayout>
                 <LinearLayout
                     android:gravity="center|right"
                     android:orientation="horizontal"