From 157bb20a989ca26fcfae78e19f3dfe56e0df4ae8 Mon Sep 17 00:00:00 2001
From: lucka-me <i@lucka.moe>
Date: Tue, 6 Sep 2022 23:05:30 +0800
Subject: [PATCH] Move MainActivity to labs.lucka.refrain

Signed-off-by: lucka-me <i@lucka.moe>
---
 app/src/main/AndroidManifest.xml                              | 2 +-
 app/src/main/java/labs/lucka/refrain/{ui => }/MainActivity.kt | 4 +++-
 app/src/main/java/labs/lucka/refrain/service/TraceService.kt  | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename app/src/main/java/labs/lucka/refrain/{ui => }/MainActivity.kt (86%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bf69d57..82d114d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
         android:theme="@style/Theme.Refrain"
         tools:targetApi="32">
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/labs/lucka/refrain/ui/MainActivity.kt b/app/src/main/java/labs/lucka/refrain/MainActivity.kt
similarity index 86%
rename from app/src/main/java/labs/lucka/refrain/ui/MainActivity.kt
rename to app/src/main/java/labs/lucka/refrain/MainActivity.kt
index d55f124..d2bc960 100644
--- a/app/src/main/java/labs/lucka/refrain/ui/MainActivity.kt
+++ b/app/src/main/java/labs/lucka/refrain/MainActivity.kt
@@ -1,10 +1,12 @@
-package labs.lucka.refrain.ui
+package labs.lucka.refrain
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.get
+import labs.lucka.refrain.ui.RefrainApp
+import labs.lucka.refrain.ui.RefrainModel
 
 class MainActivity : ComponentActivity() {
 
diff --git a/app/src/main/java/labs/lucka/refrain/service/TraceService.kt b/app/src/main/java/labs/lucka/refrain/service/TraceService.kt
index 2612459..e9a00b7 100644
--- a/app/src/main/java/labs/lucka/refrain/service/TraceService.kt
+++ b/app/src/main/java/labs/lucka/refrain/service/TraceService.kt
@@ -26,7 +26,7 @@ import labs.lucka.refrain.R
 import labs.lucka.refrain.common.preferences.Keys
 import labs.lucka.refrain.common.preferencesDataStore
 import labs.lucka.refrain.service.appender.FileAppender
-import labs.lucka.refrain.ui.MainActivity
+import labs.lucka.refrain.MainActivity
 import java.time.LocalDateTime
 import java.time.ZoneId