Skip to content

Commit 7028ad9

Browse files
authored
Merge pull request #333 from Team-HMH/feat/remove_server_point
Feat/remove server point
2 parents 327e78a + 57fcd19 commit 7028ad9

File tree

103 files changed

+62
-2286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+62
-2286
lines changed

.github/workflows/develop_PR_builder.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ jobs:
3838

3939
- name: Add Local Properties
4040
env:
41-
KAKAO_API_KEY: ${{ secrets.KAKAO_API_KEY }}
4241
HMH_DEV_BASE_URL: ${{ secrets.HMH_DEV_BASE_URL }}
4342
HMH_PROD_BASE_URL: ${{ secrets.HMH_PROD_BASE_URL }}
4443
AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}

.github/workflows/release.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929

3030
- name: Add Local Properties
3131
env:
32-
KAKAO_API_KEY: ${{ secrets.KAKAO_API_KEY }}
3332
HMH_DEV_BASE_URL: ${{ secrets.HMH_DEV_BASE_URL }}
3433
HMH_PROD_BASE_URL: ${{ secrets.HMH_PROD_BASE_URL }}
3534
AMPLITUDE_API_KEY: ${{ secrets.AMPLITUDE_API_KEY }}

app/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,16 @@ dependencies {
7373
// Domain
7474
implementation(projects.domain.usagestats)
7575
implementation(projects.domain.userinfo)
76-
implementation(projects.domain.login)
7776
implementation(projects.domain.challenge)
7877
implementation(projects.domain.onboarding)
79-
implementation(projects.domain.point)
8078
implementation(projects.domain.lock)
8179

8280
// Data
8381
implementation(projects.data.usagestats)
8482
implementation(projects.data.userinfo)
85-
implementation(projects.data.login)
8683
implementation(projects.data.challenge)
8784
implementation(projects.data.device)
8885
implementation(projects.data.onboarding)
89-
implementation(projects.data.point)
9086
implementation(projects.data.lock)
9187
implementation(projects.data.main)
9288

@@ -107,8 +103,6 @@ dependencies {
107103
implementation(libs.splash.screen)
108104
implementation(libs.lottie)
109105

110-
// kakao
111-
implementation(libs.kakao.login)
112106

113107
// Hilt Worker
114108
implementation(libs.androidx.hilt.common)

app/proguard-rules.pro

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
# For more details, see
66
# http://developer.android.com/guide/developing/tools/proguard.html
77

8-
##---------------Begin: Kakao SDK ----------
9-
-keep class com.kakao.sdk.**.model.* { <fields>; }
10-
-keep class * extends com.google.gson.TypeAdapter
11-
##---------------END: Kakao SDK ----------
12-
138
##---------------Begin: Okio ----------
149
# Animal Sniffer compileOnly dependency to ensure APIs are compatible with older versions of Java.
1510
-dontwarn org.codehaus.mojo.animal_sniffer.*

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,6 @@
4646
</intent-filter>
4747
</activity>
4848

49-
<activity
50-
android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
51-
android:exported="true">
52-
<intent-filter>
53-
<action android:name="android.intent.action.VIEW" />
54-
55-
<category android:name="android.intent.category.DEFAULT" />
56-
<category android:name="android.intent.category.BROWSABLE" />
57-
58-
<data
59-
android:host="oauth"
60-
android:scheme="kakao${kakaoApiKey}" />
61-
</intent-filter>
62-
</activity>
63-
6449
<activity
6550
android:name=".common.permission.PermissionActivity"
6651
android:exported="false" />

app/src/main/java/com/hmh/hamyeonham/HMHApplication.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import com.amplitude.api.Amplitude
77
import com.hmh.hamyeonham.core.notification.AppNotificationManager
88
import com.hmh.hamyeonham.firebase.setFirebaseCrashlyticsEnabled
99
import com.hmh.hamyeonham.hus.usagestats.HMHUsageStatsManager
10-
import com.kakao.sdk.common.KakaoSdk
1110
import dagger.hilt.EntryPoint
1211
import dagger.hilt.EntryPoints
1312
import dagger.hilt.InstallIn
@@ -35,7 +34,6 @@ class HMHApplication : Application(), Configuration.Provider {
3534
super.onCreate()
3635
setFirebaseCrashlyticsEnabled(!BuildConfig.DEBUG)
3736
setAmplitude()
38-
KakaoSdk.init(this, BuildConfig.KAKAO_API_KEY)
3937
HMHUsageStatsManager.init(this)
4038
notificationManager.setupNotificationChannel()
4139
}

app/src/main/java/com/hmh/hamyeonham/StartActivity.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@ import androidx.appcompat.app.AppCompatActivity
66
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
77
import com.hmh.hamyeonham.common.view.viewBinding
88
import com.hmh.hamyeonham.databinding.ActivitySampleBinding
9-
import com.hmh.hamyeonham.feature.login.LoginActivity
9+
import com.hmh.hamyeonham.feature.main.MainActivity
1010
import dagger.hilt.android.AndroidEntryPoint
11-
import kotlinx.coroutines.CoroutineScope
12-
import kotlinx.coroutines.Dispatchers
1311

1412
@AndroidEntryPoint
1513
class StartActivity : AppCompatActivity() {
1614
private val binding by viewBinding(ActivitySampleBinding::inflate)
17-
private val coroutineScope = CoroutineScope(Dispatchers.Main)
1815

1916
override fun onCreate(savedInstanceState: Bundle?) {
2017
super.onCreate(savedInstanceState)
@@ -34,7 +31,7 @@ class StartActivity : AppCompatActivity() {
3431
}
3532

3633
private fun navigateToLogin() {
37-
startActivity(Intent(this, LoginActivity::class.java))
34+
startActivity(Intent(this, MainActivity::class.java))
3835
finish()
3936
}
4037
}

app/src/main/java/com/hmh/hamyeonham/navigation/DefaultNavigationProvider.kt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ package com.hmh.hamyeonham.navigation
22

33
import android.content.Context
44
import android.content.Intent
5-
import com.hmh.hamyeonham.challenge.point.PointActivity
65
import com.hmh.hamyeonham.common.navigation.NavigationProvider
76
import com.hmh.hamyeonham.common.permission.PermissionActivity
87
import com.hmh.hamyeonham.feature.lock.LockActivity
9-
import com.hmh.hamyeonham.feature.login.LoginActivity
108
import com.hmh.hamyeonham.feature.main.MainActivity
119
import com.hmh.hamyeonham.feature.onboarding.OnBoardingActivity
1210
import com.hmh.hamyeonham.feature.onboarding.OnBoardingStoryActivity
@@ -25,10 +23,6 @@ class DefaultNavigationProvider @Inject constructor(
2523
return Intent(context, OnBoardingStoryActivity::class.java)
2624
}
2725

28-
override fun toLogin(): Intent {
29-
return Intent(context, LoginActivity::class.java)
30-
}
31-
3226
override fun toMain(): Intent {
3327
return Intent(context, MainActivity::class.java)
3428
}
@@ -41,10 +35,6 @@ class DefaultNavigationProvider @Inject constructor(
4135
return Intent(context, StoreActivity::class.java)
4236
}
4337

44-
override fun toPoint(): Intent {
45-
return Intent(context, PointActivity::class.java)
46-
}
47-
4838
override fun toPermission(): Intent {
4939
return Intent(context, PermissionActivity::class.java)
5040
}

build-logic/convention/src/main/kotlin/com/hmh/hamyeonham/plugin/CommonConfigs.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ internal fun Project.configureAndroidCommonPlugin() {
2222

2323
extensions.getByType<BaseExtension>().apply {
2424
defaultConfig {
25-
val kakaoApiKey = properties["kakaoApiKey"] as? String ?: ""
26-
manifestPlaceholders["kakaoApiKey"] = properties["kakaoApiKey"] as String
27-
buildConfigField("String", "KAKAO_API_KEY", "\"${kakaoApiKey}\"")
28-
2925
val amplitudeApiKey = properties["amplitudeApiKey"] as? String ?: ""
3026
buildConfigField("String", "AMPLITUDE_API_KEY", "\"${amplitudeApiKey}\"")
3127
}

core/common/src/main/java/com/hmh/hamyeonham/common/context/ContextExt.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.hmh.hamyeonham.common.context
22

33
import android.Manifest
4-
import android.app.Activity
54
import android.app.Dialog
65
import android.content.Context
7-
import android.content.ContextWrapper
86
import android.content.pm.ApplicationInfo
97
import android.content.pm.PackageManager
108
import android.graphics.Point

0 commit comments

Comments
 (0)