Fix bugs

HMBSbige · Sep 15, 2019 · 8e2cb64 · 8e2cb64
1 parent 29a6bda
commit 8e2cb64
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 54 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 android {
     compileSdkVersion compile_Version
     defaultConfig {
-        applicationId "com.github.shadowsocks"
+        applicationId "com.github.shadowsocksr_hmbsbige"
         minSdkVersion min_version
         targetSdkVersion target_version
         versionCode 325    // multiDex的一些相关配置，这样配置可以让你的编译速度更快

diff --git a/app/src/main/res/layout/layout_apps.xml b/app/src/main/res/layout/layout_apps.xml
@@ -8,47 +8,47 @@
     android:duplicateParentState="false">
   <include layout="@layout/toolbar_light_dark"/>
   <LinearLayout android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:elevation="1dp"
-                android:background="@android:color/white"
-                android:orientation="vertical"
-                tools:ignore="RtlSymmetry">
+      android:layout_height="wrap_content"
+      android:elevation="1dp"
+      android:background="@android:color/white"
+      android:orientation="vertical"
+      tools:ignore="RtlSymmetry">
     <Switch android:checked="true"
-            android:id="@+id/onSwitch"
-            android:text="@string/on"
-            android:textSize="18sp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:paddingLeft="60dp"
-            android:paddingRight="8dp"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:ignore="RtlHardcoded"/>
+        android:id="@+id/onSwitch"
+        android:text="@string/on"
+        android:textSize="18sp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:paddingLeft="60dp"
+        android:paddingRight="8dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="RtlHardcoded"/>
     <Switch android:checked="true"
-            android:id="@+id/bypassSwitch"
-            android:text="@string/bypass_apps"
-            android:textSize="18sp"
-            android:textColor="?android:attr/textColorSecondary"
-            android:paddingLeft="60dp"
-            android:paddingRight="8dp"
-            android:paddingTop="12dp"
-            android:paddingBottom="12dp"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:ignore="RtlHardcoded"/>
+        android:id="@+id/bypassSwitch"
+        android:text="@string/bypass_apps"
+        android:textSize="18sp"
+        android:textColor="?android:attr/textColorSecondary"
+        android:paddingLeft="60dp"
+        android:paddingRight="8dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="RtlHardcoded"/>
   </LinearLayout>
   <FrameLayout android:layout_width="fill_parent"
-               android:layout_height="0dp"
-               android:layout_weight="1">
+      android:layout_height="0dp"
+      android:layout_weight="1">
     <ProgressBar android:id="@+id/loading"
-                 android:layout_width="wrap_content"
-                 android:layout_height="wrap_content"
-                 android:layout_gravity="center" />
-    <androidx.appcompat.widget.RecyclerView
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:id="@+id/applistview"
-            android:visibility="gone"/>
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/applistview"
+        android:visibility="gone"/>
   </FrameLayout>
-</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_apps_item.xml b/app/src/main/res/layout/layout_apps_item.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:focusable="true"
-              android:background="?android:attr/selectableItemBackground">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:focusable="true"
+    android:background="?android:attr/selectableItemBackground">
 
     <ImageView
         android:id="@+id/itemicon"
@@ -31,4 +31,4 @@
         android:layout_marginEnd="8dp"
         android:layout_marginRight="8dp"/>
 
-</LinearLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
@@ -15,8 +15,6 @@
         android:animateLayoutChanges="true"
         android:orientation="vertical">
 
-        <include layout="@layout/toolbar_light_dark"/>
-
         <LinearLayout
             android:id="@+id/stat"
             android:layout_width="match_parent"
@@ -30,8 +28,6 @@
             android:orientation="vertical"
             android:paddingBottom="16dip"
             android:paddingEnd="88dip"
-            android:paddingLeft="16dip"
-            android:paddingRight="88dip"
             android:paddingStart="16dip"
             android:paddingTop="16dip"
             android:visibility="gone">
@@ -68,7 +64,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="24dp"
-                    android:layout_marginRight="24dp"
                     android:ellipsize="marquee"
                     android:gravity="end"
                     android:text="@string/sent"
@@ -111,7 +106,6 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="24dp"
-                    android:layout_marginRight="24dp"
                     android:ellipsize="marquee"
                     android:gravity="end"
                     android:text="@string/received"
@@ -161,18 +155,17 @@
         android:name="com.github.shadowsocks.ShadowsocksSettings"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@+id/title_bar"/>
+        android:layout_below="@+id/title_bar"
+        tools:layout="@layout/layout_front_proxy" />
 
     <com.github.jorgecastilloprz.FABProgressCircle
         android:id="@+id/fabProgressCircle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBottom="@+id/title_bar"
         android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
         android:layout_marginBottom="@dimen/fab_margin_bottom"
         android:layout_marginEnd="16dp"
-        android:layout_marginRight="16dp"
         android:elevation="6dp"
 
         app:arcColor="@color/material_blue_grey_700"
@@ -189,4 +182,6 @@
             app:srcCompat="@drawable/ic_start_idle"
             tools:ignore="VectorDrawableCompat"/>
     </com.github.jorgecastilloprz.FABProgressCircle>
+
+    <include layout="@layout/toolbar_light_dark" />
 </RelativeLayout>
diff --git a/app/src/main/res/xml/pref_all.xml b/app/src/main/res/xml/pref_all.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res/com.github.shadowsocks">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <PreferenceCategory
         android:title="@string/proxy_cat">