Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-18 16:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Dependencies bump (hell)

Browse Source
This commit is contained in:
Sad Ellie 2023-05-15 15:50:29 +03:00
parent 6499971bd9
commit 9156473d7a
59 changed files with 123 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/build.gradle.kts
View File

@ -16,6 +16,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
@file:Suppress("UnstableApiUsage")
plugins {
// Basic stuff
id("com.android.application")
@ -74,19 +76,19 @@ android {
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
isCoreLibraryDesugaringEnabled = true
}
packagingOptions {
packaging {
resources {
excludes.add("/META-INF/{AL2.0,LGPL2.1}")
}
}
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_11.toString()
freeCompilerArgs = freeCompilerArgs + listOf(
"-opt-in=androidx.lifecycle.compose.ExperimentalLifecycleComposeApi"
)
@ -97,6 +99,12 @@ android {
}
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
}
}
dependencies {
implementation(libs.androidx.core)
coreLibraryDesugaring(libs.android.desugarJdkLibs)

6
build-logic/convention/build.gradle.kts
View File

@ -27,6 +27,12 @@ java {
targetCompatibility = JavaVersion.VERSION_11
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
}
}
dependencies {
compileOnly(libs.android.gradlePlugin)
compileOnly(libs.kotlin.gradlePlugin)

1
build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureCompose.kt
View File

@ -23,6 +23,7 @@ import org.gradle.api.Project
import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.kotlin.dsl.getByType
@Suppress("UnstableApiUsage")
internal fun Project.configureCompose(
commonExtension: CommonExtension<*, *, *, *>,
) {

18
build-logic/convention/src/main/java/com/sadellie/unitto/ConfigureKotlinAndroid.kt
View File

@ -25,8 +25,11 @@ import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.api.plugins.ExtensionAware
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.withType
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@Suppress("UnstableApiUsage")
internal fun Project.configureKotlinAndroid(
commonExtension: CommonExtension<*, *, *, *>,
) {
@ -45,8 +48,8 @@ internal fun Project.configureKotlinAndroid(
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
isCoreLibraryDesugaringEnabled = true
}
@ -59,7 +62,7 @@ internal fun Project.configureKotlinAndroid(
resValues = false
}
packagingOptions {
packaging {
resources {
excludes.add("/META-INF/{AL2.0,LGPL2.1}")
}
@ -73,7 +76,14 @@ internal fun Project.configureKotlinAndroid(
"-opt-in=androidx.compose.ui.unit.ExperimentalUnitApi",
"-opt-in=androidx.lifecycle.compose.ExperimentalLifecycleComposeApi"
)
jvmTarget = JavaVersion.VERSION_1_8.toString()
jvmTarget = JavaVersion.VERSION_11.toString()
}
}
tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
// Set JVM target to 11
jvmTarget = JavaVersion.VERSION_11.toString()
}
}

BIN
build-logic/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

5
build-logic/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +0,0 @@
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

2
core/base/build.gradle.kts
View File

@ -16,6 +16,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
@file:Suppress("UnstableApiUsage")
plugins {
id("unitto.library")
}

2
core/ui/build.gradle.kts
View File

@ -16,6 +16,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
@file:Suppress("UnstableApiUsage")
plugins {
id("unitto.library")
id("unitto.library.compose")

1
core/ui/src/main/java/com/sadellie/unitto/core/ui/Formatter.kt
View File

@ -19,6 +19,7 @@
package com.sadellie.unitto.core.ui
import android.content.Context
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.base.Separator
import com.sadellie.unitto.core.base.Token
import java.math.BigDecimal

2
core/ui/src/main/java/com/sadellie/unitto/core/ui/common/MenuButton.kt
View File

@ -24,7 +24,7 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.base.R
/**
* Button that is used in Top bars

2
core/ui/src/main/java/com/sadellie/unitto/core/ui/common/NavigateUpButton.kt
View File

@ -24,7 +24,7 @@ import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.base.R
/**
* Button that is used in Top bars

2
core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoDrawerSheet.kt
View File

@ -31,8 +31,8 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.base.TopLevelDestinations
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.ui.model.DrawerItems
@Composable

2
core/ui/src/main/java/com/sadellie/unitto/core/ui/common/UnittoListItem.kt
View File

@ -46,7 +46,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.base.R
/**
* Represents one item in list on Settings screen.

2
core/ui/src/main/java/com/sadellie/unitto/core/ui/theme/Type.kt
View File

@ -25,7 +25,7 @@ import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.em
import androidx.compose.ui.unit.sp
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.base.R
private val Montserrat = FontFamily(
Font(R.font.montserrat_light, weight = FontWeight.Light),

1
data/model/src/main/java/com/sadellie/unitto/data/model/UnitGroup.kt
View File

@ -19,6 +19,7 @@
package com.sadellie.unitto.data.model
import androidx.annotation.StringRes
import com.sadellie.unitto.core.base.R
val ALL_UNIT_GROUPS: List<UnitGroup> by lazy {
UnitGroup.values().toList()

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Acceleration.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val accelerationCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Angle.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val angleCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Area.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val areaCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Capacitance.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val electrostaticCapacitance: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Currency.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val currencyCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Data.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val dataCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/DataTransfer.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val dataTransferCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Energy.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val energyCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/FlowRate.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.FlowRateUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
val flowRateCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Flux.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val fluxCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Force.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
val forceCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Length.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val lengthCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Luminance.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
val luminanceCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Mass.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val massCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/NumberBase.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.NumberBaseUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
internal val numberBaseCollection: List<AbstractUnit> by lazy {
listOf(

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Power.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val powerCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Prefix.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
val prefixCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Pressure.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val pressureCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Speed.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val speedCollection: List<AbstractUnit> by lazy {

6
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Temperature.kt
View File

@ -19,12 +19,12 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.MAX_PRECISION
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.common.setMinimumRequiredScale
import com.sadellie.unitto.data.common.trimZeros
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
import java.math.RoundingMode

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Time.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val timeCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Torque.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
val torqueCollection: List<AbstractUnit> by lazy {

2
data/units/src/main/java/com/sadellie/unitto/data/units/collections/Volume.kt
View File

@ -18,11 +18,11 @@
package com.sadellie.unitto.data.units.collections
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.DefaultUnit
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.data.units.MyUnitIDS
import com.sadellie.unitto.data.units.R
import java.math.BigDecimal
internal val volumeCollection: List<AbstractUnit> by lazy {

3
feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorScreen.kt
View File

@ -62,6 +62,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.base.Separator
import com.sadellie.unitto.core.ui.Formatter
import com.sadellie.unitto.core.ui.common.MenuButton
@ -73,7 +74,7 @@ import com.sadellie.unitto.feature.calculator.components.DragDownView
import com.sadellie.unitto.feature.calculator.components.HistoryList
import kotlinx.coroutines.launch
import java.text.SimpleDateFormat
import java.util.*
import java.util.Locale
import kotlin.math.abs
import kotlin.math.roundToInt

4
feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/components/HistoryList.kt
View File

@ -54,14 +54,14 @@ import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.Formatter
import com.sadellie.unitto.core.ui.common.textfield.UnittoTextToolbar
import com.sadellie.unitto.core.ui.common.textfield.copyWithoutGrouping
import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayMedium
import com.sadellie.unitto.data.model.HistoryItem
import com.sadellie.unitto.feature.calculator.R
import java.text.SimpleDateFormat
import java.util.*
import java.util.Locale
@Composable
internal fun HistoryList(

2
feature/converter/src/main/java/com/sadellie/unitto/feature/converter/ConverterScreen.kt
View File

@ -35,7 +35,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.MenuButton
import com.sadellie.unitto.core.ui.common.PortraitLandscape
import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar

12
feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/MyTextField.kt
View File

@ -27,7 +27,7 @@ import androidx.compose.animation.expandVertically
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.shrinkVertically
import androidx.compose.animation.with
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
@ -50,7 +50,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.textfield.InputTextField
import com.sadellie.unitto.core.ui.theme.NumbersTextStyleDisplayLarge
@ -105,9 +105,9 @@ internal fun MyTextField(
targetState = textToShow,
transitionSpec = {
// Enter animation
(expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
((expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
// Exit animation
with fadeOut())
).togetherWith(fadeOut()))
.using(SizeTransform(clip = false))
}
) {
@ -138,9 +138,9 @@ internal fun MyTextField(
targetState = secondaryText,
transitionSpec = {
// Enter animation
(expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
((expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
// Exit animation
with fadeOut())
).togetherWith(fadeOut()))
.using(SizeTransform(clip = false))
}
) {

12
feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/TopScreen.kt
View File

@ -29,7 +29,7 @@ import androidx.compose.animation.expandVertically
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.shrinkVertically
import androidx.compose.animation.with
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
@ -51,8 +51,8 @@ import androidx.compose.ui.draw.rotate
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.Formatter
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.ui.common.ColumnWithConstraints
import com.sadellie.unitto.core.ui.common.textfield.InputTextField
import com.sadellie.unitto.data.model.AbstractUnit
@ -129,9 +129,9 @@ internal fun TopScreenPart(
targetState = stringResource(unitFrom?.shortName ?: R.string.loading_label),
transitionSpec = {
// Enter animation
(expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
((expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
// Exit animation
with fadeOut())
).togetherWith(fadeOut()))
.using(SizeTransform(clip = false))
}
) { value ->
@ -164,9 +164,9 @@ internal fun TopScreenPart(
targetState = stringResource(unitTo?.shortName ?: R.string.loading_label),
transitionSpec = {
// Enter animation
(expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
((expandHorizontally(clip = false, expandFrom = Alignment.Start) + fadeIn()
// Exit animation
with fadeOut())
).togetherWith(fadeOut()))
.using(SizeTransform(clip = false))
}
) { value ->

14
feature/converter/src/main/java/com/sadellie/unitto/feature/converter/components/UnitSelectionButton.kt
View File

@ -18,6 +18,7 @@
package com.sadellie.unitto.feature.converter.components
import android.annotation.SuppressLint
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.SizeTransform
import androidx.compose.animation.core.FastOutSlowInEasing
@ -27,7 +28,7 @@ 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.animation.togetherWith
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.interaction.collectIsPressedAsState
import androidx.compose.foundation.layout.PaddingValues
@ -43,7 +44,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.base.R
/**
* Button to select a unit
@ -52,6 +53,7 @@ import com.sadellie.unitto.core.ui.R
* @param onClick Function to call when button is clicked (navigate to a unit selection screen)
* @param label Text on button
*/
@SuppressLint("UnusedContentLambdaTargetStateParameter")
@Composable
internal fun UnitSelectionButton(
modifier: Modifier = Modifier,
@ -80,11 +82,11 @@ internal fun UnitSelectionButton(
targetState = label ?: 0,
transitionSpec = {
if (targetState > initialState) {
slideInVertically { height -> height } + fadeIn() with
slideOutVertically { height -> -height } + fadeOut()
(slideInVertically { height -> height } + fadeIn()).togetherWith(
slideOutVertically { height -> -height } + fadeOut())
} else {
slideInVertically { height -> -height } + fadeIn() with
slideOutVertically { height -> height } + fadeOut()
(slideInVertically { height -> -height } + fadeIn()).togetherWith(
slideOutVertically { height -> height } + fadeOut())
}.using(
SizeTransform(clip = false)
)

1
feature/epoch/src/main/java/com/sadellie/unitto/feature/epoch/EpochScreen.kt
View File

@ -27,6 +27,7 @@ import androidx.compose.ui.text.TextRange
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.MenuButton
import com.sadellie.unitto.core.ui.common.PortraitLandscape
import com.sadellie.unitto.core.ui.common.UnittoScreenWithTopBar

2
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/AboutScreen.kt
View File

@ -45,7 +45,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.BuildConfig
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
import com.sadellie.unitto.core.ui.openLink

2
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/SettingsScreen.kt
View File

@ -47,9 +47,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.BuildConfig
import com.sadellie.unitto.core.base.OUTPUT_FORMAT
import com.sadellie.unitto.core.base.PRECISIONS
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.base.SEPARATORS
import com.sadellie.unitto.core.base.TOP_LEVEL_DESTINATIONS
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.ui.common.Header
import com.sadellie.unitto.core.ui.common.MenuButton
import com.sadellie.unitto.core.ui.common.UnittoListItem

2
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThemesScreen.kt
View File

@ -49,7 +49,7 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.Header
import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.SegmentedButton

2
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/ThirdPartyLicensesScreen.kt
View File

@ -36,7 +36,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
import com.sadellie.unitto.core.ui.openLink

4
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/UnitGroupsScreen.kt
View File

@ -47,10 +47,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.Header
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
import com.sadellie.unitto.core.ui.R
import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.core.ui.common.UnittoScreenWithLargeTopBar
import org.burnoutcrew.reorderable.ReorderableItem
import org.burnoutcrew.reorderable.detectReorder
import org.burnoutcrew.reorderable.detectReorderAfterLongPress

2
feature/settings/src/main/java/com/sadellie/unitto/feature/settings/components/AlertDialogWithList.kt
View File

@ -38,7 +38,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.feature.settings.R
import com.sadellie.unitto.core.base.R
/**
* Alert dialog that has a list of options in it

1
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/LeftSideScreen.kt
View File

@ -45,6 +45,7 @@ import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.feature.unitslist.components.ChipsRow
import com.sadellie.unitto.feature.unitslist.components.SearchBar

1
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/RightSideScreen.kt
View File

@ -32,6 +32,7 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.res.stringResource
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.Formatter
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.data.model.NumberBaseUnit

2
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/ChipsRow.kt
View File

@ -46,9 +46,9 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.ALL_UNIT_GROUPS
import com.sadellie.unitto.data.model.UnitGroup
import com.sadellie.unitto.feature.unitslist.R
/**
* Row of chips with [UnitGroup]s. Temporary solution

8
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchBar.kt
View File

@ -18,6 +18,7 @@
package com.sadellie.unitto.feature.unitslist.components
import android.annotation.SuppressLint
import androidx.activity.compose.BackHandler
import androidx.compose.animation.AnimatedContent
import androidx.compose.animation.AnimatedVisibility
@ -27,7 +28,7 @@ import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.scaleIn
import androidx.compose.animation.scaleOut
import androidx.compose.animation.with
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.text.BasicTextField
@ -61,8 +62,8 @@ import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.core.ui.common.NavigateUpButton
import com.sadellie.unitto.feature.unitslist.R
/**
* Search bar on the Second screen. Controls what will be shown in the list above this component
@ -214,6 +215,7 @@ private fun SearchButton(
}
}
@SuppressLint("UnusedContentLambdaTargetStateParameter")
@Composable
private fun FavoritesButton(
favoritesOnly: Boolean,
@ -223,7 +225,7 @@ private fun FavoritesButton(
AnimatedContent(
targetState = favoritesOnly,
transitionSpec = {
(scaleIn() with scaleOut()).using(SizeTransform(clip = false))
(scaleIn() togetherWith scaleOut()).using(SizeTransform(clip = false))
}
) {
Icon(

2
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/SearchPlaceholder.kt
View File

@ -35,7 +35,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.feature.unitslist.R
import com.sadellie.unitto.core.base.R
/**
* Placeholder that can be seen when there are no units found

8
feature/unitslist/src/main/java/com/sadellie/unitto/feature/unitslist/components/UnitListItem.kt
View File

@ -18,11 +18,12 @@
package com.sadellie.unitto.feature.unitslist.components
import android.annotation.SuppressLint
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.animation.togetherWith
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
@ -53,8 +54,8 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.sadellie.unitto.core.base.R
import com.sadellie.unitto.data.model.AbstractUnit
import com.sadellie.unitto.feature.unitslist.R
/**
* Represents one list item. Once clicked will navigate up.
@ -65,6 +66,7 @@ import com.sadellie.unitto.feature.unitslist.R
* @param favoriteAction Function to mark unit as favorite. It's a toggle.
* @param shortNameLabel String on the second line.
*/
@SuppressLint("UnusedContentLambdaTargetStateParameter")
@Composable
private fun BasicUnitListItem(
modifier: Modifier,
@ -124,7 +126,7 @@ private fun BasicUnitListItem(
),
targetState = isFavorite,
transitionSpec = {
(scaleIn() with scaleOut()).using(SizeTransform(clip = false))
(scaleIn() togetherWith scaleOut()).using(SizeTransform(clip = false))
}
) {
Icon(

12
gradle/libs.versions.toml
View File

@ -1,19 +1,19 @@
[versions]
appCode = "20"
appName = "Kobicha"
kotlin = "1.8.10"
kotlin = "1.8.21"
androidxCore = "1.10.0"
androidGradlePlugin = "7.4.2"
androidGradlePlugin = "8.0.1"
orgJetbrainsKotlinxCoroutinesTest = "1.6.4"
androidxCompose = "1.5.0-alpha02"
androidxComposeCompiler = "1.4.4"
androidxComposeUi = "1.5.0-alpha02"
androidxComposeMaterial3 = "1.1.0-beta02"
androidxComposeCompiler = "1.4.7"
androidxComposeUi = "1.5.0-alpha04"
androidxComposeMaterial3 = "1.2.0-alpha01"
androidxNavigation = "2.5.3"
androidxLifecycleRuntimeCompose = "2.6.1"
androidxHilt = "1.0.0"
comGoogleDagger = "2.45"
androidxComposeMaterialIconsExtended = "1.5.0-alpha02"
androidxComposeMaterialIconsExtended = "1.5.0-alpha04"
androidxDatastore = "1.0.0"
comGoogleAccompanist = "0.30.1"
androidxRoom = "2.5.1"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Thu Feb 02 22:43:30 AZT 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME