-
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
Feature/#62 video upload UI #138
Open
lsakee
wants to merge
5
commits into
develop
Choose a base branch
from
feature/#62-video-upload-ui
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
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
79 changes: 79 additions & 0 deletions
79
core/designsystem/src/main/java/com/record/designsystem/component/button/RecordyImgButton.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,79 @@ | ||
package com.record.designsystem.component.button | ||
|
||
import androidx.annotation.DrawableRes | ||
import androidx.compose.foundation.Image | ||
import androidx.compose.foundation.background | ||
import androidx.compose.foundation.border | ||
import androidx.compose.foundation.layout.Arrangement | ||
import androidx.compose.foundation.layout.Box | ||
import androidx.compose.foundation.layout.Column | ||
import androidx.compose.foundation.layout.fillMaxWidth | ||
import androidx.compose.foundation.layout.padding | ||
import androidx.compose.foundation.shape.RoundedCornerShape | ||
import androidx.compose.material3.Text | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.draw.clip | ||
import androidx.compose.ui.graphics.Color | ||
import androidx.compose.ui.graphics.Shape | ||
import androidx.compose.ui.res.painterResource | ||
import androidx.compose.ui.text.TextStyle | ||
import androidx.compose.ui.tooling.preview.Preview | ||
import androidx.compose.ui.unit.dp | ||
import com.record.designsystem.R | ||
import com.record.designsystem.theme.Black | ||
import com.record.designsystem.theme.RecordyTheme | ||
import com.record.ui.extension.customClickable | ||
import timber.log.Timber | ||
|
||
@Composable | ||
fun RecordyImgButton( | ||
modifier: Modifier = Modifier, | ||
text: String, | ||
textStyle: TextStyle = RecordyTheme.typography.body2M, | ||
shape: Shape = RoundedCornerShape(8.dp), | ||
onClick: () -> Unit = {}, | ||
backgroundColor: Color = RecordyTheme.colors.gray10, | ||
textColor: Color = RecordyTheme.colors.gray06, | ||
@DrawableRes icon: Int, | ||
) { | ||
Box( | ||
modifier = modifier | ||
.fillMaxWidth() | ||
.clip(shape) | ||
.background(color = backgroundColor) | ||
.border(width = 1.dp, color = backgroundColor, shape = shape) | ||
.padding(vertical = 14.dp, horizontal = 18.dp) | ||
.customClickable(rippleEnabled = false, onClick = { onClick() }), | ||
) { | ||
Image(modifier = Modifier.align(Alignment.CenterEnd).padding(end = 4.dp), painter = painterResource(id = icon), contentDescription = null) | ||
Text( | ||
text = text, | ||
style = textStyle, | ||
color = textColor, | ||
modifier = Modifier.align(Alignment.CenterStart), | ||
) | ||
} | ||
} | ||
|
||
@Preview(showBackground = true, backgroundColor = 0xFFFFFF) | ||
@Composable | ||
fun RecordyImgButtonPreview() { | ||
RecordyTheme { | ||
RecordyTheme { | ||
Column( | ||
modifier = Modifier | ||
.background(Black) | ||
.padding(vertical = 10.dp, horizontal = 10.dp), | ||
verticalArrangement = Arrangement.spacedBy(10.dp), | ||
) { | ||
RecordyImgButton( | ||
icon = R.drawable.ic_move_18, | ||
text = "ํค์๋", | ||
onClick = { Timber.d("basic key word") }, | ||
) | ||
} | ||
} | ||
} | ||
} |
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
39 changes: 39 additions & 0 deletions
39
core/designsystem/src/main/res/drawable/ic_alert_warning_80.xml
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 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:aapt="http://schemas.android.com/aapt" | ||
android:width="80dp" | ||
android:height="80dp" | ||
android:viewportWidth="80" | ||
android:viewportHeight="80"> | ||
<path | ||
android:strokeWidth="1" | ||
android:pathData="M61.886,17.031C60.294,17.624 58.593,17.946 56.83,17.946C48.132,17.946 41.107,10.204 40.427,0.506C35.946,0.388 31.426,2.117 27.772,5.713L27.611,5.872L27.386,5.855L25.298,5.704C25.298,5.704 25.298,5.704 25.298,5.704C17.004,5.106 9.643,12.126 8.648,21.869L8.625,22.089L8.447,22.22L6.371,23.752C0.104,28.378 -1.423,38.295 3.138,45.167L2.721,45.444L3.138,45.167L4.196,46.761L4.317,46.944L4.265,47.157L3.894,48.665L3.409,48.546L3.894,48.665C1.823,57.092 6.198,65.741 13.402,67.837L16.5,68.738L16.715,68.801L16.811,69.003C21.098,77.965 30.389,81.793 38.525,78.099C38.525,78.099 38.526,78.099 38.526,78.099L39.793,77.522L40,77.427L40.207,77.522L41.474,78.099L61.886,17.031ZM61.886,17.031C63.708,22.386 68.236,26.244 73.606,26.244C74.42,26.244 75.213,26.151 75.979,25.982C80.211,31.099 80.778,39.265 76.862,45.167L75.803,46.761L75.682,46.944L75.734,47.157L76.105,48.665L76.591,48.546L76.105,48.665C78.177,57.092 73.799,65.741 66.597,67.837C66.597,67.837 66.597,67.837 66.597,67.837L63.5,68.738L63.285,68.801L63.188,69.003C58.904,77.966 49.61,81.796 41.474,78.099L61.886,17.031Z"> | ||
<aapt:attr name="android:fillColor"> | ||
<gradient | ||
android:startX="40" | ||
android:startY="-0" | ||
android:endX="10.196" | ||
android:endY="108.235" | ||
android:type="linear"> | ||
<item android:offset="0" android:color="#FFF1E150"/> | ||
<item android:offset="0.941" android:color="#FFFFD428"/> | ||
</gradient> | ||
</aapt:attr> | ||
<aapt:attr name="android:strokeColor"> | ||
<gradient | ||
android:startX="40" | ||
android:startY="0" | ||
android:endX="19.216" | ||
android:endY="97.255" | ||
android:type="linear"> | ||
<item android:offset="0" android:color="#FFFFF6AD"/> | ||
<item android:offset="0.958" android:color="#FFE3B644"/> | ||
</gradient> | ||
</aapt:attr> | ||
</path> | ||
<path | ||
android:pathData="M40,51.892C39.081,51.892 38.311,51.604 37.689,51.028C37.068,50.453 36.757,49.74 36.757,48.889V27.868C36.757,27.017 37.068,26.304 37.689,25.728C38.311,25.153 39.081,24.865 40,24.865C40.919,24.865 41.689,25.153 42.311,25.728C42.932,26.304 43.243,27.017 43.243,27.868V48.889C43.243,49.74 42.932,50.453 42.311,51.028C41.689,51.604 40.919,51.892 40,51.892Z" | ||
android:fillColor="#FF690B"/> | ||
<path | ||
android:pathData="M36.757,59.459a3.243,3.243 0,1 0,6.486 0a3.243,3.243 0,1 0,-6.486 0z" | ||
android:fillColor="#FF690B"/> | ||
</vector> |
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 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="18dp" | ||
android:height="18dp" | ||
android:viewportWidth="18" | ||
android:viewportHeight="18"> | ||
<path | ||
android:pathData="M7.136,13.365C6.947,13.575 6.956,13.908 7.157,14.107C7.357,14.306 7.674,14.296 7.863,14.085L12.113,9.361C12.295,9.159 12.295,8.842 12.113,8.64L7.864,3.915C7.674,3.704 7.357,3.694 7.157,3.893C6.956,4.092 6.947,4.425 7.136,4.635L11.062,9L7.136,13.365Z" | ||
android:fillColor="#EEEEEE"/> | ||
</vector> |
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.record.model | ||
|
||
data class AlertInfo( | ||
val showDialog: Boolean = false, | ||
val title: String = "", | ||
val subTitle: String = "", | ||
val negativeButtonLabel: String = "", | ||
val positiveButtonLabel: String = "", | ||
) |
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
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
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
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.
navigateTo ๊ฐ ๋ถ๋๊ฑฐ๋ navigate๋ง ์๋ ๊ฒ์ ์ฐจ์ด๋ ๋ญ๊ฐ์?