Skip to content

Commit

Permalink
fix minify
Browse files Browse the repository at this point in the history
  • Loading branch information
@T8RIN
T8RIN committed Feb 27, 2023
1 parent a49b8dd commit 3fdfacf
Show file tree
Hide file tree
Showing 6 changed files with 213 additions and 128 deletions.
5 changes: 3 additions & 2 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ android {
applicationId = "ru.tech.imageresizershrinker"
minSdk = 21
targetSdk = 33
versionCode = 18
versionName = "1.6.2"
versionCode = 19
versionName = "1.6.3"
}

buildTypes {
Expand Down Expand Up @@ -60,4 +60,5 @@ dependencies {
implementation(project(":colordetector"))
implementation("dev.olshevski.navigation:reimagined:1.3.1")
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.0-rc01")
implementation("nl.dionsegijn:konfetti-compose:2.0.2")
}
Binary file modified app/release/app-release.apk
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions app/release/output-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 18,
"versionName": "1.6.2",
"versionCode": 19,
"versionName": "1.6.3",
"outputFile": "app-release.apk"
}
],
Expand Down
187 changes: 63 additions & 124 deletions app/src/main/java/ru/tech/imageresizershrinker/main_screen/components/MainScreen.kt
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
package ru.tech.imageresizershrinker.main_screen.components

import android.content.Intent
import android.net.Uri
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.rounded.Crop
import androidx.compose.material.icons.rounded.Palette
import androidx.compose.material.icons.rounded.PhotoSizeSelectLarge
import androidx.compose.material3.*
import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
import androidx.compose.runtime.*
Expand All @@ -21,24 +15,24 @@ import androidx.compose.ui.draw.shadow
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shadow
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import com.cookhelper.dynamic.theme.LocalDynamicThemeState
import dev.olshevski.navigation.reimagined.NavController
import dev.olshevski.navigation.reimagined.navigate
import kotlinx.coroutines.delay
import nl.dionsegijn.konfetti.compose.KonfettiView
import nl.dionsegijn.konfetti.compose.OnParticleSystemUpdateListener
import nl.dionsegijn.konfetti.core.*
import nl.dionsegijn.konfetti.core.emitter.Emitter
import ru.tech.imageresizershrinker.BuildConfig
import ru.tech.imageresizershrinker.R
import ru.tech.imageresizershrinker.main_screen.Screen
import ru.tech.imageresizershrinker.resize_screen.components.blend
import ru.tech.imageresizershrinker.theme.Github
import ru.tech.imageresizershrinker.utils.LocalWindowSizeClass
import java.util.concurrent.TimeUnit

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand All @@ -48,6 +42,8 @@ fun MainScreen(navController: NavController<Screen>) {
val colorScheme = MaterialTheme.colorScheme
val themeState = LocalDynamicThemeState.current

var showConfetti by remember { mutableStateOf(false) }

val colors = remember(colorScheme) {
colorScheme.run {
listOf(
Expand All @@ -66,6 +62,7 @@ fun MainScreen(navController: NavController<Screen>) {
)
}
}

Column(
Modifier
.fillMaxSize()
Expand All @@ -85,6 +82,7 @@ fun MainScreen(navController: NavController<Screen>) {
detectTapGestures(
onPress = {
scaleState = 1.3f
showConfetti = true
delay(200)
tryAwaitRelease()
themeState.updateColor(colors.random())
Expand Down Expand Up @@ -192,121 +190,62 @@ fun MainScreen(navController: NavController<Screen>) {
}
}
}

if (showConfetti) {
val primary = MaterialTheme.colorScheme.primary
KonfettiView(
modifier = Modifier.fillMaxSize(),
parties = remember { particles(primary) },
updateListener = object : OnParticleSystemUpdateListener {
override fun onParticleSystemEnded(system: PartySystem, activeSystems: Int) {
if (activeSystems == 0) showConfetti = false
}
}
)
}
}

@Composable
fun SourceCodePreference(
modifier: Modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
) {
val context = LocalContext.current
PreferenceItem(
onClick = {
context.startActivity(
Intent(
Intent.ACTION_VIEW,
Uri.parse("https://github.com/T8RIN/ImageResizer")
)
private fun particles(primary: Color) = listOf(
Party(
speed = 0f,
maxSpeed = 15f,
damping = 0.9f,
angle = Angle.BOTTOM,
spread = Spread.ROUND,
colors = listOf(0xfce18a, 0xff726d, 0xf4306d, 0xb48def).map {
it.blend(
primary
)
},
icon = Icons.Rounded.Github,
title = stringResource(R.string.check_source_code),
subtitle = stringResource(R.string.check_source_code_sub),
color = MaterialTheme.colorScheme.tertiaryContainer,
modifier = modifier
)
}

@Composable
fun SingleResizePreference(
onClick: () -> Unit,
color: Color = MaterialTheme.colorScheme.surfaceVariant,
modifier: Modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
) {
PreferenceItem(
onClick = onClick,
icon = Icons.Rounded.PhotoSizeSelectLarge,
title = stringResource(R.string.single_resize),
subtitle = stringResource(R.string.resize_single_image),
color = color,
modifier = modifier
)
}

@Composable
fun CropPreference(
onClick: () -> Unit,
color: Color = MaterialTheme.colorScheme.surfaceVariant,
modifier: Modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
) {
PreferenceItem(
onClick = onClick,
icon = Icons.Rounded.Crop,
title = stringResource(R.string.crop),
subtitle = stringResource(R.string.crop_sub),
color = color,
modifier = modifier
)
}

@Composable
fun PickColorPreference(
onClick: () -> Unit,
color: Color = MaterialTheme.colorScheme.surfaceVariant,
modifier: Modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
) {
PreferenceItem(
onClick = onClick,
icon = Icons.Rounded.Palette,
title = stringResource(R.string.pick_color),
subtitle = stringResource(R.string.pick_color_sub),
color = color,
modifier = modifier
emitter = Emitter(duration = 2, TimeUnit.SECONDS).perSecond(100),
position = Position.Relative(0.0, 0.0).between(Position.Relative(1.0, 0.0))
),
Party(
speed = 10f,
maxSpeed = 30f,
damping = 0.9f,
angle = Angle.RIGHT - 45,
spread = Spread.SMALL,
colors = listOf(0xfce18a, 0xff726d, 0xf4306d, 0xb48def).map {
it.blend(
primary
)
},
emitter = Emitter(duration = 2, TimeUnit.SECONDS).perSecond(30),
position = Position.Relative(0.0, 1.0)
),
Party(
speed = 10f,
maxSpeed = 30f,
damping = 0.9f,
angle = Angle.RIGHT - 135,
spread = Spread.SMALL,
colors = listOf(0xfce18a, 0xff726d, 0xf4306d, 0xb48def).map {
it.blend(
primary
)
},
emitter = Emitter(duration = 2, TimeUnit.SECONDS).perSecond(30),
position = Position.Relative(1.0, 1.0)
)
}

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun PreferenceItem(
onClick: () -> Unit,
title: String,
subtitle: String,
icon: ImageVector,
color: Color = MaterialTheme.colorScheme.surfaceVariant,
modifier: Modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
) {
Card(
modifier = modifier,
onClick = onClick,
colors = CardDefaults.cardColors(containerColor = color)
) {
Row(Modifier.padding(16.dp)) {
Icon(imageVector = icon, contentDescription = null)
Spacer(modifier = Modifier.width(16.dp))
Column {
Text(
text = title,
fontSize = 16.sp,
fontWeight = FontWeight.Medium
)
Spacer(modifier = Modifier.height(2.dp))
Text(
text = subtitle,
fontSize = 12.sp,
fontWeight = FontWeight.Normal,
lineHeight = 14.sp,
color = LocalContentColor.current.copy(alpha = 0.5f)
)
}
}
}
}
)
Loading

0 comments on commit 3fdfacf

Please sign in to comment.