Skip to content

Commit

Permalink
feat: 마이몽 피드백 ui 개발
Browse files Browse the repository at this point in the history
  • Loading branch information
Heonbyeong committed Aug 15, 2024
1 parent 58fdc01 commit 3f3a71f
Show file tree
Hide file tree
Showing 7 changed files with 101 additions and 13 deletions.
13 changes: 8 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,33 @@
tools:targetApi="31">
<meta-data
android:name="com.kakao.sdk.AppKey"
android:value="@string/native_app_key"/>
android:value="@string/native_app_key" />

<activity
android:name=".MainActivity"
android:exported="true"
android:label="${appLabel}"
android:windowSoftInputMode="adjustResize"
android:screenOrientation="portrait"
android:theme="@style/Theme.Moneymongandroid"
android:screenOrientation="portrait">
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
<activity
android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data android:host="oauth"
<data
android:host="oauth"
android:scheme="@string/kakao_native_app_key" />
</intent-filter>

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import com.moneymong.moneymong.design_system.R
Expand All @@ -20,6 +21,7 @@ import com.moneymong.moneymong.design_system.error.ErrorDialog
import com.moneymong.moneymong.design_system.theme.Gray01
import com.moneymong.moneymong.design_system.theme.MMHorizontalSpacing
import com.moneymong.moneymong.feature.mymong.main.component.MyMongTopBar
import com.moneymong.moneymong.feature.mymong.main.view.MyMongFeedbackView
import com.moneymong.moneymong.feature.mymong.main.view.MyMongInfoView
import com.moneymong.moneymong.feature.mymong.main.view.MyMongSettingView
import org.orbitmvi.orbit.compose.collectAsState
Expand Down Expand Up @@ -53,6 +55,9 @@ fun MyMongScreen(
is MyMongSideEffect.NavigateToLogin -> {
navigateToLogin()
}

is MyMongSideEffect.FollowKakaoChannel -> {
}
}
}

Expand Down Expand Up @@ -94,12 +99,16 @@ fun MyMongScreen(
grade = state.grade,
getInfo = viewModel::getInfo
)
Spacer(modifier = Modifier.height(24.dp))
Spacer(modifier = Modifier.height(16.dp))
MyMongFeedbackView(
onClick = viewModel::onClickKakaoChannel
)
Spacer(modifier = Modifier.height(16.dp))
MyMongSettingView(
navigateToTermsOfUse = viewModel::navigateToTermsOfUse,
navigateToPrivacyPolicy = viewModel::navigateToPriPolicyButton,
navigateToWithdrawal = viewModel::navigateToWithdrawal,
showLogoutDialog = { viewModel.changeLogoutDialogVisibility(true) }
)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ sealed interface MyMongSideEffect : SideEffect {
data object NavigateToPrivacyPolicy : MyMongSideEffect
data object NavigateToTermsOfUse : MyMongSideEffect
data object NavigateToLogin : MyMongSideEffect
data object FollowKakaoChannel : MyMongSideEffect
}
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ class MyMongViewModel @Inject constructor(
}
}

fun onClickKakaoChannel() = eventEmit(MyMongSideEffect.FollowKakaoChannel)

private suspend fun clearLocalData() {
saveAgencyIdUseCase(0)
saveUserIdUseCase(0)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
package com.moneymong.moneymong.feature.mymong.main.view

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
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.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.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.moneymong.moneymong.design_system.component.button.MDSButton
import com.moneymong.moneymong.design_system.component.button.MDSButtonSize
import com.moneymong.moneymong.design_system.component.button.MDSButtonType
import com.moneymong.moneymong.design_system.theme.Body4
import com.moneymong.moneymong.design_system.theme.Gray08
import com.moneymong.moneymong.design_system.R
import com.moneymong.moneymong.design_system.theme.White
import com.moneymong.moneymong.feature.mymong.main.util.myMongRoundRectShadow

@Composable
fun MyMongFeedbackView(
modifier: Modifier = Modifier,
onClick: () -> Unit
) {
Box(
modifier = modifier
.myMongRoundRectShadow()
.background(color = White, shape = RoundedCornerShape(12.dp))
) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.SpaceBetween
) {
Column {
Text(
text = "머니몽에게 자유롭게\n문의 해보세요!",
style = Body4,
color = Gray08
)
Spacer(modifier = Modifier.height(8.dp))
MDSButton(
modifier = Modifier.padding(end = 10.dp),
text = "머니몽 팀에게 카톡하기",
size = MDSButtonSize.SMALL,
type = MDSButtonType.SECONDARY,
contentHorizontalPadding = 12.dp,
onClick = onClick
)
}
Image(
modifier = Modifier.size(134.dp),
painter = painterResource(id = R.drawable.img_kakao_feedback),
contentDescription = null
)
}
}
}

@Preview(showBackground = true)
@Composable
fun MyMongFeedbackPreview() {
MyMongFeedbackView {

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ internal fun MyMongSettingView(
}.versionName

Column(modifier = modifier.fillMaxWidth()) {
Text(
text = "내 설정",
color = Gray10,
style = Body4
)
Spacer(modifier = Modifier.height(8.dp))
Column(
modifier = Modifier
.fillMaxWidth()
Expand Down

0 comments on commit 3f3a71f

Please sign in to comment.