From 3b08a9e4bc84c69a527927fdeb8413729c6c4875 Mon Sep 17 00:00:00 2001
From: aurora32s <aurora32s@naver.com>
Date: Mon, 3 Apr 2023 14:21:25 +0900
Subject: [PATCH 1/4] =?UTF-8?q?[ADD]=20#3=20-=20libs.versions.toml=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml        | 2 +-
 .idea/gradle.xml          | 1 +
 .idea/misc.xml            | 2 +-
 gradle/libs.versions.toml | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 gradle/libs.versions.toml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..312bf2e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="20" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a9f4e52..a2d7c21 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bdd9278..712d484 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..6ed4ba9
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,5 @@
+[versions]
+
+[libraries]
+
+[plugins]
\ No newline at end of file

From e443a0cff0eb56698bb279c2519060f401dd0c03 Mon Sep 17 00:00:00 2001
From: aurora32s <aurora32s@naver.com>
Date: Mon, 3 Apr 2023 14:30:19 +0900
Subject: [PATCH 2/4] =?UTF-8?q?[BASE]=20#3=20-=20android=EB=A5=BC=20?=
 =?UTF-8?q?=EC=9C=84=ED=95=9C=20=EA=B8=B0=EB=B3=B8=20dependencies=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml        | 2 +-
 .idea/gradle.xml          | 1 +
 .idea/misc.xml            | 2 +-
 build.gradle              | 7 ++++---
 gradle/libs.versions.toml | 9 ++++++++-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 312bf2e..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="20" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a2d7c21..a0de2a1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,6 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 712d484..4d86ddb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/build.gradle b/build.gradle
index 21155bd..adb3100 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,8 @@ buildscript {
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.kotlin) apply false
+    alias(libs.plugins.android.hilt) apply false
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6ed4ba9..5b435b4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,12 @@
 [versions]
+androidGradlePlugin = '7.3.1'
+hilt = '2.42'
+kotlin = '1.7.0'
 
 [libraries]
 
-[plugins]
\ No newline at end of file
+[plugins]
+android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
+android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
+android-kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+android-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
\ No newline at end of file

From 1c70bbc78420d984cef51fa8464b780320d4c5fb Mon Sep 17 00:00:00 2001
From: aurora32s <aurora32s@naver.com>
Date: Mon, 3 Apr 2023 15:22:42 +0900
Subject: [PATCH 3/4] =?UTF-8?q?[BASE]=20#3=20-=20=ED=94=84=EB=A1=9C?=
 =?UTF-8?q?=EC=A0=9D=ED=8A=B8=EC=97=90=20=ED=95=84=EC=9A=94=ED=95=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EC=A0=81=EC=9D=B8=20dependencies=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 24 +++----
 .../com/haman/allformemory/MainActivity.kt    |  8 +--
 .../com/haman/allformemory/ui/theme/Theme.kt  | 35 +++--------
 .../com/haman/allformemory/ui/theme/Type.kt   | 13 +---
 build.gradle                                  |  5 --
 gradle/libs.versions.toml                     | 63 ++++++++++++++++++-
 6 files changed, 82 insertions(+), 66 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b123f84..30464f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 
 android {
     namespace 'com.haman.allformemory'
-    compileSdk 32
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.haman.allformemory"
         minSdk 26
-        targetSdk 32
+        targetSdk 33
         versionCode 1
         versionName "1.0"
 
@@ -37,7 +37,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.1.1'
+        kotlinCompilerExtensionVersion '1.2.0'
     }
     packagingOptions {
         resources {
@@ -47,17 +47,9 @@ android {
 }
 
 dependencies {
-
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation 'androidx.activity:activity-compose:1.3.1'
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.0.0-alpha02'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.bundles.compose)
+    testImplementation(libs.junit4)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/haman/allformemory/MainActivity.kt b/app/src/main/java/com/haman/allformemory/MainActivity.kt
index 376a5ab..4dad821 100644
--- a/app/src/main/java/com/haman/allformemory/MainActivity.kt
+++ b/app/src/main/java/com/haman/allformemory/MainActivity.kt
@@ -4,9 +4,9 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
@@ -20,7 +20,7 @@ class MainActivity : ComponentActivity() {
                 // A surface container using the 'background' color from the theme
                 Surface(
                     modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
+                    color = MaterialTheme.colors.background
                 ) {
                     Greeting("Android")
                 }
diff --git a/app/src/main/java/com/haman/allformemory/ui/theme/Theme.kt b/app/src/main/java/com/haman/allformemory/ui/theme/Theme.kt
index f21ebb4..6ab1eb1 100644
--- a/app/src/main/java/com/haman/allformemory/ui/theme/Theme.kt
+++ b/app/src/main/java/com/haman/allformemory/ui/theme/Theme.kt
@@ -3,11 +3,7 @@ package com.haman.allformemory.ui.theme
 import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.darkColorScheme
-import androidx.compose.material3.dynamicDarkColorScheme
-import androidx.compose.material3.dynamicLightColorScheme
-import androidx.compose.material3.lightColorScheme
+import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.graphics.toArgb
@@ -15,16 +11,14 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.ViewCompat
 
-private val DarkColorScheme = darkColorScheme(
+private val DarkColorScheme = darkColors(
     primary = Purple80,
-    secondary = PurpleGrey80,
-    tertiary = Pink80
+    secondary = PurpleGrey80
 )
 
-private val LightColorScheme = lightColorScheme(
+private val LightColorScheme = lightColors(
     primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
+    secondary = PurpleGrey40
 
     /* Other default colors to override
     background = Color(0xFFFFFBFE),
@@ -44,24 +38,9 @@ fun AllForMemoryTheme(
     dynamicColor: Boolean = true,
     content: @Composable () -> Unit
 ) {
-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
-        }
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            (view.context as Activity).window.statusBarColor = colorScheme.primary.toArgb()
-            ViewCompat.getWindowInsetsController(view)?.isAppearanceLightStatusBars = darkTheme
-        }
-    }
-
+    val colors = if (darkTheme) DarkColorScheme else LightColorScheme
     MaterialTheme(
-        colorScheme = colorScheme,
+        colors = colors,
         typography = Typography,
         content = content
     )
diff --git a/app/src/main/java/com/haman/allformemory/ui/theme/Type.kt b/app/src/main/java/com/haman/allformemory/ui/theme/Type.kt
index e307abc..e8636e5 100644
--- a/app/src/main/java/com/haman/allformemory/ui/theme/Type.kt
+++ b/app/src/main/java/com/haman/allformemory/ui/theme/Type.kt
@@ -1,20 +1,9 @@
 package com.haman.allformemory.ui.theme
 
-import androidx.compose.material3.Typography
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.sp
+import androidx.compose.material.Typography
 
 // Set of Material typography styles to start with
 val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
-    )
     /* Other default text styles to override
     titleLarge = TextStyle(
         fontFamily = FontFamily.Default,
diff --git a/build.gradle b/build.gradle
index adb3100..ccf1c0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,8 +1,3 @@
-buildscript {
-    ext {
-        compose_version = '1.1.1'
-    }
-}// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5b435b4..cf39d58 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,12 +1,73 @@
 [versions]
 androidGradlePlugin = '7.3.1'
+androidx-lifecycle-runtime-compose = '2.6.0-alpha03'
+activityCompose = '1.6.1'
+composeUi = '1.2.0'
+compose-kotlin-compiler = '1.2.0'
+espresso = '3.5.1'
+hamcrest = "1.1"
 hilt = '2.42'
+junit = '1.1.5'
+junit4 = '4.13.2'
 kotlin = '1.7.0'
+navigation = "1.0.0"
+paging = "3.1.1"
+pagingCompose = "1.0.0-alpha14"
+robolectric = "4.9.2"
+room = "2.4.3"
 
 [libraries]
+androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "kotlin" }
+kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlin" }
+
+# compose
+androidx-activitiy-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
+androidx-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidx-lifecycle-runtime-compose" }
+androidx-compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref = "composeUi" }
+androidx-compose-material = { group = "androidx.compose.material", name = "material", version.ref = "composeUi" }
+androidx-compose-animation = { group = "androidx.compose.animation", name = "animation", version.ref = "composeUi" }
+androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "composeUi" }
+hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "navigation" }
+androidx-compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "composeUi" }
+androidx-compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "composeUi" }
+
+# unit test
+junit4 = { group = "junit", name = "junit", version.ref = "junit4" }
+kotlin-coroutine-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlin" }
+hamcrest = { group = "org.hamcrest", name = "hamcrest-all", version.ref = "hamcrest" }
+
+# android test
+androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit" }
+androidx-espresso = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
+robolectric = { group = "org.robolectric", name = "robolectric", version.ref = "robolectric" }
+
+# hilt
+hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }
+hilt-compiler = { group = "com.google.dagger", name = "hilt-android-compiler", version.ref = "hilt" }
+
+# room
+room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" }
+room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" }
+room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" }
+room-paging = { group = "androidx.room", name = "room-paging", version.ref = "room"}
+
+# paging
+paging-runtime = { group = "androidx.paging", name = "paging-runtime", version.ref = "paging" }
+paging-compose = { group = "androidx.paging", name = "paging-compose", version.ref = "pagingCompose" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 android-kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-android-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
\ No newline at end of file
+android-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
+
+[bundles]
+compose = [
+    'androidx-activitiy-compose',
+    'androidx-lifecycle-runtime-compose',
+    'androidx-compose-ui-util',
+    'androidx-compose-material',
+    'androidx-compose-animation',
+    'androidx-compose-material-iconsExtended',
+    'androidx-compose-ui-tooling-preview'
+]
\ No newline at end of file

From b330547fc2fd22185bcb1bf836de061bd185f10b Mon Sep 17 00:00:00 2001
From: aurora32s <aurora32s@naver.com>
Date: Mon, 3 Apr 2023 15:39:48 +0900
Subject: [PATCH 4/4] =?UTF-8?q?[BASE]=20#3=20-=20ksp=20plugin=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle              | 1 +
 gradle/libs.versions.toml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/build.gradle b/build.gradle
index ccf1c0c..0e2d6ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,4 +3,5 @@ plugins {
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.android.kotlin) apply false
     alias(libs.plugins.android.hilt) apply false
+    alias(libs.plugins.ksp) apply false
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cf39d58..8a6e31d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,6 +9,7 @@ hamcrest = "1.1"
 hilt = '2.42'
 junit = '1.1.5'
 junit4 = '4.13.2'
+ksp = "1.6.10-1.0.2"
 kotlin = '1.7.0'
 navigation = "1.0.0"
 paging = "3.1.1"
@@ -60,6 +61,7 @@ android-application = { id = "com.android.application", version.ref = "androidGr
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 android-kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 android-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
+ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 
 [bundles]
 compose = [