[MERGE] #82 - 난독화 missing rule 추가

[FIX] #82 - 난독화 missing rule 추가
SW-Marastro · Aug 21, 2024 · c85a48c · c85a48c
2 parents 6cf9792 + 6678553
commit c85a48c
Show file tree

Hide file tree

Showing 12 changed files with 100 additions and 26 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         minSdk min_sdk_version
         targetSdk target_sdk_version
 
-        versionCode 1
-        versionName "1.0"
+        versionCode 6
+        versionName "1.1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -24,8 +24,7 @@
 
     <application
         android:name=".MyKkumiApplication"
-        android:usesCleartextTraffic="false"
-        android:networkSecurityConfig="@xml/network_security_config"
+        android:usesCleartextTraffic="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ buildscript {
         espresso_core_version = "3.5.1"
 
         // Dependency Injection
-        hilt_version = "2.46.1"
+        hilt_version = "2.51.1"
 
         // Network
         retrofit_version = "2.9.0"

diff --git a/core/common-ui/proguard-rules.pro b/core/common-ui/proguard-rules.pro
@@ -18,4 +18,11 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemSkeletonPostListBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.report.PostReportConfirmDialog
+-dontwarn com.swmarastro.mykkumi.common_ui.server_driven.SpannableStringBuilderProvider$Companion
+-dontwarn com.swmarastro.mykkumi.common_ui.server_driven.SpannableStringBuilderProvider
+-dontwarn com.swmarastro.mykkumi.common_ui.permission.ImagePermissionUtils
+-dontwarn java.lang.invoke.StringConcatFactory
diff --git a/feature/auth/proguard-rules.pro b/feature/auth/proguard-rules.pro
@@ -18,4 +18,42 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# 공통 모듈의 클래스 유지
+-keep class com.swmarastro.mykkumi.common.** { *; }
+
+# 기타 ProGuard 설정
+-keep class !a.a, * { *; }
+-dontwarn a.a
+
+-dontwarn com.swmarastro.mykkumi.common_ui.permission.ImagePermissionUtils
+-dontwarn java.lang.invoke.StringConcatFactory
+-dontwarn com.swmarastro.mykkumi.common_ui.custom.CustomScrollView
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemSkeletonPostListBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.permission.ImagePermissionUtils
+-dontwarn com.swmarastro.mykkumi.data.datasource.HobbyCategoryDataSource
+-dontwarn com.swmarastro.mykkumi.data.datasource.KakaoLoginDataSource
+-dontwarn com.swmarastro.mykkumi.data.datasource.PreSignedUrlDataSource
+-dontwarn com.swmarastro.mykkumi.data.datasource.PutImageS3DataSource
+-dontwarn com.swmarastro.mykkumi.data.datasource.ReAccessTokenDataSource
+-dontwarn com.swmarastro.mykkumi.data.datasource.UserInfoDataSource
+-dontwarn com.swmarastro.mykkumi.data.di.DataStoreModule_ProvideAuthTokenDataStoreFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_PreSignedUrlDataSourceFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideHobbyCategoryDataSourceFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideKakaoInitializerFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideKakaoLoginDataSourceFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideReAccessTokenDataSourceFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideS3OkHttpClientFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideS3RetrofitFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideTokenInterceptorFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_ProvideUserInfoDataSourceFactory
+-dontwarn com.swmarastro.mykkumi.data.di.NetworkModule_PutImageS3DataSourceFactory
+-dontwarn com.swmarastro.mykkumi.data.interceptor.TokenAuthenticator
+-dontwarn com.swmarastro.mykkumi.data.interceptor.TokenInterceptor
+-dontwarn com.swmarastro.mykkumi.data.repository.HobbyCategoryRepositoryImpl
+-dontwarn com.swmarastro.mykkumi.data.repository.KakaoLoginRepositoryImpl
+-dontwarn com.swmarastro.mykkumi.data.repository.PreSignedUrlRepositoryImpl
+-dontwarn com.swmarastro.mykkumi.data.repository.ReAccessTokenRepositoryImpl
+-dontwarn com.swmarastro.mykkumi.data.repository.UserInfoRepositoryImpl
+-dontwarn com.swmarastro.mykkumi.data.util.KakaoInitializer
diff --git a/feature/auth/src/main/java/com/swmarastro/mykkumi/feature/auth/LoginComposeActivity.kt b/feature/auth/src/main/java/com/swmarastro/mykkumi/feature/auth/LoginComposeActivity.kt
@@ -67,7 +67,7 @@ import kotlinx.coroutines.launch
 @AndroidEntryPoint
 class LoginComposeActivity : ComponentActivity() {
 
-    private val viewModel by viewModels<LoginViewModel>()
+    private val viewModel: LoginViewModel by viewModels()
 
     @ExperimentalPermissionsApi
     override fun onCreate(savedInstanceState: Bundle?) {

diff --git a/...auth/src/main/java/com/swmarastro/mykkumi/feature/auth/onBoarding/LoginInputUserScreen.kt b/...auth/src/main/java/com/swmarastro/mykkumi/feature/auth/onBoarding/LoginInputUserScreen.kt
@@ -152,10 +152,11 @@ fun LoginInputUserScreen(
     }
 
     Scaffold(
-        scaffoldState = scaffoldState
-    ) {
+        scaffoldState = scaffoldState,
+    ) { paddingValues ->
         Column(
             modifier = Modifier
+                .padding(paddingValues)
                 .fillMaxSize()
                 .background(Color.White),
         ) {
@@ -275,7 +276,7 @@ fun LoginInputUserScreen(
                     )
                 }
             }
-    
+
             Spacer(
                 modifier = Modifier.height(40.dp)
             )
@@ -366,7 +367,7 @@ fun LoginInputUserScreen(
                     )
                 }
             }
-    
+
             Spacer(
                 modifier = Modifier.height(12.dp),
             )

diff --git a/feature/home/proguard-rules.pro b/feature/home/proguard-rules.pro
@@ -32,4 +32,8 @@
 -dontwarn com.swmarastro.mykkumi.common_ui.base.BaseFragment
 -dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemListLoadingBinding
 -dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemPostWriterBinding
--dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
+-dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
+-dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemSkeletonPostListBinding
+-dontwarn com.swmarastro.mykkumi.common_ui.report.PostReportConfirmDialog
+-dontwarn com.swmarastro.mykkumi.common_ui.server_driven.SpannableStringBuilderProvider$Companion
+-dontwarn com.swmarastro.mykkumi.common_ui.server_driven.SpannableStringBuilderProvider
diff --git a/feature/home/src/main/java/com/swmarastro/mykkumi/feature/home/HomeFragment.kt b/feature/home/src/main/java/com/swmarastro/mykkumi/feature/home/HomeFragment.kt
@@ -80,6 +80,8 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home) {
                     if (count == 0) count = viewModel.postLimit.value ?: rangeEnd
                     postListAdapter.notifyItemRangeInserted(rangeEnd - count, rangeEnd)
                 }
+
+                binding.emptyPostList.visibility = View.GONE
             }
             else if(viewModel.bannerListUiState.value.isNullOrEmpty()) {
                 binding.includeListLoading.visibility = View.GONE
@@ -223,13 +225,19 @@ class HomeFragment : BaseFragment<FragmentHomeBinding>(R.layout.fragment_home) {
 
     // 포스트 신고 확인 Dialog
     private fun postReportConfirm(postId: Int) {
-        val dialog = PostReportConfirmDialog(this)
-        dialog.setOnClickListener { postId ->
-            Toast.makeText(context, getString(com.swmarastro.mykkumi.common_ui.R.string.post_report_confirm_clear_toast), Toast.LENGTH_SHORT).show()
-            Log.d("test", "신고 포스트: ${postId}")
-        }
+        val intent = viewModel.navigateLogin()
+        if(intent == null) { // 로그인 됨
+            val dialog = PostReportConfirmDialog(this)
+            dialog.setOnClickListener { postId ->
+                Toast.makeText(context, getString(com.swmarastro.mykkumi.common_ui.R.string.post_report_confirm_clear_toast), Toast.LENGTH_SHORT).show()
+                Log.d("test", "신고 포스트: ${postId}")
+            }
 
-        dialog.show(postId)
+            dialog.show(postId)
+        }
+        else { // 로그인 안 됨
+            startActivity(intent)
+        }
     }
 
     override fun onDestroyView() {

diff --git a/feature/home/src/main/java/com/swmarastro/mykkumi/feature/home/HomeViewModel.kt b/feature/home/src/main/java/com/swmarastro/mykkumi/feature/home/HomeViewModel.kt
@@ -1,5 +1,7 @@
 package com.swmarastro.mykkumi.feature.home
 
+import android.content.Intent
+import android.net.Uri
 import androidx.core.net.toUri
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -101,6 +103,19 @@ class HomeViewModel @Inject constructor(
         }
     }
 
+    // 로그인 페이지 이동
+    fun navigateLogin() : Intent? {
+        if(authTokenDataStore.isLogin()) return null
+
+        val loginDeepLink = "mykkumi://mykkumi.signin"
+
+        val intent = Intent()
+        intent.setAction(Intent.ACTION_VIEW)
+        intent.setData(Uri.parse(loginDeepLink))
+
+        return intent
+    }
+
     // 배너 전체 리스트 페이지로 이동
     fun navigateBannerAll(navController: NavController?) {
         navController?.navigate(R.id.action_navigate_fragment_to_home_banner_all)

diff --git a/feature/home/src/main/java/com/swmarastro/mykkumi/feature/home/post/PostListAdapter.kt b/feature/home/src/main/java/com/swmarastro/mykkumi/feature/home/post/PostListAdapter.kt
@@ -124,24 +124,24 @@ class PostListAdapter (
                 waitNotice()
             }
 
+            // 포스트 신고하기
+            binding.textBtnPostReport.setOnClickListener(View.OnClickListener {
+                reportPost(item.id)
+            })
+
             // 로그인 된 유저한테만 보여줄 것 - 팔로우, 신고하기 버튼
             if(viewModel.isLogined.value) {
                 binding.includePostWriter.btnFollow.visibility = View.VISIBLE // 팔로우
-                binding.textBtnPostReport.visibility = View.VISIBLE // 신고하기
+//                binding.textBtnPostReport.visibility = View.VISIBLE // 신고하기
 
                 // 팔로우 버튼 - 아직 안 됨
                 binding.includePostWriter.btnFollow.setOnClickListener(View.OnClickListener {
                     waitNotice()
                 })
-
-                // 포스트 신고하기
-                binding.textBtnPostReport.setOnClickListener(View.OnClickListener {
-                    reportPost(item.id)
-                })
             }
             else {
                 binding.includePostWriter.btnFollow.visibility = View.GONE // 팔로우
-                binding.textBtnPostReport.visibility = View.GONE // 신고하기
+//                binding.textBtnPostReport.visibility = View.GONE // 신고하기
             }
 
             // 댓글 작성 버튼 - 아직 안 됨

diff --git a/feature/post/proguard-rules.pro b/feature/post/proguard-rules.pro
@@ -25,6 +25,8 @@
 -dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemListLoadingBinding
 -dontwarn com.swmarastro.mykkumi.common_ui.databinding.ItemPostWriterBinding
 -dontwarn com.swmarastro.mykkumi.common_ui.post.PostImageIndicator
+-dontwarn com.swmarastro.mykkumi.common_ui.permission.ImagePermissionUtils
+-dontwarn java.lang.invoke.StringConcatFactory
 
 # 공통 모듈의 클래스 유지
 -keep class com.swmarastro.mykkumi.common.** { *; }