migrated package names

mitai-app · Dec 11, 2023 · cc33d1b · cc33d1b
1 parent f4edfda
commit cc33d1b
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 24 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
         <activity
             android:launchMode="singleInstance"
             android:taskAffinity=""
-            android:name="io.vonley.mi.ui.compose.MainActivity"
+            android:name="io.vonley.mi.ui.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/io/vonley/mi/Mi.kt b/app/src/main/java/io/vonley/mi/Mi.kt
@@ -38,7 +38,7 @@ object Mi {
         }
     }
 
-    private val analytics: FirebaseAnalytics = Firebase.analytics
+    private val analytics: FirebaseAnalytics get() = Firebase.analytics
 
     fun log(
         event: MiEvent,

diff --git a/app/src/main/java/io/vonley/mi/MiApplication.kt b/app/src/main/java/io/vonley/mi/MiApplication.kt
@@ -8,6 +8,7 @@ import android.net.nsd.NsdManager.RegistrationListener
 import android.net.nsd.NsdManager.ResolveListener
 import android.net.nsd.NsdServiceInfo
 import android.util.Log
+import com.google.firebase.FirebaseApp
 import dagger.hilt.android.HiltAndroidApp
 import io.vonley.mi.extensions.e
 import io.vonley.mi.intents.PSXService
@@ -17,6 +18,7 @@ class MiApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
+        FirebaseApp.initializeApp(this)
         startService(Intent(this, PSXService::class.java))
     }
 

diff --git a/app/src/main/java/io/vonley/mi/ui/MainActivity.kt b/app/src/main/java/io/vonley/mi/ui/MainActivity.kt
@@ -17,9 +17,9 @@ import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
 import io.vonley.mi.common.templates.nav.BottomNavigationBar
 import io.vonley.mi.common.templates.nav.TopBar
-import io.vonley.mi.ui.screens.*
 import io.vonley.mi.ui.screens.consoles.presentation.ConsolesView
 import io.vonley.mi.ui.screens.ftp.presentation.FTPView
+import io.vonley.mi.ui.screens.home.HomeView
 import io.vonley.mi.ui.screens.packages.presentation.RepositoryView
 import io.vonley.mi.ui.screens.settings.SettingsView
 

diff --git a/app/src/main/java/io/vonley/mi/ui/TabItem.kt b/app/src/main/java/io/vonley/mi/ui/TabItem.kt
@@ -2,9 +2,9 @@ package io.vonley.mi.ui
 
 import androidx.compose.runtime.Composable
 import io.vonley.mi.R
-import io.vonley.mi.ui.screens.*
 import io.vonley.mi.ui.screens.consoles.presentation.ConsolesView
 import io.vonley.mi.ui.screens.ftp.presentation.FTPView
+import io.vonley.mi.ui.screens.home.HomeView
 import io.vonley.mi.ui.screens.packages.presentation.RepositoryView
 import io.vonley.mi.ui.screens.settings.SettingsView
 

diff --git a/app/src/main/java/io/vonley/mi/ui/screens/consoles/presentation/ConsoleView.kt b/app/src/main/java/io/vonley/mi/ui/screens/consoles/presentation/ConsoleView.kt
@@ -80,7 +80,7 @@ fun PreviewConsoleView() {
     //ConsolesView()
     val consoles = arrayOf(
         Console(
-            ip = "192.168.11.45",
+            ip = "192.168.1.184",
             name = "PS4",
             type = PlatformType.PS4,
             features = arrayListOf(
@@ -91,7 +91,7 @@ fun PreviewConsoleView() {
             pinned = true
         ),
         Console(
-            ip = "192.168.11.46",
+            ip = "192.168.11.185",
             name = "PS3",
             type = PlatformType.PS3,
             features = arrayListOf(
@@ -102,7 +102,7 @@ fun PreviewConsoleView() {
             pinned = true
         ),
         Console(
-            ip = "192.168.11.47",
+            ip = "192.168.1.1",
             name = "Unknown",
             type = PlatformType.UNKNOWN,
             features = arrayListOf(

diff --git a/app/src/main/java/io/vonley/mi/ui/screens/consoles/presentation/ConsoleViewModel.kt b/app/src/main/java/io/vonley/mi/ui/screens/consoles/presentation/ConsoleViewModel.kt
@@ -16,6 +16,7 @@ import io.vonley.mi.ui.screens.consoles.domain.usecase.SelectConsoleUseCase
 import io.vonley.mi.utils.SharedPreferenceManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @HiltViewModel
@@ -42,30 +43,28 @@ class ConsoleViewModel @Inject constructor(
             }.onCompletion { error ->
                 if (error != null) {
                     "Error ${error.message}".e("ERROR", error)
-                    _consoles.value = ConsoleState.Error("Unable to fetch consoles: ${error.message}")
+                    _consoles.value =
+                        ConsoleState.Error("Unable to fetch consoles: ${error.message}")
                 }
             }.catch { error ->
                 "Error ${error.message}".e("ERROR", error)
                 _consoles.value = ConsoleState.Error("Unable to fetch consoles: ${error.message}")
             }.launchIn(viewModelScope)
     }
 
-    fun addConsole(input: String) {
-        addConsoleUseCase(input).onEach { console ->
+    fun addConsole(input: String) = viewModelScope.launch {
+        addConsoleUseCase(input).collect { console ->
 
-        }.launchIn(viewModelScope)
+        }
     }
 
-    fun pin(client: Client) {
-        suspend {
-            addConsoleUseCase.pin(client.ip, true)
-        }.asFlow().launchIn(viewModelScope)
+
+    fun pin(client: Client) = viewModelScope.launch {
+        addConsoleUseCase.pin(client.ip, true)
     }
 
-    fun unpin(client: Client) {
-        suspend {
-            addConsoleUseCase.pin(client.ip, false)
-        }.asFlow().launchIn(viewModelScope)
+    fun unpin(client: Client) = viewModelScope.launch {
+        addConsoleUseCase.pin(client.ip, false)
     }
 
     fun select(console: Console) {

diff --git a/app/src/main/java/io/vonley/mi/ui/screens/home/HomeView.kt b/app/src/main/java/io/vonley/mi/ui/screens/home/HomeView.kt
@@ -1,4 +1,4 @@
-package io.vonley.mi.ui.screens
+package io.vonley.mi.ui.screens.home
 
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.layout.Column