Skip to content

Commit

Permalink
Cambio de icono
Browse files Browse the repository at this point in the history
  • Loading branch information
@Arturo254
Arturo254 committed Oct 25, 2024
1 parent a6a6217 commit 9ddbcc5
Show file tree
Hide file tree
Showing 29 changed files with 80 additions and 188 deletions.
Empty file removed .kotlin/sessions/kotlin-compiler-17793028793621325438.salive
View file
Empty file.
2 changes: 1 addition & 1 deletion app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Binary file modified app/foss/release/baselineProfiles/0/app-foss-release.dm
View file
Binary file not shown.
Binary file modified app/foss/release/baselineProfiles/1/app-foss-release.dm
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion app/foss/release/output-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"filters": [],
"attributes": [],
"versionCode": 25,
"versionName": "1.6.0",
"versionName": "1.7.0",
"outputFile": "app-foss-release.apk"
}
],
Expand Down
24 changes: 1 addition & 23 deletions app/src/main/java/com/malopieds/innertune/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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") }
Expand Down
96 changes: 56 additions & 40 deletions app/src/main/java/com/malopieds/innertune/ui/screens/settings/AboutScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(),
Expand Down Expand Up @@ -273,7 +274,7 @@ fun AboutScreen(
}
}

Spacer(Modifier.height(4.dp))
Spacer(Modifier.height(10.dp))

Text(
text = " Dev By Arturo Cervantes 亗",
Expand All @@ -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))
Expand Down
17 changes: 2 additions & 15 deletions app/src/main/java/com/malopieds/innertune/ui/screens/settings/AppearanceSettings.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,6 @@ fun AppearanceSettings(
)


// ...


// ...

val isBlurSupported = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S

EnumListPreference(
Expand All @@ -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)
}
}
)
Expand Down
127 changes: 19 additions & 108 deletions app/src/main/res/drawable/opentune_monochrome.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,112 +4,23 @@
android:height="60dp"
android:viewportWidth="288"
android:viewportHeight="288">
<path
android:pathData="m54.7,144c27.7,-68.9 54.9,-28.7 65.1,0z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="90.58"
android:startY="105.98"
android:endX="103.79"
android:endY="141.82"
android:type="linear">
<item android:offset="0" android:color="#FF000000"/>
<item android:offset="1" android:color="#FF4D4D4D"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="m168.2,144c25.4,-51.1 50.5,-21.3 59.9,0z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="201.2"
android:startY="115.78"
android:endX="209.45"
android:endY="143.55"
android:type="linear">
<item android:offset="0" android:color="#FF000000"/>
<item android:offset="1" android:color="#FF4D4D4D"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="m126.1,144c-25.2,51.1 -50,21.3 -59.3,0z"
android:strokeAlpha="0.5"
android:fillAlpha="0.5">
<aapt:attr name="android:fillColor">
<gradient
android:startX="96.48"
android:startY="172.22"
android:endX="72.19"
android:endY="139.95"
android:type="linear">
<item android:offset="0" android:color="#FF474747"/>
<item android:offset="1" android:color="#FFA3A3A3"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="m233.3,144c-25.2,89.7 -50.1,37.4 -59.3,0z"
android:strokeAlpha="0.5"
android:fillAlpha="0.5">
<aapt:attr name="android:fillColor">
<gradient
android:startX="203.62"
android:startY="193.54"
android:endX="160.92"
android:endY="161.21"
android:type="linear">
<item android:offset="0" android:color="#FF474747"/>
<item android:offset="1" android:color="#FFA3A3A3"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="m174,144c-15.7,33.4 -31.1,13.9 -36.9,0z"
android:strokeAlpha="0.5"
android:fillAlpha="0.5">
<aapt:attr name="android:fillColor">
<gradient
android:startX="155.52"
android:startY="162.43"
android:endX="139.46"
android:endY="142.13"
android:type="linear">
<item android:offset="0" android:color="#FF474747"/>
<item android:offset="1" android:color="#FFA3A3A3"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="m126.1,144c30.6,-141.9 60.8,-59.1 72,0z"
android:strokeAlpha="0.5"
android:fillAlpha="0.5">
<aapt:attr name="android:fillColor">
<gradient
android:startX="141.33"
android:startY="86.51"
android:endX="205.4"
android:endY="96.26"
android:type="linear">
<item android:offset="0" android:color="#FF474747"/>
<item android:offset="1" android:color="#FFA3A3A3"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="m161.9,144c-30.6,141.9 -60.8,59.1 -72,0z"
android:strokeAlpha="0.5"
android:fillAlpha="0.5">
<aapt:attr name="android:fillColor">
<gradient
android:startX="146.67"
android:startY="201.49"
android:endX="82.6"
android:endY="191.75"
android:type="linear">
<item android:offset="0" android:color="#FF474747"/>
<item android:offset="1" android:color="#FFA3A3A3"/>
</gradient>
</aapt:attr>
</path>
<group>
<clip-path
android:pathData="m55.87,52.42h176.26v183.16h-176.26z"/>
<path
android:pathData="m143.9,52.4c3.2,0 5.9,1.9 6.7,4.7 1.1,4.2 2.2,6.1 6.5,11.4 2.4,3.1 6,6.7 9.3,9.2 1.1,0.8 5.1,3.5 9,6 9.3,6 12.5,8.4 16.5,12.1 3.7,3.5 6.1,6.7 8.3,11 3.3,6.1 4.8,12.2 4.9,18.9 0,6.8 -1.4,13.8 -4.1,21.3 -3.4,9.1 -9.6,18.6 -13.4,20.4 -2.3,1.1 -3.8,1.1 -6.1,-0.1 -1.5,-0.7 -2,-1.2 -2.8,-2.6 -1.6,-3 -1.2,-5 1.8,-8.9 1.3,-1.6 1.4,-1.9 1.2,-3.2 -0.3,-2.3 -2.5,-8 -4.4,-11.6 -4.7,-8.6 -11.9,-15.2 -21.9,-20l-4.3,-2.1 -0.2,39.4c-0.1,16.4 -0.2,24.6 -0.2,29.4 -0.1,2.5 -0.1,4 -0.1,5.3q-0.2,-0.6 -0.3,-1.2c-3.2,-10.9 -4.3,-14.7 -13.2,-23.9v-52.6c0,-51.4 0.1,-57.8 0.5,-58.9 0.7,-1.5 2.1,-2.9 3.5,-3.5 0.5,-0.3 1.8,-0.5 2.8,-0.5zM71.4,201c0,-19.1 15.5,-34.5 34.6,-34.5 19.1,0 34.5,15.4 34.5,34.5 0,19.1 -15.4,34.6 -34.5,34.6 -19.1,0 -34.6,-15.5 -34.6,-34.6z"
android:fillType="evenOdd">
<aapt:attr name="android:fillColor">
<gradient
android:startX="179.14"
android:startY="69.7"
android:endX="106.85"
android:endY="232.42"
android:type="linear">
<item android:offset="0" android:color="#FF000000"/>
<item android:offset="0.82" android:color="#FF888888"/>
</gradient>
</aapt:attr>
</path>
</group>
</vector>
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_background.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_background.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9ddbcc5

Please sign in to comment.