-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[PC-253] 패키지 재정리, Auth 화면 생성 #22
Merged
Merged
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6b10720
[PC-253] 패키지 재정리, 화면 생성
sksowk156 b08728e
[PC-253] conflict 수정
sksowk156 04897e0
[PC-253] page -> graph 이름 변경
sksowk156 e48894c
Merge remote-tracking branch 'origin' into feature/sksowk156/PC-253
sksowk156 e6435f6
[PC-253] maverick viewmodel di 추가
sksowk156 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
feature/auth/src/main/java/com/puzzle/auth/AuthViewModel.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
61 changes: 61 additions & 0 deletions
61
feature/auth/src/main/java/com/puzzle/auth/page/main/AuthScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| package com.puzzle.auth.page.main | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import com.airbnb.mvrx.compose.collectAsState | ||
| import com.airbnb.mvrx.compose.mavericksViewModel | ||
|
|
||
| @Composable | ||
| fun AuthRoute( | ||
| viewModel: AuthViewModel = mavericksViewModel(), | ||
| ) { | ||
| val state by viewModel.collectAsState() | ||
| val context = LocalContext.current | ||
|
|
||
| AuthScreen( | ||
|
|
||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| fun AuthScreen() { | ||
| // Column( | ||
| // modifier = Modifier | ||
| // .fillMaxSize() | ||
| // .clickable { | ||
| // viewModel.navigationHelper.navigate( | ||
| // NavigationEvent.NavigateTo( | ||
| // route = MatchingGraph, | ||
| // popUpTo = AuthGraph, | ||
| // ) | ||
| // ) | ||
| // }, | ||
| // ) { | ||
| // Text( | ||
| // text = "카카오 로그인", | ||
| // fontSize = 30.sp, | ||
| // modifier = Modifier.clickable { | ||
| // UserApiClient.instance.loginWithKakaoAccount(context) { token, error -> | ||
| // if (error != null) { | ||
| // Log.e("test", "로그인 실패", error) | ||
| // } else if (token != null) { | ||
| // Log.i("test", "로그인 성공 ${token.accessToken}") | ||
| // } | ||
| // } | ||
| // } | ||
| // ) | ||
| // | ||
| // Text( | ||
| // text = "AuthRoute", | ||
| // fontSize = 30.sp, | ||
| // ) | ||
| // } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun PreviewAuthScreen() { | ||
|
|
||
| } |
13 changes: 13 additions & 0 deletions
13
feature/auth/src/main/java/com/puzzle/auth/page/main/AuthViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.puzzle.auth.page.main | ||
|
|
||
| import com.airbnb.mvrx.MavericksViewModel | ||
| import com.puzzle.auth.page.main.contract.AuthState | ||
| import com.puzzle.navigation.NavigationHelper | ||
| import dagger.assisted.Assisted | ||
| import dagger.assisted.AssistedInject | ||
|
|
||
| class AuthViewModel @AssistedInject constructor( | ||
| @Assisted initialState: AuthState, | ||
| private val navigationHelper: NavigationHelper, | ||
| ) : MavericksViewModel<AuthState>(initialState) { | ||
| } | ||
4 changes: 4 additions & 0 deletions
4
feature/auth/src/main/java/com/puzzle/auth/page/main/contract/AuthIntent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package com.puzzle.auth.page.main.contract | ||
|
|
||
| class AuthIntent { | ||
| } |
4 changes: 4 additions & 0 deletions
4
feature/auth/src/main/java/com/puzzle/auth/page/main/contract/AuthSideEffect.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package com.puzzle.auth.page.main.contract | ||
|
|
||
| class AuthSideEffect { | ||
| } |
7 changes: 7 additions & 0 deletions
7
feature/auth/src/main/java/com/puzzle/auth/page/main/contract/AuthState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.puzzle.auth.page.main.contract | ||
|
|
||
| import com.airbnb.mvrx.MavericksState | ||
|
|
||
| data class AuthState( | ||
| val a: Boolean, | ||
| ) : MavericksState |
13 changes: 13 additions & 0 deletions
13
feature/auth/src/main/java/com/puzzle/auth/page/registration/AuthRegistrationScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.puzzle.auth.page.registration | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import com.airbnb.mvrx.compose.collectAsState | ||
| import com.airbnb.mvrx.compose.mavericksViewModel | ||
|
|
||
| @Composable | ||
| internal fun AuthRegistrationScreen( | ||
| viewModel: AuthRegistrationViewModel = mavericksViewModel() | ||
| ) { | ||
| val state by viewModel.collectAsState() | ||
| } |
13 changes: 13 additions & 0 deletions
13
feature/auth/src/main/java/com/puzzle/auth/page/registration/AuthRegistrationViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.puzzle.auth.page.registration | ||
|
|
||
| import com.airbnb.mvrx.MavericksViewModel | ||
| import com.puzzle.auth.page.registration.contract.AuthRegistrationState | ||
| import com.puzzle.navigation.NavigationHelper | ||
| import dagger.assisted.Assisted | ||
| import dagger.assisted.AssistedInject | ||
|
|
||
| class AuthRegistrationViewModel @AssistedInject constructor( | ||
| @Assisted initialState: AuthRegistrationState, | ||
| private val navigationHelper: NavigationHelper, | ||
| ) : MavericksViewModel<AuthRegistrationState>(initialState) { | ||
| } |
4 changes: 4 additions & 0 deletions
4
...e/auth/src/main/java/com/puzzle/auth/page/registration/contract/AuthRegistrationIntent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package com.puzzle.auth.page.registration.contract | ||
|
|
||
| sealed class AuthRegistrationIntent { | ||
| } |
4 changes: 4 additions & 0 deletions
4
...th/src/main/java/com/puzzle/auth/page/registration/contract/AuthRegistrationSideEffect.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package com.puzzle.auth.page.registration.contract | ||
|
|
||
| sealed class AuthRegistrationSideEffect { | ||
| } |
7 changes: 7 additions & 0 deletions
7
...re/auth/src/main/java/com/puzzle/auth/page/registration/contract/AuthRegistrationState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.puzzle.auth.page.registration.contract | ||
|
|
||
| import com.airbnb.mvrx.MavericksState | ||
|
|
||
| data class AuthRegistrationState( | ||
| val a: Boolean, | ||
| ) : MavericksState |
13 changes: 13 additions & 0 deletions
13
feature/auth/src/main/java/com/puzzle/auth/page/verification/AuthVerficationViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.puzzle.auth.page.verification | ||
|
|
||
| import com.airbnb.mvrx.MavericksViewModel | ||
| import com.puzzle.auth.page.verification.contract.AuthVerficationState | ||
| import com.puzzle.navigation.NavigationHelper | ||
| import dagger.assisted.Assisted | ||
| import dagger.assisted.AssistedInject | ||
|
|
||
| class AuthVerficationViewModel @AssistedInject constructor( | ||
| @Assisted initialState: AuthVerficationState, | ||
| private val navigationHelper: NavigationHelper, | ||
| ) : MavericksViewModel<AuthVerficationState>(initialState) { | ||
| } |
13 changes: 13 additions & 0 deletions
13
feature/auth/src/main/java/com/puzzle/auth/page/verification/AuthVerificationScreen.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package com.puzzle.auth.page.verification | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import com.airbnb.mvrx.compose.collectAsState | ||
| import com.airbnb.mvrx.compose.mavericksViewModel | ||
|
|
||
| @Composable | ||
| internal fun AuthVerificationRoute( | ||
| viewModel: AuthVerficationViewModel = mavericksViewModel() | ||
| ) { | ||
| val state by viewModel.collectAsState() | ||
| } |
7 changes: 7 additions & 0 deletions
7
...ure/auth/src/main/java/com/puzzle/auth/page/verification/contract/AuthVerficationState.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| package com.puzzle.auth.page.verification.contract | ||
|
|
||
| import com.airbnb.mvrx.MavericksState | ||
|
|
||
| data class AuthVerficationState( | ||
| val a: Boolean, | ||
| ) : MavericksState |
4 changes: 4 additions & 0 deletions
4
...e/auth/src/main/java/com/puzzle/auth/page/verification/contract/AuthVerificationIntent.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package com.puzzle.auth.page.verification.contract | ||
|
|
||
| sealed class AuthVerificationIntent { | ||
| } |
4 changes: 4 additions & 0 deletions
4
...th/src/main/java/com/puzzle/auth/page/verification/contract/AuthVerificationSideEffect.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| package com.puzzle.auth.page.verification.contract | ||
|
|
||
| sealed class AuthVerificationSideEffect { | ||
| } |
2 changes: 1 addition & 1 deletion
2
...ching/detail/component/BasicInfoHeader.kt → ...ching/common/component/BasicInfoHeader.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...java/com/puzzle/matching/ui/DialogType.kt → ...le/matching/common/constant/DialogType.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 0 additions & 3 deletions
3
feature/matching/src/main/java/com/puzzle/matching/contract/MatchingSideEffect.kt
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
...re/matching/src/main/java/com/puzzle/matching/detail/contract/MatchingDetailSideEffect.kt
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
p4) EOL하나 있네용, 근데 지금 고치지 말고 나중에 ViewModel 작업할 때 하나 넣어주세요!~