rename package

xuduo · Dec 7, 2023 · 0916cd1 · 0916cd1
1 parent 60cc45e
commit 0916cd1
Show file tree

Hide file tree

Showing 61 changed files with 284 additions and 208 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -27,8 +27,8 @@ android {
     compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        testInstrumentationRunner = "com.xd.mvvm.testrecorder.test.runner.RecordingTestRunner"
-        applicationId = "com.xd.mvvm.testrecorder"
+        testInstrumentationRunner = "com.xd.testrecorder.test.runner.RecordingTestRunner"
+        applicationId = "com.xd.testrecorder"
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
@@ -102,7 +102,7 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
     }
-    namespace = "com.xd.mvvm.testrecorder"
+    namespace = "com.xd.testrecorder"
     buildToolsVersion = "34.0.0"
 
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {

diff --git a/app/src/androidTest/java/com/xd/mvvm/testrecorder/test/main/MainTest.kt b/app/src/androidTest/java/com/xd/mvvm/testrecorder/test/main/MainTest.kt
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder.test.main
+package com.xd.testrecorder.test.main
 
 import androidx.compose.ui.test.onNodeWithContentDescription
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import com.xd.mvvm.testrecorder.R
-import com.xd.mvvm.testrecorder.test.utils.BaseTest
+import com.xd.testrecorder.R
+import com.xd.testrecorder.test.utils.BaseTest
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/app/src/androidTest/java/com/xd/mvvm/testrecorder/test/runner/RecordingTestRunner.kt b/app/src/androidTest/java/com/xd/mvvm/testrecorder/test/runner/RecordingTestRunner.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder.test.runner
+package com.xd.testrecorder.test.runner
 
 import android.app.Application
 import android.content.Context

diff --git a/app/src/androidTest/java/com/xd/mvvm/testrecorder/test/utils/BaseTest.kt b/app/src/androidTest/java/com/xd/mvvm/testrecorder/test/utils/BaseTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder.test.utils
+package com.xd.testrecorder.test.utils
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.compose.ui.test.SemanticsMatcher
@@ -23,8 +23,8 @@ import androidx.compose.ui.test.hasSetTextAction
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import com.google.accompanist.themeadapter.appcompat.AppCompatTheme
-import com.xd.mvvm.testrecorder.MainActivity
-import com.xd.mvvm.testrecorder.MainNavGraph
+import com.xd.testrecorder.MainActivity
+import com.xd.testrecorder.MainNavGraph
 import dagger.hilt.android.testing.HiltAndroidRule
 import org.junit.Before
 import org.junit.Rule

diff --git a/app/src/androidTest/java/com/xd/mvvm/testrecorder/test/weather/WeatherTest.kt b/app/src/androidTest/java/com/xd/mvvm/testrecorder/test/weather/WeatherTest.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder.test.weather
+package com.xd.testrecorder.test.weather
 
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.assertIsOff
@@ -25,8 +25,8 @@ import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
-import com.xd.mvvm.testrecorder.R
-import com.xd.mvvm.testrecorder.test.utils.BaseTest
+import com.xd.testrecorder.R
+import com.xd.testrecorder.test.utils.BaseTest
 import dagger.hilt.android.testing.HiltAndroidTest
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/app/src/debug/java/com/example/android/architecture/blueprints/todoapp/HiltTestActivity.kt b/app/src/debug/java/com/example/android/architecture/blueprints/todoapp/HiltTestActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder
+package com.xd.testrecorder
 
 import androidx.activity.ComponentActivity
 import dagger.hilt.android.AndroidEntryPoint

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,19 +14,19 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.xd.testrecorder">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="false"
-        android:name="com.xd.mvvm.testrecorder.MainApplication"
+        android:name=".MainApplication"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:name="com.xd.mvvm.testrecorder.MainActivity"
+            android:name=".MainActivity"
             android:windowSoftInputMode="adjustResize"
             android:exported="true"
             android:theme="@style/AppTheme.OverlapSystemBar">

diff --git a/.../com/xd/mvvm/testrecorder/MainActivity.kt → .../java/com/xd/testrecorder/MainActivity.kt b/.../com/xd/mvvm/testrecorder/MainActivity.kt → .../java/com/xd/testrecorder/MainActivity.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder
+package com.xd.testrecorder
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity

diff --git a/...m/xd/mvvm/testrecorder/MainApplication.kt → ...va/com/xd/testrecorder/MainApplication.kt b/...m/xd/mvvm/testrecorder/MainApplication.kt → ...va/com/xd/testrecorder/MainApplication.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder
+package com.xd.testrecorder
 
 import android.app.Application
 import dagger.hilt.android.HiltAndroidApp

diff --git a/.../com/xd/mvvm/testrecorder/MainNavGraph.kt → .../java/com/xd/testrecorder/MainNavGraph.kt b/.../com/xd/mvvm/testrecorder/MainNavGraph.kt → .../java/com/xd/testrecorder/MainNavGraph.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder
+package com.xd.testrecorder
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -26,15 +26,15 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.xd.mvvm.testrecorder.logger.Logger
-import com.xd.mvvm.testrecorder.main.MainScreen
-import com.xd.mvvm.testrecorder.recorder.RecorderScreen
-import com.xd.mvvm.testrecorder.recording.ActionImageScreen
-import com.xd.mvvm.testrecorder.recording.ActionListScreen
-import com.xd.mvvm.testrecorder.recording.ProcessListScreen
-import com.xd.mvvm.testrecorder.recording.RecordingListScreen
-import com.xd.mvvm.testrecorder.weather.CachedWeatherScreen
-import com.xd.mvvm.testrecorder.weather.WeatherScreen
+import com.xd.testrecorder.logger.Logger
+import com.xd.testrecorder.main.MainScreen
+import com.xd.testrecorder.recorder.RecorderScreen
+import com.xd.testrecorder.recording.ActionImageScreen
+import com.xd.testrecorder.recording.ActionListScreen
+import com.xd.testrecorder.recording.ProcessListScreen
+import com.xd.testrecorder.recording.RecordingListScreen
+import com.xd.testrecorder.weather.CachedWeatherScreen
+import com.xd.testrecorder.weather.WeatherScreen
 
 val LocalNavController = compositionLocalOf<NavController> {
     error("No NavController provided")
@@ -79,11 +79,11 @@ fun MainNavGraph(
             composable(MainDestinations.RECORDING_LIST) {
                 RecordingListScreen()
             }
-            composable("${MainDestinations.ACTION_LIST}/{recordingId}") {backStackEntry->
+            composable("${MainDestinations.ACTION_LIST}/{recordingId}") { backStackEntry->
                 val recordingId = backStackEntry.arguments?.getString("recordingId")?.toLongOrNull() ?: 0L
                 ActionListScreen(recordingId)
             }
-            composable("${MainDestinations.ACTION_IMAGE}/{recordingId}/{actionId}") {backStackEntry->
+            composable("${MainDestinations.ACTION_IMAGE}/{recordingId}/{actionId}") { backStackEntry->
                 val recordingId = backStackEntry.arguments?.getString("recordingId")?.toLongOrNull() ?: 0L
                 val actionId = backStackEntry.arguments?.getString("actionId")?.toLongOrNull() ?: 0L
                 ActionImageScreen(recordingId,actionId)

diff --git a/...om/xd/mvvm/testrecorder/MainNavigation.kt → ...ava/com/xd/testrecorder/MainNavigation.kt b/...om/xd/mvvm/testrecorder/MainNavigation.kt → ...ava/com/xd/testrecorder/MainNavigation.kt
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder
+package com.xd.testrecorder
 
 import androidx.navigation.NavController
-import com.xd.mvvm.testrecorder.MainDestinations.ACTION_IMAGE
-import com.xd.mvvm.testrecorder.MainDestinations.ACTION_LIST
+import com.xd.testrecorder.MainDestinations.ACTION_IMAGE
+import com.xd.testrecorder.MainDestinations.ACTION_LIST
 
 /**
  * Destinations used in the [MainActivity]

diff --git a/...m/xd/mvvm/testrecorder/main/MainScreen.kt → ...va/com/xd/testrecorder/main/MainScreen.kt b/...m/xd/mvvm/testrecorder/main/MainScreen.kt → ...va/com/xd/testrecorder/main/MainScreen.kt
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder.main
+package com.xd.testrecorder.main
 
 import android.app.Activity
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.provider.Settings
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -50,13 +49,13 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.xd.mvvm.testrecorder.LocalNavController
-import com.xd.mvvm.testrecorder.MainDestinations
-import com.xd.mvvm.testrecorder.R
-import com.xd.mvvm.testrecorder.accessibility.TouchAccessibilityViewModel
-import com.xd.mvvm.testrecorder.config.ConfigViewModel
-import com.xd.mvvm.testrecorder.overlay.OverlayService
-import com.xd.mvvm.testrecorder.widget.AppBar
+import com.xd.testrecorder.LocalNavController
+import com.xd.testrecorder.MainDestinations
+import com.xd.testrecorder.R
+import com.xd.testrecorder.accessibility.TouchAccessibilityViewModel
+import com.xd.testrecorder.config.ConfigViewModel
+import com.xd.testrecorder.overlay.OverlayService
+import com.xd.testrecorder.widget.AppBar
 
 @Composable
 fun MainScreen(

diff --git a/...m/testrecorder/recorder/RecorderScreen.kt → ...d/testrecorder/recorder/RecorderScreen.kt b/...m/testrecorder/recorder/RecorderScreen.kt → ...d/testrecorder/recorder/RecorderScreen.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.xd.mvvm.testrecorder.recorder
+package com.xd.testrecorder.recorder
 
 import android.app.Activity
 import androidx.activity.compose.rememberLauncherForActivityResult
@@ -30,8 +30,9 @@ import androidx.compose.material.rememberScaffoldState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.xd.mvvm.testrecorder.R
-import com.xd.mvvm.testrecorder.widget.AppBar
+import com.xd.testrecorder.R
+import com.xd.testrecorder.recorder.RecorderViewModel
+import com.xd.testrecorder.widget.AppBar
 
 @Composable
 fun RecorderScreen(

diff --git a/...strecorder/recording/ActionImageScreen.kt → ...strecorder/recording/ActionImageScreen.kt b/...strecorder/recording/ActionImageScreen.kt → ...strecorder/recording/ActionImageScreen.kt
@@ -1,4 +1,4 @@
-package com.xd.mvvm.testrecorder.recording
+package com.xd.testrecorder.recording
 
 import android.graphics.BitmapFactory
 import android.util.Log
@@ -39,13 +39,14 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.xd.mvvm.testrecorder.LocalLogger
-import com.xd.mvvm.testrecorder.R
-import com.xd.mvvm.testrecorder.data.Action
-import com.xd.mvvm.testrecorder.data.ActionCodeConverter
-import com.xd.mvvm.testrecorder.data.ActionImage
-import com.xd.mvvm.testrecorder.data.CodeConverterOptions
-import com.xd.mvvm.testrecorder.widget.AppBar
+import com.xd.testrecorder.LocalLogger
+import com.xd.testrecorder.R
+import com.xd.testrecorder.data.Action
+import com.xd.testrecorder.data.ActionCodeConverter
+import com.xd.testrecorder.data.ActionImage
+import com.xd.testrecorder.data.CodeConverterOptions
+import com.xd.testrecorder.recording.RecordingViewModel
+import com.xd.testrecorder.widget.AppBar
 
 @Composable
 fun ActionImageScreen(

diff --git a/...estrecorder/recording/ActionListScreen.kt → ...estrecorder/recording/ActionListScreen.kt b/...estrecorder/recording/ActionListScreen.kt → ...estrecorder/recording/ActionListScreen.kt
@@ -1,4 +1,4 @@
-package com.xd.mvvm.testrecorder.recording
+package com.xd.testrecorder.recording
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Row
@@ -17,13 +17,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.xd.mvvm.testrecorder.LocalNavController
-import com.xd.mvvm.testrecorder.R
-import com.xd.mvvm.testrecorder.data.Action
-import com.xd.mvvm.testrecorder.goToActionImage
-import com.xd.mvvm.testrecorder.logger.L
-import com.xd.mvvm.testrecorder.util.LiveDataLoadingContent
-import com.xd.mvvm.testrecorder.widget.AppBar
+import com.xd.testrecorder.LocalNavController
+import com.xd.testrecorder.R
+import com.xd.testrecorder.data.Action
+import com.xd.testrecorder.goToActionImage
+import com.xd.testrecorder.logger.L
+import com.xd.testrecorder.recording.RecordingViewModel
+import com.xd.testrecorder.util.LiveDataLoadingContent
+import com.xd.testrecorder.widget.AppBar
 
 @Composable
 fun ActionListScreen(
@@ -71,7 +72,6 @@ private fun ActionListScreenContent(
 private fun Item(
     action: Action
 ) {
-    val context = LocalContext.current
     val nav = LocalNavController.current
     Row(
         verticalAlignment = Alignment.CenterVertically,

diff --git a/...strecorder/recording/ProcessListScreen.kt → ...strecorder/recording/ProcessListScreen.kt b/...strecorder/recording/ProcessListScreen.kt → ...strecorder/recording/ProcessListScreen.kt
@@ -1,4 +1,4 @@
-package com.xd.mvvm.testrecorder.recording
+package com.xd.testrecorder.recording
 
 import android.app.Activity
 import android.content.Context
@@ -37,10 +37,12 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.xd.mvvm.testrecorder.R
-import com.xd.mvvm.testrecorder.overlay.OverlayService
-import com.xd.mvvm.testrecorder.util.LiveDataLoadingContent
-import com.xd.mvvm.testrecorder.widget.AppBar
+import com.xd.testrecorder.R
+import com.xd.testrecorder.overlay.OverlayService
+import com.xd.testrecorder.recording.AppInfo
+import com.xd.testrecorder.recording.RecordingViewModel
+import com.xd.testrecorder.util.LiveDataLoadingContent
+import com.xd.testrecorder.widget.AppBar
 
 @Composable
 fun ProcessListScreen(

diff --git a/...recorder/recording/RecordingListScreen.kt → ...recorder/recording/RecordingListScreen.kt b/...recorder/recording/RecordingListScreen.kt → ...recorder/recording/RecordingListScreen.kt
@@ -1,4 +1,4 @@
-package com.xd.mvvm.testrecorder.recording
+package com.xd.testrecorder.recording
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
@@ -19,13 +19,14 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import com.xd.mvvm.testrecorder.LocalNavController
-import com.xd.mvvm.testrecorder.R
-import com.xd.mvvm.testrecorder.data.RecordingWithActionCount
-import com.xd.mvvm.testrecorder.goToActionList
-import com.xd.mvvm.testrecorder.logger.L
-import com.xd.mvvm.testrecorder.util.LiveDataLoadingContent
-import com.xd.mvvm.testrecorder.widget.AppBar
+import com.xd.testrecorder.LocalNavController
+import com.xd.testrecorder.R
+import com.xd.testrecorder.data.RecordingWithActionCount
+import com.xd.testrecorder.goToActionList
+import com.xd.testrecorder.logger.L
+import com.xd.testrecorder.recording.RecordingViewModel
+import com.xd.testrecorder.util.LiveDataLoadingContent
+import com.xd.testrecorder.widget.AppBar
 
 @Composable
 fun RecordingListScreen(

diff --git a/...xd/mvvm/testrecorder/util/ComposeUtils.kt → .../com/xd/testrecorder/util/ComposeUtils.kt b/...xd/mvvm/testrecorder/util/ComposeUtils.kt → .../com/xd/testrecorder/util/ComposeUtils.kt
@@ -2,7 +2,7 @@
     ExperimentalMaterialApi::class
 )
 
-package com.xd.mvvm.testrecorder.util
+package com.xd.testrecorder.util
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
@@ -30,12 +30,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.LiveData
-import com.xd.mvvm.testrecorder.R
-import com.xd.mvvm.testrecorder.data.D
-import com.xd.mvvm.testrecorder.data.Err
-import com.xd.mvvm.testrecorder.data.Loading
-import com.xd.mvvm.testrecorder.data.Success
-import com.xd.mvvm.testrecorder.logger.L
+import com.xd.testrecorder.R
+import com.xd.testrecorder.data.D
+import com.xd.testrecorder.data.Err
+import com.xd.testrecorder.data.Loading
+import com.xd.testrecorder.data.Success
+import com.xd.testrecorder.logger.L
 
 @Composable
 fun <T> RefreshingLoadingContent(