RENAME app to OwnDroid

#2

app/build.gradle.kts

@@ -11,8 +11,8 @@ android {
         applicationId = "com.binbin.androidowner"
         minSdk = 21
         targetSdk = 34
-        versionCode = 23
-        versionName = "4.6"
+        versionCode = 24
+        versionName = "5.0-preview"
     }
 
     buildTypes {

app/src/main/java/com/binbin/androidowner/MainActivity.kt

@@ -42,7 +42,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.binbin.androidowner.dpm.*
 import com.binbin.androidowner.ui.Animations
-import com.binbin.androidowner.ui.theme.AndroidOwnerTheme
+import com.binbin.androidowner.ui.theme.OwnDroidTheme
 import com.binbin.androidowner.ui.theme.SetDarkTheme
 import com.binbin.androidowner.ui.theme.bgColor
 
@@ -69,7 +69,7 @@ class MainActivity : ComponentActivity() {
         registerActivityResult()
         displayMetrics = applicationContext.resources.displayMetrics
         setContent {
-            AndroidOwnerTheme {
+            OwnDroidTheme {
                 MyScaffold()
             }
         }

app/src/main/java/com/binbin/androidowner/Setting.kt

@@ -4,23 +4,19 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.MaterialTheme.typography
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
@@ -101,41 +97,17 @@ private fun About(){
     val pkgInfo = myContext.packageManager.getPackageInfo(myContext.packageName,0)
     val verCode = pkgInfo.versionCode
     val verName = pkgInfo.versionName
-    Column(modifier = Modifier.fillMaxSize().padding(horizontal = 8.dp).verticalScroll(rememberScrollState())){
+    Column(modifier = Modifier.fillMaxSize().verticalScroll(rememberScrollState())){
         Spacer(Modifier.padding(vertical = 10.dp))
-        Text(text = stringResource(R.string.about), style = typography.headlineLarge)
-        Spacer(Modifier.padding(vertical = 5.dp))
-        Text(text = stringResource(R.string.app_name)+" v$verName ($verCode)")
-        Text(text = stringResource(R.string.about_desc))
-        Spacer(Modifier.padding(vertical = 5.dp))
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier
-                .fillMaxWidth()
-                .clickable { shareLink(myContext, "https://github.com/BinTianqi/AndroidOwner/blob/master/Guide.md") }
-                .padding(start = 8.dp, bottom = 8.dp)
-        ){
-            Icon(
-                painter = painterResource(id = R.drawable.open_in_new),
-                contentDescription = null,
-                modifier = Modifier.padding(start = 6.dp, end = 10.dp)
-            )
-            Text(text = stringResource(R.string.user_guide), style = typography.titleLarge, modifier = Modifier.padding(bottom = 2.dp))
-        }
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier
-                .fillMaxWidth()
-                .clickable { shareLink(myContext, "https://github.com/BinTianqi/AndroidOwner") }
-                .padding(start = 8.dp, bottom = 4.dp)
-        ) {
-            Icon(
-                painter = painterResource(id = R.drawable.open_in_new),
-                contentDescription = null,
-                modifier = Modifier.padding(start = 6.dp, end = 10.dp)
-            )
-            Text(text = stringResource(R.string.source_code), style = typography.titleLarge, modifier = Modifier.padding(bottom = 2.dp))
+        Column(modifier = Modifier.padding(horizontal = 8.dp)){
+            Text(text = stringResource(R.string.about), style = typography.headlineLarge)
+            Spacer(Modifier.padding(vertical = 5.dp))
+            Text(text = stringResource(R.string.app_name)+" v$verName ($verCode)")
+            Text(text = stringResource(R.string.about_desc))
+            Spacer(Modifier.padding(vertical = 5.dp))
         }
+        SubPageItem(R.string.user_guide,"",R.drawable.open_in_new){shareLink(myContext, "https://github.com/BinTianqi/AndroidOwner/blob/master/Guide.md")}
+        SubPageItem(R.string.source_code,"",R.drawable.open_in_new){shareLink(myContext, "https://github.com/BinTianqi/AndroidOwner")}
     }
 }
 

app/src/main/java/com/binbin/androidowner/dpm/Permissions.kt

@@ -536,7 +536,7 @@ private fun activateDeviceAdmin(inputContext:Context,inputComponent:ComponentNam
     try {
         val intent = Intent(DevicePolicyManager.ACTION_ADD_DEVICE_ADMIN)
         intent.putExtra(DevicePolicyManager.EXTRA_DEVICE_ADMIN, inputComponent)
-        intent.putExtra(DevicePolicyManager.EXTRA_ADD_EXPLANATION, inputContext.getString(R.string.activate_android_owner_here))
+        intent.putExtra(DevicePolicyManager.EXTRA_ADD_EXPLANATION, inputContext.getString(R.string.activate_device_admin_here))
         startActivity(inputContext,intent,null)
     }catch(e:ActivityNotFoundException){
         Toast.makeText(inputContext,inputContext.getString(R.string.unsupported),Toast.LENGTH_SHORT).show()

app/src/main/java/com/binbin/androidowner/ui/theme/Theme.kt

@@ -95,7 +95,7 @@ fun SetDarkTheme(){
 }
 
 @Composable
-fun AndroidOwnerTheme(
+fun OwnDroidTheme(
     darkTheme: Boolean = isSystemInDarkTheme(),
     content: @Composable () -> Unit
 ) {

app/src/main/res/values-zh/strings.xml

@@ -74,7 +74,7 @@
     <string name="support_msg_desc">如果你禁用了某个功能，用户尝试使用这个功能时会看见这个消息（可多行）</string>
     <string name="long_support_msg">提供支持的长消息</string>
     <string name="transform">转移</string>
-    <string name="activate_android_owner_here">在这里激活Android Owner</string>
+    <string name="activate_device_admin_here">在这里激活Device admin</string>
 
     <!--Shizuku-->
     <string name="not_primary_user_not_support_shizuku">暂不支持在非主用户中使用Shizuku</string>

app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!--Global-->
-    <string name="app_name" translatable="false">Android Owner</string>
+    <string name="app_name" translatable="false">OwnDroid</string>
     <string name="disabled">Disabled</string>
     <string name="enabled">Enabled</string>
     <string name="disable">Disable</string>
@@ -78,7 +78,7 @@
     <string name="support_msg_desc">When you try to use functions disabled by this app, the support message will show. </string>
     <string name="long_support_msg">Long message</string>
     <string name="transform">Transform</string>
-    <string name="activate_android_owner_here">Activate Android Owner here. </string>
+    <string name="activate_device_admin_here">Activate Device admin here. </string>
 
     <!--Shizuku-->
     <string name="shizuku" translatable="false">Shizuku</string>