Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/src/main/java/com/afs/tutrd/TutrdApp.kt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ fun TutrdApp() {
val tutrdNavController = rememberTutrdNavController()
val navController = tutrdNavController.navController
val isVisibleBottomBar = tutrdNavController.isInBottomTabs()

val currentTab = tutrdNavController.mapRouteToTab()

TutrdScaffold(
Expand Down
45 changes: 45 additions & 0 deletions app/src/main/java/com/afs/tutrd/component/divider/Divider.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package com.afs.tutrd.component.divider

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.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp

@Composable
fun Divider(
title: String?
) {
Column(
modifier = Modifier,
verticalArrangement = Arrangement.spacedBy(16.dp)
) {
if (title != null) {
Text(
fontWeight = FontWeight.Bold,
fontSize = 18.sp,
text = title,
)
}
Box(
modifier = Modifier
.fillMaxWidth()
.height(1.dp)
.background(color = Color(213, 213, 213)))
}
}

@Preview
@Composable
fun preview() {
Divider(title = "정보")
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@ import androidx.navigation.NavGraphBuilder
import androidx.navigation.NavOptions
import androidx.navigation.compose.composable
import com.afs.tutrd.navigation.profile.screen.Profile
import com.afs.tutrd.presentation.profile.ProfileScreen
import com.afs.tutrd.presentation.profile.view.ProfileScreen

internal fun NavGraphBuilder.profileScreen(
modifier: Modifier = Modifier
) {
composable<Profile> {
ProfileScreen(modifier = modifier)
ProfileScreen(

modifier = modifier)
}
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
package com.afs.tutrd.presentation.profile.view

import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.background
import androidx.compose.foundation.gestures.scrollable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonColors
import androidx.compose.material3.LocalMinimumInteractiveComponentEnforcement
import androidx.compose.material3.LocalMinimumTouchTargetEnforcement
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.hilt.navigation.compose.hiltViewModel
import com.afs.tutrd.component.divider.Divider
import com.afs.tutrd.component.scaffold.TutrdScaffold
import com.afs.tutrd.presentation.home.viewmodel.HomeViewModel

@Composable
fun InfoRow(title: String, value: String, isDimmed: Boolean = false) {
Row(
modifier = Modifier
.fillMaxWidth(),
horizontalArrangement = Arrangement.SpaceBetween
) {
Text(
fontWeight = FontWeight.Bold,
fontSize = 16.sp,
text = title
)
Text(
modifier = if (isDimmed) Modifier.alpha(0.5f) else Modifier,
fontSize = 16.sp,
text = value
)
}
}

@Composable
fun ProfileTextButton(text: String, onClick: () -> Unit) {
TextButton(
modifier = Modifier
.height(24.dp)
.width(IntrinsicSize.Max),
colors = ButtonColors(
containerColor = Color.Transparent,
contentColor = Color.Black,
disabledContentColor = Color.Gray,
disabledContainerColor = Color.Gray),
contentPadding = PaddingValues(0.dp),
onClick = onClick
) {
Text(
modifier = Modifier
.fillMaxWidth(),
fontWeight = FontWeight.Bold,
fontSize = 16.sp,
text = text
)
}
}

@Composable
fun ProfileScreen(
modifier: Modifier = Modifier,
viewModel: HomeViewModel = hiltViewModel()
) {

val scrollState = rememberScrollState()

TutrdScaffold(
topBar = { ProfileTopBar(title = "프로필") }
) { paddingValues ->
Column(
modifier = modifier
.fillMaxSize()
.padding(paddingValues)
.padding(all = 20.dp)
.verticalScroll(scrollState),
verticalArrangement = Arrangement.spacedBy(32.dp)
) {
TuteeTutorToggleBar()
Column(
modifier = Modifier
.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(16.dp)
) {
Divider(title = "정보")
InfoRow(title = "이름", value = "정환")
InfoRow(title = "이메일", value = "qwer123@naver.com")
InfoRow(title = "연락처", value = "010-9025-8656")
InfoRow(title = "주요분야", value = "수학, 코딩")
InfoRow(title = "한줄소개", value = "입력해주세요")
}

Column(
modifier = Modifier
.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(16.dp)
) {
Divider(title = "서비스")

ProfileTextButton(text = "서비스 이용약관", onClick = { /* TODO */ })
ProfileTextButton(text = "개인정보 처리방침", onClick = { /* TODO */ })
ProfileTextButton(text = "오픈소스 라이선스", onClick = { /* TODO */ })

}

Column(
modifier = Modifier
.fillMaxWidth(),
verticalArrangement = Arrangement.spacedBy(16.dp)
) {
Divider(title = "계정")
InfoRow(title = "아이디", value = "qwer123@naver.com", isDimmed = true)
ProfileTextButton(text = "비밀번호 변경", onClick = { /* TODO */ })
ProfileTextButton(text = "로그아웃", onClick = { /* TODO */ })
ProfileTextButton(text = "탈퇴", onClick = { /* TODO */ })
}
}
}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.afs.tutrd.presentation.profile.view

import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.afs.tutrd.theme.Heading1

@Composable
internal fun ProfileTopBar(
title: String
) {
Box(
modifier = Modifier
.height(56.dp)
.fillMaxWidth()
.padding(horizontal = 20.dp)
,
contentAlignment = Alignment.CenterStart
) {
Row(
modifier = Modifier
) {
Text(
modifier = Modifier,
text = title,
style = Heading1
)
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package com.afs.tutrd.presentation.profile.view

import androidx.compose.foundation.background
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.shape.RoundedCornerShape
import androidx.compose.material3.Switch
import androidx.compose.material3.SwitchDefaults
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp

@Composable
fun TuteeTutorToggleBar() {

val toggleText = "튜티로 전환" //FIXME
var checked by remember { mutableStateOf(false) }

Row(
modifier = Modifier
.fillMaxWidth()
.height(56.dp)
.background(
color = Color(247, 247, 245),
shape = RoundedCornerShape(8.dp)
)
.padding(horizontal = 12.dp),
verticalAlignment = Alignment.CenterVertically
) {
Text(
modifier = Modifier,
fontSize = 16.sp,
fontWeight = FontWeight.Bold,
text = toggleText
)
Spacer(modifier = Modifier.weight(1f))
Switch(
colors = SwitchDefaults.colors(

),
checked = checked,
onCheckedChange = { checked = it} //FIXME 전환로직 삽입
)
}
}
//
//@Preview
//@Composable
//fun preview() {
// TuteeTutorToggleBar()
//}