From 8503c64f0493ecda6f4d155b88fa9cf5ab3489b5 Mon Sep 17 00:00:00 2001
From: tom5079 <tom5079@naver.com>
Date: Sat, 22 Jan 2022 20:13:28 +0900
Subject: [PATCH] Import optimizations

---
 .../main/java/xyz/quaver/pupil/sources/SourceLoader.kt    | 1 -
 app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt     | 8 ++------
 app/src/main/java/xyz/quaver/pupil/ui/SourceSelector.kt   | 6 +-----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/xyz/quaver/pupil/sources/SourceLoader.kt b/app/src/main/java/xyz/quaver/pupil/sources/SourceLoader.kt
index c9d1d718..47de05ba 100644
--- a/app/src/main/java/xyz/quaver/pupil/sources/SourceLoader.kt
+++ b/app/src/main/java/xyz/quaver/pupil/sources/SourceLoader.kt
@@ -51,7 +51,6 @@ data class SourceEntry(
     val icon: Drawable,
     val version: String
 )
-typealias SourceEntries = Map<String, SourceEntry>
 
 val PackageInfo.isSourceFeatureEnabled
     get() = this.reqFeatures.orEmpty().any { it.name == SOURCES_FEATURE }
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
index c085626f..b8acf2a3 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/MainActivity.kt
@@ -31,17 +31,13 @@ import androidx.core.view.WindowCompat
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.createGraph
 import com.google.accompanist.insets.ProvideWindowInsets
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import kotlinx.coroutines.launch
 import org.kodein.di.DIAware
 import org.kodein.di.android.closestDI
-import org.kodein.di.instance
 import org.kodein.log.LoggerFactory
 import org.kodein.log.newLogger
-import xyz.quaver.pupil.sources.SourceEntries
-import xyz.quaver.pupil.sources.SourceEntry
 import xyz.quaver.pupil.sources.core.Source
 import xyz.quaver.pupil.sources.loadSource
 import xyz.quaver.pupil.ui.theme.PupilTheme
@@ -74,8 +70,8 @@ class MainActivity : ComponentActivity(), DIAware {
                         )
                     }
 
-                    NavHost(navController, "source") {
-                        composable("source") {
+                    NavHost(navController, "main") {
+                        composable("main") {
                             var source by remember { mutableStateOf<Source?>(null) }
 
                             BackHandler(
diff --git a/app/src/main/java/xyz/quaver/pupil/ui/SourceSelector.kt b/app/src/main/java/xyz/quaver/pupil/ui/SourceSelector.kt
index 0260aa06..5807bef4 100644
--- a/app/src/main/java/xyz/quaver/pupil/ui/SourceSelector.kt
+++ b/app/src/main/java/xyz/quaver/pupil/ui/SourceSelector.kt
@@ -21,7 +21,6 @@ package xyz.quaver.pupil.ui
 import android.content.Intent
 import android.net.Uri
 import android.provider.Settings
-import android.util.Log
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
@@ -31,7 +30,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.DownloadDone
 import androidx.compose.material.icons.filled.Explore
-import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.outlined.Info
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -43,7 +41,6 @@ import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
 import androidx.navigation.NavDestination.Companion.hierarchy
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.NavHost
@@ -67,7 +64,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.Serializable
 import org.kodein.di.compose.rememberInstance
-import xyz.quaver.pupil.sources.SourceEntries
 import xyz.quaver.pupil.sources.SourceEntry
 import xyz.quaver.pupil.sources.rememberSources
 import xyz.quaver.pupil.util.ApkDownloadManager
@@ -255,7 +251,7 @@ fun SourceSelector(onSource: (SourceEntry) -> Unit) {
         topBar = {
             TopAppBar(
                 title = {
-                    Text("Sources")
+                    Text("Pupil")
                 },
                 contentPadding = rememberInsetsPaddingValues(LocalWindowInsets.current.statusBars)
             )