Skip to content
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.

Sign up for GitHub

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

feat: 앱 내 더보기란 개발자 등록 #373

Merged
merged 2 commits into from
Oct 31, 2024
Merged

feat: 앱 내 더보기란 개발자 등록 #373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f252ef8
kuring-214 [추가] 멤버 이름 문자열 리소스 추가
boiledEgg-s Oct 31, 2024
f3a3542
kuring-214 [추가] 더보기란 개발자 이름 추가
boiledEgg-s Oct 31, 2024
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
21 changes: 21 additions & 0 deletions ...in/src/main/java/com/ku_stacks/ku_ring/main/setting/compose/inner_screen/SettingScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,19 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.ku_stacks.ku_ring.designsystem.components.LightAndDarkPreview
import com.ku_stacks.ku_ring.designsystem.components.topbar.CenterTitleTopBar
import com.ku_stacks.ku_ring.designsystem.kuringtheme.KuringTheme
import com.ku_stacks.ku_ring.designsystem.kuringtheme.values.Pretendard
import com.ku_stacks.ku_ring.main.R
import com.ku_stacks.ku_ring.main.setting.compose.groups.FeedbackGroup
import com.ku_stacks.ku_ring.main.setting.compose.groups.InformationGroup
Expand Down Expand Up @@ -63,6 +68,7 @@ internal fun SettingScreen(
onNavigateToOpenSources = onNavigateToOpenSources,
)
SettingScreenDivider()
KuringMemberText()
SocialNetworkServiceGroup(onNavigateToKuringInstagram = onNavigateToKuringInstagram)
SettingScreenDivider()
FeedbackGroup(onNavigateToFeedback = onNavigateToFeedback)
Expand All @@ -83,6 +89,21 @@ private fun SettingScreenDivider(modifier: Modifier = Modifier) {
)
}

@Composable
private fun KuringMemberText(modifier: Modifier = Modifier) {
Text(
text = stringResource(R.string.setting_kuring_members),
style = TextStyle(
fontSize = 12.sp,
fontFamily = Pretendard,
fontWeight = FontWeight(400),
color = KuringTheme.colors.textCaption1,
letterSpacing = 0.15.sp,
),
modifier = modifier.padding(20.dp)
)
}

@LightAndDarkPreview
@Composable
private fun SettingScreenPreview() {
Expand Down
2 changes: 2 additions & 0 deletions feature/main/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
<string name="setting_information_service_terms">서비스 이용약관</string>
<string name="setting_information_open_sources">사용된 오픈소스</string>

<string name="setting_kuring_members">Designed by 김예은, 이소영, 조혜준.\nDeveloped by 명우영, 이석준, 이현우\nManaged by 채수빈</string>

<string name="setting_sns_title">SNS</string>
<string name="setting_sns_instagram">인스타그램</string>

Expand Down