Skip to content

Commit adcf9c5

Browse files
AnGgIt886AnGgIt886
committed
Little fix and change
1 parent 92eb43f commit adcf9c5

File tree

6 files changed

+11
-74
lines changed

6 files changed

+11
-74
lines changed

‎app/src/main/kotlin/com/neko/v2ray/ui/MainActivity.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -874,10 +874,6 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
874874
requestSubSettingActivity.launch(Intent(this,SubSettingActivity::class.java))
875875
}
876876

877-
fun userAssetSetting(view: View) {
878-
startActivity(Intent(this, UserAssetActivity::class.java))
879-
}
880-
881877
fun UwuAbout(view: View) {
882878
startActivity(Intent(this, NekoAboutActivity::class.java))
883879
}

‎app/src/main/kotlin/com/neko/v2ray/ui/UserAssetActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.tbruyelle.rxpermissions3.RxPermissions
2525
import com.neko.v2ray.AppConfig
2626
import com.neko.v2ray.AppConfig.LOOPBACK
2727
import com.neko.v2ray.R
28-
import com.neko.v2ray.databinding.ActivitySubSettingBinding
28+
import com.neko.v2ray.databinding.ActivityUserAssetBinding
2929
import com.neko.v2ray.databinding.ItemRecyclerUserAssetBinding
3030
import com.neko.v2ray.databinding.LayoutProgressBinding
3131
import com.neko.v2ray.dto.AssetUrlItem

‎app/src/main/res/drawable/uwu_switch_track.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:shape="rectangle"
1111
android:useLevel="false">
1212
<stroke
13-
android:width="1.5dip"
13+
android:width="2.0dip"
1414
android:color="?attr/colorThemeUwu" />
1515
<solid
1616
android:color="@color/uwu_switch_on_bg" />
@@ -39,7 +39,7 @@
3939
android:shape="rectangle"
4040
android:useLevel="false">
4141
<stroke
42-
android:width="1.5dip"
42+
android:width="2.0dip"
4343
android:color="?attr/colorOutline" />
4444
<solid
4545
android:color="@color/uwu_switch_off_bg" />

‎app/src/main/res/layout/activity_routing_edit.xml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -301,17 +301,11 @@
301301
android:layout_height="wrap_content"
302302
android:layout_marginTop="8.0dip"
303303
android:layout_marginBottom="8.0dip">
304-
<TextView
305-
android:layout_width="wrap_content"
306-
android:layout_height="wrap_content"
307-
android:text="@string/routing_settings_locked" />
308-
<com.neko.switchbutton.SwitchButton
304+
<com.google.android.material.materialswitch.MaterialSwitch
309305
android:id="@+id/chk_locked"
306+
android:text="@string/routing_settings_locked"
310307
android:layout_width="wrap_content"
311-
android:layout_height="wrap_content"
312-
app:kswAnimationDuration="300"
313-
app:kswBackDrawable="@drawable/uwu_switch_track"
314-
app:kswThumbDrawable="@drawable/uwu_switch_thumb" />
308+
android:layout_height="wrap_content" />
315309
</LinearLayout>
316310
<LinearLayout
317311
android:orientation="vertical"

‎app/src/main/res/layout/item_recycler_routing_setting.xml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,37 +35,24 @@
3535
android:layout_height="wrap_content"
3636
android:layout_weight="1.0"
3737
android:paddingStart="@dimen/padding_start">
38-
<<<<<<< HEAD:app/src/main/res/layout/item_recycler_routing_setting.xml
39-
<TextView
40-
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
41-
android:id="@+id/remarks"
42-
android:layout_width="wrap_content"
43-
android:layout_height="wrap_content"
44-
android:layout_marginTop="10.0dip" />
45-
=======
46-
4738
<LinearLayout
4839
android:layout_width="wrap_content"
4940
android:layout_height="wrap_content"
41+
android:layout_marginTop="10.0dip"
5042
android:orientation="horizontal">
51-
5243
<TextView
5344
android:id="@+id/remarks"
5445
android:layout_width="wrap_content"
5546
android:layout_height="wrap_content"
5647
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
57-
5848
<ImageView
5949
android:id="@+id/img_locked"
6050
android:layout_gravity="center"
6151
android:layout_marginStart="@dimen/padding_start"
62-
android:layout_width="@dimen/padding"
63-
android:layout_height="@dimen/padding"
52+
android:layout_width="16dp"
53+
android:layout_height="16dp"
6454
app:srcCompat="@drawable/ic_lock_24dp" />
65-
6655
</LinearLayout>
67-
68-
>>>>>>> 9b86ba9e (Add routing rule lock, keep this rule when import presets):V2rayNG/app/src/main/res/layout/item_recycler_routing_setting.xml
6956
<TextView
7057
android:textAppearance="@style/TextAppearance.AppCompat.Small"
7158
android:id="@+id/domainIp"
@@ -103,7 +90,8 @@
10390
<ImageView
10491
android:layout_width="@dimen/png_height"
10592
android:layout_height="@dimen/png_height"
106-
app:srcCompat="@drawable/ic_edit_24dp" />
93+
app:srcCompat="@drawable/ic_edit_24dp"
94+
app:tint="?android:textColorPrimary" />
10795
</LinearLayout>
10896
<LinearLayout
10997
android:orientation="horizontal"

‎app/src/main/res/layout/uwu_menu_tools_bottom_sheet.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -484,47 +484,6 @@
484484
android:backgroundTint="@color/uwu_bg_dialog_bottomshet"
485485
app:tint="?android:textColorPrimary" />
486486
</LinearLayout>
487-
<LinearLayout
488-
android:gravity="center|right"
489-
android:orientation="horizontal"
490-
android:background="@drawable/uwu_bg_mid_bottomsheet"
491-
android:layout_width="match_parent"
492-
android:layout_height="wrap_content"
493-
android:layout_marginStart="16.0dip"
494-
android:layout_marginEnd="16.0dip"
495-
android:layout_marginTop="1.0dip"
496-
android:layout_marginBottom="1.0dip"
497-
android:onClick="userAssetSetting">
498-
<ImageView
499-
android:background="@drawable/uwu_google_shape"
500-
android:padding="12.0dip"
501-
android:layout_width="45.0dip"
502-
android:layout_height="45.0dip"
503-
android:layout_margin="16.0dip"
504-
android:src="@drawable/ic_file_24dp"
505-
android:scaleType="fitCenter"
506-
android:backgroundTint="?attr/colorThemeUwu"
507-
app:tint="?attr/colorIcon" />
508-
<TextView
509-
android:textSize="16.0sp"
510-
android:textColor="?android:textColorPrimary"
511-
android:gravity="left"
512-
android:layout_width="wrap_content"
513-
android:layout_height="wrap_content"
514-
android:text="@string/title_user_asset_setting"
515-
android:layout_weight="1.0" />
516-
<ImageView
517-
android:background="@drawable/uwu_bg_circle_arrow"
518-
android:padding="2.0dip"
519-
android:layout_width="wrap_content"
520-
android:layout_height="wrap_content"
521-
android:layout_margin="10.0dip"
522-
android:src="@drawable/uwu_arrow"
523-
android:layout_centerVertical="true"
524-
android:layout_alignParentEnd="true"
525-
android:backgroundTint="@color/uwu_bg_dialog_bottomshet"
526-
app:tint="?android:textColorPrimary" />
527-
</LinearLayout>
528487
<LinearLayout
529488
android:gravity="center|right"
530489
android:orientation="horizontal"

0 commit comments

Comments
 (0)