Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-07-01 14:10:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Inline formatting options

Browse Source
This commit is contained in:
Sad Ellie 2023-05-23 23:06:08 +03:00
parent 6bb6afcbcf
commit bf79ca54f6
3 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/base/src/main/java/com/sadellie/unitto/core/base/OutputFormat.kt
View File

@ -29,14 +29,3 @@ object OutputFormat {
// App will try it's best to use engineering notation // App will try it's best to use engineering notation
const val FORCE_ENGINEERING = 2 const val FORCE_ENGINEERING = 2
} }
/**
* Available formats. Used in settings
*/
val OUTPUT_FORMAT: Map<Int, Int> by lazy {
mapOf(
OutputFormat.PLAIN to R.string.plain,
OutputFormat.ALLOW_ENGINEERING to R.string.allow_engineering,
OutputFormat.FORCE_ENGINEERING to R.string.force_engineering,
)
}

11
core/base/src/main/java/com/sadellie/unitto/core/base/Separator.kt
View File

@ -26,14 +26,3 @@ object Separator {
const val PERIOD = 1 const val PERIOD = 1
const val COMMA = 2 const val COMMA = 2
} }
/**
* Map of separators that is used in settings
*/
val SEPARATORS: Map<Int, Int> by lazy {
mapOf(
Separator.SPACES to R.string.spaces,
Separator.PERIOD to R.string.period,
Separator.COMMA to R.string.comma
)
}

46
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/formatting/FormattingScreen.kt
View File

@ -49,10 +49,8 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.OUTPUT_FORMAT
import com.sadellie.unitto.core.base.OutputFormat import com.sadellie.unitto.core.base.OutputFormat
import com.sadellie.unitto.core.base.R import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.base.SEPARATORS
import com.sadellie.unitto.core.base.Separator import com.sadellie.unitto.core.base.Separator
import com.sadellie.unitto.core.ui.common.NavigateUpButton import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoSlider import com.sadellie.unitto.core.ui.common.UnittoSlider
@ -176,13 +174,21 @@ fun FormattingScreen(
.padding(start = 56.dp) .padding(start = 56.dp)
) { ) {
SegmentedButtonsRow { SegmentedButtonsRow {
SEPARATORS.forEach { (separator, stringRes) -> SegmentedButton(
SegmentedButton( label = stringResource(R.string.spaces),
label = stringResource(stringRes), onClick = { onSeparatorChange(Separator.SPACES) },
onClick = { onSeparatorChange(separator) }, selected = Separator.SPACES == uiState.separator
selected = separator == uiState.separator )
) SegmentedButton(
} label = stringResource(R.string.period),
onClick = { onSeparatorChange(Separator.PERIOD) },
selected = Separator.PERIOD == uiState.separator
)
SegmentedButton(
label = stringResource(R.string.comma),
onClick = { onSeparatorChange(Separator.COMMA) },
selected = Separator.COMMA == uiState.separator
)
} }
} }
} }
@ -205,13 +211,21 @@ fun FormattingScreen(
.padding(start = 56.dp) .padding(start = 56.dp)
) { ) {
SegmentedButtonsRow { SegmentedButtonsRow {
OUTPUT_FORMAT.forEach { (outputFormat, stringRes) -> SegmentedButton(
SegmentedButton( label = stringResource(R.string.plain),
label = stringResource(stringRes), onClick = { onOutputFormatChange(OutputFormat.PLAIN) },
onClick = { onOutputFormatChange(outputFormat) }, selected = OutputFormat.PLAIN == uiState.outputFormat
selected = outputFormat == uiState.outputFormat )
) SegmentedButton(
} label = stringResource(R.string.allow_engineering),
onClick = { onOutputFormatChange(OutputFormat.ALLOW_ENGINEERING) },
selected = OutputFormat.ALLOW_ENGINEERING == uiState.outputFormat
)
SegmentedButton(
label = stringResource(R.string.force_engineering),
onClick = { onOutputFormatChange(OutputFormat.FORCE_ENGINEERING) },
selected = OutputFormat.FORCE_ENGINEERING == uiState.outputFormat
)
} }
} }
} }