Merge pull request #10 from NOW-SOPT-ANDROID/feat/week_xml4

week4: 4차 필수과제 진행(xml)
NOW-SOPT-ANDROID · May 24, 2024 · a685e71 · a685e71
2 parents 074747a + dc30072
commit a685e71
Show file tree

Hide file tree

Showing 52 changed files with 911 additions and 503 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,8 +1,12 @@
 plugins {
     id 'com.android.application'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.0'
     id 'org.jetbrains.kotlin.android'
 }
 
+Properties properties = new Properties()
+properties.load(project.rootProject.file('local.properties').newDataInputStream())
+
 android {
     namespace 'com.sopt.now'
     compileSdk 34
@@ -15,6 +19,9 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        buildConfigField "String", "AUTH_BASE_URL", properties["base.url"]
+        buildConfigField "String", "FRIEND_BASE_URL", properties["friend.base.url"]
     }
 
     buildTypes {
@@ -33,6 +40,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 }
 
@@ -48,9 +56,25 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-//    ViewModel 의존성 설정
+    //    ViewModel 의존성 설정
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
 
     implementation "androidx.fragment:fragment-ktx:1.6.1"
     implementation "androidx.activity:activity-ktx:1.8.0"
+
+    // Network
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.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")
+
+    // Glide 라이브러리 추가
+    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <!--    Retrofit2 라이브러리 추가-->
+    <uses-permission android:name="android.permission.INTERNET" />
+
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -11,20 +15,21 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.NOWSOPTAndroid"
+        android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".activity.SignInActivity"
+            android:name=".signIn.SignInActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.SignUpActivity"
+            android:name=".signUp.SignUpActivity"
             android:exported="false"/>
         <activity
-            android:name=".activity.MainActivity"
+            android:name=".main.MainActivity"
             android:exported="false"/>
     </application>
 

diff --git a/app/src/main/java/com/sopt/now/activity/SignInActivity.kt b/app/src/main/java/com/sopt/now/activity/SignInActivity.kt
diff --git a/app/src/main/java/com/sopt/now/activity/SignUpActivity.kt b/app/src/main/java/com/sopt/now/activity/SignUpActivity.kt
diff --git a/app/src/main/java/com/sopt/now/homeFragment/HomeFragment.kt b/app/src/main/java/com/sopt/now/homeFragment/HomeFragment.kt
diff --git a/app/src/main/java/com/sopt/now/homeFragment/HomeProfileAdapter.kt b/app/src/main/java/com/sopt/now/homeFragment/HomeProfileAdapter.kt