-
Notifications
You must be signed in to change notification settings - Fork 1
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
Feature/jaino/#38 #39
Merged
Merged
Changes from 36 commits
Commits
Show all changes
38 commits
Select commit
Hold shift + click to select a range
baac204
[CHORE] #32 : Firebase Manager Const μΆκ°
jeongjaino a73e1e1
[FEATURE] #32 : 맀λμ μ‘°ν λ‘μ§ κ΅¬ν
jeongjaino b14a2a0
[FEATURE] #32 : ManageDataSource binds λ©μλ μΆκ°
jeongjaino 8c1d897
[FEATURE] #32 : ManageRepository binds λ©μλ μΆκ°
jeongjaino 5ba3b14
[FEATURE] #32 : λ±λ‘λ 맀λμ μ‘°ν μ μ€μΌμ΄μ€ ꡬν
jeongjaino 46aa779
[CHORE] #32 : code collection const μΆκ°
jeongjaino fbe4b51
[FEATURE] #32 : μ΄μμ§ μ½λ κ²μ¦ λ‘μ§ λ° μ΄μμ§ λ±λ‘ λ‘μ§ μΆκ°
jeongjaino 10e1be4
[FEATURE] #32 : μ΄μμ§ μ½λ κ²μ¦ μ μ€μΌμ΄μ€ ꡬν
jeongjaino 138fdd0
[REFACTOR] #32 : μ΄μμ§ μ½λ μΈμ¦ λ©μλ λ€μ΄λ° λ° λ°ν νμ
μμ
jeongjaino c224478
[REFACTOR] #32 : κ²μ¦, λ―Έκ²μ¦ νμ
ν΄λμ€ μμ±μΌλ‘, κ²μ¦ μ€ν¨ κ²½μ° μΆκ° ꡬν
jeongjaino cd311e9
[CHORE] #32 : Singleton Hilt scoped μΆκ°
jeongjaino c3f6301
[CHORE] #38 : Color Naming μμ Color + μμμ½λ 2 char
jeongjaino 9129995
[FEATURE] #38 : κ³΅μ© TopBar ꡬν
jeongjaino d8b6e27
[CHORE] #38 : TopBar Modifier 맀κ°λ³μ μΆκ°
jeongjaino c7dbe6e
[CHORE] #38 : κΈ°μ‘΄ TopBar 곡μ©μΌλ‘ λ³κ²½
jeongjaino 1219603
[CHORE] #38 : Title 22sp -> 18sp λ‘ μμ
jeongjaino 4023dee
[CHORE] #38 : μ’
μμ± μΆκ°
jeongjaino 7d1ae38
[REFACTOR] #38 : 맀λμ State ꡬνλ λ©μλ λ°νκ° μμ
jeongjaino 8dad305
[REFACTOR] #38 : λ°ν κ° μμ Unit -> Boolean
jeongjaino 9d18cb8
[STYLE] #38 : Verification -> ValidationμΌλ‘ μμ
jeongjaino af1a5cd
[STYLE] #38 : Rename ManagerCode -> ManageCode
jeongjaino f159417
[CHORE] #38 : nav_manage -> nav_management rename
jeongjaino 8c77ce1
[CHORE] #38 : bottomNavView add controller
jeongjaino ea95a3e
[CHORE] #38 : delete manage fragment xml view
jeongjaino 9adf0fd
[FEATURE] #38 : κ³΅μ© Button ꡬν
jeongjaino 83a9f05
[CHORE] #38 : firestore field name μμ
jeongjaino 74cc7fa
[CHORE] #38 : toast extensions ꡬν
jeongjaino 7bb8f8b
[CHORE] #38 : κ΄λ¦¬ νμ΄μ§ string λ±λ‘
jeongjaino fa40799
[FEATURE] #38 : κ³΅μ© TextField ꡬν
jeongjaino 1e6015e
[FEATURE] #38 : κ΄λ¦¬ νμ΄μ§ ꡬν
jeongjaino 44c3884
[FEATURE] #38 : μ΄μμ§ κ²μ¦ λ‘μ§μ΄ ν¬ν¨λ ManageviewModel ꡬν
jeongjaino 75dba23
[FEATURE] #38 : μ΄μμ§ μ½λ μΈμ¦ λμλ‘κ·Έ ꡬν
jeongjaino 1c7c72e
[FEATURE] #38 : ManageFragmentμ Screen, Dialog 보μ¬μ§λ λ‘μ§ κ΅¬ν
jeongjaino 4057923
[CHORE] #38 : String.xml νμ -> μ΄μμ§ μ μ
jeongjaino 1037bc1
[CHORE] #38 : Lint μ€λ₯ μμ
jeongjaino b76b616
[CHORE] #38 : ktlint unused parameter ν΄κ²°
jeongjaino 7c1eff3
[CHORE] #38 : Context -> Activity Extensions 주체 λ³κ²½
jeongjaino 2da1f1f
Merge branch 'develop' into feature/jaino/#38
jeongjaino 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 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
12 changes: 12 additions & 0 deletions
12
core/common/src/main/java/com/wap/wapp/core/commmon/extensions/ContextExtensions.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,12 @@ | ||
package com.wap.wapp.core.commmon.extensions | ||
|
||
import android.content.Context | ||
import android.widget.Toast | ||
|
||
fun Context.showToast(message: String) { | ||
Toast.makeText(this, message, Toast.LENGTH_SHORT).show() | ||
} | ||
|
||
fun Context.showLongToast(message: String) { | ||
Toast.makeText(this, message, Toast.LENGTH_LONG).show() | ||
} | ||
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
9 changes: 9 additions & 0 deletions
9
core/data/src/main/java/com/wap/wapp/core/data/repository/manage/ManageRepository.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,9 @@ | ||
package com.wap.wapp.core.data.repository.manage | ||
|
||
interface ManageRepository { | ||
suspend fun getManager(userId: String): Result<Boolean> | ||
|
||
suspend fun postManager(userId: String): Result<Unit> | ||
|
||
suspend fun getManageCode(code: String): Result<Boolean> | ||
} |
20 changes: 20 additions & 0 deletions
20
core/data/src/main/java/com/wap/wapp/core/data/repository/manage/ManageRepositoryImpl.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,20 @@ | ||
package com.wap.wapp.core.data.repository.manage | ||
|
||
import com.wap.wapp.core.network.source.manage.ManageDataSource | ||
import javax.inject.Inject | ||
|
||
class ManageRepositoryImpl @Inject constructor( | ||
private val manageDataSource: ManageDataSource, | ||
) : ManageRepository { | ||
override suspend fun getManager(userId: String): Result<Boolean> { | ||
return manageDataSource.getManager(userId) | ||
} | ||
|
||
override suspend fun postManager(userId: String): Result<Unit> { | ||
return manageDataSource.postManager(userId) | ||
} | ||
|
||
override suspend fun getManageCode(code: String): Result<Boolean> { | ||
return manageDataSource.getManageCode(code) | ||
} | ||
} |
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
39 changes: 39 additions & 0 deletions
39
core/designsystem/src/main/java/com/wap/designsystem/component/Button.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,39 @@ | ||
package com.wap.designsystem.component | ||
|
||
import androidx.annotation.StringRes | ||
import androidx.compose.foundation.layout.fillMaxWidth | ||
import androidx.compose.foundation.layout.height | ||
import androidx.compose.foundation.shape.RoundedCornerShape | ||
import androidx.compose.material3.Button | ||
import androidx.compose.material3.ButtonDefaults | ||
import androidx.compose.material3.Text | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.res.stringResource | ||
import androidx.compose.ui.unit.dp | ||
import com.wap.designsystem.WappTheme | ||
import com.wap.wapp.core.designsystem.R | ||
|
||
@Composable | ||
fun WappButton( | ||
modifier: Modifier = Modifier, | ||
@StringRes textRes: Int = R.string.done, | ||
onClick: () -> Unit, | ||
isEnabled: Boolean = true, | ||
) { | ||
Button( | ||
modifier = modifier | ||
.fillMaxWidth() | ||
.height(48.dp), | ||
onClick = { onClick() }, | ||
enabled = isEnabled, | ||
colors = ButtonDefaults.buttonColors( | ||
contentColor = WappTheme.colors.black, | ||
containerColor = WappTheme.colors.yellow, | ||
disabledContentColor = WappTheme.colors.white, | ||
disabledContainerColor = WappTheme.colors.grayA2, | ||
), | ||
shape = RoundedCornerShape(10.dp), | ||
content = { Text(text = stringResource(textRes)) }, | ||
) | ||
} |
44 changes: 44 additions & 0 deletions
44
core/designsystem/src/main/java/com/wap/designsystem/component/TextField.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,44 @@ | ||
package com.wap.designsystem.component | ||
|
||
import androidx.annotation.StringRes | ||
import androidx.compose.material3.Text | ||
import androidx.compose.material3.TextField | ||
import androidx.compose.material3.TextFieldDefaults | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.res.stringResource | ||
import com.wap.designsystem.WappTheme | ||
|
||
@Composable | ||
fun WappTextField( | ||
value: String, | ||
onValueChanged: (String) -> Unit, | ||
@StringRes label: Int, | ||
isError: Boolean = false, | ||
supportingText: String = "", | ||
) { | ||
TextField( | ||
value = value, | ||
onValueChange = { value -> onValueChanged(value) }, | ||
colors = TextFieldDefaults.colors( | ||
unfocusedContainerColor = WappTheme.colors.black25, | ||
focusedContainerColor = WappTheme.colors.black25, | ||
errorContainerColor = WappTheme.colors.black25, | ||
unfocusedLabelColor = WappTheme.colors.white, | ||
focusedLabelColor = WappTheme.colors.white, | ||
unfocusedTextColor = WappTheme.colors.white, | ||
focusedTextColor = WappTheme.colors.white, | ||
errorTextColor = WappTheme.colors.white, | ||
unfocusedSupportingTextColor = WappTheme.colors.white, | ||
focusedSupportingTextColor = WappTheme.colors.white, | ||
focusedIndicatorColor = WappTheme.colors.yellow, | ||
cursorColor = WappTheme.colors.yellow, | ||
), | ||
label = { | ||
Text(text = stringResource(label)) | ||
}, | ||
isError = isError, | ||
supportingText = { | ||
Text(text = supportingText) | ||
}, | ||
) | ||
} |
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.
ππππππππ
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.
Activity μ Context μ νμ₯ ν¨μ μ€ μ΄λ€ κ² λ μ ν©ν κΉμ?
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.
Activityμμλ§ νΈμΆλλ μ΅μ€ν μ μ΄λΌ Acitivty μͺ½μΌλ‘ μμ νλκ² λ§λ κ² κ°λ€μ! μμ νκ² μ΅λλ€