Skip to content

Commit

Permalink
Update V6
Browse files Browse the repository at this point in the history
  • Loading branch information
Arturo254 committed May 9, 2024
1 parent 6e65a81 commit 37505c3
Show file tree
Hide file tree
Showing 159 changed files with 7,594 additions and 1,528 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</a>
</div>

>[!NOTE]
>[!NOTE]
>
> la aplicación original tiene 2 años sin actualización , se reescribio el codigo usando al 100% kotlin y actualizando a material Design 3
Expand Down
35 changes: 10 additions & 25 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,18 @@ plugins {
id("com.google.devtools.ksp")
}

if (isFullBuild && System.getenv("PULL_REQUEST") == null) {
apply(plugin = "com.google.gms.google-services")
apply(plugin = "com.google.firebase.crashlytics")
apply(plugin = "com.google.firebase.firebase-perf")
}

android {
namespace = "com.zionhuang.music"
compileSdk = 34
buildToolsVersion = "34.0.0"
defaultConfig {
applicationId = "com.zionhuang.music"
minSdk = 24
targetSdk = 33
versionCode = 19
versionName = "0.5.4"
targetSdk = 34
versionCode = 22
versionName = "0.6.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

}
buildTypes {
release {
Expand All @@ -40,9 +35,6 @@ android {
}
flavorDimensions += "version"
productFlavors {
create("full") {
dimension = "version"
}
create("foss") {
dimension = "version"
}
Expand All @@ -58,22 +50,23 @@ android {
}
}
buildFeatures {
buildConfig = true
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
compileOptions {
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlin {
jvmToolchain(11)
jvmToolchain(17)
}
kotlinOptions {
freeCompilerArgs = freeCompilerArgs + "-Xcontext-receivers"
jvmTarget = "11"
jvmTarget = "17"
}
testOptions {
unitTests.isIncludeAndroidResources = true
Expand Down Expand Up @@ -136,17 +129,9 @@ dependencies {

implementation(projects.innertube)
implementation(projects.kugou)
implementation(projects.lrclib)

coreLibraryDesugaring(libs.desugaring)

"fullImplementation"(platform(libs.firebase.bom))
"fullImplementation"(libs.firebase.analytics)
"fullImplementation"(libs.firebase.crashlytics)
"fullImplementation"(libs.firebase.config)
"fullImplementation"(libs.firebase.perf)
"fullImplementation"(libs.mlkit.language.id)
"fullImplementation"(libs.mlkit.translate)
"fullImplementation"(libs.opencc4j)

implementation(libs.timber)
}
Binary file modified app/foss/release/baselineProfiles/0/app-foss-release.dm
Binary file not shown.
Binary file modified app/foss/release/baselineProfiles/1/app-foss-release.dm
Binary file not shown.
4 changes: 2 additions & 2 deletions app/foss/release/output-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 19,
"versionName": "0.5.4",
"versionCode": 22,
"versionName": "0.6.0Beta Version",
"outputFile": "app-foss-release.apk"
}
],
Expand Down
3 changes: 1 addition & 2 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,4 @@
-dontwarn org.openjsse.javax.net.ssl.SSLParameters
-dontwarn org.openjsse.javax.net.ssl.SSLSocket
-dontwarn org.openjsse.net.ssl.OpenJSSE
-dontwarn org.slf4j.impl.StaticLoggerBinder

-dontwarn org.slf4j.impl.StaticLoggerBinder
2 changes: 1 addition & 1 deletion app/src/debug/res/values/app_name.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">InnerTunne</string>
<string name="app_name">InnerTune Debug</string>
</resources>
5 changes: 5 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />

<queries>
<intent>
Expand Down Expand Up @@ -69,6 +71,8 @@
<data android:pathPrefix="/c/" />
<!-- playlist prefix -->
<data android:pathPrefix="/playlist" />
<!-- search prefix -->
<data android:pathPrefix="/search" />
</intent-filter>

<intent-filter>
Expand Down Expand Up @@ -133,6 +137,7 @@

<service
android:name=".playback.ExoDownloadService"
android:foregroundServiceType="dataSync"
android:exported="false">
<intent-filter>
<action android:name="androidx.media3.exoplayer.downloadService.action.RESTART" />
Expand Down
Binary file modified app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions app/src/main/java/com/zionhuang/music/App.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import coil.ImageLoaderFactory
import coil.disk.DiskCache
import com.zionhuang.innertube.YouTube
import com.zionhuang.innertube.models.YouTubeLocale
import com.zionhuang.kugou.KuGou
import com.zionhuang.music.constants.*
import com.zionhuang.music.extensions.*
import com.zionhuang.music.utils.dataStore
Expand Down Expand Up @@ -44,9 +43,6 @@ class App : Application(), ImageLoaderFactory {
?: languageTag.takeIf { it in LanguageCodeToName }
?: "en"
)
if (languageTag == "zh-TW") {
KuGou.useTraditionalChinese = true
}

if (dataStore[ProxyEnabledKey] == true) {
try {
Expand Down
Loading

0 comments on commit 37505c3

Please sign in to comment.