Skip to content

Commit de823dd

Browse files
committed
Fixing WhatsNew Sheet for OpenSource
1 parent e15ed3f commit de823dd

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

base/src/main/java/com/maubis/scarlet/base/main/sheets/WhatsNewBottomSheet.kt

+11-8
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,27 @@ import com.facebook.yoga.YogaEdge
1717
import com.maubis.markdown.Markdown
1818
import com.maubis.scarlet.base.R
1919
import com.maubis.scarlet.base.config.ApplicationBase
20+
import com.maubis.scarlet.base.config.ApplicationBase.Companion.instance
2021
import com.maubis.scarlet.base.config.CoreConfig
2122
import com.maubis.scarlet.base.config.CoreConfig.Companion.FONT_MONSERRAT
2223
import com.maubis.scarlet.base.support.sheets.LithoBottomSheet
2324
import com.maubis.scarlet.base.support.sheets.getLithoBottomSheetTitle
2425
import com.maubis.scarlet.base.support.specs.*
2526
import com.maubis.scarlet.base.support.ui.LithoCircleDrawable
2627
import com.maubis.scarlet.base.support.ui.ThemeColorType
28+
import com.maubis.scarlet.base.support.utils.Flavor
2729

2830
class WhatsNewBottomSheet : LithoBottomSheet() {
2931

3032
override fun getComponent(componentContext: ComponentContext, dialog: Dialog): Component {
33+
val options = listOf(
34+
if (instance.appFlavor() == Flavor.NONE) null else GridSectionOptionItem(R.drawable.gdrive_icon, R.string.whats_new_sheet_google_drive, {}),
35+
if (instance.appFlavor() == Flavor.NONE) null else GridSectionOptionItem(R.drawable.ic_image_gallery, R.string.whats_new_sheet_photo_sync, {}),
36+
GridSectionOptionItem(R.drawable.ic_action_lock, R.string.whats_new_sheet_app_lock, {}),
37+
GridSectionOptionItem(R.drawable.ic_action_select, R.string.whats_new_sheet_selection, {}),
38+
GridSectionOptionItem(R.drawable.icon_widget, R.string.whats_new_sheet_widget, {}),
39+
GridSectionOptionItem(R.drawable.ic_image_gallery, R.string.whats_new_sheet_more_languages, {}))
40+
3141
val component = Column.create(componentContext)
3242
.widthPercent(100f)
3343
.paddingDip(YogaEdge.VERTICAL, 8f)
@@ -45,14 +55,7 @@ class WhatsNewBottomSheet : LithoBottomSheet() {
4555
.maxLines(3)
4656
.numColumns(2)
4757
.iconSizeRes(R.dimen.ultra_large_round_icon_size)
48-
.section(GridSectionItem(options = listOf(
49-
GridSectionOptionItem(R.drawable.gdrive_icon, R.string.whats_new_sheet_google_drive, {}),
50-
GridSectionOptionItem(R.drawable.ic_image_gallery, R.string.whats_new_sheet_photo_sync, {}),
51-
GridSectionOptionItem(R.drawable.ic_action_lock, R.string.whats_new_sheet_app_lock, {}),
52-
GridSectionOptionItem(R.drawable.ic_action_select, R.string.whats_new_sheet_selection, {}),
53-
GridSectionOptionItem(R.drawable.icon_widget, R.string.whats_new_sheet_widget, {}),
54-
GridSectionOptionItem(R.drawable.ic_image_gallery, R.string.whats_new_sheet_more_languages, {})
55-
)))
58+
.section(GridSectionItem(options = options.filterNotNull()))
5659
.showSeparator(false))
5760
.child(BottomSheetBar.create(componentContext)
5861
.primaryActionRes(R.string.import_export_layout_exporting_done)

0 commit comments

Comments
 (0)