diff --git a/.gitignore b/.gitignore index 62cdb84..780cf30 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ google-services.json scrcpy.help* *.mp4 + +abandoned_assets/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 16aebab..87147cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ~~什么我居然开始写更新日志了~~ +## 0.2.4 + +- 改进: 再次修改图标至 monochrome 主题色填充以避免与上游项目混淆 + ## 0.2.3 - 改进: 莫奈颜色更多配置项 diff --git a/README.md b/README.md index 633de28..645e972 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ scrcpy -[Scrcpy](https://github.com/Genymobile/scrcpy) android client +[scrcpy](https://github.com/Genymobile/scrcpy) android client 从通过 [ADB Wireless](https://developer.android.com/tools/adb?hl=zh-cn#connect-to-a-device-over-wi-fi) @@ -14,6 +14,8 @@ 不需要 root 权限,也无需在设备上安装应用程序 +> 本项目基于 scrcpy,但并非其官方版本,与原作者及维护团队不存在任何隶属或合作关系 + ## 截图

diff --git a/ScrcpyForAndroid.code-workspace b/ScrcpyForAndroid.code-workspace index a2952f4..4d64f03 100644 --- a/ScrcpyForAndroid.code-workspace +++ b/ScrcpyForAndroid.code-workspace @@ -40,6 +40,9 @@ }, { "path": "../termux-kotlin-app" + }, + { + "path": "../Android-DataBackup" } ], } \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 53dfd24..191ccb5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -54,8 +54,8 @@ android { applicationId = "io.github.miuzarte.scrcpyforandroid" minSdk = 26 targetSdk = 37 - versionCode = 19 - versionName = "0.2.3" + versionCode = 20 + versionName = "0.2.4" externalNativeBuild { cmake { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c31fdac..e4f808c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,7 +17,7 @@ android:fullBackupContent="@xml/backup_rules" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/Theme.ScrcpyForAndroid"> diff --git a/app/src/main/assets/icon/icon.svg b/app/src/main/assets/icon/icon.svg index 5f7f0fa..9dca78f 100644 --- a/app/src/main/assets/icon/icon.svg +++ b/app/src/main/assets/icon/icon.svg @@ -1,46 +1,45 @@ - - + - + - + - + + c-0.1,1.1,1.1,1.1,1.1,1.1h20.7c0,0,1.2,0,1.1-1.2c-0.3-3-1.7-5.6-3.9-7.5l2.2-3.3c0.3-0.5,0.2-1.2-0.3-1.5 + c-0.2-0.2-0.5-0.2-0.8-0.2c-0.3,0.1-0.5,0.2-0.7,0.5l-2.2,3.3c-1.7-1-3.7-1.6-5.9-1.6c-2.1,0-4.2,0.6-5.9,1.6l-2.2-3.3 + c-0.2-0.2-0.4-0.4-0.7-0.5C15.2,28.1,15.1,28.1,15,28.1z"/> + c0,0,0,0,0,0C19.7,35.9,19,35.2,18.3,35.2C18.3,35.2,18.3,35.2,18.3,35.2z M29.7,35.2c-0.8,0-1.4,0.6-1.4,1.4c0,0,0,0,0,0 + c0,0.8,0.6,1.4,1.4,1.4c0,0,0,0,0,0c0.8,0,1.4-0.6,1.4-1.4c0,0,0,0,0,0C31.2,35.9,30.5,35.2,29.7,35.2 + C29.7,35.2,29.7,35.2,29.7,35.2z"/> + C16.8,35.2,17.5,34.5,18.3,34.5L18.3,34.5z"/> + C28.3,35.2,29,34.5,29.7,34.5L29.7,34.5z"/> + c0.1,0,0.1,0,0.2,0c0.3,0.1,0.5,0.2,0.7,0.5l2.2,3.3c1.7-1,3.7-1.6,5.9-1.6c2.1,0,4.2,0.6,5.9,1.6l2.2-3.3c0.2-0.2,0.4-0.4,0.7-0.5 + c0.3-0.1,0.6,0,0.8,0.2c0.2,0.1,0.3,0.3,0.4,0.5c0.2-0.5,0-1-0.4-1.3c-0.2-0.2-0.5-0.2-0.8-0.2c-0.3,0.1-0.5,0.2-0.7,0.5l-2.2,3.3 + c-1.7-1-3.7-1.6-5.9-1.6c-2.1,0-4.2,0.6-5.9,1.6l-2.2-3.3c-0.2-0.2-0.4-0.4-0.7-0.5C15.2,27.3,15.1,27.3,15,27.3z M31.9,32.6 + l-0.3,0.4c2.1,1.8,3.5,4.3,3.8,7.2c0-0.1,0-0.2,0-0.4C35.2,37,33.9,34.5,31.9,32.6z M16.1,32.6c-2,1.9-3.3,4.4-3.6,7.3 + c0,0.1,0,0.3,0,0.4c0.4-2.9,1.8-5.4,3.8-7.2L16.1,32.6z"/> diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 03a456f..9ec0c21 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,18 +1,3 @@ - + android:fillColor="@color/ic_launcher_device"/> + android:fillColor="@color/ic_launcher_device"/> + android:fillColor="@color/ic_launcher_foreground_sub"/> + android:fillColor="@color/ic_launcher_foreground_main"/> + android:fillColor="@color/colorOnPrimary"/> + android:fillColor="@color/colorOnPrimary"/> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index a3deeeb..0b0d585 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,21 +1,6 @@ - - + - \ No newline at end of file + diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml deleted file mode 100644 index 6f3b755..0000000 --- a/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611d..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a695..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f50..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml new file mode 100644 index 0000000..2f1d821 --- /dev/null +++ b/app/src/main/res/values-v31/colors.xml @@ -0,0 +1,9 @@ + + + @android:color/system_accent1_100 + @android:color/system_accent1_50 + @android:color/system_accent1_400 + @android:color/system_accent1_700 + @android:color/system_accent1_600 + @android:color/system_accent1_0 + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f8c6127..5facb35 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,9 @@ - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 - #FF000000 - #FFFFFFFF - \ No newline at end of file + #733420 + #FFEEE8 + #CB7C62 + #733420 + #CB7C62 + #FFEEE8 +