Merge pull request #250 from TeamPINGLE/chore-2.0.0

[chore] 2.0.0 업데이트
TeamPINGLE · Mar 13, 2024 · 2fc735f · 2fc735f
2 parents efc0c25 + e2e3598
commit 2fc735f
Show file tree

Hide file tree

Showing 28 changed files with 102 additions and 97 deletions.
diff --git a/.github/workflows/pr_builder.yml b/.github/workflows/pr_builder.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Access BASE_URL
         env:
           HFM_BASE_URL: ${{ secrets.BASE_URL }}
-        run: echo "base.url=\"$BASE_URL\"" >> local.properties
+        run: echo "dev.base.url=\"$BASE_URL\"" >> local.properties
 
       - name: Access IO_SENTRY_DSN
         env:

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -26,12 +26,10 @@ android {
         applicationId = "org.sopt.pingle"
         minSdk = 28
         targetSdk = 34
-        versionCode = 15
-        versionName = "1.1.0"
+        versionCode = 16
+        versionName = "2.0.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        buildConfigField("String", "BASE_URL", properties["base.url"].toString())
-        buildConfigField("String", "ACCESS_TOKEN", properties["access.token"].toString())
         buildConfigField(
             "String",
             "NAVER_MAP_CLIENT_ID",
@@ -50,11 +48,13 @@ android {
     buildTypes {
         debug {
             isMinifyEnabled = false
+            buildConfigField("String", "BASE_URL", properties["dev.base.url"].toString())
             buildConfigField("String", "AMPLITUDE_API_KEY", properties["amplitude.dev.api.key"].toString())
         }
         release {
             isMinifyEnabled = true
             isShrinkResources = true
+            buildConfigField("String", "BASE_URL", properties["prod.base.url"].toString())
             buildConfigField("String", "AMPLITUDE_API_KEY", properties["amplitude.prod.api.key"].toString())
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -82,16 +82,12 @@
             android:exported="false"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity" />
+
         <activity
             android:name=".presentation.ui.newgroup.NewGroupActivity"
             android:exported="false"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity" />
-        <activity
-            android:name=".presentation.ui.newgroup.newgroupinfo.NewGroupInfoActivity"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".presentation.ui.newgroup.newgroupannouncement.NewGroupAnnouncementActivity"
             android:exported="false"
@@ -102,11 +98,6 @@
             android:exported="false"
             android:screenOrientation="portrait"
             tools:ignore="LockedOrientationActivity" />
-        <activity
-            android:name=".presentation.ui.main.planannouncement.PlanAnnouncementActivity"
-            android:exported="false"
-            android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".presentation.ui.onboarding.onboarding.OnboardingActivity"
             android:exported="false"
@@ -128,6 +119,11 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustNothing"
             tools:ignore="LockedOrientationActivity" />
+        <activity
+            android:name=".presentation.ui.main.planannouncement.PlanAnnouncementActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".presentation.ui.search.SearchActivity"
             android:exported="false"

diff --git a/app/src/main/java/org/sopt/pingle/data/datasourceimpl/local/PingleLocalDataSourceImpl.kt b/app/src/main/java/org/sopt/pingle/data/datasourceimpl/local/PingleLocalDataSourceImpl.kt
@@ -72,10 +72,5 @@ class PingleLocalDataSourceImpl @Inject constructor(
         const val REFRESH_TOKEN = "RefreshToken"
         const val GROUP_ID = "GroupId"
         const val GROUP_NAME = "GroupName"
-        const val MEETING_COUNT = "MeetingCount"
-        const val PARTICIPANTS_COUNT = "ParticipantsCount"
-        const val GROUP_KEYWORD = "GroupKeyWord"
-        const val IS_OWNER = "IsOwner"
-        const val GROUP_CODE = "GroupCode"
     }
 }
diff --git a/app/src/main/java/org/sopt/pingle/di/DataSourceModule.kt b/app/src/main/java/org/sopt/pingle/di/DataSourceModule.kt
@@ -53,25 +53,25 @@ abstract class DataSourceModule {
 
     @Binds
     @Singleton
-    abstract fun bindsParticipantRemoteDataSource(participantRemoteDataSourceImpl: ParticipantRemoteDataSourceImpl): ParticipantRemoteDataSource
+    abstract fun bindsMyGroupListRemoteDataSource(myGroupListRemoteDataSourceImpl: MyGroupListRemoteDataSourceImpl): MyGroupListRemoteDataSource
 
     @Binds
     @Singleton
-    abstract fun bindsPingleRemoteDataSource(pingleRemoteDataSourceImpl: PingleRemoteDataSourceImpl): PingleRemoteDataSource
+    abstract fun bindsNewGroupRemoteDataSource(newGroupRemoteDataSourceImpl: NewGroupRemoteDataSourceImpl): NewGroupRemoteDataSource
 
     @Binds
     @Singleton
-    abstract fun bindsPlanRemoteDataSource(planRemoteDataSourceImpl: PlanRemoteDataSourceImpl): PlanRemoteDataSource
+    abstract fun bindsParticipantRemoteDataSource(participantRemoteDataSourceImpl: ParticipantRemoteDataSourceImpl): ParticipantRemoteDataSource
 
     @Binds
     @Singleton
-    abstract fun bindsRankingRemoteDataSource(rankingRemoteDataSourceImpl: RankingRemoteDataSourceImpl): RankingRemoteDataSource
+    abstract fun bindsPingleRemoteDataSource(pingleRemoteDataSourceImpl: PingleRemoteDataSourceImpl): PingleRemoteDataSource
 
     @Binds
     @Singleton
-    abstract fun bindsMyGroupListRemoteDataSource(myGroupListRemoteDataSourceImpl: MyGroupListRemoteDataSourceImpl): MyGroupListRemoteDataSource
+    abstract fun bindsPlanRemoteDataSource(planRemoteDataSourceImpl: PlanRemoteDataSourceImpl): PlanRemoteDataSource
 
     @Binds
     @Singleton
-    abstract fun bindsNewGroupRemoteDataSource(newGroupRemoteDataSourceImpl: NewGroupRemoteDataSourceImpl): NewGroupRemoteDataSource
+    abstract fun bindsRankingRemoteDataSource(rankingRemoteDataSourceImpl: RankingRemoteDataSourceImpl): RankingRemoteDataSource
 }
diff --git a/app/src/main/java/org/sopt/pingle/di/RepositoryModule.kt b/app/src/main/java/org/sopt/pingle/di/RepositoryModule.kt
@@ -47,25 +47,25 @@ abstract class RepositoryModule {
 
     @Binds
     @Singleton
-    abstract fun bindsParticipantRepository(participantRepositoryImpl: ParticipantRepositoryImpl): ParticipantRepository
+    abstract fun bindsMyGroupListRepository(myGroupListRepositoryImpl: MyGroupListRepositoryImpl): MyGroupListRepository
 
     @Binds
     @Singleton
-    abstract fun bindsPingleRepository(pingleRepositoryImpl: PingleRepositoryImpl): PingleRepository
+    abstract fun bindsNewGroupRepository(newGroupRepositoryImpl: NewGroupRepositoryImpl): NewGroupRepository
 
     @Binds
     @Singleton
-    abstract fun bindsPlanRepository(planRepositoryImpl: PlanRepositoryImpl): PlanRepository
+    abstract fun bindsParticipantRepository(participantRepositoryImpl: ParticipantRepositoryImpl): ParticipantRepository
 
     @Binds
     @Singleton
-    abstract fun bindsRankingRepository(rankingRepositoryImpl: RankingRepositoryImpl): RankingRepository
+    abstract fun bindsPingleRepository(pingleRepositoryImpl: PingleRepositoryImpl): PingleRepository
 
     @Binds
     @Singleton
-    abstract fun bindsMyGroupListRepository(myGroupListRepositoryImpl: MyGroupListRepositoryImpl): MyGroupListRepository
+    abstract fun bindsPlanRepository(planRepositoryImpl: PlanRepositoryImpl): PlanRepository
 
     @Binds
     @Singleton
-    abstract fun bindsNewGroupRepository(newGroupRepositoryImpl: NewGroupRepositoryImpl): NewGroupRepository
+    abstract fun bindsRankingRepository(rankingRepositoryImpl: RankingRepositoryImpl): RankingRepository
 }
diff --git a/app/src/main/java/org/sopt/pingle/di/ServiceModule.kt b/app/src/main/java/org/sopt/pingle/di/ServiceModule.kt
@@ -42,6 +42,16 @@ object ServiceModule {
     fun providesMapService(@Pingle retrofit: Retrofit): MapService =
         retrofit.create(MapService::class.java)
 
+    @Provides
+    @Singleton
+    fun providesMyGroupListService(@Pingle retrofit: Retrofit): MyGroupListService =
+        retrofit.create(MyGroupListService::class.java)
+
+    @Provides
+    @Singleton
+    fun providesNewGroupService(@Pingle retrofit: Retrofit): NewGroupService =
+        retrofit.create(NewGroupService::class.java)
+
     @Provides
     @Singleton
     fun providesParticipantService(@Pingle retrofit: Retrofit): ParticipantService =
@@ -61,14 +71,4 @@ object ServiceModule {
     @Singleton
     fun providesRankingService(@Pingle retrofit: Retrofit): RankingService =
         retrofit.create(RankingService::class.java)
-
-    @Provides
-    @Singleton
-    fun providesMyGroupListService(@Pingle retrofit: Retrofit): MyGroupListService =
-        retrofit.create(MyGroupListService::class.java)
-
-    @Provides
-    @Singleton
-    fun providesNewGroupService(@Pingle retrofit: Retrofit): NewGroupService =
-        retrofit.create(NewGroupService::class.java)
 }
diff --git a/app/src/main/java/org/sopt/pingle/di/UseCaseModule.kt b/app/src/main/java/org/sopt/pingle/di/UseCaseModule.kt
@@ -68,11 +68,26 @@ class UseCaseModule {
     fun providesGetMapPingleListUseCase(mapRepository: MapRepository): GetMapPingleListUseCase =
         GetMapPingleListUseCase(mapRepository = mapRepository)
 
+    @Provides
+    @Singleton
+    fun providesGetMyGroupListUseCase(myGroupListRepository: MyGroupListRepository): GetMyGroupListUseCase =
+        GetMyGroupListUseCase(myGroupListRepository = myGroupListRepository)
+
     @Provides
     @Singleton
     fun providesGetMyPingleListUseCase(pingleRepository: PingleRepository): GetMyPingleListUseCase =
         GetMyPingleListUseCase(pingleRepository = pingleRepository)
 
+    @Provides
+    @Singleton
+    fun providesGetNewGroupCheckNameUseCase(newGroupRepository: NewGroupRepository): GetNewGroupCheckNameUseCase =
+        GetNewGroupCheckNameUseCase(newGroupRepository = newGroupRepository)
+
+    @Provides
+    @Singleton
+    fun providesGetNewGroupKeywordsUseCase(newGroupRepository: NewGroupRepository): GetNewGroupKeywordsUserCase =
+        GetNewGroupKeywordsUserCase(newGroupRepository = newGroupRepository)
+
     @Provides
     @Singleton
     fun providesGetParticipantListUseCase(participantRepository: ParticipantRepository): GetParticipantListUseCase =
@@ -103,6 +118,11 @@ class UseCaseModule {
     fun providesPostJoinGroupCodeUseCase(joinGroupRepository: JoinGroupRepository): PostJoinGroupCodeUseCase =
         PostJoinGroupCodeUseCase(joinGroupRepository = joinGroupRepository)
 
+    @Provides
+    @Singleton
+    fun providesPostNewGroupCreateUseCase(newGroupRepository: NewGroupRepository): PostNewGroupCreateUseCase =
+        PostNewGroupCreateUseCase(newGroupRepository = newGroupRepository)
+
     @Provides
     @Singleton
     fun providesPostPingleJoinUseCase(pingleRepository: PingleRepository): PostPingleJoinUseCase =
@@ -112,24 +132,4 @@ class UseCaseModule {
     @Singleton
     fun providesPostPlanMeetingUseCase(planRepository: PlanRepository): PostPlanMeetingUseCase =
         PostPlanMeetingUseCase(planRepository = planRepository)
-
-    @Provides
-    @Singleton
-    fun providesGetMyGroupListUseCase(myGroupListRepository: MyGroupListRepository): GetMyGroupListUseCase =
-        GetMyGroupListUseCase(myGroupListRepository = myGroupListRepository)
-
-    @Provides
-    @Singleton
-    fun providesGetNewGroupKeywordsUseCase(newGroupRepository: NewGroupRepository): GetNewGroupKeywordsUserCase =
-        GetNewGroupKeywordsUserCase(newGroupRepository = newGroupRepository)
-
-    @Provides
-    @Singleton
-    fun providesGetNewGroupCheckNameUseCase(newGroupRepository: NewGroupRepository): GetNewGroupCheckNameUseCase =
-        GetNewGroupCheckNameUseCase(newGroupRepository = newGroupRepository)
-
-    @Provides
-    @Singleton
-    fun providesPostNewGroupCreateUseCase(newGroupRepository: NewGroupRepository): PostNewGroupCreateUseCase =
-        PostNewGroupCreateUseCase(newGroupRepository = newGroupRepository)
 }
diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/auth/AuthActivity.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/auth/AuthActivity.kt
@@ -20,6 +20,7 @@ import org.sopt.pingle.util.AmplitudeUtils
 import org.sopt.pingle.util.activity.setDoubleBackPressToExit
 import org.sopt.pingle.util.base.BindingActivity
 import org.sopt.pingle.util.view.UiState
+import org.sopt.pingle.util.view.setOnSingleClickListener
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -44,7 +45,7 @@ class AuthActivity : BindingActivity<ActivityAuthBinding>(R.layout.activity_auth
     }
 
     private fun addListeners() {
-        binding.btnAuthKakao.setOnClickListener {
+        binding.btnAuthKakao.setOnSingleClickListener {
             kakaoAuthService.loginKakao(viewModel::login, viewModel::saveAccount)
             AmplitudeUtils.trackEventWithProperty(START_SIGNUP, SIGNUP_TYPE, KAKAO)
         }

diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/auth/AuthViewModel.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/auth/AuthViewModel.kt
@@ -32,11 +32,11 @@ class AuthViewModel @Inject constructor(
             authRepository.postLogin(
                 kakaoAccessToken,
                 RequestAuthDto(LOGIN_PLATFORM)
-            ).onSuccess { authEntitiy ->
+            ).onSuccess { authEntity ->
                 with(localStorage) {
                     isLogin = true
-                    accessToken = (HEADER_BEARER + authEntitiy.accessToken)
-                    refreshToken = (HEADER_BEARER + authEntitiy.refreshToken)
+                    accessToken = (HEADER_BEARER + authEntity.accessToken)
+                    refreshToken = (HEADER_BEARER + authEntity.refreshToken)
                 }
                 _loginState.value = UiState.Success(Unit)
             }.onFailure {

diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinGroupCodeActivity.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/joingroup/JoinGroupCodeActivity.kt
@@ -18,6 +18,7 @@ import org.sopt.pingle.util.component.PingleSnackbar
 import org.sopt.pingle.util.context.hideKeyboard
 import org.sopt.pingle.util.context.stringOf
 import org.sopt.pingle.util.view.UiState
+import org.sopt.pingle.util.view.setOnSingleClickListener
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -45,10 +46,10 @@ class JoinGroupCodeActivity :
             hideKeyboard(binding.etJoinGroupCodeInvitation)
         }
 
-        binding.btnJoinGroupCodeNext.setOnClickListener {
+        binding.btnJoinGroupCodeNext.setOnSingleClickListener {
             viewModel.joinGroupCodeState(
                 teamId = teamId,
-                joinGroupEntity = JoinGroupCodeEntity(viewModel.joinGroupCodeEditText.value.toString())
+                joinGroupEntity = JoinGroupCodeEntity(viewModel.joinGroupCodeEditText.value)
             )
 
             AmplitudeUtils.trackEvent(CLICK_EXISTINGGROUP_ENTER)
@@ -141,7 +142,7 @@ class JoinGroupCodeActivity :
     companion object {
         const val TEAM_ID = "teamId"
         const val GROUP_NAME = "groupName"
-        const val LOADING = "Loding"
+        const val LOADING = "Loading"
         const val EMPTY = "Empty"
         const val JOIN_GROUP_CODE_ACTIVITY = "JoinGroupCodeActivity"
         const val SNACKBAR_BOTTOM_MARGIN = 97

diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/main/home/map/MapFragment.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/main/home/map/MapFragment.kt
@@ -358,7 +358,7 @@ class MapFragment : BindingFragment<FragmentMapBinding>(R.layout.fragment_map),
     private fun makeMarkers(pinEntityList: List<PinEntity>) {
         homeViewModel.clearMarkerModelData()
 
-        pinEntityList.mapIndexed { index, pinEntity ->
+        pinEntityList.mapIndexed { _, pinEntity ->
             pinEntity.toMarkerModel().apply {
                 this.marker.apply {
                     map = naverMap

diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/main/more/MoreFragment.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/main/more/MoreFragment.kt
@@ -25,6 +25,7 @@ import org.sopt.pingle.util.component.PingleSnackbar
 import org.sopt.pingle.util.fragment.navigateToWebView
 import org.sopt.pingle.util.fragment.stringOf
 import org.sopt.pingle.util.view.UiState
+import org.sopt.pingle.util.view.setOnSingleClickListener
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -55,11 +56,11 @@ class MoreFragment : BindingFragment<FragmentMoreBinding>(R.layout.fragment_more
     }
 
     private fun addListeners() {
-        binding.tvMoreContactTitle.setOnClickListener {
+        binding.tvMoreContactTitle.setOnSingleClickListener {
             startActivity(navigateToWebView(CONTACT))
         }
 
-        binding.tvMoreNoticeTitle.setOnClickListener {
+        binding.tvMoreNoticeTitle.setOnSingleClickListener {
             startActivity(navigateToWebView(NOTICE))
         }
 

diff --git a/app/src/main/java/org/sopt/pingle/presentation/ui/plan/planlocation/PlanLocationFragment.kt b/app/src/main/java/org/sopt/pingle/presentation/ui/plan/planlocation/PlanLocationFragment.kt
@@ -30,6 +30,11 @@ class PlanLocationFragment :
         collectData()
     }
 
+    override fun onDestroyView() {
+        binding.rvPlanLocationList.adapter = null
+        super.onDestroyView()
+    }
+
     private fun initLayout() {
         binding.rvPlanLocationList.adapter = planLocationAdapter
     }
@@ -77,9 +82,4 @@ class PlanLocationFragment :
     private fun deleteOldPosition(position: Int) {
         planLocationViewModel.updatePlanLocationList(position)
     }
-
-    override fun onDestroyView() {
-        binding.rvPlanLocationList.adapter = null
-        super.onDestroyView()
-    }
 }
diff --git a/...in/java/org/sopt/pingle/presentation/ui/plan/planopenchatting/PlanOpenChattingFragment.kt b/...in/java/org/sopt/pingle/presentation/ui/plan/planopenchatting/PlanOpenChattingFragment.kt
@@ -33,7 +33,7 @@ class PlanOpenChattingFragment :
     }
 
     private fun collectData() {
-        planViewModel.planOpenChattingLink.flowWithLifecycle(viewLifecycleOwner.lifecycle).onEach { openChattingLink ->
+        planViewModel.planOpenChattingLink.flowWithLifecycle(viewLifecycleOwner.lifecycle).onEach {
             planViewModel.validityOpenChattingLink()
         }.launchIn(viewLifecycleOwner.lifecycleScope)
     }

diff --git a/app/src/main/java/org/sopt/pingle/util/base/BindingFragment.kt b/app/src/main/java/org/sopt/pingle/util/base/BindingFragment.kt
@@ -24,8 +24,4 @@ abstract class BindingFragment<T : ViewDataBinding>(@LayoutRes private val layou
         binding.lifecycleOwner = this.viewLifecycleOwner
         return binding.root
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-    }
 }