TOP-103 채팅 소켓 연결 및 기본 디자인 수정 (#132)

* TOP-103 채팅 리스트 조회 및 상세 이전 데이터 조회

* TOP-103 채팅 디자인 수정

* feat:TOP-103 채팅 라이브러리 도입

* feat:TOP-103 채팅 연동

* feat:TOP-103 내 채팅, 상대방 채팅 코드 개선

* feat:TOP-103 스크롤 하단으로 움직이게 만들기

* feat:TOP-103 채팅 디자인 수정

* feat:TOP-103 상세 채팅 화면 바텀 네비게이션 안보이도록 수정

* feat:TOP-103 ON_START에서 채팅 리스트에서 바텀시트 보이도록 수정

* feat:TOP-103 채팅 텍스트 있을시 색상 변경

* feat:TOP-103 imepadding 추가

Author: taewooyo

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -17,13 +17,14 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_falling_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.THT">
+        android:theme="@style/Theme.THT"
+        android:usesCleartextTraffic="true">
         <activity
             android:name=".SplashActivity"
-            android:screenOrientation="portrait"
             android:exported="true"
-            tools:ignore="LockedOrientationActivity"
-            android:theme="@style/Theme.App.Starting">
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.App.Starting"
+            tools:ignore="LockedOrientationActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -33,9 +34,10 @@
             </intent-filter>
         </activity>
         <activity
-            android:screenOrientation="portrait"
             android:name=".HomeActivity"
             android:exported="false"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustResize"
             tools:ignore="LockedOrientationActivity" />
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"

app/src/main/java/com/tht/tht/AppModule.kt

@@ -1,11 +1,13 @@
 package com.tht.tht
 
 import android.app.Application
+import com.tht.tht.navigation.BottomNavigationProviderImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import tht.core.navigation.BottomNavigationProvider
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -14,4 +16,7 @@ object AppModule {
     @ApplicationContext
     @Provides
     fun provideApplicationContext(application: Application) = application
+
+    @Provides
+    fun provideApplication(): BottomNavigationProvider = BottomNavigationProviderImpl()
 }

app/src/main/java/com/tht/tht/HomeActivity.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.View
 import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Lifecycle
@@ -53,18 +54,22 @@ class HomeActivity : BaseActivity<HomeViewModel, ActivityHomeBinding>(), Fragmen
                     )
                     true
                 }
+
                 R.id.menu_heart -> {
                     showFragment(LikeFragment.TAG)
                     true
                 }
+
                 R.id.menu_chat -> {
                     showFragment(ChatFragment.TAG)
                     true
                 }
+
                 R.id.menu_my -> {
                     showFragment(MyPageFragment.TAG)
                     true
                 }
+
                 else -> false
             }
         }
@@ -101,6 +106,15 @@ class HomeActivity : BaseActivity<HomeViewModel, ActivityHomeBinding>(), Fragmen
         }
     }
 
+    fun showBottomNav() {
+        binding.bnvHome.visibility = View.VISIBLE
+    }
+
+    fun hideBottomNav() {
+        binding.bnvHome.visibility = View.GONE
+    }
+
+
     override fun addFragmentBackStack(tag: String, bundle: Bundle?) {
         binding.root.hideSoftInput()
         with(supportFragmentManager) {

app/src/main/java/com/tht/tht/navigation/BottomNavigationProviderImpl.kt

@@ -0,0 +1,15 @@
+package com.tht.tht.navigation
+
+import android.content.Context
+import com.tht.tht.HomeActivity
+import tht.core.navigation.BottomNavigationProvider
+
+class BottomNavigationProviderImpl : BottomNavigationProvider {
+    override fun show(context: Context) {
+        (context as HomeActivity).showBottomNav()
+    }
+
+    override fun hide(context: Context) {
+        (context as HomeActivity).hideBottomNav()
+    }
+}

app/src/main/res/xml/network_security_config.xml

@@ -2,5 +2,6 @@
 <network-security-config>
     <domain-config cleartextTrafficPermitted="true">
         <domain includeSubdomains="true">tht-talk.co.kr</domain>
+        <domain includeSubdomains="true">3.34.157.62</domain>
     </domain-config>
 </network-security-config>

build.gradle.kts

@@ -43,6 +43,7 @@ subprojects {
     // run use ./gradlew assembleRelease -PcomposeCompilerReports=true  --rerun-tasks
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach  {
         kotlinOptions {
+            jvmTarget = "17"
             if (project.findProperty("composeCompilerReports") == "true") {
                 val metricsOutputDir = "${rootProject.file(".").absolutePath}/compose-report/compose-metrics"
                 val reportOutputDir = "${rootProject.file(".").absolutePath}/compose-report/compose-reports"
@@ -56,3 +57,10 @@ subprojects {
         }
     }
 }
+
+//configurations.all {
+//    resolutionStrategy {
+//        force("org.jetbrains.kotlin:kotlin-stdlib:1.9.0")
+//        force ("org.jetbrains.kotlin:kotlin-reflect:1.9.0")
+//    }
+//}

core/compose-ui/src/main/java/com/example/compose_ui/component/image/ThtImage.kt

@@ -2,11 +2,14 @@ package com.example.compose_ui.component.image
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.DpSize
+import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImagePainter
 import coil.compose.rememberAsyncImagePainter
 import coil.request.ImageRequest
@@ -32,7 +35,9 @@ fun ThtImage(
 
         else -> {
             Image(
-                modifier = modifier.size(size),
+                modifier = modifier
+                    .size(size)
+                    .clip(RoundedCornerShape(12.dp)),
                 painter = painter,
                 contentDescription = null,
                 contentScale = ContentScale.Crop,

core/compose-ui/src/main/java/com/example/compose_ui/component/text/headline/Headline.kt

@@ -8,6 +8,7 @@ import androidx.compose.ui.graphics.Shadow
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.TextUnit
 import com.example.compose_ui.component.font.rememberPretendardFontStyle
 import com.example.compose_ui.extensions.dpTextUnit
@@ -104,7 +105,9 @@ fun ThtHeadline4(
     fontWeight: FontWeight,
     color: Color,
     textAlign: TextAlign = TextAlign.Center,
-    shadow: Shadow? = null
+    shadow: Shadow? = null,
+    maxLines: Int = 1,
+    overflow: TextOverflow = TextOverflow.Ellipsis
 ) {
     Text(
         modifier = modifier,
@@ -116,6 +119,8 @@ fun ThtHeadline4(
             shadow = shadow
         ),
         color = color,
+        overflow = overflow,
+        maxLines = maxLines,
     )
 }
 

core/navigation/src/main/java/tht/core/navigation/NavigationProvider.kt

@@ -0,0 +1,8 @@
+package tht.core.navigation
+
+import android.content.Context
+
+interface BottomNavigationProvider {
+    fun show(context: Context)
+    fun hide(context: Context)
+}

data/src/main/java/com/tht/tht/data/constant/THTApiConstant.kt

@@ -49,6 +49,10 @@ object THTApiConstant {
 
     object Chat {
         const val CHAT_LIST = "/chat/rooms"
+
+        const val CHAT_DETAIL_INFORMATION = "/chat/room/{chat-room-idx}"
+
+        const val CHAT_DETAIL_HISTORY = "/chat/history"
     }
 
     object Setting {