-
-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Complete app-wide UI / UX overhaul (#82)
-------- Signed-off-by: starry-shivam <[email protected]>
- Loading branch information
1 parent
6971d97
commit b825973
Showing
60 changed files
with
22,856 additions
and
115,017 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
180 changes: 180 additions & 0 deletions
180
app/src/main/java/com/starry/greenstash/ui/common/CurrencyPicker.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| /** | ||
| * MIT License | ||
| * | ||
| * Copyright (c) [2022 - Present] Stɑrry Shivɑm | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
|
|
||
| package com.starry.greenstash.ui.common | ||
|
|
||
| import androidx.compose.foundation.layout.Column | ||
| 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.foundation.rememberScrollState | ||
| import androidx.compose.foundation.selection.selectable | ||
| import androidx.compose.foundation.selection.selectableGroup | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.foundation.verticalScroll | ||
| import androidx.compose.material.icons.Icons | ||
| import androidx.compose.material.icons.filled.Search | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.ExperimentalMaterial3Api | ||
| import androidx.compose.material3.Icon | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.ModalBottomSheet | ||
| import androidx.compose.material3.OutlinedTextField | ||
| import androidx.compose.material3.RadioButton | ||
| import androidx.compose.material3.RadioButtonDefaults | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.rememberModalBottomSheetState | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.MutableState | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.rememberCoroutineScope | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.semantics.Role | ||
| import androidx.compose.ui.unit.dp | ||
| import com.starry.greenstash.R | ||
| import com.starry.greenstash.ui.theme.greenstashFont | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.delay | ||
| import kotlinx.coroutines.launch | ||
| import kotlinx.coroutines.withContext | ||
|
|
||
| @ExperimentalMaterial3Api | ||
| @Composable | ||
| fun CurrencyPicker( | ||
| defaultCurrencyValue: String, | ||
| currencyNames: Array<String>, | ||
| currencyValues: Array<String>, | ||
| showBottomSheet: MutableState<Boolean>, | ||
| onCurrencySelected: (String) -> Unit | ||
| ) { | ||
| val defaultCurrencyEntry = currencyNames[currencyValues.indexOf(defaultCurrencyValue)] | ||
| val (selectedCurrencyOption, onCurrencyOptionSelected) = remember { | ||
| mutableStateOf(defaultCurrencyEntry) | ||
| } | ||
| val (searchText, onSearchTextChanged) = remember { mutableStateOf("") } | ||
| val filteredCurrencies = currencyNames.filter { it.contains(searchText, ignoreCase = true) } | ||
|
|
||
| val coroutineScope = rememberCoroutineScope() | ||
| val sheetState = rememberModalBottomSheetState() | ||
|
|
||
| if (showBottomSheet.value) { | ||
| ModalBottomSheet( | ||
| sheetState = sheetState, | ||
| onDismissRequest = { | ||
| coroutineScope.launch { | ||
| sheetState.hide() | ||
| delay(300) | ||
| withContext(Dispatchers.Main) { | ||
| showBottomSheet.value = false | ||
| val choice = currencyValues[currencyNames.indexOf(selectedCurrencyOption)] | ||
| onCurrencySelected(choice) | ||
| } | ||
| } | ||
| }, | ||
| content = { | ||
| Column { | ||
| OutlinedTextField( | ||
| value = searchText, | ||
| onValueChange = onSearchTextChanged, | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(16.dp), | ||
| placeholder = { Text("Search currency") }, | ||
| leadingIcon = { | ||
| Icon( | ||
| imageVector = Icons.Default.Search, | ||
| contentDescription = "Search" | ||
| ) | ||
| }, shape = RoundedCornerShape(12.dp) | ||
| ) | ||
| Column( | ||
| modifier = Modifier | ||
| .selectableGroup() | ||
| .verticalScroll(rememberScrollState()) | ||
| ) { | ||
| filteredCurrencies.forEach { text -> | ||
| Row( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .height(46.dp) | ||
| .selectable( | ||
| selected = (text == selectedCurrencyOption), | ||
| onClick = { | ||
| onCurrencyOptionSelected(text) | ||
| }, | ||
| role = Role.RadioButton | ||
| ), | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Row(modifier = Modifier.padding(horizontal = 18.dp)) { | ||
| RadioButton( | ||
| selected = (text == selectedCurrencyOption), | ||
| onClick = null, | ||
| colors = RadioButtonDefaults.colors( | ||
| selectedColor = MaterialTheme.colorScheme.primary, | ||
| unselectedColor = MaterialTheme.colorScheme.inversePrimary, | ||
| disabledSelectedColor = Color.Black, | ||
| disabledUnselectedColor = Color.Black | ||
| ) | ||
| ) | ||
| Text( | ||
| text = text, | ||
| modifier = Modifier.padding(start = 16.dp), | ||
| color = MaterialTheme.colorScheme.onSurface, | ||
| fontFamily = greenstashFont | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| Button( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .padding(16.dp), | ||
| onClick = { | ||
| coroutineScope.launch { | ||
| sheetState.hide() | ||
| delay(300) | ||
| withContext(Dispatchers.Main) { | ||
| showBottomSheet.value = false | ||
| val choice = | ||
| currencyValues[currencyNames.indexOf(selectedCurrencyOption)] | ||
| onCurrencySelected(choice) | ||
| } | ||
| } | ||
| } | ||
| ) { | ||
| Text(stringResource(id = R.string.confirm), fontFamily = greenstashFont) | ||
| } | ||
| } | ||
| ) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
app/src/main/java/com/starry/greenstash/ui/common/SlideInContainer.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /** | ||
| * MIT License | ||
| * | ||
| * Copyright (c) [2022 - Present] Stɑrry Shivɑm | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
|
|
||
| package com.starry.greenstash.ui.common | ||
|
|
||
| import androidx.compose.animation.AnimatedVisibility | ||
| import androidx.compose.animation.expandVertically | ||
| import androidx.compose.animation.fadeIn | ||
| import androidx.compose.animation.fadeOut | ||
| import androidx.compose.animation.shrinkVertically | ||
| import androidx.compose.animation.slideInVertically | ||
| import androidx.compose.animation.slideOutVertically | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.LaunchedEffect | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.ui.Alignment | ||
| import kotlinx.coroutines.delay | ||
|
|
||
| @Composable | ||
| fun SlideInAnimatedContainer( | ||
| initialDelay: Long, content: | ||
| @Composable () -> Unit | ||
| ) { | ||
| val showContent = remember { mutableStateOf(false) } | ||
| LaunchedEffect(key1 = true) { | ||
| delay(initialDelay) | ||
| showContent.value = true | ||
| } | ||
|
|
||
| AnimatedVisibility( | ||
| visible = showContent.value, | ||
| enter = slideInVertically { it / 2 } + expandVertically(expandFrom = Alignment.Top) + fadeIn( | ||
| initialAlpha = 0.3f | ||
| ), | ||
| exit = slideOutVertically() + shrinkVertically() + fadeOut(), | ||
| ) { | ||
| content() | ||
| } | ||
| } |
Oops, something went wrong.