Merge pull request #155 from eoeo0326/feat/search_compose

검색 화면 Compose 전환

app/build.gradle

@@ -7,15 +7,12 @@ plugins {
     id 'com.google.gms.google-services'
     id 'kotlin-parcelize'
 }
-
 def localPropertiesFile = project.rootProject.file('local.properties')
 def localProperties = new Properties()
 localProperties.load(new FileInputStream(localPropertiesFile))
-
 android {
     namespace 'com.boostcamp.dailyfilm'
     compileSdk 33
-
     defaultConfig {
         applicationId "com.boostcamp.dailyfilm"
         minSdk 24
@@ -26,7 +23,6 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs "ko-rKR", "ko"
     }
-
     buildTypes {
         release {
             minifyEnabled false
@@ -53,13 +49,13 @@ android {
 }
 
 dependencies {
-
     def nav_version = "2.5.3"
     def hilt_version = "2.44"
     def room_version = "2.4.3"
     def lifecycle_version = "2.6.0-alpha03"
     def pagingComposeVersion = "1.0.0-alpha19"
     def pagingVersion = "3.1.1"
+    def pagingComposeVersion = "1.0.0-alpha19"
     def glide_version = "4.14.2"
     def glide_compose_version = "1.0.0-alpha.1"
 
@@ -77,40 +73,33 @@ dependencies {
     implementation 'androidx.activity:activity-compose:1.7.1'
     // Optional - Integration with ViewModels
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
-    implementation "androidx.lifecycle:lifecycle-runtime-compose:2.6.1"
     // Optional - Integration with LiveData
     implementation 'androidx.compose.runtime:runtime-livedata'
+    // collectAsStateWithLifecycle()
+    implementation "androidx.lifecycle:lifecycle-runtime-compose:2.6.1"
 
     // Navigation
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
-
     // Hilt
     implementation "com.google.dagger:hilt-android:$hilt_version"
     kapt "com.google.dagger:hilt-compiler:$hilt_version"
-
     // Room
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
-
     // ViewModel
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-
     // Firebase
     implementation platform('com.google.firebase:firebase-bom:31.0.3')
     implementation 'com.google.firebase:firebase-analytics-ktx'
-
     // Firebase Storage
     implementation 'com.google.firebase:firebase-storage-ktx'
-
     // Firebase Realtime Database
     implementation 'com.google.firebase:firebase-database-ktx'
-
     // Firebase Google Auth
     implementation 'com.google.firebase:firebase-auth:21.1.0'
     implementation 'com.google.android.gms:play-services-auth:20.3.0'
-
     // Glide
     implementation "com.github.bumptech.glide:glide:$glide_version"
     annotationProcessor "com.github.bumptech.glide:compiler:$glide_version"
@@ -122,25 +111,18 @@ dependencies {
 
     // Exoplayer
     implementation 'com.google.android.exoplayer:exoplayer:2.18.1'
-
     // Coordinator-layout
     implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
-
     // ffmpeg
     implementation 'com.github.TTC1018:android-video-trimmer:0.1.5-async'
     implementation 'com.arthenica:mobile-ffmpeg-min-gpl:4.4'
-
     // lottie
     implementation 'com.airbnb.android:lottie:5.0.2'
-
-
     // dataStore
     implementation("androidx.datastore:datastore-preferences:1.0.0")
     implementation("androidx.datastore:datastore-core:1.0.0")
-
     // keyboard
     implementation 'com.github.yshrsmz:KeyboardVisibilityEvent:v3.0.0-RC3'
-
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'com.google.android.material:material:1.7.0'
@@ -153,33 +135,4 @@ dependencies {
     debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_ui_version"
     androidTestImplementation 'androidx.test.ext:junit:1.1.4'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
-
-
-
-
-    /*// compose
-    def composeBom = platform('androidx.compose:compose-bom:2022.10.00')
-    implementation(composeBom)
-    androidTestImplementation(composeBom)
-
-    implementation "androidx.compose.runtime:runtime"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
-    implementation "androidx.lifecycle:lifecycle-runtime-compose:2.6.1"
-    implementation 'androidx.activity:activity-compose:1.3.1'
-    implementation "androidx.compose.ui:ui:$compose_ui_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
-    implementation "androidx.compose.foundation:foundation"
-    implementation "androidx.compose.foundation:foundation-layout"
-    implementation "androidx.compose.material:material"
-    implementation "androidx.compose.runtime:runtime-livedata"
-    implementation "com.google.accompanist:accompanist-themeadapter-material:0.28.0"
-
-    constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
-            because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
-        }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
-            because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
-        }
-    }*/
 }

app/src/main/AndroidManifest.xml

@@ -6,10 +6,10 @@
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-
     <uses-permission
         android:name="com.google.android.gms.permission.AD_ID"
         tools:node="remove" />
+
     <uses-feature
         android:name="android.hardware.camera"
         android:required="false" />
@@ -26,6 +26,10 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.DailyFilm"
         tools:targetApi="31">
+        <activity
+            android:name=".presentation.searchfilm.SearchFilmComposeActivity"
+            android:exported="false"
+            android:theme="@style/Theme.DailyFilm" />
         <activity
             android:name=".presentation.searchfilm.SearchFilmActivity"
             android:exported="false" />

app/src/main/java/com/boostcamp/dailyfilm/presentation/calendar/CalendarActivity.kt

@@ -25,6 +25,7 @@ import com.boostcamp.dailyfilm.presentation.calendar.model.DateState
 import com.boostcamp.dailyfilm.presentation.login.LoginActivity
 import com.boostcamp.dailyfilm.presentation.playfilm.model.EditState
 import com.boostcamp.dailyfilm.presentation.searchfilm.SearchFilmActivity
+import com.boostcamp.dailyfilm.presentation.searchfilm.SearchFilmComposeActivity
 import com.boostcamp.dailyfilm.presentation.selectvideo.SelectVideoActivity
 import com.boostcamp.dailyfilm.presentation.settings.compose.SettingComposeActivity
 import com.boostcamp.dailyfilm.presentation.totalfilm.TotalFilmActivity
@@ -161,7 +162,7 @@ class CalendarActivity : BaseActivity<ActivityCalendarBinding>(R.layout.activity
                         true
                     }
                     R.id.item_search -> {
-                        startActivity(Intent(this@CalendarActivity, SearchFilmActivity::class.java))
+                        startActivity(Intent(this@CalendarActivity, SearchFilmComposeActivity::class.java))
                         true
                     }
                     else -> false