From e594211c24fc5a2b7e7ff8cece49bf55d8adc41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=EC=98=81=EB=AF=BC?= Date: Sat, 13 Jan 2024 20:44:55 +0900 Subject: [PATCH] =?UTF-8?q?style:=20=EC=BD=94=EB=93=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 2 +- .../com/no5ing/bbibbi/ExampleInstrumentedTest.kt | 6 ++---- .../java/com/no5ing/bbibbi/FirebaseService.kt | 1 - .../main/family/FamilyPageInvitationState.kt | 1 - .../ui/common/button/CameraCaptureButton.kt | 2 +- .../ui/feature/dialog/ReactionListDialog.kt | 6 ++---- .../landing/join_family/JoinFamilyPageLinkBar.kt | 2 +- .../JoinFamilyWithLinkPage.kt | 16 ++++++++-------- .../ui/feature/landing/login/LoginPage.kt | 14 +++++++++----- .../feature/landing/onboarding/OnBoardingPage.kt | 7 ++++--- .../ui/feature/main/calendar/MainCalendarDay.kt | 1 - .../ui/feature/main/calendar/MainCalendarPage.kt | 5 ----- .../main/calendar/detail/CalendarDetailPage.kt | 1 - .../main/family/FamilyPageInviteButton.kt | 3 +-- .../ui/feature/main/home/HomePage.kt | 3 +-- .../ui/feature/main/home/HomePageContent.kt | 1 - .../ui/feature/main/home/HomePageStoryBar.kt | 2 +- .../ui/feature/post/view/PostViewReactionBar.kt | 4 ++-- .../bbibbi/presentation/ui/widget/AppWidget.kt | 7 ++++--- .../family/FamilyInviteLinkViewModel.kt | 6 +----- .../family/JoinFamilyWithLinkViewModel.kt | 1 - .../viewmodel/members/FamilyMembersViewModel.kt | 4 ---- app/src/main/res/drawable/notification_icon.xml | 12 +++++++++--- app/src/main/res/drawable/plus_icon.xml | 6 +++--- app/src/main/res/values/themes.xml | 1 + .../java/com/no5ing/bbibbi/ExampleUnitTest.kt | 3 +-- 26 files changed, 52 insertions(+), 65 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aca9dfe..8c5780e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -22,7 +22,7 @@ val secretProperties = Properties().apply { val majorVersion = 1 val minorVersion = 0 val patchVersion = 1 -val buildVersion = 0 +val buildVersion = 1 android { namespace = "com.no5ing.bbibbi" diff --git a/app/src/androidTest/java/com/no5ing/bbibbi/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/no5ing/bbibbi/ExampleInstrumentedTest.kt index e21da84..cdeb646 100644 --- a/app/src/androidTest/java/com/no5ing/bbibbi/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/no5ing/bbibbi/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ package com.no5ing.bbibbi -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.* import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * diff --git a/app/src/main/java/com/no5ing/bbibbi/FirebaseService.kt b/app/src/main/java/com/no5ing/bbibbi/FirebaseService.kt index af9210e..f4050c3 100644 --- a/app/src/main/java/com/no5ing/bbibbi/FirebaseService.kt +++ b/app/src/main/java/com/no5ing/bbibbi/FirebaseService.kt @@ -5,7 +5,6 @@ import android.app.NotificationManager import android.app.PendingIntent import android.content.Context import android.content.Intent -import androidx.compose.ui.graphics.Color import androidx.core.app.NotificationCompat import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/family/FamilyPageInvitationState.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/family/FamilyPageInvitationState.kt index c16e727..7372ad0 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/family/FamilyPageInvitationState.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/state/main/family/FamilyPageInvitationState.kt @@ -5,7 +5,6 @@ import androidx.compose.runtime.Stable import androidx.compose.runtime.State import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.link.DeepLink -import com.no5ing.bbibbi.presentation.uistate.family.FamilyInviteLinkUiState @Stable data class FamilyPageInvitationState( diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/CameraCaptureButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/CameraCaptureButton.kt index ce7aeee..5be55e1 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/CameraCaptureButton.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/common/button/CameraCaptureButton.kt @@ -21,7 +21,7 @@ fun CameraCaptureButton( modifier = modifier .size(80.dp) .clickable { - if(!isCapturing) onClick() + if (!isCapturing) onClick() }, alpha = if (isCapturing) 0.3f else 1.0f, ) diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/dialog/ReactionListDialog.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/dialog/ReactionListDialog.kt index 6e7c682..e5f5ec8 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/dialog/ReactionListDialog.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/dialog/ReactionListDialog.kt @@ -35,7 +35,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState -import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -53,7 +52,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.DialogProperties import androidx.compose.ui.window.DialogWindowProvider -import androidx.hilt.navigation.compose.hiltViewModel import com.no5ing.bbibbi.R import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.presentation.ui.common.button.CTAButton @@ -75,7 +73,7 @@ fun ReactionListDialog( selectedEmoji: String, isEnabled: MutableState = remember { mutableStateOf(false) }, emojiMap: Map>, - // postViewReactionMemberViewModel: PostViewReactionMemberViewModel = hiltViewModel(), + // postViewReactionMemberViewModel: PostViewReactionMemberViewModel = hiltViewModel(), ) { if (isEnabled.value) { val navController = LocalNavigateControllerState.current @@ -104,7 +102,7 @@ fun ReactionListDialog( val (width, height) = getScreenSize() - // val memberState = postViewReactionMemberViewModel.uiState.collectAsState() + // val memberState = postViewReactionMemberViewModel.uiState.collectAsState() val myGroup = emojiMap[selectedEmoji] ?: emptyList() val totalCntMessage = stringResource(id = R.string.emoji_reaction_total, myGroup.size) Box( diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/join_family/JoinFamilyPageLinkBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/join_family/JoinFamilyPageLinkBar.kt index 8761ac0..5b46709 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/join_family/JoinFamilyPageLinkBar.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/join_family/JoinFamilyPageLinkBar.kt @@ -28,7 +28,7 @@ import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo @Composable -fun JoinFamilyPageLinkBar( +fun JoinFamilyPageLinkBar( onTap: () -> Unit, modifier: Modifier = Modifier, ) { diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/join_family_with_link/JoinFamilyWithLinkPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/join_family_with_link/JoinFamilyWithLinkPage.kt index f449302..b15f645 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/join_family_with_link/JoinFamilyWithLinkPage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/join_family_with_link/JoinFamilyWithLinkPage.kt @@ -84,7 +84,7 @@ fun JoinFamilyWithLinkPage( } LaunchedEffect(deepLinkState) { if (deepLinkState != null) { - if(isValidUrl(deepLinkState)){ + if (isValidUrl(deepLinkState)) { state.nicknameTextState.value = deepLinkState state.isInvalidInputState.value = false state.ctaButtonEnabledState.value = true @@ -202,13 +202,13 @@ fun JoinFamilyWithLinkPage( contentPadding = PaddingValues(vertical = 18.dp), isActive = state.ctaButtonEnabledState.value && uiState.isIdle(), onClick = { - joinFamilyWithLinkViewModel.invoke( - Arguments( - arguments = mapOf( - "linkId" to getLinkIdFromUrl(state.nicknameTextState.value), - ) - ) - ) + joinFamilyWithLinkViewModel.invoke( + Arguments( + arguments = mapOf( + "linkId" to getLinkIdFromUrl(state.nicknameTextState.value), + ) + ) + ) }, ) } diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/login/LoginPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/login/LoginPage.kt index 90eed39..b8130e7 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/login/LoginPage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/login/LoginPage.kt @@ -195,8 +195,10 @@ fun KakaoLoginButton( ) { val alphaValue = if (isLoggingIn) 0.5f else 1.0f Button( - colors = ButtonDefaults.buttonColors(containerColor = - MaterialTheme.bbibbiScheme.kakaoYellow.copy(alpha = alphaValue)), + colors = ButtonDefaults.buttonColors( + containerColor = + MaterialTheme.bbibbiScheme.kakaoYellow.copy(alpha = alphaValue) + ), onClick = onClick, modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(8.dp), @@ -232,9 +234,11 @@ fun GoogleLoginButton( val alphaValue = if (isLoggingIn) 0.5f else 1.0f Button( colors = ButtonDefaults - .buttonColors(containerColor = MaterialTheme.bbibbiScheme.white.copy( - alpha = alphaValue - )), + .buttonColors( + containerColor = MaterialTheme.bbibbiScheme.white.copy( + alpha = alphaValue + ) + ), onClick = onClick, modifier = Modifier.fillMaxWidth(), shape = RoundedCornerShape(8.dp), diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/onboarding/OnBoardingPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/onboarding/OnBoardingPage.kt index 545a062..ccca277 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/onboarding/OnBoardingPage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/landing/onboarding/OnBoardingPage.kt @@ -37,11 +37,12 @@ fun OnBoardingPage( onAlreadyHaveFamily: () -> Unit = {}, onFamilyNotExists: () -> Unit = {}, onBoardingPageState: OnBoardingPageState = rememberOnBoardingPageState(), - // familyRegistrationViewModel: FamilyRegistrationViewModel = hiltViewModel(), + // familyRegistrationViewModel: FamilyRegistrationViewModel = hiltViewModel(), ) { val sessionState = LocalSessionState.current - // val registrationState = familyRegistrationViewModel.uiState.collectAsState() - val nextViewRoute = if(sessionState.isLoggedIn() && sessionState.hasFamily()) onAlreadyHaveFamily else onFamilyNotExists + // val registrationState = familyRegistrationViewModel.uiState.collectAsState() + val nextViewRoute = + if (sessionState.isLoggedIn() && sessionState.hasFamily()) onAlreadyHaveFamily else onFamilyNotExists val perm = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) rememberPermissionState(permission = Manifest.permission.POST_NOTIFICATIONS) { isAccepted -> if (!isAccepted) { diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/MainCalendarDay.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/MainCalendarDay.kt index 7abb1c1..0a8b64d 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/MainCalendarDay.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/MainCalendarDay.kt @@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Icon diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/MainCalendarPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/MainCalendarPage.kt index d0c6692..d425ed4 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/MainCalendarPage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/MainCalendarPage.kt @@ -1,6 +1,5 @@ package com.no5ing.bbibbi.presentation.ui.feature.main.calendar -import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -20,13 +19,9 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember -import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/detail/CalendarDetailPage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/detail/CalendarDetailPage.kt index 5f6974b..5678563 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/detail/CalendarDetailPage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/calendar/detail/CalendarDetailPage.kt @@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.rememberPagerState diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/family/FamilyPageInviteButton.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/family/FamilyPageInviteButton.kt index a05061c..b9d525e 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/family/FamilyPageInviteButton.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/family/FamilyPageInviteButton.kt @@ -35,7 +35,6 @@ import com.no5ing.bbibbi.presentation.state.main.family.rememberFamilyPageInvita import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme import com.no5ing.bbibbi.presentation.viewmodel.family.FamilyInviteLinkViewModel import com.no5ing.bbibbi.util.LocalSessionState -import timber.log.Timber @Composable fun FamilyPageInviteButton( @@ -92,7 +91,7 @@ fun FamilyPageInviteButton( fontSize = 18.sp, ) Text( - text = if(uiState.isReady()) uiState.data.url else "Loading...", + text = if (uiState.isReady()) uiState.data.url else "Loading...", color = MaterialTheme.bbibbiScheme.textSecondary, fontSize = 14.sp, ) diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePage.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePage.kt index d15f3ab..74f0191 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePage.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePage.kt @@ -30,7 +30,6 @@ import com.no5ing.bbibbi.presentation.viewmodel.members.FamilyMembersViewModel import com.no5ing.bbibbi.presentation.viewmodel.post.IsMeUploadedTodayViewModel import com.no5ing.bbibbi.presentation.viewmodel.post.MainPostFeedViewModel import com.no5ing.bbibbi.util.LocalSessionState -import timber.log.Timber @Composable fun HomePage( @@ -62,7 +61,7 @@ fun HomePage( isMeUploadedTodayViewModel.invoke(Arguments(arguments = mapOf("memberId" to memberId))) } LaunchedEffect(meState.value.status) { - if(meState.value.isIdle()) { + if (meState.value.isIdle()) { retrieveMeViewModel.invoke(Arguments()) } } diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePageContent.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePageContent.kt index bf417fa..dfe7227 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePageContent.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePageContent.kt @@ -56,7 +56,6 @@ import com.no5ing.bbibbi.presentation.viewmodel.members.FamilyMembersViewModel import com.no5ing.bbibbi.presentation.viewmodel.post.MainPostFeedViewModel import com.no5ing.bbibbi.util.gapBetweenNow import com.no5ing.bbibbi.util.todayAsString -import timber.log.Timber @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePageStoryBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePageStoryBar.kt index 0b8007c..79d0b0c 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePageStoryBar.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/main/home/HomePageStoryBar.kt @@ -128,7 +128,7 @@ fun StoryBarIcon( onTap = onTap, ) Text( - text = if(isMe) stringResource(id = R.string.family_me) else member.name, + text = if (isMe) stringResource(id = R.string.family_me) else member.name, color = MaterialTheme.bbibbiScheme.textSecondary, overflow = TextOverflow.Ellipsis, maxLines = 1, diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/post/view/PostViewReactionBar.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/post/view/PostViewReactionBar.kt index 9f71d7d..d2c1601 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/post/view/PostViewReactionBar.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/feature/post/view/PostViewReactionBar.kt @@ -48,7 +48,7 @@ fun PostViewReactionBar( familyPostReactionBarViewModel: PostReactionBarViewModel = hiltViewModel(), removePostReactionViewModel: RemovePostReactionViewModel = hiltViewModel(), addPostReactionViewModel: AddPostReactionViewModel = hiltViewModel(), - // postViewReactionMemberViewModel: PostViewReactionMemberViewModel = hiltViewModel(), + // postViewReactionMemberViewModel: PostViewReactionMemberViewModel = hiltViewModel(), uiState: State> = familyPostReactionBarViewModel.uiState.collectAsState(), onTapAddEmojiButton: () -> Unit, ) { @@ -62,7 +62,7 @@ fun PostViewReactionBar( ) ) ) - // postViewReactionMemberViewModel.invoke(Arguments()) + // postViewReactionMemberViewModel.invoke(Arguments()) } val selectedEmoji = remember { mutableStateOf(emojiList.first()) } val emojiMap = uiState.value.groupBy { it.emojiType } diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/widget/AppWidget.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/widget/AppWidget.kt index 30f03be..0e551bf 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/ui/widget/AppWidget.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/ui/widget/AppWidget.kt @@ -7,7 +7,6 @@ import android.graphics.Rect import android.text.TextPaint import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.DpSize import androidx.compose.ui.unit.TextUnit import androidx.compose.ui.unit.dp @@ -95,8 +94,10 @@ class AppWidget : GlanceAppWidget() { WidgetImageWorker::class.java, Duration.ofMinutes(15), ) - .setConstraints(Constraints.Builder() - .setRequiredNetworkType(NetworkType.CONNECTED).build()) + .setConstraints( + Constraints.Builder() + .setRequiredNetworkType(NetworkType.CONNECTED).build() + ) .build() ) provideContent { diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/FamilyInviteLinkViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/FamilyInviteLinkViewModel.kt index c8d274b..00c5861 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/FamilyInviteLinkViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/FamilyInviteLinkViewModel.kt @@ -5,11 +5,7 @@ import com.no5ing.bbibbi.data.model.APIResponse import com.no5ing.bbibbi.data.model.APIResponse.Companion.wrapToAPIResponse import com.no5ing.bbibbi.data.model.link.DeepLink import com.no5ing.bbibbi.data.repository.Arguments -import com.no5ing.bbibbi.presentation.uistate.family.FamilyInviteLinkUiState import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel -import com.skydoves.sandwich.retrofit.body -import com.skydoves.sandwich.suspendOnFailure -import com.skydoves.sandwich.suspendOnSuccess import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import javax.inject.Inject @@ -18,7 +14,7 @@ import javax.inject.Inject class FamilyInviteLinkViewModel @Inject constructor( private val restAPI: RestAPI, ) : BaseViewModel>() { - override fun initState(): APIResponse { + override fun initState(): APIResponse { return APIResponse.idle() } diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/JoinFamilyWithLinkViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/JoinFamilyWithLinkViewModel.kt index 548cff3..1d191c2 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/JoinFamilyWithLinkViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/family/JoinFamilyWithLinkViewModel.kt @@ -1,6 +1,5 @@ package com.no5ing.bbibbi.presentation.viewmodel.family -import com.no5ing.bbibbi.data.datasource.local.LocalDataStorage import com.no5ing.bbibbi.data.datasource.network.RestAPI import com.no5ing.bbibbi.data.datasource.network.request.member.JoinFamilyRequest import com.no5ing.bbibbi.data.model.APIResponse diff --git a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/FamilyMembersViewModel.kt b/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/FamilyMembersViewModel.kt index bebcf69..8eddd2b 100644 --- a/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/FamilyMembersViewModel.kt +++ b/app/src/main/java/com/no5ing/bbibbi/presentation/viewmodel/members/FamilyMembersViewModel.kt @@ -3,18 +3,14 @@ package com.no5ing.bbibbi.presentation.viewmodel.members import androidx.lifecycle.viewModelScope import androidx.paging.PagingData import androidx.paging.cachedIn -import androidx.paging.filter import com.no5ing.bbibbi.data.model.member.Member import com.no5ing.bbibbi.data.repository.Arguments import com.no5ing.bbibbi.data.repository.member.GetMembersRepository -import com.no5ing.bbibbi.di.SessionModule import com.no5ing.bbibbi.presentation.viewmodel.BaseViewModel import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.collectLatest -import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.stateIn import javax.inject.Inject diff --git a/app/src/main/res/drawable/notification_icon.xml b/app/src/main/res/drawable/notification_icon.xml index 2816215..390f8bc 100644 --- a/app/src/main/res/drawable/notification_icon.xml +++ b/app/src/main/res/drawable/notification_icon.xml @@ -1,4 +1,10 @@ - - + + diff --git a/app/src/main/res/drawable/plus_icon.xml b/app/src/main/res/drawable/plus_icon.xml index 99219cb..a6d6547 100644 --- a/app/src/main/res/drawable/plus_icon.xml +++ b/app/src/main/res/drawable/plus_icon.xml @@ -3,7 +3,7 @@ android:height="46dp" android:viewportWidth="45" android:viewportHeight="46"> - + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 4b3e97c..a5901e0 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,6 @@ + diff --git a/app/src/test/java/com/no5ing/bbibbi/ExampleUnitTest.kt b/app/src/test/java/com/no5ing/bbibbi/ExampleUnitTest.kt index 51f933b..878f36c 100644 --- a/app/src/test/java/com/no5ing/bbibbi/ExampleUnitTest.kt +++ b/app/src/test/java/com/no5ing/bbibbi/ExampleUnitTest.kt @@ -1,9 +1,8 @@ package com.no5ing.bbibbi +import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.Assert.* - /** * Example local unit test, which will execute on the development machine (host). *