Merge branch 'develop' of https://github.com/TeamHous/Hous-Android in…

…to feature/#74-create-setting-view

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/drawable/shape_red_stroke_15_rect.xml
#	app/src/main/res/drawable/shape_yellow_fill_8_rect.xml
#	app/src/main/res/drawable/test_img.xml

.github/workflows/android.yml

@@ -42,6 +42,11 @@ jobs:
           DUMMY_ACCESS_TOKEN: ${{ secrets.DUMMY_ACCESS_TOKEN }}
       run: echo "DUMMY_ACCESS_TOKEN=\"$DUMMY_ACCESS_TOKEN\"" >> local.properties
 
+    - name: Access DUMMY_ROOM_ID
+      env:
+          ROOM_ID: ${{ secrets.ROOM_ID }}
+      run: echo "ROOM_ID=\"$ROOM_ID\"" >> local.properties
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 

app/build.gradle

@@ -38,6 +38,7 @@ android {
         versionName "1.0"
         buildConfigField "String", "HOUS_URL", properties["HOUS_URL"]
         buildConfigField "String", "DUMMY_ACCESS_TOKEN", properties["DUMMY_ACCESS_TOKEN"]
+        buildConfigField "String", "ROOM_ID", properties["ROOM_ID"]
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -57,9 +58,14 @@ android {
 }
 
 dependencies {
+    // lottie
+    implementation 'com.airbnb.android:lottie:5.2.0'
+
+    // intercepter
+    implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0'
+
     // Coil
     implementation "io.coil-kt:coil:2.1.0"
-
     // compose
     implementation 'androidx.activity:activity-compose:1.5.0'
     implementation 'androidx.compose.material:material:1.1.1'
@@ -69,7 +75,6 @@ dependencies {
     androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.1.1'
     implementation "com.google.android.material:compose-theme-adapter:1.1.14"
     implementation "com.google.accompanist:accompanist-appcompat-theme:0.16.0"
-
     // gson
     implementation "com.google.code.gson:gson:2.9.0"
 
@@ -105,4 +110,6 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    // recycler View
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
 }

app/debug/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.hous.hous_aos",
+  "variantName": "debug",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-debug.apk"
+    }
+  ],
+  "elementType": "File"
+}

app/release/output-metadata.json

@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.hous.hous_aos",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}

app/src/main/AndroidManifest.xml

@@ -10,39 +10,43 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_icon"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/ic_icon"
         android:supportsRtl="true"
         android:theme="@style/Theme.HousAos"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".ui.profile.SettingActivity"
-            android:exported="true" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:name=".ui.splash.IntroActivity"
+            android:screenOrientation="portrait"
+        <activity
+            android:name=".ui.home.RoommateCardActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
         <activity
             android:name=".ui.newrules.NewRuleActivity"
+            android:screenOrientation="portrait"
             android:exported="false" />
         <activity
             android:name=".ui.profile.TendencyTestActivity"
+            android:screenOrientation="portrait"
             android:exported="false" />
         <activity
             android:name=".ui.profile.TestInfoActivity"
+            android:screenOrientation="portrait"
             android:exported="false" />
         <activity
             android:name=".ui.profile.TendencyResultActivity"
+            android:screenOrientation="portrait"
             android:exported="false" />
         <activity
             android:name=".ui.main.MainActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
             android:exported="true">
 
         </activity>
     </application>
 
-</manifest>
+</manifest>