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

피쳐플래그 추가 #397

Merged
merged 3 commits into from
Feb 23, 2025
Merged

피쳐플래그 추가 #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ed9b56
FeatureFlag 추가
eastshine2741 Feb 22, 2025
ddd7bfa
THEME_MARKET 피쳐플래그로 테마마켓 숨기기
eastshine2741 Feb 22, 2025
1ca5dc3
lint
eastshine2741 Feb 22, 2025
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
7 changes: 7 additions & 0 deletions app/src/main/java/com/wafflestudio/snutt2/lib/featureflag/FeatureFlag.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.wafflestudio.snutt2.lib.featureflag

enum class FeatureFlag(
val isEnabled: Boolean,
) {
THEME_MARKET(false),
}
21 changes: 12 additions & 9 deletions app/src/main/java/com/wafflestudio/snutt2/views/logged_in/home/settings/SettingsPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
import com.wafflestudio.snutt2.BuildConfig
import com.wafflestudio.snutt2.R
import com.wafflestudio.snutt2.components.compose.*
import com.wafflestudio.snutt2.lib.featureflag.FeatureFlag
import com.wafflestudio.snutt2.ui.SNUTTColors
import com.wafflestudio.snutt2.ui.SNUTTTypography
import com.wafflestudio.snutt2.ui.onSurfaceVariant
Expand Down Expand Up @@ -135,15 +136,17 @@ fun SettingsPage(
)
},
)
SettingItem(
title = stringResource(R.string.settings_item_theme_market),
hasNextPage = true,
onClick = {
navController.navigate(
NavigationDestination.ThemeMarket,
)
},
)
if (FeatureFlag.THEME_MARKET.isEnabled) {
SettingItem(
title = stringResource(R.string.settings_item_theme_market),
hasNextPage = true,
onClick = {
navController.navigate(
NavigationDestination.ThemeMarket,
)
},
)
}
}
Margin(height = 10.dp)
SettingColumn {
Expand Down
3 changes: 2 additions & 1 deletion ...ain/java/com/wafflestudio/snutt2/views/logged_in/home/settings/theme/ThemeConfigScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import com.wafflestudio.snutt2.components.compose.QuestionCircleIcon
import com.wafflestudio.snutt2.components.compose.SimpleTopBar
import com.wafflestudio.snutt2.components.compose.ThemeIcon
import com.wafflestudio.snutt2.components.compose.clicks
import com.wafflestudio.snutt2.lib.featureflag.FeatureFlag
import com.wafflestudio.snutt2.model.BuiltInTheme
import com.wafflestudio.snutt2.model.CustomTheme
import com.wafflestudio.snutt2.model.TableTheme
Expand Down Expand Up @@ -203,7 +204,7 @@ fun ThemeConfigScreen(
)
},
)
if (marketCustomThemes.isNotEmpty()) {
if (FeatureFlag.THEME_MARKET.isEnabled && marketCustomThemes.isNotEmpty()) {
Spacer(modifier = Modifier.height(4.dp))
ThemesRow(
title = stringResource(R.string.theme_config_market_custom_theme),
Expand Down