Skip to content

Commit

Permalink
Adjust UI
Browse files Browse the repository at this point in the history
  • Loading branch information
@2dust
2dust committed Apr 23, 2024
1 parent 9354188 commit b799969
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 76 deletions.
5 changes: 4 additions & 1 deletion V2rayNG/app/src/main/res/drawable/ic_qu_scan_24dp.xml
View file
Expand Up @@ -3,8 +3,11 @@
android:height="24dp"
android:viewportWidth="1024"
android:viewportHeight="1024">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M0,512C0,229.23 229.81,0 512,0 794.77,0 1024,229.81 1024,512 1024,794.77 794.19,1024 512,1024 229.23,1024 0,794.19 0,512Z" />

<path
android:fillColor="#FF000000"
android:pathData="M181.333333 384a32 32 0 0 1-64 0v-111.146667a155.52 155.52 0 0 1 155.52-155.52H384a32 32 0 0 1 0 64h-111.146667a91.52 91.52 0 0 0-91.52 91.52V384zM640 181.333333a32 32 0 0 1 0-64h111.146667a155.52 155.52 0 0 1 155.52 155.52V384a32 32 0 0 1-64 0v-111.146667a91.52 91.52 0 0 0-91.52-91.52H640zM842.666667 640a32 32 0 0 1 64 0v111.146667a155.52 155.52 0 0 1-155.52 155.52H640a32 32 0 0 1 0-64h111.146667a91.52 91.52 0 0 0 91.52-91.52V640zM384 842.666667a32 32 0 0 1 0 64h-111.146667a155.52 155.52 0 0 1-155.52-155.52V640a32 32 0 0 1 64 0v111.146667a91.52 91.52 0 0 0 91.52 91.52H384z m-192-298.666667a32 32 0 0 1 0-64h640a32 32 0 0 1 0 64H192z" />
android:pathData="M780.16 875.52H652.8c-17.92 0-32-14.08-32-32s14.08-32 32-32h127.36c16 0 29.44-13.44 29.44-29.44v-127.36c0-17.92 14.08-32 32-32s32 14.08 32 32v127.36c-0.64 51.2-42.24 93.44-93.44 93.44zM192.64 415.36c-17.92 0-32-14.08-32-32V256c0-51.2 41.6-93.44 93.44-93.44h127.36c17.92 0 32 14.08 32 32s-14.08 32-32 32h-128c-16 0-29.44 13.44-29.44 29.44v127.36c0.64 17.92-14.08 32-31.36 32zM840.96 415.36c-17.92 0-32-14.08-32-32V256c0-16-13.44-29.44-29.44-29.44h-127.36c-17.92 0-32-14.08-32-32s14.08-32 32-32h127.36c51.2 0 93.44 41.6 93.44 93.44v127.36c0 17.92-14.08 32-32 32zM381.44 875.52h-128c-51.2 0-93.44-41.6-93.44-93.44v-127.36c0-17.92 14.08-32 32-32s32 14.08 32 32v127.36c0 16 13.44 29.44 29.44 29.44h127.36c17.92 0 32 14.08 32 32s-14.08 32-31.36 32zM759.04 553.6H274.56c-17.92 0-32-14.08-32-32s14.08-32 32-32h484.48c17.92 0 32 14.08 32 32s-14.72 32-32 32z" />
</vector>
3 changes: 3 additions & 0 deletions V2rayNG/app/src/main/res/drawable/ic_qu_switch_24dp.xml
View file
Expand Up @@ -3,6 +3,9 @@
android:height="24dp"
android:viewportHeight="1024"
android:viewportWidth="1024">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M0,512C0,229.23 229.81,0 512,0 794.77,0 1024,229.81 1024,512 1024,794.77 794.19,1024 512,1024 229.23,1024 0,794.19 0,512Z" />

<path
android:fillColor="#FF000000"
Expand Down
6 changes: 3 additions & 3 deletions V2rayNG/app/src/main/res/layout/widget_switch.xml
View file
Expand Up @@ -16,8 +16,8 @@

<ImageView
android:id="@+id/image_switch"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_width="45dp"
android:layout_height="45dp"
android:padding="12dp"
app:srcCompat="@drawable/ic_stat_name" />
</LinearLayout>
Expand All @@ -26,6 +26,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/app_name"
android:textColor="@color/colorText"
android:textColor="@color/colorWidgetText"
android:textSize="10sp" />
</LinearLayout>
1 change: 1 addition & 0 deletions V2rayNG/app/src/main/res/values/colors.xml
View file
Expand Up @@ -3,6 +3,7 @@
<color name="colorPing">#009966</color>
<color name="colorPingRed">#FF0099</color>
<color name="colorConfigType">#f97910</color>
<color name="colorWidgetText">#FFFFFF</color>

<color name="color_fab_active">#f97910</color>
<color name="color_fab_inactive">#9C9C9C</color>
Expand Down
153 changes: 81 additions & 72 deletions V2rayNG/app/src/main/res/xml/pref_settings.xml
View file
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">

<CheckBoxPreference
android:defaultValue="true"
Expand All @@ -24,9 +25,9 @@
android:title="@string/title_pref_fake_dns_enabled" />

<EditTextPreference
android:inputType="number"
android:key="pref_local_dns_port"
android:summary="10853"
android:inputType="number"
android:title="@string/title_pref_local_dns_port" />

<EditTextPreference
Expand All @@ -44,11 +45,6 @@
android:summary="%s"
android:title="@string/title_pref_routing_domain_strategy" />

<Preference
android:key="pref_routing_custom"
android:summary="@string/title_pref_routing_custom"
android:title="@string/title_pref_routing_custom" />

<ListPreference
android:defaultValue="3"
android:entries="@array/routing_mode"
Expand All @@ -57,69 +53,11 @@
android:summary="%s"
android:title="@string/title_pref_routing_mode" />

</PreferenceCategory>

<PreferenceCategory android:title="@string/title_mux_settings">
<CheckBoxPreference
android:key="pref_mux_enabled"
android:summary="@string/summary_pref_mux_enabled"
android:title="@string/title_pref_mux_enabled" />

<EditTextPreference
android:key="pref_mux_concurency"
android:summary="8"
android:inputType="number"
android:title="@string/title_pref_mux_concurency" />

<EditTextPreference
android:key="pref_mux_xudp_concurency"
android:summary="8"
android:inputType="number"
android:title="@string/title_pref_mux_xudp_concurency" />

<ListPreference
android:defaultValue="reject"
android:entries="@array/mux_xudp_quic_entries"
android:entryValues="@array/mux_xudp_quic_value"
android:key="pref_mux_xudp_quic"
android:summary="%s"
android:title="@string/title_pref_mux_xudp_quic" />
</PreferenceCategory>
<Preference
android:key="pref_routing_custom"
android:summary="@string/title_pref_routing_custom"
android:title="@string/title_pref_routing_custom" />

<PreferenceCategory android:title="@string/title_fragment_settings">
<CheckBoxPreference
android:key="pref_fragment_enabled"
android:title="@string/title_pref_fragment_enabled"/>

<ListPreference
android:key="pref_fragment_packets"
android:defaultValue="tlshello"
android:entries="@array/fragment_packets"
android:entryValues="@array/fragment_packets"
android:summary="%s"
android:title="@string/title_pref_fragment_packets" />

<EditTextPreference
android:key="pref_fragment_length"
android:summary="50-100"
android:title="@string/title_pref_fragment_length" />

<EditTextPreference
android:key="pref_fragment_interval"
android:summary="10-20"
android:title="@string/title_pref_fragment_interval" />
</PreferenceCategory>

<PreferenceCategory android:title="@string/title_sub_setting">
<CheckBoxPreference
android:key="pref_auto_update_subscription"
android:summary="@string/summary_pref_auto_update_subscription"
android:title="@string/title_pref_auto_update_subscription" />
<EditTextPreference
android:key="pref_auto_update_interval"
android:summary="1440"
android:inputType="number"
android:title="@string/title_pref_auto_update_interval" />
</PreferenceCategory>

<PreferenceCategory android:title="@string/title_ui_settings">
Expand Down Expand Up @@ -155,7 +93,78 @@
android:title="@string/title_pref_ui_mode_night" />
</PreferenceCategory>

<PreferenceCategory android:title="@string/title_advanced">
<PreferenceCategory
android:title="@string/title_mux_settings"
app:initialExpandedChildrenCount="0">
<CheckBoxPreference
android:key="pref_mux_enabled"
android:summary="@string/summary_pref_mux_enabled"
android:title="@string/title_pref_mux_enabled" />

<EditTextPreference
android:inputType="number"
android:key="pref_mux_concurency"
android:summary="8"
android:title="@string/title_pref_mux_concurency" />

<EditTextPreference
android:inputType="number"
android:key="pref_mux_xudp_concurency"
android:summary="8"
android:title="@string/title_pref_mux_xudp_concurency" />

<ListPreference
android:defaultValue="reject"
android:entries="@array/mux_xudp_quic_entries"
android:entryValues="@array/mux_xudp_quic_value"
android:key="pref_mux_xudp_quic"
android:summary="%s"
android:title="@string/title_pref_mux_xudp_quic" />
</PreferenceCategory>

<PreferenceCategory
android:title="@string/title_fragment_settings"
app:initialExpandedChildrenCount="0">
<CheckBoxPreference
android:key="pref_fragment_enabled"
android:title="@string/title_pref_fragment_enabled" />

<EditTextPreference
android:key="pref_fragment_length"
android:summary="50-100"
android:title="@string/title_pref_fragment_length" />

<EditTextPreference
android:key="pref_fragment_interval"
android:summary="10-20"
android:title="@string/title_pref_fragment_interval" />

<ListPreference
android:defaultValue="tlshello"
android:entries="@array/fragment_packets"
android:entryValues="@array/fragment_packets"
android:key="pref_fragment_packets"
android:summary="%s"
android:title="@string/title_pref_fragment_packets" />
</PreferenceCategory>

<PreferenceCategory
android:title="@string/title_sub_setting"
app:initialExpandedChildrenCount="0">
<CheckBoxPreference
android:key="pref_auto_update_subscription"
android:summary="@string/summary_pref_auto_update_subscription"
android:title="@string/title_pref_auto_update_subscription" />
<EditTextPreference
android:inputType="number"
android:key="pref_auto_update_interval"
android:summary="1440"
android:title="@string/title_pref_auto_update_interval" />
</PreferenceCategory>

<PreferenceCategory
android:title="@string/title_advanced"
app:initialExpandedChildrenCount="0">

<CheckBoxPreference
android:key="pref_prefer_ipv6"
Expand All @@ -175,15 +184,15 @@
android:title="@string/title_pref_allow_insecure" />

<EditTextPreference
android:inputType="number"
android:key="pref_socks_port"
android:summary="10808"
android:inputType="number"
android:title="@string/title_pref_socks_port" />

<EditTextPreference
android:inputType="number"
android:key="pref_http_port"
android:summary="10809"
android:inputType="number"
android:title="@string/title_pref_http_port" />

<EditTextPreference
Expand Down

0 comments on commit b799969

Please sign in to comment.