Feat/week06 compose

app/build.gradle

@@ -1,8 +1,12 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0'
 }
 
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
 android {
     namespace 'com.sopt.now.compose'
     compileSdk 34
@@ -13,6 +17,7 @@ android {
         targetSdk 34
         versionCode 1
         versionName "1.0"
+        buildConfigField "String", "AUTH_BASE_URL", properties["base.url"]
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -35,6 +40,8 @@ android {
     }
     buildFeatures {
         compose true
+        viewBinding true
+        buildConfig true
     }
     composeOptions {
         kotlinCompilerExtensionVersion '1.5.1'
@@ -47,20 +54,39 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.13.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
-    implementation 'androidx.activity:activity-compose:1.8.2'
-    implementation platform('androidx.compose:compose-bom:2024.03.00')
+    implementation 'androidx.activity:activity-compose:1.9.0'
+    implementation platform('androidx.compose:compose-bom:2024.04.01')
     implementation 'androidx.compose.ui:ui'
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'androidx.compose.material3:material3'
     implementation 'androidx.navigation:navigation-compose:2.7.7'
+    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation platform('androidx.compose:compose-bom:2024.03.00')
+    androidTestImplementation platform('androidx.compose:compose-bom:2024.04.01')
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
+    implementation "androidx.navigation:navigation-compose:2.7.7"
+
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1'
+    implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0'
+
+// define a BOM and its version
+    implementation(platform("com.squareup.okhttp3:okhttp-bom:4.10.0"))
+
+// define any required OkHttp artifacts without version
+    implementation("com.squareup.okhttp3:okhttp")
+    implementation("com.squareup.okhttp3:logging-interceptor")
+
 }

app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -11,29 +13,21 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.NOWSOPTAndroid"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true"
-            android:theme="@style/Theme.NOWSOPTAndroid">
-        </activity>
+
 
         <activity
-            android:name=".LoginActivity"
+            android:name=".MainActivity"
             android:exported="true"
             android:theme="@style/Theme.NOWSOPTAndroid">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".SignupActivity"
-            android:exported="true"
-            android:theme="@style/Theme.NOWSOPTAndroid"/>
-
-
     </application>
 
 </manifest>

app/src/main/java/com/sopt/now/compose/ApiFactory.kt

@@ -0,0 +1,23 @@
+package com.sopt.now.compose
+
+import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import kotlinx.serialization.json.Json
+import okhttp3.MediaType.Companion.toMediaType
+import retrofit2.Retrofit
+
+object ApiFactory {
+    private const val BASE_URL: String = BuildConfig.AUTH_BASE_URL
+
+    val retrofit: Retrofit by lazy {
+        Retrofit.Builder()
+            .baseUrl(BASE_URL)
+            .addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
+            .build()
+    }
+
+    inline fun <reified T> create(): T = retrofit.create(T::class.java)
+}
+
+object ServicePool {
+    val authService = ApiFactory.create<AuthService>()
+}

app/src/main/java/com/sopt/now/compose/AuthService.kt

@@ -0,0 +1,34 @@
+package com.sopt.now.compose
+
+import com.sopt.now.compose.data.RequestLogInDto
+import com.sopt.now.compose.data.RequestPasswordDto
+import com.sopt.now.compose.data.RequestSignUpDto
+import com.sopt.now.compose.data.ResponseDto
+import com.sopt.now.compose.data.ResponseInfoDto
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+
+interface AuthService {
+    @POST("member/join")
+    fun signUp(
+        @Body request: RequestSignUpDto,
+    ): Call<ResponseDto>
+
+    @POST("member/login")
+    fun logIn(
+        @Body request: RequestLogInDto,
+    ): Call<ResponseDto>
+
+    @GET("member/info")
+    fun info(@Header("memberId") memberId: Int): Call<ResponseInfoDto>
+
+    @PATCH("member/password")
+    fun changePassword(
+        @Header("memberId") memberId: Int,
+        @Body request: RequestPasswordDto
+    ): Call<ResponseDto>
+}

app/src/main/java/com/sopt/now/compose/BottomBar.kt

@@ -0,0 +1,85 @@
+package com.sopt.now.compose
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.NavigationBarItem
+import androidx.compose.material3.NavigationBarItemDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.currentBackStackEntryAsState
+
+
+@Composable
+fun BottomBar(
+    navController: NavHostController,
+    modifier: Modifier = Modifier,
+    isLoggedIn: Boolean
+) {
+
+    val screens = listOf(
+        BottomNavItem.Home, BottomNavItem.Search, BottomNavItem.MyPage
+    )
+
+    if (isLoggedIn) {
+        val navBackStackEntry by navController.currentBackStackEntryAsState()
+        val currentRoute = navBackStackEntry?.destination?.route
+        NavigationBar(
+            modifier = modifier,
+            containerColor = Color.LightGray,
+        ) {
+            screens.forEach { screen ->
+
+                NavigationBarItem(
+                    label = {
+                        Text(text = screen.title!!)
+                    },
+                    icon = {
+                        Icon(imageVector = screen.icon!!, contentDescription = "")
+                    },
+                    selected = currentRoute == screen.route,
+                    onClick = {
+                        navController.navigate(screen.route)
+                    },
+                    colors = NavigationBarItemDefaults.colors(
+                        unselectedTextColor = Color.Gray, selectedTextColor = Color.White
+                    ),
+                )
+            }
+        }
+    }
+
+}
+
+sealed class BottomNavItem(
+    val route: String,
+    val title: String? = null,
+    val icon: ImageVector? = null
+) {
+    data object Home : BottomNavItem(
+        route = Routes.Home.route,
+        title = "Home",
+        icon = Icons.Default.Home
+    )
+
+    data object Search : BottomNavItem(
+        route = Routes.Search.route,
+        title = "Search",
+        icon = Icons.Default.Search
+    )
+
+    data object MyPage : BottomNavItem(
+        route = Routes.MyPage.route,
+        title = "MyPage",
+        icon = Icons.Default.Person
+    )
+
+}

app/src/main/java/com/sopt/now/compose/Friend.kt

@@ -0,0 +1,8 @@
+package com.sopt.now.compose
+
+data class Friend(
+    val profileImageRes: Int,
+    val name: String,
+    val description: String
+
+)