Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-20 09:15:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

No more wildcard imports

Browse Source
This commit is contained in:
Sad Ellie 2022-06-03 20:19:10 +03:00
parent 02a6826e1f
commit 63d943cbb9
21 changed files with 174 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/sadellie/unitto/MainActivity.kt
View File

@ -14,7 +14,11 @@ import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import androidx.navigation.navArgument
import com.sadellie.unitto.data.*
import com.sadellie.unitto.data.ABOUT_SCREEN
import com.sadellie.unitto.data.LEFT_BUTTON
import com.sadellie.unitto.data.MAIN_SCREEN
import com.sadellie.unitto.data.SECOND_SCREEN
import com.sadellie.unitto.data.SETTINGS_SCREEN
import com.sadellie.unitto.data.preferences.AppTheme
import com.sadellie.unitto.screens.MainViewModel
import com.sadellie.unitto.screens.about.AboutScreen
@ -62,7 +66,11 @@ fun UnittoApp(
viewModel: MainViewModel,
) {
Scaffold { padding ->
NavHost(modifier = Modifier.padding(padding), navController = navController, startDestination = MAIN_SCREEN) {
NavHost(
modifier = Modifier.padding(padding),
navController = navController,
startDestination = MAIN_SCREEN
) {
composable(MAIN_SCREEN) {
MainScreen(

6
app/src/main/java/com/sadellie/unitto/data/preferences/UserPreferences.kt
View File

@ -1,7 +1,11 @@
package com.sadellie.unitto.data.preferences
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.*
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.booleanPreferencesKey
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.intPreferencesKey
import androidx.datastore.preferences.core.stringPreferencesKey
import com.sadellie.unitto.data.units.AbstractUnit
import com.sadellie.unitto.data.units.MyUnitIDS
import kotlinx.coroutines.flow.Flow

16
app/src/main/java/com/sadellie/unitto/data/units/AllUnits.kt
View File

@ -1,6 +1,20 @@
package com.sadellie.unitto.data.units
import com.sadellie.unitto.data.units.collections.*
import com.sadellie.unitto.data.units.collections.ACCELERATION_COLLECTION
import com.sadellie.unitto.data.units.collections.ANGLE_COLLECTION
import com.sadellie.unitto.data.units.collections.AREA_COLLECTION
import com.sadellie.unitto.data.units.collections.CURRENCY_COLLECTION
import com.sadellie.unitto.data.units.collections.DATA_COLLECTION
import com.sadellie.unitto.data.units.collections.DATA_TRANSFER_COLLECTION
import com.sadellie.unitto.data.units.collections.ENERGY_COLLECTION
import com.sadellie.unitto.data.units.collections.LENGTH_COLLECTION
import com.sadellie.unitto.data.units.collections.MASS_COLLECTION
import com.sadellie.unitto.data.units.collections.POWER_COLLECTION
import com.sadellie.unitto.data.units.collections.PRESSURE_COLLECTION
import com.sadellie.unitto.data.units.collections.SPEED_COLLECTION
import com.sadellie.unitto.data.units.collections.TEMPERATURE_COLLECTION
import com.sadellie.unitto.data.units.collections.TIME_COLLECTION
import com.sadellie.unitto.data.units.collections.VOLUME_COLLECTION
/**
* This is a collection of all available units

6
app/src/main/java/com/sadellie/unitto/screens/MainViewModel.kt
View File

@ -12,7 +12,11 @@ import com.google.firebase.crashlytics.FirebaseCrashlytics
import com.sadellie.unitto.data.KEY_0
import com.sadellie.unitto.data.KEY_DOT
import com.sadellie.unitto.data.KEY_MINUS
import com.sadellie.unitto.data.preferences.*
import com.sadellie.unitto.data.preferences.AppTheme
import com.sadellie.unitto.data.preferences.MAX_PRECISION
import com.sadellie.unitto.data.preferences.OutputFormat
import com.sadellie.unitto.data.preferences.Separator
import com.sadellie.unitto.data.preferences.UserPreferencesRepository
import com.sadellie.unitto.data.units.ALL_UNITS
import com.sadellie.unitto.data.units.AbstractUnit
import com.sadellie.unitto.data.units.MyUnitIDS

15
app/src/main/java/com/sadellie/unitto/screens/about/AboutScreen.kt
View File

@ -2,12 +2,23 @@ package com.sadellie.unitto.screens.about
import androidx.compose.animation.rememberSplineBasedDecay
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Close
import androidx.compose.material3.*
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LargeTopAppBar
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedCard
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Stable
import androidx.compose.runtime.remember

15
app/src/main/java/com/sadellie/unitto/screens/main/MainScreen.kt
View File

@ -2,10 +2,21 @@ package com.sadellie.unitto.screens.main
import android.content.res.Configuration
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.MoreVert
import androidx.compose.material3.*
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color

15
app/src/main/java/com/sadellie/unitto/screens/main/components/Keyboard.kt
View File

@ -7,7 +7,20 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.data.*
import com.sadellie.unitto.data.KEY_0
import com.sadellie.unitto.data.KEY_1
import com.sadellie.unitto.data.KEY_2
import com.sadellie.unitto.data.KEY_3
import com.sadellie.unitto.data.KEY_4
import com.sadellie.unitto.data.KEY_5
import com.sadellie.unitto.data.KEY_6
import com.sadellie.unitto.data.KEY_7
import com.sadellie.unitto.data.KEY_8
import com.sadellie.unitto.data.KEY_9
import com.sadellie.unitto.data.KEY_AC
import com.sadellie.unitto.data.KEY_CLEAR
import com.sadellie.unitto.data.KEY_DOT
import com.sadellie.unitto.data.KEY_NEGATE
import com.sadellie.unitto.screens.Formatter

7
app/src/main/java/com/sadellie/unitto/screens/main/components/MyTextField.kt
View File

@ -1,7 +1,12 @@
package com.sadellie.unitto.screens.main.components
import android.widget.Toast
import androidx.compose.animation.*
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.SizeTransform
import androidx.compose.animation.expandHorizontally
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.with
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement

8
app/src/main/java/com/sadellie/unitto/screens/main/components/UnitSelectionButton.kt
View File

@ -1,6 +1,12 @@
package com.sadellie.unitto.screens.main.components
import androidx.compose.animation.*
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.SizeTransform
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.with
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults

7
app/src/main/java/com/sadellie/unitto/screens/second/SecondScreen.kt
View File

@ -6,8 +6,13 @@ import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.material3.Scaffold
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalFocusManager

6
app/src/main/java/com/sadellie/unitto/screens/second/components/ChipsRow.kt
View File

@ -4,7 +4,11 @@ import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.lazy.items

21
app/src/main/java/com/sadellie/unitto/screens/second/components/SearchBar.kt
View File

@ -1,7 +1,12 @@
package com.sadellie.unitto.screens.second.components
import androidx.activity.compose.BackHandler
import androidx.compose.animation.*
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.Crossfade
import androidx.compose.animation.SizeTransform
import androidx.compose.animation.scaleIn
import androidx.compose.animation.scaleOut
import androidx.compose.animation.with
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.text.BasicTextField
@ -13,9 +18,19 @@ import androidx.compose.material.icons.filled.FavoriteBorder
import androidx.compose.material.icons.filled.Search
import androidx.compose.material.icons.outlined.ArrowBack
import androidx.compose.material.icons.outlined.Clear
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.SmallTopAppBar
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha

6
app/src/main/java/com/sadellie/unitto/screens/second/components/SearchPlaceholder.kt
View File

@ -1,6 +1,10 @@
package com.sadellie.unitto.screens.second.components
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.SearchOff
import androidx.compose.material3.Icon

20
app/src/main/java/com/sadellie/unitto/screens/second/components/UnitListItem.kt
View File

@ -1,10 +1,19 @@
package com.sadellie.unitto.screens.second.components
import androidx.compose.animation.*
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.SizeTransform
import androidx.compose.animation.scaleIn
import androidx.compose.animation.scaleOut
import androidx.compose.animation.with
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Favorite
@ -14,8 +23,13 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color

7
app/src/main/java/com/sadellie/unitto/screens/setttings/AlertDialogWithList.kt
View File

@ -9,7 +9,12 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.*
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.RadioButton
import androidx.compose.material3.RadioButtonDefaults
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment

6
app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsListItem.kt
View File

@ -2,7 +2,11 @@ package com.sadellie.unitto.screens.setttings
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Switch

19
app/src/main/java/com/sadellie/unitto/screens/setttings/SettingsScreen.kt
View File

@ -9,9 +9,19 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.ArrowBack
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.LargeTopAppBar
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalContext
@ -20,7 +30,10 @@ import androidx.compose.ui.unit.dp
import com.sadellie.unitto.BuildConfig
import com.sadellie.unitto.R
import com.sadellie.unitto.data.ABOUT_SCREEN
import com.sadellie.unitto.data.preferences.*
import com.sadellie.unitto.data.preferences.APP_THEMES
import com.sadellie.unitto.data.preferences.OUTPUT_FORMAT
import com.sadellie.unitto.data.preferences.PRECISIONS
import com.sadellie.unitto.data.preferences.SEPARATORS
import com.sadellie.unitto.screens.MainViewModel
import com.sadellie.unitto.screens.openLink

6
app/src/main/java/com/sadellie/unitto/ui/theme/ColorSchemeUtils.kt
View File

@ -3,7 +3,11 @@ package com.sadellie.unitto.ui.theme
import android.app.WallpaperManager
import android.content.Context
import android.os.Build
import androidx.compose.material3.*
import androidx.compose.material3.ColorScheme
import androidx.compose.material3.darkColorScheme
import androidx.compose.material3.dynamicDarkColorScheme
import androidx.compose.material3.dynamicLightColorScheme
import androidx.compose.material3.lightColorScheme
import androidx.compose.runtime.Stable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.luminance

3
app/src/test/java/com/sadellie/unitto/screens/FormatterTest.kt
View File

@ -1,8 +1,7 @@
package com.sadellie.unitto.screens
import com.sadellie.unitto.data.preferences.Separator
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Test
private val formatter = Formatter

3
app/src/test/java/com/sadellie/unitto/screens/LevenshteinTest.kt
View File

@ -1,7 +1,6 @@
package com.sadellie.unitto.screens
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Test
class LevenshteinTest {

3
app/src/test/java/com/sadellie/unitto/screens/MinimumRequiredScaleTest.kt
View File

@ -1,7 +1,6 @@
package com.sadellie.unitto.screens
import org.junit.Assert.*
import org.junit.Assert.assertEquals
import org.junit.Test
import java.math.BigDecimal