Skip to content

Commit

Permalink
feat: 위젯 모듈 분리
Browse files Browse the repository at this point in the history
  • Loading branch information
CChuYong committed Jan 26, 2024
1 parent d62ed0b commit e8ec5d6
Show file tree
Hide file tree
Showing 152 changed files with 677 additions and 507 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ android {
}
}


buildTypes {
release {
isMinifyEnabled = true
Expand Down Expand Up @@ -91,6 +90,7 @@ android {
}

dependencies {
implementation(project(":widget"))
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
implementation("androidx.activity:activity-compose:1.8.2")
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
</service>

<receiver
android:name=".WidgetReceiver"
android:name=".widget.WidgetReceiver"
android:exported="false"
android:label="@string/yellow_widget_name">
<intent-filter>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/no5ing/bbibbi/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ import com.no5ing.bbibbi.data.datasource.network.RestAPI
import com.no5ing.bbibbi.data.datasource.network.request.member.AddFcmTokenRequest
import com.no5ing.bbibbi.di.NetworkModule
import com.no5ing.bbibbi.di.SessionModule
import com.no5ing.bbibbi.presentation.ui.MainPage
import com.no5ing.bbibbi.presentation.feature.MainPage
import com.no5ing.bbibbi.presentation.ui.navigation.NavDestinationListener
import com.no5ing.bbibbi.presentation.view_controller.LandingAlreadyFamilyExistsDestination
import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.navigate
import com.no5ing.bbibbi.presentation.feature.view_controller.LandingAlreadyFamilyExistsDestination
import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.navigate
import com.no5ing.bbibbi.presentation.ui.theme.BbibbiTheme
import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
import com.no5ing.bbibbi.util.LocalDeepLinkState
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import com.no5ing.bbibbi.data.datasource.network.response.Pagination
import com.no5ing.bbibbi.data.repository.Arguments
import com.no5ing.bbibbi.data.repository.BasePageSource
import com.no5ing.bbibbi.data.repository.BaseRepository
import com.no5ing.bbibbi.presentation.uistate.post.PostCommentUiState
import com.no5ing.bbibbi.presentation.feature.uistate.post.PostCommentUiState
import com.no5ing.bbibbi.util.parallelMap
import com.skydoves.sandwich.ApiResponse
import com.skydoves.sandwich.mapSuccess
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import com.no5ing.bbibbi.data.model.member.Member
import com.no5ing.bbibbi.data.repository.Arguments
import com.no5ing.bbibbi.data.repository.BasePageSource
import com.no5ing.bbibbi.data.repository.BaseRepository
import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
import com.no5ing.bbibbi.util.parallelMap
import com.skydoves.sandwich.ApiResponse
import com.skydoves.sandwich.mapSuccess
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/no5ing/bbibbi/di/SessionModule.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.no5ing.bbibbi.di
import android.content.Context
import com.no5ing.bbibbi.data.model.auth.AuthResult
import com.no5ing.bbibbi.data.model.member.Member
import com.no5ing.bbibbi.presentation.uistate.common.SessionState
import com.no5ing.bbibbi.presentation.feature.uistate.common.SessionState
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import timber.log.Timber
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.util
package com.no5ing.bbibbi.presentation.component

import androidx.activity.compose.BackHandler
import androidx.compose.runtime.Composable
Expand All @@ -10,8 +10,6 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.res.stringResource
import com.no5ing.bbibbi.R
import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
import com.no5ing.bbibbi.presentation.ui.snackBarInfo
import com.no5ing.bbibbi.util.LocalSnackbarHostState
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import android.content.Context
import android.graphics.PixelFormat
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import android.annotation.SuppressLint
import androidx.compose.animation.core.MutableTransitionState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.Box
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import androidx.compose.foundation.gestures.Orientation
import androidx.compose.material3.ExperimentalMaterial3Api
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui
package com.no5ing.bbibbi.presentation.component


import androidx.compose.foundation.background
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import androidx.compose.animation.core.AnimationSpec
import androidx.compose.animation.core.SpringSpec
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.component
package com.no5ing.bbibbi.presentation.component

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.expandHorizontally
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.button
package com.no5ing.bbibbi.presentation.component.button

import androidx.compose.animation.core.LinearEasing
import androidx.compose.animation.core.animateFloatAsState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.button
package com.no5ing.bbibbi.presentation.component.button

import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui.common.button
package com.no5ing.bbibbi.presentation.component.button

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.fadeIn
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.ui
package com.no5ing.bbibbi.presentation.feature

import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
Expand All @@ -16,9 +16,10 @@ import androidx.navigation.NavHostController
import androidx.navigation.compose.NavHost
import com.no5ing.bbibbi.presentation.ui.navigation.animation.defaultFadeIn
import com.no5ing.bbibbi.presentation.ui.navigation.animation.defaultFadeOut
import com.no5ing.bbibbi.presentation.view_controller.CameraViewDestination
import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination
import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.composable
import com.no5ing.bbibbi.presentation.feature.view_controller.CameraViewDestination
import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination
import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.composable
import com.no5ing.bbibbi.presentation.component.CustomSnackBarHost
import com.no5ing.bbibbi.presentation.ui.navigation.graph.landingGraph
import com.no5ing.bbibbi.presentation.ui.navigation.graph.mainGraph
import com.no5ing.bbibbi.presentation.ui.navigation.graph.registerGraph
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.landing.join_family_with_link
package com.no5ing.bbibbi.presentation.feature.state.landing.join_family_with_link

import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.landing.login
package com.no5ing.bbibbi.presentation.feature.state.landing.login

import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.landing.login
package com.no5ing.bbibbi.presentation.feature.state.landing.login

enum class LoginStatus {
IDLE,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.landing.onboarding
package com.no5ing.bbibbi.presentation.feature.state.landing.onboarding

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.pager.PagerState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.main.family
package com.no5ing.bbibbi.presentation.feature.state.main.family

import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.no5ing.bbibbi.presentation.state.main.home
package com.no5ing.bbibbi.presentation.feature.state.main.home

import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.Stable
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.paging.PagingData
import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.main.home
package com.no5ing.bbibbi.presentation.feature.state.main.home

import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.main.home
package com.no5ing.bbibbi.presentation.feature.state.main.home

import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.no5ing.bbibbi.presentation.state.post.view
package com.no5ing.bbibbi.presentation.feature.state.post.view

import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
import androidx.compose.runtime.remember
import com.no5ing.bbibbi.data.model.APIResponse
import com.no5ing.bbibbi.presentation.uistate.family.MainFeedUiState
import com.no5ing.bbibbi.presentation.feature.uistate.family.MainFeedUiState
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.register.day_of_birth
package com.no5ing.bbibbi.presentation.feature.state.register.day_of_birth

import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.register.nickname
package com.no5ing.bbibbi.presentation.feature.state.register.nickname

import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.register.profile_image
package com.no5ing.bbibbi.presentation.feature.state.register.profile_image

import android.net.Uri
import androidx.compose.runtime.Composable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.state.setting.change_nickname
package com.no5ing.bbibbi.presentation.feature.state.setting.change_nickname

import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.uistate.common
package com.no5ing.bbibbi.presentation.feature.uistate.common

import com.no5ing.bbibbi.data.model.auth.AuthResult

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.no5ing.bbibbi.presentation.feature.uistate.family

data class FamilyInviteLinkUiState(
val url: String
)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.uistate.family
package com.no5ing.bbibbi.presentation.feature.uistate.family

import com.no5ing.bbibbi.data.model.BaseModel
import com.no5ing.bbibbi.data.model.member.Member
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.uistate.post
package com.no5ing.bbibbi.presentation.feature.uistate.post

import android.os.Parcelable
import com.no5ing.bbibbi.data.model.BaseModel
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.uistate.post
package com.no5ing.bbibbi.presentation.feature.uistate.post

import com.no5ing.bbibbi.data.model.BaseModel
import com.no5ing.bbibbi.data.model.member.Member
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.view.common
package com.no5ing.bbibbi.presentation.feature.view.common

import android.net.Uri
import android.util.Rational
Expand Down Expand Up @@ -49,9 +49,9 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
import com.google.accompanist.permissions.isGranted
import com.google.accompanist.permissions.rememberPermissionState
import com.no5ing.bbibbi.R
import com.no5ing.bbibbi.presentation.ui.common.button.CameraCaptureButton
import com.no5ing.bbibbi.presentation.ui.common.component.BBiBBiSurface
import com.no5ing.bbibbi.presentation.ui.common.component.ClosableTopBar
import com.no5ing.bbibbi.presentation.component.button.CameraCaptureButton
import com.no5ing.bbibbi.presentation.component.BBiBBiSurface
import com.no5ing.bbibbi.presentation.component.ClosableTopBar
import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
import com.no5ing.bbibbi.util.getCameraProvider
import com.no5ing.bbibbi.util.takePhotoWithImage
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.view.dialog
package com.no5ing.bbibbi.presentation.feature.view.dialog

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.no5ing.bbibbi.presentation.view.dialog
package com.no5ing.bbibbi.presentation.feature.view.dialog

import androidx.compose.animation.core.tween
import androidx.compose.foundation.ExperimentalFoundationApi
Expand Down Expand Up @@ -60,20 +60,20 @@ import com.no5ing.bbibbi.R
import com.no5ing.bbibbi.data.model.APIResponse
import com.no5ing.bbibbi.data.model.member.Member
import com.no5ing.bbibbi.data.repository.Arguments
import com.no5ing.bbibbi.presentation.ui.common.component.CircleProfileImage
import com.no5ing.bbibbi.presentation.ui.common.component.DraggableCardComplex
import com.no5ing.bbibbi.presentation.ui.common.component.ModalBottomSheet
import com.no5ing.bbibbi.presentation.ui.common.component.rememberModalBottomSheetState
import com.no5ing.bbibbi.presentation.view_controller.MainProfileDestination
import com.no5ing.bbibbi.presentation.view_controller.NavigationDestination.Companion.navigate
import com.no5ing.bbibbi.presentation.ui.showSnackBarWithDismiss
import com.no5ing.bbibbi.presentation.ui.snackBarWarning
import com.no5ing.bbibbi.presentation.component.CircleProfileImage
import com.no5ing.bbibbi.presentation.component.DraggableCardComplex
import com.no5ing.bbibbi.presentation.component.ModalBottomSheet
import com.no5ing.bbibbi.presentation.component.rememberModalBottomSheetState
import com.no5ing.bbibbi.presentation.feature.view_controller.MainProfileDestination
import com.no5ing.bbibbi.presentation.feature.view_controller.NavigationDestination.Companion.navigate
import com.no5ing.bbibbi.presentation.component.showSnackBarWithDismiss
import com.no5ing.bbibbi.presentation.component.snackBarWarning
import com.no5ing.bbibbi.presentation.ui.theme.bbibbiScheme
import com.no5ing.bbibbi.presentation.ui.theme.bbibbiTypo
import com.no5ing.bbibbi.presentation.uistate.post.PostCommentUiState
import com.no5ing.bbibbi.presentation.viewmodel.post.CreatePostCommentViewModel
import com.no5ing.bbibbi.presentation.viewmodel.post.DeletePostCommentViewModel
import com.no5ing.bbibbi.presentation.viewmodel.post.PostCommentViewModel
import com.no5ing.bbibbi.presentation.feature.uistate.post.PostCommentUiState
import com.no5ing.bbibbi.presentation.feature.viewmodel.post.CreatePostCommentViewModel
import com.no5ing.bbibbi.presentation.feature.viewmodel.post.DeletePostCommentViewModel
import com.no5ing.bbibbi.presentation.feature.viewmodel.post.PostCommentViewModel
import com.no5ing.bbibbi.util.LocalNavigateControllerState
import com.no5ing.bbibbi.util.LocalSessionState
import com.no5ing.bbibbi.util.LocalSnackbarHostState
Expand Down
Loading

0 comments on commit e8ec5d6

Please sign in to comment.