From 953c726110cbba5a9863eced4e91468159a8ed79 Mon Sep 17 00:00:00 2001
From: Fankesyooni <qzmmcn@163.com>
Date: Thu, 17 Mar 2022 05:42:47 +0800
Subject: [PATCH] Merge code

---
 .../fankes/coloros/notify/ui/MainActivity.kt  |   8 +--
 app/src/main/res/layout/activity_main.xml     |  58 ++++--------------
 app/src/main/res/mipmap-xxhdpi/ic_github.png  | Bin 0 -> 5987 bytes
 3 files changed, 15 insertions(+), 51 deletions(-)
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_github.png

diff --git a/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt b/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt
index 8857e60..9e5d93c 100644
--- a/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/ui/MainActivity.kt
@@ -170,13 +170,13 @@ class MainActivity : BaseActivity() {
         notifyIconFixButton.setOnClickListener { startActivity(Intent(this, ConfigureActivity::class.java)) }
         /** 重启按钮点击事件 */
         findViewById<View>(R.id.title_restart_icon).setOnClickListener { SystemUITool.restartSystemUI(context = this) }
+        /** 项目地址按钮点击事件 */
+        findViewById<View>(R.id.title_github_icon).setOnClickListener {
+            openBrowser(url = "https://github.com/fankes/ColorOSNotifyIcon")
+        }
         /** 恰饭！ */
         findViewById<View>(R.id.link_with_follow_me).setOnClickListener {
             openBrowser(url = "https://www.coolapk.com/u/876977", packageName = "com.coolapk.market")
         }
-        /** 项目地址点击事件 */
-        findViewById<View>(R.id.link_with_project_address).setOnClickListener {
-            openBrowser(url = "https://github.com/fankes/ColorOSNotifyIcon")
-        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8f4d5e5..e96efa9 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -29,6 +29,17 @@
             android:textSize="25sp"
             android:textStyle="bold" />
 
+        <androidx.constraintlayout.utils.widget.ImageFilterView
+            android:id="@+id/title_github_icon"
+            style="?android:attr/selectableItemBackgroundBorderless"
+            android:layout_width="27dp"
+            android:layout_height="27dp"
+            android:layout_marginEnd="15dp"
+            android:alpha="0.85"
+            android:src="@mipmap/ic_github"
+            android:tint="@color/colorTextGray"
+            android:tooltipText="项目地址" />
+
         <androidx.constraintlayout.utils.widget.ImageFilterView
             android:id="@+id/title_restart_icon"
             style="?android:attr/selectableItemBackgroundBorderless"
@@ -479,53 +490,6 @@
                     android:textSize="12sp" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/link_with_project_address"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="15dp"
-                android:layout_marginTop="15dp"
-                android:layout_marginRight="15dp"
-                android:background="@drawable/bg_permotion_round"
-                android:elevation="0dp"
-                android:gravity="center"
-                android:orientation="vertical"
-                android:padding="15dp">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="10dp"
-                    android:gravity="center|start">
-
-                    <androidx.constraintlayout.utils.widget.ImageFilterView
-                        android:layout_width="15dp"
-                        android:layout_height="15dp"
-                        android:layout_marginEnd="5dp"
-                        android:alpha="0.85"
-                        android:src="@mipmap/ic_about"
-                        android:tint="@color/colorTextGray" />
-
-                    <TextView
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:alpha="0.85"
-                        android:singleLine="true"
-                        android:text="项目地址"
-                        android:textColor="@color/colorTextGray"
-                        android:textSize="12sp" />
-                </LinearLayout>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0.8"
-                    android:lineSpacingExtra="6dp"
-                    android:text="本软件是免费开源项目，遵循 AGPL3.0 协议，你可以点击这里前往 Github 查看源码以及获取模块更新。"
-                    android:textColor="@color/colorTextDark"
-                    android:textSize="12sp" />
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_github.png b/app/src/main/res/mipmap-xxhdpi/ic_github.png
new file mode 100644
index 0000000000000000000000000000000000000000..302740a4733a3720d6d7177b626fcfdc4fbf1b9c
GIT binary patch
literal 5987
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
M6Ke>;$o=vE0e<j;(f|Me

literal 0
HcmV?d00001