Kr328/ClashForAndroid
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adjust ui

Browse Source
This commit is contained in:
Kr328 committed 2019-12-09 23:42:53 +08:00
1 parent 9cca3c958e
commit 9fe2ec39ae
21 files changed
+43 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/github/kr328/clash/MainActivity.kt
-4
View File
@@ -27,10 +27,6 @@ class MainActivity : BaseActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
setSupportActionBar(activity_main_toolbar.apply {
setLogo(R.mipmap.ic_launcher_foreground)
})
activity_main_clash_proxies.setOnClickListener {
startActivity(Intent(this, ProxyActivity::class.java))
}
app/src/main/res/layout/activity_feedback.xml
+1 -1
View File
@@ -11,7 +11,7 @@
android:id="@+id/activity_feedback_toolbar"
android:elevation="4dp"
android:layout_width="match_parent"
android:layout_height="60dp" />
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView
app/src/main/res/layout/activity_import_file.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/activity_import_file_toolbar"
android:layout_width="match_parent"
android:layout_height="60dp">
android:layout_height="wrap_content">
<FrameLayout
android:layout_width="wrap_content"
app/src/main/res/layout/activity_import_url.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/activity_import_url_toolbar"
android:layout_width="match_parent"
android:layout_height="60dp">
android:layout_height="wrap_content">
<FrameLayout
android:layout_width="wrap_content"
app/src/main/res/layout/activity_logs.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/activity_logs_toolbar"
android:layout_width="match_parent"
android:layout_height="60dp">
android:layout_height="wrap_content">
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>
app/src/main/res/layout/activity_main.xml
+24 -8
View File
@@ -9,12 +9,28 @@
android:animateLayoutChanges="true"
tools:context=".MainActivity">
<androidx.appcompat.widget.Toolbar
android:id="@+id/activity_main_toolbar"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="90dp"
app:contentInsetStartWithNavigation="0dp"
app:contentInsetStart="0dp" />
android:gravity="center_vertical">
<ImageView
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="36dp"
android:contentDescription="@string/application_name"
android:src="@drawable/ic_logo" />
<TextView
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textSize="20sp"
android:textColor="@android:color/black"
android:text="@string/launch_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"/>
<View
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
<include layout="@layout/activity_main_clash_status" />
@@ -44,7 +60,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginStart="25dp"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:text="@string/clash_logs" />
</LinearLayout>
@@ -71,7 +87,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginStart="25dp"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:text="@string/clash_settings" />
</LinearLayout>
@@ -98,7 +114,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginStart="25dp"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:text="@string/clash_feedback" />
</LinearLayout>
@@ -125,7 +141,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginStart="25dp"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:text="@string/clash_about" />
</LinearLayout>
app/src/main/res/layout/activity_main_clash_status.xml
+1 -1
View File
@@ -33,7 +33,7 @@
android:layout_toEndOf="@id/activity_main_clash_status_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginStart="25dp"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@android:color/white"
android:text="@string/clash_status_stopped" />
app/src/main/res/layout/activity_main_profiles.xml
+1 -1
View File
@@ -34,7 +34,7 @@
android:layout_toEndOf="@id/activity_main_profiles_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginStart="25dp"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:text="@string/clash_profiles" />
app/src/main/res/layout/activity_main_proxy_manage.xml
+1 -1
View File
@@ -34,7 +34,7 @@
android:layout_toEndOf="@id/activity_main_clash_proxies_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginStart="25dp"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:text="@string/clash_proxy_manage" />
app/src/main/res/layout/activity_new_profile.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/activity_new_profile_toolbar"
android:layout_width="match_parent"
android:layout_height="60dp" />
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<ListView
app/src/main/res/layout/activity_profiles.xml
+1 -1
View File
@@ -14,7 +14,7 @@
android:id="@+id/activity_profiles_toolbar"
android:elevation="4dp"
android:layout_width="match_parent"
android:layout_height="60dp" />
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.recyclerview.widget.RecyclerView
app/src/main/res/layout/activity_proxies.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<androidx.appcompat.widget.Toolbar
android:id="@+id/activity_proxies_toolbar"
android:layout_width="match_parent"
android:layout_height="60dp" />
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
app/src/main/res/layout/activity_setting_access.xml
+1 -1
View File
@@ -14,7 +14,7 @@
android:id="@+id/activity_setting_access_toolbar"
android:elevation="4dp"
android:layout_width="match_parent"
android:layout_height="60dp" />
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
app/src/main/res/layout/activity_setting_application.xml
+1 -1
View File
@@ -12,7 +12,7 @@
android:id="@+id/activity_setting_application_toolbar"
android:elevation="4dp"
android:layout_width="match_parent"
android:layout_height="60dp" />
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView
app/src/main/res/layout/activity_setting_main.xml
+1 -1
View File
@@ -12,7 +12,7 @@
android:id="@+id/activity_setting_main_toolbar"
android:elevation="4dp"
android:layout_width="match_parent"
android:layout_height="60dp" />
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.fragment.app.FragmentContainerView
app/src/main/res/layout/activity_setting_proxy.xml
+1 -1
View File
@@ -14,7 +14,7 @@
android:id="@+id/activity_setting_proxy_toolbar"
android:elevation="4dp"
android:layout_width="match_parent"
android:layout_height="60dp" />
android:layout_height="wrap_content" />
</com.google.android.material.appbar.AppBarLayout>
<com.github.kr328.clash.view.RadioFatItem
app/src/main/res/layout/preference_main_item.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<ImageView
android:id="@android:id/icon"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginEnd="22dp"
android:layout_marginTop="20dp"
android:layout_width="30dp"
android:layout_height="30dp"
app/src/main/res/layout/preference_proxy_item.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<ImageView
android:id="@android:id/icon"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:layout_marginEnd="22dp"
android:layout_marginTop="20dp"
android:layout_width="30dp"
android:layout_height="30dp"
app/src/main/res/layout/view_fat_item.xml
+1 -1
View File
@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:layout_toEndOf="@id/view_fat_item_icon"
android:layout_toStartOf="@id/view_fat_item_operation_clickable"
android:layout_marginStart="22.5dp"
android:layout_marginStart="24.5dp"
android:paddingTop="15dp"
android:paddingBottom="15dp"
android:orientation="vertical">
app/src/main/res/layout/view_radio_fat_item.xml
+1 -1
View File
@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/view_radio_fat_item_operation_clickable"
android:layout_marginStart="70dp"
android:layout_marginStart="72dp"
android:paddingTop="15dp"
android:paddingBottom="15dp"
android:orientation="vertical">
service/src/main/res/values/arrays.xml
+1
View File
@@ -18,6 +18,7 @@
<item>160.0.0.0/5</item>
<item>168.0.0.0/6</item>
<item>172.0.0.0/12</item>
<item>172.19.0.0/30</item>
<item>172.32.0.0/11</item>
<item>172.64.0.0/10</item>
<item>172.128.0.0/9</item>