From 3f91c10c104636403298fc130ec5c28a5da8afe8 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Thu, 21 Nov 2019 21:49:53 +0800
Subject: [PATCH] MainActivity

---
 app/build.gradle                              |   1 +
 .../com/github/kr328/clash/view/FatButton.kt  |  18 ++++
 app/src/main/res/drawable/ic_about.xml        |   9 ++
 .../main/res/drawable/ic_clash_started.xml    |   5 +
 .../main/res/drawable/ic_clash_stopped.xml    |   5 +
 app/src/main/res/drawable/ic_feedback.xml     |   9 ++
 app/src/main/res/drawable/ic_logs.xml         |   9 ++
 app/src/main/res/drawable/ic_profiles.xml     |   9 ++
 app/src/main/res/drawable/ic_proxies.xml      |   9 ++
 app/src/main/res/drawable/ic_settings.xml     |   9 ++
 app/src/main/res/layout/activity_main.xml     | 102 +++++++++++++++++-
 .../res/layout/activity_main_clash_status.xml |  50 +++++++++
 .../res/layout/activity_main_profiles.xml     |  50 +++++++++
 .../res/layout/activity_main_proxy_manage.xml |  50 +++++++++
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/strings.xml           |  16 +++
 app/src/main/res/values/styles.xml            |   4 +-
 .../kr328/clash/service/ClashService.kt       |   8 ++
 .../github/kr328/clash/service/TunService.kt  |  17 ++-
 19 files changed, 377 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/com/github/kr328/clash/view/FatButton.kt
 create mode 100644 app/src/main/res/drawable/ic_about.xml
 create mode 100644 app/src/main/res/drawable/ic_clash_started.xml
 create mode 100644 app/src/main/res/drawable/ic_clash_stopped.xml
 create mode 100644 app/src/main/res/drawable/ic_feedback.xml
 create mode 100644 app/src/main/res/drawable/ic_logs.xml
 create mode 100644 app/src/main/res/drawable/ic_profiles.xml
 create mode 100644 app/src/main/res/drawable/ic_proxies.xml
 create mode 100644 app/src/main/res/drawable/ic_settings.xml
 create mode 100644 app/src/main/res/layout/activity_main_clash_status.xml
 create mode 100644 app/src/main/res/layout/activity_main_profiles.xml
 create mode 100644 app/src/main/res/layout/activity_main_proxy_manage.xml

diff --git a/app/build.gradle b/app/build.gradle
index b74b6d9..0fd02f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,4 +33,5 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0"
     implementation "androidx.constraintlayout:constraintlayout:1.1.3"
     implementation "androidx.room:room-runtime:$room_version"
+    implementation "com.google.android.material:material:1.2.0-alpha02"
 }
diff --git a/app/src/main/java/com/github/kr328/clash/view/FatButton.kt b/app/src/main/java/com/github/kr328/clash/view/FatButton.kt
new file mode 100644
index 0000000..684d333
--- /dev/null
+++ b/app/src/main/java/com/github/kr328/clash/view/FatButton.kt
@@ -0,0 +1,18 @@
+package com.github.kr328.clash.view
+
+import android.content.Context
+import android.graphics.Canvas
+import android.util.AttributeSet
+import android.view.View
+
+class FatButton @JvmOverloads constructor(context: Context, attributeSet: AttributeSet? = null, defaultStyleAttr: Int = 0, defaultStyleRes: Int = 0) :
+    View(context, attributeSet, defaultStyleAttr, defaultStyleRes) {
+
+    override fun onDraw(canvas: Canvas?) {
+        super.onDraw(canvas)
+
+        canvas?.apply {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
new file mode 100644
index 0000000..cc94088
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_clash_started.xml b/app/src/main/res/drawable/ic_clash_started.xml
new file mode 100644
index 0000000..7cdc15d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clash_started.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_clash_stopped.xml b/app/src/main/res/drawable/ic_clash_stopped.xml
new file mode 100644
index 0000000..f8734b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clash_stopped.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8 0,-1.85 0.63,-3.55 1.69,-4.9L16.9,18.31C15.55,19.37 13.85,20 12,20zM18.31,16.9L7.1,5.69C8.45,4.63 10.15,4 12,4c4.42,0 8,3.58 8,8 0,1.85 -0.63,3.55 -1.69,4.9z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_feedback.xml b/app/src/main/res/drawable/ic_feedback.xml
new file mode 100644
index 0000000..29f9baa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_feedback.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM13,14h-2v-2h2v2zM13,10h-2L11,6h2v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_logs.xml b/app/src/main/res/drawable/ic_logs.xml
new file mode 100644
index 0000000..4a3eb4f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_logs.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_profiles.xml b/app/src/main/res/drawable/ic_profiles.xml
new file mode 100644
index 0000000..78118c1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_profiles.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_proxies.xml b/app/src/main/res/drawable/ic_proxies.xml
new file mode 100644
index 0000000..ff485cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_proxies.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M4,8h4L8,4L4,4v4zM10,20h4v-4h-4v4zM4,20h4v-4L4,16v4zM4,14h4v-4L4,10v4zM10,14h4v-4h-4v4zM16,4v4h4L20,4h-4zM10,8h4L14,4h-4v4zM16,14h4v-4h-4v4zM16,20h4v-4h-4v4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 0000000..968166e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM17.25,12c0,0.23 -0.02,0.46 -0.05,0.68l1.48,1.16c0.13,0.11 0.17,0.3 0.08,0.45l-1.4,2.42c-0.09,0.15 -0.27,0.21 -0.43,0.15l-1.74,-0.7c-0.36,0.28 -0.76,0.51 -1.18,0.69l-0.26,1.85c-0.03,0.17 -0.18,0.3 -0.35,0.3h-2.8c-0.17,0 -0.32,-0.13 -0.35,-0.29l-0.26,-1.85c-0.43,-0.18 -0.82,-0.41 -1.18,-0.69l-1.74,0.7c-0.16,0.06 -0.34,0 -0.43,-0.15l-1.4,-2.42c-0.09,-0.15 -0.05,-0.34 0.08,-0.45l1.48,-1.16c-0.03,-0.23 -0.05,-0.46 -0.05,-0.69 0,-0.23 0.02,-0.46 0.05,-0.68l-1.48,-1.16c-0.13,-0.11 -0.17,-0.3 -0.08,-0.45l1.4,-2.42c0.09,-0.15 0.27,-0.21 0.43,-0.15l1.74,0.7c0.36,-0.28 0.76,-0.51 1.18,-0.69l0.26,-1.85c0.03,-0.17 0.18,-0.3 0.35,-0.3h2.8c0.17,0 0.32,0.13 0.35,0.29l0.26,1.85c0.43,0.18 0.82,0.41 1.18,0.69l1.74,-0.7c0.16,-0.06 0.34,0 0.43,0.15l1.4,2.42c0.09,0.15 0.05,0.34 -0.08,0.45l-1.48,1.16c0.03,0.23 0.05,0.46 0.05,0.69z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 73a0e7a..4938194 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,7 +11,107 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/activity_main_toolbar"
         android:layout_width="match_parent"
-        android:layout_height="75dp" />
+        android:layout_height="75dp"
+        app:contentInsetStartWithNavigation="0dp"
+        app:contentInsetStart="0dp" />
 
+    <include layout="@layout/activity_main_clash_status" />
+    <include layout="@layout/activity_main_proxy_manage" />
+    <include layout="@layout/activity_main_profiles" />
 
+    <LinearLayout
+        android:padding="15dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginTop="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:focusable="true"
+        android:clickable="true"
+        android:orientation="horizontal">
+        <ImageView
+            android:contentDescription="@string/clash_logs"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:src="@drawable/ic_logs" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:text="@string/clash_logs"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:padding="15dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:focusable="true"
+        android:clickable="true"
+        android:orientation="horizontal">
+        <ImageView
+            android:contentDescription="@string/clash_settings"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:src="@drawable/ic_settings" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:text="@string/clash_settings"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:padding="15dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:focusable="true"
+        android:clickable="true"
+        android:orientation="horizontal">
+        <ImageView
+            android:contentDescription="@string/clash_feedback"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:src="@drawable/ic_feedback" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:text="@string/clash_feedback"/>
+    </LinearLayout>
+
+    <LinearLayout
+        android:padding="15dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:focusable="true"
+        android:clickable="true"
+        android:orientation="horizontal">
+        <ImageView
+            android:contentDescription="@string/clash_about"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:src="@drawable/ic_about" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:text="@string/clash_about"/>
+    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_main_clash_status.xml b/app/src/main/res/layout/activity_main_clash_status.xml
new file mode 100644
index 0000000..51d0c4f
--- /dev/null
+++ b/app/src/main/res/layout/activity_main_clash_status.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_marginStart="30dp"
+    android:layout_marginEnd="30dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    app:cardElevation="4dp"
+    app:cardCornerRadius="8dp"
+    app:cardBackgroundColor="@android:color/darker_gray">
+
+    <RelativeLayout
+        android:paddingStart="18dp"
+        android:paddingEnd="18dp"
+        android:paddingTop="24dp"
+        android:paddingBottom="24dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/activity_main_clash_status_icon"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:contentDescription="@string/clash_status_stopped"
+            android:src="@drawable/ic_clash_stopped"/>
+
+        <TextView
+            android:id="@+id/activity_main_clash_status_title"
+            android:layout_toEndOf="@id/activity_main_clash_status_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:textColor="@android:color/white"
+            android:text="@string/clash_status_stopped"/>
+
+        <TextView
+            android:id="@+id/activity_main_clash_status_summary"
+            android:text="@string/clash_status_click_to_start"
+            android:textColor="@color/light_gray"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:layout_marginTop="2dp"
+            android:layout_alignStart="@id/activity_main_clash_status_title"
+            android:layout_below="@id/activity_main_clash_status_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </RelativeLayout>
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_profiles.xml b/app/src/main/res/layout/activity_main_profiles.xml
new file mode 100644
index 0000000..8c7a202
--- /dev/null
+++ b/app/src/main/res/layout/activity_main_profiles.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_marginTop="10dp"
+    android:layout_marginStart="30dp"
+    android:layout_marginEnd="30dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    app:cardCornerRadius="8dp"
+    app:cardBackgroundColor="@android:color/white">
+
+    <RelativeLayout
+        android:paddingStart="18dp"
+        android:paddingEnd="18dp"
+        android:paddingTop="15dp"
+        android:paddingBottom="15dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/activity_main_profiles"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_centerVertical="true"
+            android:contentDescription="@string/clash_status_stopped"
+            android:src="@drawable/ic_profiles"/>
+
+        <TextView
+            android:id="@+id/activity_main_profiles_title"
+            android:layout_toEndOf="@id/activity_main_profiles"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:text="@string/clash_profiles"/>
+
+        <TextView
+            android:id="@+id/activity_main_clash_profiles_summary"
+            android:text="@string/clash_profiles_summary"
+            android:textColor="@android:color/darker_gray"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:layout_marginTop="2dp"
+            android:layout_alignStart="@id/activity_main_profiles_title"
+            android:layout_below="@id/activity_main_profiles_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </RelativeLayout>
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_proxy_manage.xml b/app/src/main/res/layout/activity_main_proxy_manage.xml
new file mode 100644
index 0000000..8ea54e9
--- /dev/null
+++ b/app/src/main/res/layout/activity_main_proxy_manage.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_marginTop="18dp"
+    android:layout_marginStart="30dp"
+    android:layout_marginEnd="30dp"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:foreground="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    app:cardCornerRadius="8dp"
+    app:cardBackgroundColor="@android:color/white">
+
+    <RelativeLayout
+        android:paddingStart="18dp"
+        android:paddingEnd="18dp"
+        android:paddingTop="15dp"
+        android:paddingBottom="15dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageView
+            android:id="@+id/activity_main_clash_proxies"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_centerVertical="true"
+            android:contentDescription="@string/clash_status_stopped"
+            android:src="@drawable/ic_proxies"/>
+
+        <TextView
+            android:id="@+id/activity_main_clash_proxies_title"
+            android:layout_toEndOf="@id/activity_main_clash_proxies"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+            android:text="@string/clash_proxy_manage"/>
+
+        <TextView
+            android:id="@+id/activity_main_clash_proxies_summary"
+            android:text="@string/clash_proxy_manage_summary"
+            android:textColor="@android:color/darker_gray"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:layout_marginTop="2dp"
+            android:layout_alignStart="@id/activity_main_clash_proxies_title"
+            android:layout_below="@id/activity_main_clash_proxies_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </RelativeLayout>
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7d7c7a0..247b017 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,4 +4,6 @@
     <color name="colorPrimaryDark">#FAFAFA</color>
     <color name="colorAccent">#1E4376</color>
     <color name="ic_launcher_background">#FFFFFF</color>
+
+    <color name="light_gray">#d3d3d3</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa64d33..97b0020 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,19 @@
 <resources>
     <string name="app_name">Clash</string>
+
+    <string name="clash_status_stopped">Clash Stopped</string>
+    <string name="clash_status_click_to_start">Click to start</string>
+    <string name="clash_status_running">Clash Started</string>
+    <string name="clash_status_forwarded_traffic">%s Traffic Forwarded</string>
+
+    <string name="clash_proxy_manage">Proxy Manage</string>
+    <string name="clash_proxy_manage_summary">%d Proxies</string>
+
+    <string name="clash_profiles">Profiles</string>
+    <string name="clash_profiles_summary">%s Selected</string>
+
+    <string name="clash_logs">Logs</string>
+    <string name="clash_settings">Settings</string>
+    <string name="clash_feedback">Feedback</string>
+    <string name="clash_about">About</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 100b33c..53cfbc4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,5 +1,7 @@
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="android:ambientShadowAlpha">0.08</item>
+        <item name="android:spotShadowAlpha">0.08</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
diff --git a/service/src/main/java/com/github/kr328/clash/service/ClashService.kt b/service/src/main/java/com/github/kr328/clash/service/ClashService.kt
index 68ce0ba..21c90c4 100644
--- a/service/src/main/java/com/github/kr328/clash/service/ClashService.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/ClashService.kt
@@ -138,6 +138,14 @@ class ClashService : Service() {
         }
     }
 
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+
+        clash.start()
+
+        return START_NOT_STICKY
+    }
+
     override fun onBind(intent: Intent?): IBinder? {
         return ClashServiceImpl()
     }
diff --git a/service/src/main/java/com/github/kr328/clash/service/TunService.kt b/service/src/main/java/com/github/kr328/clash/service/TunService.kt
index f852b38..43c5069 100644
--- a/service/src/main/java/com/github/kr328/clash/service/TunService.kt
+++ b/service/src/main/java/com/github/kr328/clash/service/TunService.kt
@@ -21,8 +21,10 @@ class TunService : VpnService() {
     }
 
     private lateinit var fileDescriptor: ParcelFileDescriptor
+    private var clash: IClashService? = null
     private val connection = object: ServiceConnection {
         override fun onServiceDisconnected(name: ComponentName?) {
+            clash = null
             stopSelf()
         }
 
@@ -46,16 +48,18 @@ class TunService : VpnService() {
                 }
             })
             clash.start()
+
+            this@TunService.clash = clash
         }
     }
 
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        super.onStartCommand(intent, flags, startId)
+    override fun onCreate() {
+        super.onCreate()
 
         if ( prepare(this) != null ) {
             startActivity(Intent(this, VpnRequestActivity::class.java))
             stopSelf()
-            return Service.START_NOT_STICKY
+            return
         }
 
         fileDescriptor = Builder()
@@ -71,6 +75,10 @@ class TunService : VpnService() {
             .establish() ?: throw NullPointerException("Unable to establish VPN")
 
         bindService(Intent(this, ClashService::class.java), connection, Context.BIND_AUTO_CREATE)
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
 
         return Service.START_NOT_STICKY
     }
@@ -78,6 +86,9 @@ class TunService : VpnService() {
     override fun onDestroy() {
         fileDescriptor.close()
 
+        clash?.stopTunDevice()
+        clash?.stop()
+
         unbindService(connection)
 
         super.onDestroy()