ppn/olcng
3
0
Fork 0
mirror of https://github.com/openlibrecommunity/olcng.git synced 2026-07-03 14:05:17 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Optimize UI

Browse Source
This commit is contained in:
2dust
2024-09-20 15:06:27 +08:00
parent b7fafa1bf9
commit 9ce8244065
11 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SubSettingRecyclerAdapter.kt
+4 -8
View File
@@ -33,11 +33,7 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) :
val subItem = mActivity.subscriptions[position].second
holder.itemSubSettingBinding.tvName.text = subItem.remarks
holder.itemSubSettingBinding.tvUrl.text = subItem.url
if (subItem.enabled) {
holder.itemSubSettingBinding.chkEnable.setBackgroundResource(R.color.colorAccent)
} else {
holder.itemSubSettingBinding.chkEnable.setBackgroundResource(0)
}
holder.itemSubSettingBinding.chkEnable.isChecked = subItem.enabled
holder.itemView.setBackgroundColor(Color.TRANSPARENT)
holder.itemSubSettingBinding.layoutEdit.setOnClickListener {
@@ -46,10 +42,10 @@ class SubSettingRecyclerAdapter(val activity: SubSettingActivity) :
.putExtra("subId", subId)
)
}
holder.itemSubSettingBinding.infoContainer.setOnClickListener {
subItem.enabled = !subItem.enabled
holder.itemSubSettingBinding.chkEnable.setOnCheckedChangeListener { _, isChecked ->
subItem.enabled = isChecked
subStorage?.encode(subId, Gson().toJson(subItem))
notifyItemChanged(position)
}
if (TextUtils.isEmpty(subItem.url)) {
V2rayNG/app/src/main/res/layout/activity_about.xml
+7 -7
View File
@@ -34,7 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="16dp">
android:paddingStart="@dimen/padding_start">
<TextView
android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingStart="@dimen/padding_start"
android:text="@string/title_configuration_share"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
</LinearLayout>
@@ -97,7 +97,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingStart="@dimen/padding_start"
android:text="@string/title_configuration_restore"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
</LinearLayout>
@@ -129,7 +129,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingStart="@dimen/padding_start"
android:text="@string/title_source_code"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
</LinearLayout>
@@ -153,7 +153,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingStart="@dimen/padding_start"
android:text="@string/title_pref_feedback"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
</LinearLayout>
@@ -178,7 +178,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingStart="@dimen/padding_start"
android:text="@string/title_tg_channel"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
</LinearLayout>
@@ -202,7 +202,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:paddingStart="@dimen/padding_start"
android:text="@string/title_privacy_policy"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
</LinearLayout>
V2rayNG/app/src/main/res/layout/activity_bypass_list.xml
+4 -4
View File
@@ -11,8 +11,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="20dp"
android:paddingEnd="20dp">
android:paddingStart="@dimen/padding_start"
android:paddingEnd="@dimen/padding_end">
<LinearLayout
android:layout_width="match_parent"
@@ -43,7 +43,7 @@
android:id="@+id/switch_per_app_proxy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="20dp" />
android:paddingStart="@dimen/padding_start" />
</LinearLayout>
@@ -67,7 +67,7 @@
android:id="@+id/switch_bypass_apps"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="20dp" />
android:paddingStart="@dimen/padding_start" />
</LinearLayout>
</LinearLayout>
V2rayNG/app/src/main/res/layout/activity_logcat.xml
+2 -2
View File
@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="10dp"
android:paddingEnd="10dp"
android:paddingStart="@dimen/padding_start"
android:paddingEnd="@dimen/padding_end"
tools:context=".ui.LogcatActivity">
<ProgressBar
V2rayNG/app/src/main/res/layout/activity_main.xml
+1 -1
View File
@@ -77,7 +77,7 @@
android:layout_height="wrap_content"
android:maxLines="2"
android:minLines="1"
android:paddingStart="16dp"
android:paddingStart="@dimen/padding_start"
android:text="@string/connection_test_pending"
android:textAppearance="@style/TextAppearance.AppCompat.Small" />
V2rayNG/app/src/main/res/layout/activity_sub_edit.xml
+6 -6
View File
@@ -86,12 +86,12 @@
android:text="@string/sub_setting_enable" />
<androidx.appcompat.widget.AppCompatCheckBox
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/chk_enable"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="2dp"
android:paddingEnd="6dp" />
android:paddingStart="@dimen/padding_start"
android:paddingEnd="@dimen/padding_end" />
</LinearLayout>
@@ -108,12 +108,12 @@
android:text="@string/sub_auto_update" />
<androidx.appcompat.widget.AppCompatCheckBox
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/auto_update_check"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="2dp"
android:paddingEnd="6dp" />
android:paddingStart="@dimen/padding_start"
android:paddingEnd="@dimen/padding_end" />
</LinearLayout>
V2rayNG/app/src/main/res/layout/item_recycler_bypass_list.xml
+6 -6
View File
@@ -11,9 +11,9 @@
android:id="@+id/icon"
android:layout_width="60dp"
android:layout_height="60dp"
android:paddingStart="10dp"
android:paddingStart="@dimen/padding_start"
android:paddingLeft="10dp"
android:paddingEnd="10dp"
android:paddingEnd="@dimen/padding_end"
android:paddingRight="10dp" />
<LinearLayout
@@ -22,8 +22,8 @@
android:layout_weight="1.0"
android:gravity="center"
android:orientation="vertical"
android:paddingStart="@dimen/layout_margin_right_height"
android:paddingEnd="@dimen/layout_margin_right_height">
android:paddingStart="@dimen/padding_start"
android:paddingEnd="@dimen/padding_end">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/name"
@@ -44,9 +44,9 @@
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"
android:paddingStart="2dp"
android:paddingStart="@dimen/padding_start"
android:paddingLeft="2dp"
android:paddingEnd="6dp"
android:paddingEnd="@dimen/padding_end"
android:paddingRight="6dp" />
</LinearLayout>
V2rayNG/app/src/main/res/layout/item_recycler_main.xml
+4 -4
View File
@@ -11,7 +11,7 @@
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="1dp"
android:layout_margin="@dimen/cardview_margin"
app:cardCornerRadius="5dp">
<LinearLayout
@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:paddingStart="9dp">
android:paddingStart="@dimen/padding_start">
<LinearLayout
android:layout_width="wrap_content"
@@ -80,7 +80,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingEnd="5dp">
android:paddingEnd="@dimen/padding_end">
<TextView
android:id="@+id/tv_subscription"
@@ -172,7 +172,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:orientation="vertical"
android:paddingEnd="5dp">
android:paddingEnd="@dimen/padding_end">
<TextView
android:id="@+id/tv_type"
V2rayNG/app/src/main/res/layout/item_recycler_sub_setting.xml
+19 -12
View File
@@ -6,18 +6,19 @@
android:layout_height="wrap_content"
android:gravity="center_vertical">
<androidx.cardview.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
<androidx.cardview.widget.CardView
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:id="@+id/item_cardview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="1dp"
android:layout_margin="@dimen/cardview_margin"
android:orientation="horizontal"
card_view:cardCornerRadius="5dp">
<LinearLayout
android:id="@+id/info_container"
android:layout_width="match_parent"
android:layout_height="@dimen/server_height"
android:layout_height="@dimen/sub_height"
android:layout_gravity="center"
android:clickable="true"
android:focusable="true"
@@ -26,19 +27,12 @@
android:nextFocusRight="@+id/layout_edit"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/chk_enable"
android:layout_width="6dp"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="vertical" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:paddingStart="9dp">
android:paddingStart="@dimen/padding_start">
<TextView
android:id="@+id/tv_name"
@@ -54,12 +48,25 @@
android:lines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Small" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/padding_start"
android:orientation="horizontal">
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/chk_enable"
android:text="@string/sub_setting_enable"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@dimen/server_height"
android:layout_height="@dimen/sub_height"
android:gravity="center"
android:orientation="horizontal">
V2rayNG/app/src/main/res/layout/item_recycler_user_asset.xml
+2 -2
View File
@@ -8,7 +8,7 @@
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="1dp"
android:layout_margin="@dimen/cardview_margin"
app:cardCornerRadius="5dp">
<LinearLayout
@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:paddingStart="9dp">
android:paddingStart="@dimen/padding_start">
<LinearLayout
android:layout_width="wrap_content"
V2rayNG/app/src/main/res/values/dimens.xml
+4
View File
@@ -7,7 +7,11 @@
<dimen name="edit_height">50dp</dimen>
<dimen name="png_height">24dp</dimen>
<dimen name="server_height">72dp</dimen>
<dimen name="sub_height">108dp</dimen>
<dimen name="connection_test_height">60dp</dimen>
<dimen name="padding_start">16dp</dimen>
<dimen name="padding_end">16dp</dimen>
<dimen name="cardview_margin">2dp</dimen>
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>