diff --git a/.kotlin/sessions/kotlin-compiler-17793028793621325438.salive b/.kotlin/sessions/kotlin-compiler-17793028793621325438.salive deleted file mode 100644 index e69de29..0000000 diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 89bae86..4948910 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,7 +20,7 @@ android { //noinspection OldTargetApi targetSdk = 34 versionCode = 25 - versionName = "1.6.0" + versionName = "1.7.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/foss/release/baselineProfiles/0/app-foss-release.dm b/app/foss/release/baselineProfiles/0/app-foss-release.dm index 2be3ff2..f0bcb2d 100644 Binary files a/app/foss/release/baselineProfiles/0/app-foss-release.dm and b/app/foss/release/baselineProfiles/0/app-foss-release.dm differ diff --git a/app/foss/release/baselineProfiles/1/app-foss-release.dm b/app/foss/release/baselineProfiles/1/app-foss-release.dm index f9b671d..955964e 100644 Binary files a/app/foss/release/baselineProfiles/1/app-foss-release.dm and b/app/foss/release/baselineProfiles/1/app-foss-release.dm differ diff --git a/app/foss/release/output-metadata.json b/app/foss/release/output-metadata.json index ab3c9cb..8a672ef 100644 --- a/app/foss/release/output-metadata.json +++ b/app/foss/release/output-metadata.json @@ -12,7 +12,7 @@ "filters": [], "attributes": [], "versionCode": 25, - "versionName": "1.6.0", + "versionName": "1.7.0", "outputFile": "app-foss-release.apk" } ], diff --git a/app/src/main/java/com/malopieds/innertune/MainActivity.kt b/app/src/main/java/com/malopieds/innertune/MainActivity.kt index 4c580b1..9c99e9f 100644 --- a/app/src/main/java/com/malopieds/innertune/MainActivity.kt +++ b/app/src/main/java/com/malopieds/innertune/MainActivity.kt @@ -730,29 +730,7 @@ class MainActivity : ComponentActivity() { ) } } else if (navBackStackEntry?.destination?.route in topLevelScreens) { -// Box( -// contentAlignment = Alignment.Center, -// modifier = -// Modifier -// .size(48.dp) -// .clip(CircleShape) -// .clickable { -// navController.navigate("settings") -// }, -// ) { -// BadgedBox( -// badge = { -// if (latestVersion > BuildConfig.VERSION_CODE) { -// Badge() -// } -// }, -// ) { -// Icon( -// painter = painterResource(R.drawable.settingsv2), -// contentDescription = null, -// ) -// } -// } +// SettingsIconWithUpdateBadge( currentVersion = BuildConfig.VERSION_NAME, onSettingsClick = { navController.navigate("settings") } diff --git a/app/src/main/java/com/malopieds/innertune/ui/screens/settings/AboutScreen.kt b/app/src/main/java/com/malopieds/innertune/ui/screens/settings/AboutScreen.kt index 5261af0..6a78cca 100644 --- a/app/src/main/java/com/malopieds/innertune/ui/screens/settings/AboutScreen.kt +++ b/app/src/main/java/com/malopieds/innertune/ui/screens/settings/AboutScreen.kt @@ -193,7 +193,7 @@ fun AboutScreen( .verticalScroll(rememberScrollState()), horizontalAlignment = Alignment.CenterHorizontally ) { - Spacer(Modifier.height(4.dp)) + Spacer(Modifier.height(20.dp)) // Image with shimmer effect Box( @@ -231,10 +231,11 @@ fun AboutScreen( ) } + Row(verticalAlignment = Alignment.CenterVertically) { // - Spacer(Modifier.width(4.dp)) + Spacer(Modifier.width(10.dp)) Text( text = BuildConfig.FLAVOR.uppercase(), @@ -273,7 +274,7 @@ fun AboutScreen( } } - Spacer(Modifier.height(4.dp)) + Spacer(Modifier.height(10.dp)) Text( text = " Dev By Arturo Cervantes δΊ—", @@ -286,48 +287,63 @@ fun AboutScreen( Spacer(Modifier.height(8.dp)) - Row { - IconButton( - onClick = { uriHandler.openUri("https://github.com/Arturo254/InnerTune") } - ) { - Icon( -modifier = Modifier.size(20.dp), - painter = painterResource(R.drawable.github), - contentDescription = null - - ) - } - - IconButton( - onClick = { uriHandler.openUri("https://g.dev/Arturo254") } + Card( + modifier = Modifier + .fillMaxWidth() + .padding(16.dp), + shape = RoundedCornerShape(28.dp), // Bordes muy redondeados estilo MD3 + elevation = CardDefaults.cardElevation(defaultElevation = 1.dp), + colors = CardDefaults.cardColors( + containerColor = MaterialTheme.colorScheme.surfaceVariant, // Color de fondo MD3 + ) + ) { + Row( + modifier = Modifier + .padding(8.dp) + .fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceEvenly, + verticalAlignment = Alignment.CenterVertically ) { - Icon( - modifier = Modifier.size(20.dp), - contentDescription = null, - painter = painterResource(R.drawable.google)) + IconButton( + onClick = { uriHandler.openUri("https://github.com/Arturo254/InnerTune") } + ) { + Icon( + modifier = Modifier.size(20.dp), + painter = painterResource(R.drawable.github), + contentDescription = null + ) + } - } + IconButton( + onClick = { uriHandler.openUri("https://g.dev/Arturo254") } + ) { + Icon( + modifier = Modifier.size(20.dp), + contentDescription = null, + painter = painterResource(R.drawable.google) + ) + } - IconButton( - onClick = { uriHandler.openUri("https://www.paypal.com/donate?hosted_button_id=LPK2LT9SY5MBY") } - ) { - Icon( - modifier = Modifier.size(20.dp), - painter = painterResource(R.drawable.paypal), - contentDescription = null - ) - } - IconButton( - onClick = { uriHandler.openUri("https://opentune.netlify.app/") } - ) { - Icon( - modifier = Modifier.size(22.dp), - contentDescription = null, - painter = painterResource(R.drawable.resource_public)) + IconButton( + onClick = { uriHandler.openUri("https://www.paypal.com/donate?hosted_button_id=LPK2LT9SY5MBY") } + ) { + Icon( + modifier = Modifier.size(20.dp), + painter = painterResource(R.drawable.paypal), + contentDescription = null + ) + } + IconButton( + onClick = { uriHandler.openUri("https://opentune.netlify.app/") } + ) { + Icon( + modifier = Modifier.size(22.dp), + contentDescription = null, + painter = painterResource(R.drawable.resource_public) + ) + } } - - } Spacer(Modifier.height(20.dp)) diff --git a/app/src/main/java/com/malopieds/innertune/ui/screens/settings/AppearanceSettings.kt b/app/src/main/java/com/malopieds/innertune/ui/screens/settings/AppearanceSettings.kt index cb4bd41..eb36ff3 100644 --- a/app/src/main/java/com/malopieds/innertune/ui/screens/settings/AppearanceSettings.kt +++ b/app/src/main/java/com/malopieds/innertune/ui/screens/settings/AppearanceSettings.kt @@ -288,11 +288,6 @@ fun AppearanceSettings( ) -// ... - - -// ... - val isBlurSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S EnumListPreference( @@ -308,16 +303,8 @@ fun AppearanceSettings( when (style) { PlayerBackgroundStyle.DEFAULT -> stringResource(R.string.follow_theme) PlayerBackgroundStyle.GRADIENT -> stringResource(R.string.gradient) - PlayerBackgroundStyle.BLURMOV -> if (isBlurSupported) { - stringResource(R.string.blurmv) - } else { - stringResource(R.string.blur_not_supported) - } - PlayerBackgroundStyle.BLUR -> if (isBlurSupported) { - stringResource(R.string.blur) - } else { - stringResource(R.string.blur_not_supported) - } + PlayerBackgroundStyle.BLURMOV -> stringResource(R.string.blurmv) + PlayerBackgroundStyle.BLUR -> stringResource(R.string.blur) } } ) diff --git a/app/src/main/res/drawable/opentune_monochrome.xml b/app/src/main/res/drawable/opentune_monochrome.xml index 52e82e1..af4ea91 100644 --- a/app/src/main/res/drawable/opentune_monochrome.xml +++ b/app/src/main/res/drawable/opentune_monochrome.xml @@ -4,112 +4,23 @@ android:height="60dp" android:viewportWidth="288" android:viewportHeight="288"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 694bdfc..2463158 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png index 08c03e0..b740d97 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index 2244d22..368f4a8 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png index 2244d22..368f4a8 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 72c24d5..f7cefda 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png index 1d80ae9..73e03f9 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index f9d1753..865d3e1 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png index f9d1753..865d3e1 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bb57d4d..e18c2e0 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png index 2d7ebef..8676f16 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index d628366..b79c9f5 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png index d628366..b79c9f5 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 6843726..3a48437 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png index e71b1bc..6f7073e 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 06e744f..af4347d 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png index 06e744f..af4347d 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 8230162..f74969c 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png index 3c09770..beb1e33 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index 8eb2ae7..e3b5f94 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png index 8eb2ae7..e3b5f94 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ