Merge pull request #530 from TeamSparker/chore/package

#529 [chore] 패키지명 변경
TeamSparker · May 3, 2022 · 254728a · 254728a
2 parents 57bf09f + d9930a2
commit 254728a
Show file tree

Hide file tree

Showing 310 changed files with 1,240 additions and 1,246 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
     compileSdk 31
 
     defaultConfig {
-        applicationId "com.spark.android"
+        applicationId "com.teamsparker.android"
         minSdk 26
         targetSdk 31
         versionCode 1

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -23,5 +23,5 @@
 # Keep data for network connection.
 -keep class com.kakao.sdk.**.model.* { <fields>; }
 -keep class * extends com.google.gson.TypeAdapter
--keep class com.spark.android.data.remote.entity.request.** { *; }
--keep class com.spark.android.data.remote.entity.response.** { *; }
+-keep class com.teamsparker.android.data.remote.entity.request.** { *; }
+-keep class com.teamsparker.android.data.remote.entity.response.** { *; }
diff --git a/.../spark/android/ExampleInstrumentedTest.kt → ...parker/android/ExampleInstrumentedTest.kt b/.../spark/android/ExampleInstrumentedTest.kt → ...parker/android/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package com.spark.android
+package com.teamsparker.android
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.spark.android">
+    package="com.teamsparker.android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -14,7 +14,7 @@
         android:required="false" />
 
     <application
-        android:name=".SparkApplication"
+        android:name="com.teamsparker.android.SparkApplication"
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="false"
@@ -25,76 +25,76 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.SparkAndroid">
         <activity
-            android:name=".ui.habit.HabitSendSparkActivity"
+            android:name="com.teamsparker.android.ui.habit.HabitSendSparkActivity"
             android:exported="false"
             android:screenOrientation="portrait"
             android:theme="@style/Transparent"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".ui.feedreport.FeedReportActivity"
+            android:name="com.teamsparker.android.ui.feedreport.FeedReportActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.alarmcenter.AlarmCenterActivity"
+            android:name="com.teamsparker.android.ui.alarmcenter.AlarmCenterActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.onboarding.OnBoardingActivity"
+            android:name="com.teamsparker.android.ui.onboarding.OnBoardingActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.storage.photo.StoragePhotoMainPickActivity"
+            android:name="com.teamsparker.android.ui.storage.photo.StoragePhotoMainPickActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.mypage.MyPageActivity"
+            android:name="com.teamsparker.android.ui.mypage.MyPageActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.share.InstaActivity"
+            android:name="com.teamsparker.android.ui.share.InstaActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.waitingroom.WaitingRoomActivity"
+            android:name="com.teamsparker.android.ui.waitingroom.WaitingRoomActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.certify.CertifyActivity"
+            android:name="com.teamsparker.android.ui.certify.CertifyActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.timer.TimerStartActivity"
+            android:name="com.teamsparker.android.ui.timer.TimerStartActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.habit.HabitGoalManageActivity"
+            android:name="com.teamsparker.android.ui.habit.HabitGoalManageActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.joincode.JoinCodeActivity"
+            android:name="com.teamsparker.android.ui.joincode.JoinCodeActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.makeroom.MakeRoomActivity"
+            android:name="com.teamsparker.android.ui.makeroom.MakeRoomActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.storage.photo.StoragePhotoCollectionActivity"
+            android:name="com.teamsparker.android.ui.storage.photo.StoragePhotoCollectionActivity"
             android:exported="false"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.habit.HabitActivity"
+            android:name="com.teamsparker.android.ui.habit.HabitActivity"
             android:configChanges="orientation"
             android:exported="true"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustNothing" />
         <activity
-            android:name=".ui.auth.AuthActivity"
+            android:name="com.teamsparker.android.ui.auth.AuthActivity"
             android:configChanges="orientation"
             android:exported="true"
             android:screenOrientation="portrait" />
         <activity
-            android:name=".ui.intro.IntroActivity"
+            android:name="com.teamsparker.android.ui.intro.IntroActivity"
             android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
@@ -104,7 +104,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.main.MainActivity"
+            android:name="com.teamsparker.android.ui.main.MainActivity"
             android:exported="true"
             android:screenOrientation="portrait" />
         <activity
@@ -124,7 +124,7 @@
         </activity>
 
         <service
-            android:name=".SparkMessagingService"
+            android:name="com.teamsparker.android.SparkMessagingService"
             android:exported="false">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />

diff --git a/app/src/main/java/com/spark/android/data/remote/datasource/AlarmSettingDataSource.kt b/app/src/main/java/com/spark/android/data/remote/datasource/AlarmSettingDataSource.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/datasource/FeedDataSource.kt b/app/src/main/java/com/spark/android/data/remote/datasource/FeedDataSource.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/datasource/RemoteHomeDataSource.kt b/app/src/main/java/com/spark/android/data/remote/datasource/RemoteHomeDataSource.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/datasource/RemoteWaitingRoomDataSource.kt b/app/src/main/java/com/spark/android/data/remote/datasource/RemoteWaitingRoomDataSource.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/entity/response/MakeRoomResponse.kt b/app/src/main/java/com/spark/android/data/remote/entity/response/MakeRoomResponse.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/entity/response/ProfileResponse.kt b/app/src/main/java/com/spark/android/data/remote/entity/response/ProfileResponse.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/entity/response/VersionResponse.kt b/app/src/main/java/com/spark/android/data/remote/entity/response/VersionResponse.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/repository/JoinCodeRoomDoneRepository.kt b/app/src/main/java/com/spark/android/data/remote/repository/JoinCodeRoomDoneRepository.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/repository/JoinCodeRoomInfoRepository.kt b/app/src/main/java/com/spark/android/data/remote/repository/JoinCodeRoomInfoRepository.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/repository/MakeRoomRepository.kt b/app/src/main/java/com/spark/android/data/remote/repository/MakeRoomRepository.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/repository/RefreshRepository.kt b/app/src/main/java/com/spark/android/data/remote/repository/RefreshRepository.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/repository/SetPurposeRepository.kt b/app/src/main/java/com/spark/android/data/remote/repository/SetPurposeRepository.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/repository/StartHabitRepository.kt b/app/src/main/java/com/spark/android/data/remote/repository/StartHabitRepository.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/service/HomeNoticeRedDotService.kt b/app/src/main/java/com/spark/android/data/remote/service/HomeNoticeRedDotService.kt
diff --git a/app/src/main/java/com/spark/android/data/remote/service/MakeRoomService.kt b/app/src/main/java/com/spark/android/data/remote/service/MakeRoomService.kt
diff --git a/...ava/com/spark/android/SparkApplication.kt → ...m/teamsparker/android/SparkApplication.kt b/...ava/com/spark/android/SparkApplication.kt → ...m/teamsparker/android/SparkApplication.kt
@@ -1,9 +1,9 @@
-package com.spark.android
+package com.teamsparker.android
 
 import android.app.Application
 import com.kakao.sdk.common.KakaoSdk
 import com.kakao.sdk.common.util.Utility
-import com.spark.android.data.remote.LocalPreferences
+import com.teamsparker.android.data.remote.LocalPreferences
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 

diff --git a/...om/spark/android/SparkMessagingService.kt → ...msparker/android/SparkMessagingService.kt b/...om/spark/android/SparkMessagingService.kt → ...msparker/android/SparkMessagingService.kt
@@ -1,4 +1,4 @@
-package com.spark.android
+package com.teamsparker.android
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -9,9 +9,9 @@ import android.graphics.Bitmap
 import androidx.core.app.NotificationCompat
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import com.spark.android.ui.intro.IntroActivity
-import com.spark.android.util.ImageCropUtil
-import com.spark.android.util.useBitmapImg
+import com.teamsparker.android.ui.intro.IntroActivity
+import com.teamsparker.android.util.ImageCropUtil
+import com.teamsparker.android.util.useBitmapImg
 import timber.log.Timber
 import java.lang.IllegalArgumentException
 

diff --git a/.../datasource/LocalPreferencesDataSource.kt → .../datasource/LocalPreferencesDataSource.kt b/.../datasource/LocalPreferencesDataSource.kt → .../datasource/LocalPreferencesDataSource.kt
@@ -1,6 +1,6 @@
-package com.spark.android.data.local.datasource
+package com.teamsparker.android.data.local.datasource
 
-import com.spark.android.data.remote.entity.response.AlarmSettingResponse
+import com.teamsparker.android.data.remote.entity.response.AlarmSettingResponse
 
 interface LocalPreferencesDataSource {
     fun saveAccessToken(accessToken: String)

diff --git a/...asource/LocalPreferencesDataSourceImpl.kt → ...asource/LocalPreferencesDataSourceImpl.kt b/...asource/LocalPreferencesDataSourceImpl.kt → ...asource/LocalPreferencesDataSourceImpl.kt
@@ -1,12 +1,12 @@
-package com.spark.android.data.local.datasource
+package com.teamsparker.android.data.local.datasource
 
 import android.content.SharedPreferences
-import com.spark.android.data.remote.entity.response.AlarmSettingResponse
-import com.spark.android.ui.alarmsetting.AlarmSettingViewModel.Companion.ALARM_CERTIFICATION
-import com.spark.android.ui.alarmsetting.AlarmSettingViewModel.Companion.ALARM_CONSIDER
-import com.spark.android.ui.alarmsetting.AlarmSettingViewModel.Companion.ALARM_REMIND
-import com.spark.android.ui.alarmsetting.AlarmSettingViewModel.Companion.ALARM_ROOM_START
-import com.spark.android.ui.alarmsetting.AlarmSettingViewModel.Companion.ALARM_SPARK
+import com.teamsparker.android.data.remote.entity.response.AlarmSettingResponse
+import com.teamsparker.android.ui.alarmsetting.AlarmSettingViewModel.Companion.ALARM_CERTIFICATION
+import com.teamsparker.android.ui.alarmsetting.AlarmSettingViewModel.Companion.ALARM_CONSIDER
+import com.teamsparker.android.ui.alarmsetting.AlarmSettingViewModel.Companion.ALARM_REMIND
+import com.teamsparker.android.ui.alarmsetting.AlarmSettingViewModel.Companion.ALARM_ROOM_START
+import com.teamsparker.android.ui.alarmsetting.AlarmSettingViewModel.Companion.ALARM_SPARK
 import javax.inject.Inject
 
 class LocalPreferencesDataSourceImpl @Inject constructor(

diff --git a/...source/LocalPreferencesHabitDataSource.kt → ...source/LocalPreferencesHabitDataSource.kt b/...source/LocalPreferencesHabitDataSource.kt → ...source/LocalPreferencesHabitDataSource.kt
@@ -1,4 +1,4 @@
-package com.spark.android.data.local.datasource
+package com.teamsparker.android.data.local.datasource
 
 interface LocalPreferencesHabitDataSource {
     fun setHabitUserGuideState(state: Boolean)

diff --git a/...ce/LocalPreferencesHabitDataSourceImpl.kt → ...ce/LocalPreferencesHabitDataSourceImpl.kt b/...ce/LocalPreferencesHabitDataSourceImpl.kt → ...ce/LocalPreferencesHabitDataSourceImpl.kt
@@ -1,4 +1,4 @@
-package com.spark.android.data.local.datasource
+package com.teamsparker.android.data.local.datasource
 
 import android.content.SharedPreferences
 

diff --git a/...asource/LocalPreferencesHomeDataSource.kt → ...asource/LocalPreferencesHomeDataSource.kt b/...asource/LocalPreferencesHomeDataSource.kt → ...asource/LocalPreferencesHomeDataSource.kt
@@ -1,4 +1,4 @@
-package com.spark.android.data.local.datasource
+package com.teamsparker.android.data.local.datasource
 
 interface LocalPreferencesHomeDataSource {