Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Commit

Permalink
Little fix and change
Browse files Browse the repository at this point in the history
  • Loading branch information
@AnGgIt86
AnGgIt86 committed Sep 29, 2024
1 parent 92eb43f commit adcf9c5
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 74 deletions.
4 changes: 0 additions & 4 deletions app/src/main/kotlin/com/neko/v2ray/ui/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/neko/v2ray/ui/UserAssetActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/drawable/uwu_switch_track.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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" />
Expand Down
12 changes: 3 additions & 9 deletions app/src/main/res/layout/activity_routing_edit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
22 changes: 5 additions & 17 deletions app/src/main/res/layout/item_recycler_routing_setting.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
41 changes: 0 additions & 41 deletions app/src/main/res/layout/uwu_menu_tools_bottom_sheet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit adcf9c5

Please sign in to comment.