[teo/#43] 8주차 구현

app/build.gradle.kts

@@ -1,10 +1,13 @@
+// app 모듈의 build.gradle.kts 파일
 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.jetbrains.kotlin.android)
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("kotlin-kapt")
     id("com.google.devtools.ksp")
     id("dagger.hilt.android.plugin")
     id("androidx.navigation.safeargs.kotlin")
-    id("org.jetbrains.kotlin.kapt")
+    id("kotlin-android")
+    id("kotlin-parcelize")
 }
 
 android {
@@ -17,7 +20,6 @@ android {
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
             useSupportLibrary = true
@@ -33,19 +35,24 @@ android {
             )
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
     buildFeatures {
         compose = true
     }
+
     composeOptions {
         kotlinCompilerExtensionVersion = "1.5.1"
     }
+
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -61,8 +68,9 @@ dependencies {
     implementation(libs.androidx.ui)
     implementation(libs.androidx.ui.graphics)
     implementation(libs.androidx.ui.tooling.preview)
-    implementation(libs.androidx.material3) // 이미 추가됨
-    implementation("androidx.compose.material3:material3:1.0.0") // 추가된 부분
+    implementation(libs.androidx.material3)
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.runtime.livedata)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -76,12 +84,7 @@ dependencies {
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.constraintlayout.compose)
     implementation(libs.androidx.lifecycle.livedata.ktx)
-    implementation(libs.androidx.lifecycle.viewmodel.ktx) // 추가된 부분
-    implementation(libs.androidx.navigation.fragment.ktx)
-    implementation(libs.androidx.navigation.ui.ktx)
-
-    // Paging 라이브러리 추가
-    implementation("androidx.paging:paging-runtime:3.1.1")
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
 
     // Hilt Dependency Injection
     implementation("com.google.dagger:hilt-android:2.49")
@@ -99,10 +102,7 @@ dependencies {
     implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.2")
     implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2")
 
-    // Lifecycle
-    implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
-
-    // ViewModel
+    // ViewModel and Lifecycle
     implementation("androidx.activity:activity-ktx:1.9.0")
     implementation("androidx.fragment:fragment-ktx:1.6.2")
 
@@ -117,13 +117,35 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3")
 
-    // Safe Args
+    // Safe args
     implementation("androidx.navigation:navigation-fragment-ktx:2.7.3")
     implementation("androidx.navigation:navigation-ui-ktx:2.7.3")
 
     // ROOM Database
     implementation("androidx.room:room-runtime:2.6.1")
-    annotationProcessor("androidx.room:room-compiler:2.6.1")
     kapt("androidx.room:room-compiler:2.6.1")
     implementation("androidx.room:room-ktx:2.6.1")
-}
+
+    // Navigation Compose
+    implementation("androidx.navigation:navigation-compose:2.8.1")
+
+    // Parcelize
+    implementation("androidx.core:core-ktx:1.13.1")
+
+    // ViewPager implementation
+    implementation("com.google.accompanist:accompanist-pager:0.30.0")
+    implementation("com.google.accompanist:accompanist-pager-indicators:0.30.0")
+
+    implementation("com.google.accompanist:accompanist-pager:<latest_version>")
+    implementation("com.google.accompanist:accompanist-pager-indicators:<latest_version>")
+
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
+
+}
+
+
+
+
+

app/src/androidTest/java/umc/study/umc_7th/ExampleInstrumentedTest.kt → app/src/androidTest/java/com/example/umc_7th/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package umc.study.umc_7th
+package com.example.umc_7th
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
     fun useAppContext() {
         // Context of the app under test.
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("umc.study.umc_7th", appContext.packageName)
+        assertEquals("com.example.umc_7th", appContext.packageName)
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">\
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.INTERNET"/>
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
@@ -16,7 +13,7 @@
         android:theme="@style/Theme.Umc_7th"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".home.MainActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.Umc_7th">

app/src/main/java/com/example/umc_7th/album1/AlbumFragment.kt

@@ -0,0 +1,91 @@
+package com.example.umc_7th.album1
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.navigation.NavController
+import java.time.LocalDate
+
+// AlbumData 데이터 클래스 정의
+data class AlbumData(
+    val albumTitle: String,
+    val date: LocalDate,
+    val author: String,
+    val albumImage: Int,
+    val trackList: List<String>,
+    val titleTrackList: List<String>
+)
+
+@Composable
+fun AlbumInfo() {
+    Text(text = "앨범 정보")
+}
+
+@Composable
+fun AlbumVideo() {
+    Text(text = "앨범 영상")
+}
+
+@SuppressLint("NewApi")
+@Composable
+fun albumFragment(
+    navController: NavController,
+    albumTitle: String,
+    albumImage: Int,
+    author: String,
+    date: LocalDate,
+    trackList: List<String>,
+    titleTrackList: List<String>
+) {
+    // AlbumData 객체 생성
+    val album = AlbumData(
+        albumTitle = albumTitle,
+        date = date,
+        author = author,
+        albumImage = albumImage,
+        trackList = trackList,
+        titleTrackList = titleTrackList
+    )
+
+    Column {
+        // AlbumFragmentTop 호출
+        AlbumFragmentTop(
+            album = album,
+            albumFgtoMain = { navController.navigate("homeFragment") },
+            likeButtonClick = { /* TODO: 좋아요 버튼 기능 추가 */ },
+            playerMoreButtonClick = { /* TODO: 더보기 버튼 기능 추가 */ }
+        )
+
+        // TabLayout 호출
+        TabLayout(album = album)
+    }
+}
+
+// AlbumFragmentTop 함수 정의
+@Composable
+fun AlbumFragmentTop(
+    album: AlbumData,
+    albumFgtoMain: () -> Unit,
+    likeButtonClick: () -> Unit,
+    playerMoreButtonClick: () -> Unit
+) {
+    Column {
+        Text(text = "Album Title: ${album.albumTitle}")
+        Text(text = "Author: ${album.author}")
+        Text(text = "Date: ${album.date}")
+        // 버튼 클릭 이벤트 추가
+    }
+}
+
+// TabLayout 함수 정의
+@Composable
+fun TabLayout(album: AlbumData) {
+    Column {
+        Text(text = "TabLayout for ${album.albumTitle}")
+        // Tab 항목 구성
+    }
+}
+
+
+