Skip to content

Commit

Permalink
chore: 코드, 의존성 정리하기
Browse files Browse the repository at this point in the history
  • Loading branch information
CChuYong committed Feb 9, 2024
1 parent 6ba0633 commit 2ba2137
Show file tree
Hide file tree
Showing 13 changed files with 221 additions and 200 deletions.
134 changes: 83 additions & 51 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ android {
create("release") {
keyPassword = secretProperties["keyPassword"]?.toString()
keyAlias = secretProperties["keyAlias"]?.toString()
storeFile = file(secretProperties["storeFile"]?.toString()?:"")
storeFile = file(secretProperties["storeFile"]?.toString() ?: "")
storePassword = secretProperties["storePassword"]?.toString()
}
}
Expand Down Expand Up @@ -98,65 +98,97 @@ android {
}

dependencies {
implementation(project(":widget"))
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test:monitor:1.6.1")
androidTestImplementation("junit:junit:4.13.2")
androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01"))
debugImplementation("androidx.compose.ui:ui-tooling")
implementation("androidx.camera:camera-view:1.4.0-alpha04")
implementation("androidx.activity:activity-compose:1.8.2")
implementation(platform("androidx.compose:compose-bom:2023.10.01"))
implementation("androidx.activity:activity-ktx:1.8.2")
implementation("androidx.annotation:annotation-experimental:1.4.0")
implementation("androidx.annotation:annotation:1.7.1")
implementation("androidx.browser:browser:1.7.0")
implementation("androidx.camera:camera-core:1.4.0-alpha04")
implementation("androidx.camera:camera-lifecycle:1.4.0-alpha04")
implementation("androidx.compose.animation:animation-core:1.6.1")
implementation("androidx.compose.animation:animation:1.6.1")
implementation("androidx.compose.foundation:foundation-layout:1.6.1")
implementation("androidx.compose.foundation:foundation:1.6.1")
implementation("androidx.compose.material3:material3:1.2.0")
implementation("androidx.compose.material:material-icons-core:1.6.1")
implementation("androidx.compose.material:material:1.6.1")
implementation("androidx.compose.runtime:runtime-livedata:1.6.1")
implementation("androidx.compose.runtime:runtime-saveable:1.6.1")
implementation("androidx.compose.runtime:runtime:1.6.1")
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-geometry:1.6.1")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-text:1.6.1")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3")
testImplementation("junit:junit:4.13.2")
androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")
implementation("androidx.compose.runtime:runtime-livedata:1.5.4")
implementation("com.airbnb.android:lottie-compose:6.3.0")
implementation("io.coil-kt:coil-compose:2.5.0")
implementation("com.google.accompanist:accompanist-permissions:0.33.2-alpha")
implementation("androidx.camera:camera-camera2:1.4.0-alpha03")
implementation("androidx.camera:camera-lifecycle:1.4.0-alpha03")
implementation ("androidx.camera:camera-view:1.4.0-alpha03")
implementation("androidx.navigation:navigation-compose:2.7.6")
implementation("androidx.paging:paging-runtime-ktx:3.2.1")
implementation("androidx.paging:paging-compose:3.3.0-alpha02")
implementation("androidx.hilt:hilt-navigation-compose:1.2.0-alpha01")
implementation("androidx.compose.ui:ui-unit:1.6.1")
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.core:core-splashscreen:1.0.1")
implementation("androidx.glance:glance-appwidget:1.0.0")
implementation("androidx.hilt:hilt-navigation-compose:1.2.0-rc01")
implementation("androidx.lifecycle:lifecycle-common:2.7.0")
implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0")
implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:2.7.0")
implementation("androidx.navigation:navigation-common:2.7.7")
implementation("androidx.navigation:navigation-compose:2.7.7")
implementation("androidx.navigation:navigation-runtime-ktx:2.7.7")
implementation("androidx.paging:paging-common-ktx:3.3.0-alpha03")
implementation("androidx.paging:paging-compose:3.3.0-alpha03")
implementation("androidx.savedstate:savedstate:1.2.1")
implementation("androidx.security:security-crypto:1.1.0-alpha06")
implementation("androidx.compose.material:material:1.5.4")
implementation("com.mixpanel.android:mixpanel-android:7.4.0")
implementation("com.google.dagger:hilt-android:2.49")
kapt("com.google.dagger:hilt-android-compiler:2.49")
implementation("com.squareup.retrofit2:retrofit:2.9.0")
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("com.squareup.retrofit2:converter-jackson:2.9.0")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.0")
implementation("com.airbnb.android:lottie-compose:6.3.0")
implementation("com.airbnb.android:lottie:6.3.0")
implementation("com.android.installreferrer:installreferrer:2.2")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.16.0")
implementation("com.fasterxml.jackson.core:jackson-databind:2.16.0")
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.0")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.0")
implementation("com.github.skydoves:balloon-compose:1.6.4")
implementation("com.github.skydoves:balloon:1.6.4")
implementation("com.github.skydoves:sandwich-retrofit:2.0.5")
implementation("com.github.skydoves:sandwich-retrofit-serialization:2.0.5")
implementation("com.google.firebase:firebase-appcheck-playintegrity")

implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
implementation("com.github.skydoves:sandwich:2.0.5")
implementation("com.google.accompanist:accompanist-permissions:0.33.2-alpha")
implementation("com.google.android.gms:play-services-auth:20.7.0")
implementation("com.google.code.gson:gson:2.10.1")
implementation("com.google.dagger:dagger:2.49")
implementation("com.google.dagger:hilt-android:2.49")
implementation("com.google.dagger:hilt-core:2.49")
implementation("com.google.firebase:firebase-analytics-ktx")
implementation("com.google.firebase:firebase-messaging-ktx")
implementation("com.google.firebase:firebase-crashlytics-ktx")
implementation("com.google.firebase:firebase-appcheck-playintegrity")
implementation("com.google.firebase:firebase-auth-ktx")
implementation("com.google.android.gms:play-services-auth:20.7.0")

implementation("com.kakao.sdk:v2-all:2.19.0")
implementation("com.google.firebase:firebase-crashlytics-ktx")
implementation("com.google.firebase:firebase-messaging-ktx")
implementation("com.google.guava:guava:31.1-jre")
implementation("com.jakewharton.timber:timber:5.0.1")
implementation("com.kakao.sdk:v2-auth:2.19.0")
implementation("com.kakao.sdk:v2-common:2.19.0")
implementation("com.kakao.sdk:v2-user:2.19.0")
implementation("com.github.skydoves:balloon-compose:1.6.4")
implementation("com.mixpanel.android:mixpanel-android:7.4.0")
implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.2")
implementation("com.squareup.okio:okio:3.6.0")
implementation("com.squareup.retrofit2:converter-jackson:2.9.0")
implementation("com.squareup.retrofit2:retrofit:2.9.0")
implementation("io.coil-kt:coil-base:2.5.0")
implementation("io.coil-kt:coil-compose-base:2.5.0")
implementation("io.coil-kt:coil-compose:2.5.0")
implementation("io.coil-kt:coil:2.5.0")
implementation("io.github.boguszpawlowski.composecalendar:composecalendar:1.1.1")
implementation("androidx.core:core-splashscreen:1.0.1")
implementation("com.android.installreferrer:installreferrer:2.2")

implementation("androidx.glance:glance-appwidget:1.0.0")
implementation("androidx.glance:glance-material3:1.0.0")
implementation("androidx.work:work-runtime-ktx:2.9.0")
implementation("androidx.profileinstaller:profileinstaller:1.3.1")
implementation("javax.inject:javax.inject:1")
implementation("org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.22")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3")
implementation(platform("androidx.compose:compose-bom:2023.10.01"))
implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
implementation(project(":widget"))
kapt("com.google.dagger:dagger-compiler:2.49")
kapt("com.google.dagger:hilt-android-compiler:2.49")
testImplementation("junit:junit:4.13.2")
}
1 change: 0 additions & 1 deletion app/src/main/java/com/no5ing/bbibbi/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ class MainActivity : ComponentActivity() {
}

private fun onAppStartIntent(intent: Intent?) {
val appLinkAction: String? = intent?.action
Timber.d("onAppStartIntent: $intent")
val appLinkData: Uri? = intent?.data
val linkId = appLinkData?.let {
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/no5ing/bbibbi/di/NetworkModule.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.no5ing.bbibbi.di

import android.content.Context
import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
Expand Down Expand Up @@ -78,10 +77,9 @@ object NetworkModule {
@Singleton
fun provideAuthenticator(
sessionModule: SessionModule,
context: Context,
): Authenticator {
val authenticatorClient = createOkHttpClient(null, null)
return Authenticator { route, response ->
return Authenticator { _, response ->
if (response.code == 401) {
Timber.d("[NetworkModule] Refresh tokens with Authenticator")
val currentSession = sessionModule.sessionState.value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,12 @@ import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.requiredSize
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.systemBars
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.ExperimentalMaterialApi
Expand Down Expand Up @@ -57,7 +54,6 @@ import com.no5ing.bbibbi.R
import com.no5ing.bbibbi.data.model.member.MemberRealEmoji
import com.no5ing.bbibbi.presentation.theme.bbibbiScheme
import com.no5ing.bbibbi.util.CustomDialogPosition
import com.no5ing.bbibbi.util.LocalNavigateControllerState
import com.no5ing.bbibbi.util.asyncImagePainter
import com.no5ing.bbibbi.util.customDialogModifier
import com.no5ing.bbibbi.util.emojiList
Expand All @@ -73,13 +69,11 @@ fun AddReactionDialog(
onTapEmoji: (String) -> Unit,
onTapRealEmoji: (MemberRealEmoji) -> Unit,
onTapRealEmojiCreate: (String) -> Unit,
onDispose: () -> Unit,
realEmojiMap: Map<String, MemberRealEmoji>,
isEnabled: MutableState<Boolean> = remember { mutableStateOf(false) },
) {
if (isEnabled.value) {
val coroutineScope = rememberCoroutineScope()
val navController = LocalNavigateControllerState.current
var showAnimate by remember {
mutableStateOf(false)
}
Expand All @@ -91,7 +85,6 @@ fun AddReactionDialog(
isEnabled.value = false
}
}
val parentBarPadding = WindowInsets.systemBars.asPaddingValues()
Dialog(
onDismissRequest = { showAnimate = false },
properties = DialogProperties(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fun MainCalendarPage(
calendarMonthStatViewModel: GetFamilySummaryViewModel = hiltViewModel(),
monthlyStatisticsViewModel: MonthlyStatisticsViewModel = hiltViewModel(),
) {
val (width, height) = getScreenSize()
val (width) = getScreenSize()
val currentCalendarState: CalendarState<EmptySelectionState> = remember {
CalendarState(
selectionState = EmptySelectionState,
Expand Down Expand Up @@ -316,7 +316,7 @@ fun MainCalendarYearMonthBar(
Text(
text = stringResource(
id = R.string.calendar_history_cnt,
if(summary.isReady()) summary.data.totalImageCnt else 0
if (summary.isReady()) summary.data.totalImageCnt else 0
),
color = MaterialTheme.bbibbiScheme.textPrimary,
style = MaterialTheme.bbibbiTypo.bodyOneRegular,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ fun PostViewContent(
addEmojiBarState.value = false
}
},
onDispose = {
addEmojiBarState.value = false
},
onTapRealEmojiCreate = onTapRealEmojiCreate,
)
Column(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ import com.no5ing.bbibbi.presentation.theme.bbibbiTypo
import com.no5ing.bbibbi.util.LocalSessionState
import com.no5ing.bbibbi.util.asyncImagePainter
import com.no5ing.bbibbi.util.toLocalizedDate
import timber.log.Timber

@OptIn(ExperimentalFoundationApi::class)
@Composable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -67,7 +66,6 @@ fun SettingHomePage(
val appVersionState by retrieveAppVersionViewModel.uiState.collectAsState()
val resources = localResources()
val snackBarHost = LocalSnackbarHostState.current
val coroutineScope = rememberCoroutineScope()
LaunchedEffect(logOutState.value) {
when (logOutState.value) {
OperationStatus.SUCCESS -> onLogOutCompleted()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.no5ing.bbibbi.presentation.theme
import android.app.Activity
import android.os.Build
import android.view.WindowManager
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -51,7 +50,6 @@ private val LightColorScheme = lightColorScheme(

@Composable
fun BbibbiTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
content: @Composable () -> Unit
) {
val view = LocalView.current
Expand Down
Loading

0 comments on commit 2ba2137

Please sign in to comment.