#5 #3 , +about

aquamarine5 · Feb 5, 2024 · 8324d77 · 8324d77
1 parent 8d08bfd
commit 8324d77
Show file tree

Hide file tree

Showing 9 changed files with 212 additions and 124 deletions.
diff --git a/app/src/main/java/org/aquarngd/onceshot/ForegroundService.kt b/app/src/main/java/org/aquarngd/onceshot/ForegroundService.kt
@@ -2,7 +2,6 @@ package org.aquarngd.onceshot
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.app.PendingIntent
 import android.app.Service
 import android.content.ContentUris
 import android.content.Context
@@ -15,9 +14,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.Handler
 import android.os.IBinder
-import android.os.Looper
 import android.provider.MediaStore
-import android.transition.Visibility
 import android.util.Log
 import android.view.ContextThemeWrapper
 import android.view.Gravity
@@ -26,12 +23,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
 import android.widget.LinearLayout
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.sp
 import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat.getSystemService
-import androidx.core.content.withStyledAttributes
 import com.google.android.material.button.MaterialButton
 
 class ForegroundService : Service() {
@@ -128,16 +120,8 @@ class ForegroundService : Service() {
             Log.e(classTag, "Delete image: Uri is null!")
             return
         }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            startIntentSender(
-                MediaStore.createDeleteRequest(
-                    contentResolver, listOf(
-                        uri
-                    )
-                ).intentSender, null, 0, 0, 0
-            )
-            Log.d(classTag, "Delete image: call MediaStore.createDeleteRequest successfully.")
-        }
+        val result=contentResolver.delete(uri!!,null,null);
+        Log.d(classTag, "Delete image result:${{ result==1 }}")
     }
 
     private fun getAllShareableApplications(): List<ResolveInfo> {

diff --git a/app/src/main/java/org/aquarngd/onceshot/MainActivity.kt b/app/src/main/java/org/aquarngd/onceshot/MainActivity.kt
diff --git a/app/src/main/res/drawable/icon_about.xml b/app/src/main/res/drawable/icon_about.xml
@@ -0,0 +1,5 @@
+<vector android:height="35dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="35dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" 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/icon_android.xml b/app/src/main/res/drawable/icon_android.xml
@@ -0,0 +1,5 @@
+<vector android:height="35dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="35dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M17.6,9.48l1.84,-3.18c0.16,-0.31 0.04,-0.69 -0.26,-0.85c-0.29,-0.15 -0.65,-0.06 -0.83,0.22l-1.88,3.24c-2.86,-1.21 -6.08,-1.21 -8.94,0L5.65,5.67c-0.19,-0.29 -0.58,-0.38 -0.87,-0.2C4.5,5.65 4.41,6.01 4.56,6.3L6.4,9.48C3.3,11.25 1.28,14.44 1,18h22C22.72,14.44 20.7,11.25 17.6,9.48zM7,15.25c-0.69,0 -1.25,-0.56 -1.25,-1.25c0,-0.69 0.56,-1.25 1.25,-1.25S8.25,13.31 8.25,14C8.25,14.69 7.69,15.25 7,15.25zM17,15.25c-0.69,0 -1.25,-0.56 -1.25,-1.25c0,-0.69 0.56,-1.25 1.25,-1.25s1.25,0.56 1.25,1.25C18.25,14.69 17.69,15.25 17,15.25z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icon_material_design.png b/app/src/main/res/drawable/icon_material_design.png
diff --git a/app/src/main/res/layout/activity_floating_dialog.xml b/app/src/main/res/layout/activity_floating_dialog.xml
@@ -4,13 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    android:background="@color/white"
     android:orientation="vertical"
     android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar"
     tools:context=".FloatingDialog">
 
     <com.google.android.material.textview.MaterialTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@color/white"
         android:text="@string/FloatingDialog_OnceShot"
         android:textAlignment="center"
         app:errorTextAppearance="@style/Theme.MaterialComponents.Light.NoActionBar" />
@@ -37,9 +39,11 @@
         android:textColor="#000000"
         android:textSize="14sp"
         app:strokeColor="@color/teal_700" />
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
+
         <LinearLayout
             android:id="@+id/share_layout"
             android:layout_width="match_parent"

diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
@@ -18,4 +18,19 @@
     <string name="stackbricks_tips_clickinstall">点击以安装新版本</string>
     <string name="stackbricks_tips_downloading">下载中…</string>
     <string name="stackbricks_tips_checking">检查更新中</string>
+
+    <string name="mainwindow_androidcompatibility_title">Android 版本兼容性检查</string>
+    <string name="mainwindow_androidcompatibility_lowlevel_text">OnceShot 目前仅测试了 Android 33 (Tiramisu) 及以上版本的正确使用，其他版本可能会出现问题，您的手机Android版本为%1$s，低于设计版本</string>
+    <string name="mainwindow_androidcompatibility_success_text">您的手机 Android 版本为 %1$s，可以正常使用</string>
+    <string name="mainwindow_requirepermission_floating_text">OnceShot 需要添加悬浮窗让用户在截图后在操作面板进行操作</string>
+    <string name="mainwindow_requirepermission_floating_title">需要悬浮窗权限</string>
+    <string name="mainwindow_requirepermission_readimage_title">需要读取设备内图片权限</string>
+    <string name="mainwindow_requirepermission_readimage_text">OnceShot 需要通过读取设备图片来监听截图操作来显示操作面板</string>
+    <string name="mainwindow_requirepermission_mediastore_title">需要媒体库管理权限</string>
+    <string name="mainwindow_requirepermission_mediastore_text">OnceShot 通过对媒体库 (MediaStore) 的控制权限来删除截图文件</string>
+    <string name="mainwindow_onceshot_creation_title">OnceShot 由 Renegade Creation 开发</string>
+    <string name="mainwindow_onceshot_creation_text">作者：@aquamarine5 (@海蓝色的咕咕鸽)</string>
+    <string name="mainwindow_onceshot_compose_title">OnceShot 使用推荐用于构建原生 Android 界面的新工具包 Jetpack Compose 开发</string>
+    <string name="mainwindow_onceshot_compose_text">OnceShot 遵循 Material Design 3 设计理念</string>
+
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -8,14 +8,27 @@
     <string name="share_screenshot">分享截图</string>
     <string name="btn_DeleteAfterShare">复制后删除</string>
     <string name="FloatingDialog_DeleteAfterShare">复制后删除</string>
-    <string name="FloatingDialog_OnceShot">OnceShot</string>
+    <string name="FloatingDialog_OnceShot">OnceShot 操作面板</string>
     <string name="FloatingDialog_Delete">直接删除</string>
     <string name="stackbricks_tips_newversion">有最新版本</string>
     <string name="stackbricks_tips_newest">当前已经是最新版本</string>
     <string name="stackbricks_tips_checkupdate">点击检查更新</string>
     <string name="stackbricks_tips_programerror">程序出现错误</string>
     <string name="stackbricks_tips_networkerror">网络已断开</string>
     <string name="stackbricks_tips_clickinstall">点击以安装新版本</string>
-    <string name="stackbricks_tips_downloading">下载中…</string>
+    <string name="stackbricks_tips_downloading">下载中……</string>
     <string name="stackbricks_tips_checking">检查更新中</string>
+    <string name="mainwindow_androidcompatibility_title">Android 版本兼容性检查</string>
+    <string name="mainwindow_androidcompatibility_lowlevel_text">OnceShot 目前仅测试了 Android 33 (Tiramisu) 及以上版本的正确使用，其他版本可能会出现问题，您的手机 Android 版本为%1$s，低于设计版本</string>
+    <string name="mainwindow_androidcompatibility_success_text">OnceShot 目前仅测试了 Android 33 (Tiramisu) 及以上版本的正确使用，其他版本可能会出现问题，您的手机 Android 版本为 %1$s，可以正常使用</string>
+    <string name="mainwindow_requirepermission_floating_text">OnceShot 需要添加悬浮窗让用户在截图后在操作面板进行操作</string>
+    <string name="mainwindow_requirepermission_floating_title">需要悬浮窗权限</string>
+    <string name="mainwindow_requirepermission_readimage_title">需要读取设备内图片权限</string>
+    <string name="mainwindow_requirepermission_readimage_text">OnceShot 需要通过读取设备图片来监听截图操作来显示操作面板</string>
+    <string name="mainwindow_requirepermission_mediastore_title">需要媒体库管理权限</string>
+    <string name="mainwindow_requirepermission_mediastore_text">OnceShot 通过对媒体库 (MediaStore) 的控制权限来删除截图文件</string>
+    <string name="mainwindow_onceshot_creation_title">OnceShot 由 Renegade Creation 开发</string>
+    <string name="mainwindow_onceshot_creation_text">作者：@aquamarine5 (@海蓝色的咕咕鸽)</string>
+    <string name="mainwindow_onceshot_compose_title">OnceShot 使用推荐用于构建原生 Android 界面的新工具包 Jetpack Compose 开发</string>
+    <string name="mainwindow_onceshot_compose_text">OnceShot 遵循 Material Design 3 设计理念</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="share_screenshot">分享截图</string>
     <string name="btn_DeleteAfterShare">复制后删除</string>
     <string name="FloatingDialog_DeleteAfterShare">Button</string>
-    <string name="FloatingDialog_OnceShot">OnceShot</string>
+    <string name="FloatingDialog_OnceShot">OnceShot 操作面板</string>
     <string name="FloatingDialog_Delete">直接删除</string>
     <string name="stackbricks_tips_newversion">有最新版本</string>
     <string name="stackbricks_tips_newest">当前已经是最新版本</string>
@@ -18,4 +18,18 @@
     <string name="stackbricks_tips_clickinstall">点击以安装新版本</string>
     <string name="stackbricks_tips_downloading">下载中…</string>
     <string name="stackbricks_tips_checking">检查更新中</string>
+    <string name="mainwindow_androidcompatibility_title">Android 版本兼容性检查</string>
+    <string name="mainwindow_androidcompatibility_lowlevel_text">OnceShot 目前仅测试了 Android 33 (Tiramisu) 及以上版本的正确使用，其他版本可能会出现问题，您的手机Android版本为%1$s，低于设计版本</string>
+    <string name="mainwindow_androidcompatibility_success_text">您的手机 Android 版本为 %1$s，可以正常使用</string>
+    <string name="mainwindow_requirepermission_floating_text">OnceShot 需要添加悬浮窗让用户在截图后在操作面板进行操作</string>
+    <string name="mainwindow_requirepermission_floating_title">需要悬浮窗权限</string>
+    <string name="mainwindow_requirepermission_readimage_title">需要读取设备内图片权限</string>
+    <string name="mainwindow_requirepermission_readimage_text">OnceShot 需要通过读取设备图片来监听截图操作来显示操作面板</string>
+    <string name="mainwindow_requirepermission_mediastore_title">需要媒体库管理权限</string>
+    <string name="mainwindow_requirepermission_mediastore_text">OnceShot 通过对媒体库 (MediaStore) 的控制权限来删除截图文件</string>
+    <string name="mainwindow_onceshot_creation_title">OnceShot 由 Renegade Creation 开发</string>
+    <string name="mainwindow_onceshot_creation_text">作者：@aquamarine5 (@海蓝色的咕咕鸽)</string>
+    <string name="mainwindow_onceshot_compose_title">OnceShot 使用推荐用于构建原生 Android 界面的新工具包 Jetpack Compose 开发</string>
+    <string name="mainwindow_onceshot_compose_text">OnceShot 遵循 Material Design 3 设计理念</string>
+
 </resources>