diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 0fa6b67..0000000 --- a/.gitignore +++ /dev/null @@ -1,46 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json - -# Android Studio will place build artifacts here -/android/app/debug -/android/app/profile -/android/app/release diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index f1bc56b..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "3rdparty/flutter"] - path = 3rdparty/flutter - url = https://github.com/flutter/flutter diff --git a/.metadata b/.metadata deleted file mode 100644 index 05f4d5d..0000000 --- a/.metadata +++ /dev/null @@ -1,10 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled and should not be manually edited. - -version: - revision: 097d3313d8e2c7f901932d63e537c1acefb87800 - channel: stable - -project_type: app diff --git a/3rdparty/flutter b/3rdparty/flutter deleted file mode 160000 index f468f33..0000000 --- a/3rdparty/flutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f468f3366c26a5092eb964a230ce7892fda8f2f8 diff --git a/analysis_options.yaml b/analysis_options.yaml deleted file mode 100644 index 61b6c4d..0000000 --- a/analysis_options.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# This file configures the analyzer, which statically analyzes Dart code to -# check for errors, warnings, and lints. -# -# The issues identified by the analyzer are surfaced in the UI of Dart-enabled -# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be -# invoked from the command line by running `flutter analyze`. - -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. -include: package:flutter_lints/flutter.yaml - -linter: - # The lint rules applied to this project can be customized in the - # section below to disable rules from the `package:flutter_lints/flutter.yaml` - # included above or to enable additional rules. A list of all available lints - # and their documentation is published at - # https://dart-lang.github.io/linter/lints/index.html. - # - # Instead of disabling a lint rule for the entire project in the - # section below, it can also be suppressed for a single line of code - # or a specific dart file by using the `// ignore: name_of_lint` and - # `// ignore_for_file: name_of_lint` syntax on the line or in the file - # producing the lint. - rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule - # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options diff --git a/android/.gitignore b/android/.gitignore deleted file mode 100644 index 6f56801..0000000 --- a/android/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -gradle-wrapper.jar -/.gradle -/captures/ -/gradlew -/gradlew.bat -/local.properties -GeneratedPluginRegistrant.java - -# Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app -key.properties -**/*.keystore -**/*.jks diff --git a/android/app/build.gradle b/android/app/build.gradle deleted file mode 100644 index b0007eb..0000000 --- a/android/app/build.gradle +++ /dev/null @@ -1,95 +0,0 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -def keystoreProperties = new Properties() -def keystorePropertiesFile = rootProject.file("key.properties") -if (keystorePropertiesFile.exists()) { - keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -android { - compileSdkVersion flutter.compileSdkVersion - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - defaultConfig { - applicationId "com.illusionman1212.lyricsgrabbr" - minSdkVersion 23 - targetSdkVersion 31 - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - } - - signingConfigs { - release { - keyAlias keystoreProperties['keyAlias'] - keyPassword keystoreProperties['keyPassword'] - storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null - storePassword keystoreProperties['storePassword'] - } - } - - buildTypes { - release { - signingConfig signingConfigs.release - } - debug { - signingConfig signingConfigs.debug - } - } -} - -flutter { - source '../..' -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9' -} - -ext.abiCodes = ["x86_64": 1, "armeabi-v7a": 2, "arm64-v8a": 3] -import com.android.build.OutputFile -android.applicationVariants.all { variant -> - variant.outputs.each { output -> - def abiVersionCode = project.ext.abiCodes.get(output.getFilter(OutputFile.ABI)) - if (abiVersionCode != null) { - output.versionCodeOverride = variant.versionCode * 10 + abiVersionCode - } - } -} diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml deleted file mode 100644 index dbf0756..0000000 --- a/android/app/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml deleted file mode 100644 index 24a0987..0000000 --- a/android/app/src/main/AndroidManifest.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/MainActivity.kt b/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/MainActivity.kt deleted file mode 100644 index b09edb6..0000000 --- a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/MainActivity.kt +++ /dev/null @@ -1,67 +0,0 @@ -package com.illusionman1212.lyricsgrabbr - -import android.content.Intent -import android.os.Bundle -import android.text.TextUtils -import android.util.Log -import androidx.core.app.NotificationManagerCompat -import androidx.core.content.ContextCompat -import io.flutter.embedding.android.FlutterActivity -import io.flutter.plugin.common.EventChannel -import io.flutter.plugin.common.MethodChannel - - -class MainActivity: FlutterActivity() { - private var streamHandler : NotificationStreamHandler? = null - - companion object { - const val ACTION_NOTIFICATION_LISTENER_SETTINGS = "android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" - private const val EVENT_CHANNEL_NAME = "notifications.eventChannel" - private const val METHOD_CHANNEL_NAME = "notifications/method" - } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - val methodChannel = MethodChannel(flutterEngine!!.dartExecutor.binaryMessenger, METHOD_CHANNEL_NAME) - methodChannel.setMethodCallHandler { call, result -> - when (call.method) { - "plugin.hasPermission" -> { - result.success(isPermissionGranted()) - } - "plugin.openPermissionSettings" -> { - result.success(openPermissionSettings()) - } - else -> result.notImplemented() - } - } - - val eventChannel = EventChannel(flutterEngine!!.dartExecutor.binaryMessenger, EVENT_CHANNEL_NAME) - streamHandler = NotificationStreamHandler(context) - eventChannel.setStreamHandler(streamHandler) - } - - override fun onDestroy() { - if (streamHandler?.receiver != null) { - context.unregisterReceiver(streamHandler?.receiver) - } - super.onDestroy() - } - - private fun isPermissionGranted(): Boolean { - val packageName = packageName - val pkgs = NotificationManagerCompat.getEnabledListenerPackages(context) - for (name in pkgs) { - if (TextUtils.equals(packageName, name)) { - return true - } - } - - return false - } - - private fun openPermissionSettings(): Boolean { - context.startActivity(Intent(ACTION_NOTIFICATION_LISTENER_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)) - return true - } -} diff --git a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationStreamHandler.kt b/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationStreamHandler.kt deleted file mode 100644 index 7018ac0..0000000 --- a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationStreamHandler.kt +++ /dev/null @@ -1,51 +0,0 @@ -package com.illusionman1212.lyricsgrabbr - -import io.flutter.plugin.common.EventChannel.StreamHandler -import io.flutter.plugin.common.EventChannel.EventSink -import android.content.* -import android.util.Log -import androidx.core.content.ContextCompat - -class NotificationStreamHandler(private val context: Context) : StreamHandler { - private var eventSink: EventSink? = null - var receiver: NotificationReceiver? = null - private var listenerIntent : Intent? = null - - // Called whenever the event channel is subscribed to in Flutter - override fun onListen(o: Any?, eventSink: EventSink?) { - this.eventSink = eventSink - - listenerIntent = Intent(context, NotificationListener::class.java) - listenerIntent?.action = NotificationListener.START_FOREGROUND_SERVICE_ACTION - - receiver = NotificationReceiver() - val intentFilter = IntentFilter() - intentFilter.addAction(NotificationListener.NOTIFICATION_INTENT) - context.registerReceiver(receiver, intentFilter) - - ContextCompat.startForegroundService(context, listenerIntent!!) - } - - // Called whenever the event channel subscription is cancelled in Flutter - override fun onCancel(o: Any?) { - eventSink = null - Log.d("onCancel", "subscription cancelled, stopping service") - } - - inner class NotificationReceiver : BroadcastReceiver() { - override fun onReceive(context: Context, intent: Intent) { - val packageName = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_NAME) - val packageMessage = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_MESSAGE) - val packageText = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_TEXT) - val packagePlaybackState = intent.getIntExtra(NotificationListener.NOTIFICATION_PACKAGE_PLAYBACK_STATE, -1) - val packageDuration = intent.getLongExtra(NotificationListener.NOTIFICATION_PACKAGE_DURATION, -1) - val map = HashMap() - map["packageName"] = packageName!! - map["packageMessage"] = packageMessage!! - map["packageText"] = packageText!! - map["packagePlaybackState"] = packagePlaybackState - map["packageDuration"] = packageDuration - eventSink?.success(map) - } - } -} diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml deleted file mode 100644 index 35a759d..0000000 --- a/android/app/src/main/res/drawable-v21/launch_background.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml deleted file mode 100644 index 3db14bb..0000000 --- a/android/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml deleted file mode 100644 index fd32325..0000000 --- a/android/app/src/main/res/values/styles.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml deleted file mode 100644 index dbf0756..0000000 --- a/android/app/src/profile/AndroidManifest.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/android/build.gradle b/android/build.gradle deleted file mode 100644 index a1f42e7..0000000 --- a/android/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -buildscript { - ext.kotlin_version = '1.8.22' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -allprojects { - repositories { - google() - mavenCentral() - } -} - -rootProject.buildDir = '../build' -subprojects { - project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { - project.evaluationDependsOn(':app') -} - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/android/gradle.properties b/android/gradle.properties deleted file mode 100644 index c05efd1..0000000 --- a/android/gradle.properties +++ /dev/null @@ -1,16 +0,0 @@ -## For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx1024m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -# -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -#Sun Feb 27 21:16:18 EET 2022 -org.gradle.jvmargs=-Xmx1024M -Dkotlin.daemon.jvm.options\="-Xmx1024M" -android.useAndroidX=true -android.enableJetifier=true diff --git a/android/settings.gradle b/android/settings.gradle deleted file mode 100644 index 44e62bc..0000000 --- a/android/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -include ':app' - -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() - -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } - -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..8555a9b --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,107 @@ +import java.io.FileInputStream +import java.util.Properties + +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + kotlin("plugin.serialization") version "1.9.0" +} + +val keystoreProperties = Properties() +val keystorePropertiesFile: File? = rootProject.file("keystore.properties") +if (keystorePropertiesFile?.exists() == true) { + keystoreProperties.load(FileInputStream(keystorePropertiesFile)) +} + +android { + namespace = "com.illusionman1212.lyricsgrabbr" + compileSdk = 34 + + defaultConfig { + applicationId = "com.illusionman1212.lyricsgrabbr" + minSdk = 23 + targetSdk = 34 + versionCode = 5 + versionName = "0.4.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + signingConfig = signingConfigs.getByName("debug") + } + + signingConfigs { + create("release") { + storeFile = keystoreProperties["storeFile"]?.let { file(it)} + storePassword = keystoreProperties["storePassword"] as String? + keyAlias = keystoreProperties["keyAlias"] as String? + keyPassword = keystoreProperties["keyPassword"] as String? + } + } + + buildTypes { + release { + isMinifyEnabled = true + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + signingConfig = signingConfigs.getByName("release") + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + excludes += "/META-INF/DEPENDENCIES" + excludes += "mozilla/*" + } + } +} + +dependencies { + + implementation("androidx.core:core-ktx:1.12.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.7.0") + implementation("androidx.lifecycle:lifecycle-runtime-compose:2.7.0") + implementation("androidx.activity:activity-compose:1.8.2") + implementation(platform("androidx.compose:compose-bom:2023.10.01")) + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3:1.1.2") + implementation("com.google.android.material:material:1.11.0") + implementation("androidx.compose.material:material-icons-extended:1.5.4") + implementation("androidx.core:core-splashscreen:1.0.1") + implementation("androidx.navigation:navigation-compose:2.7.6") + implementation("androidx.datastore:datastore-preferences:1.0.0") + implementation("com.squareup.okhttp3:okhttp:4.12.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2") + implementation("io.coil-kt:coil:2.5.0") + implementation("io.coil-kt:coil-compose:2.5.0") + implementation("it.skrape:skrapeit:1.2.2") + implementation("org.jsoup:jsoup:1.17.2") + implementation("com.adamratzman:spotify-api-kotlin-core:4.0.2") + + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation(platform("androidx.compose:compose-bom:2023.10.01")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/illusionman1212/lyricsgrabbr/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/illusionman1212/lyricsgrabbr/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..f85890d --- /dev/null +++ b/app/src/androidTest/java/com/illusionman1212/lyricsgrabbr/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.illusionman1212.lyricsgrabbr + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.illusionman1212.lyricsgrabbr", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..841a497 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png similarity index 100% rename from android/app/src/main/ic_launcher-playstore.png rename to app/src/main/ic_launcher-playstore.png diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/LGApp.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/LGApp.kt new file mode 100644 index 0000000..5b2564d --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/LGApp.kt @@ -0,0 +1,38 @@ +package com.illusionman1212.lyricsgrabbr + +import android.app.Application +import android.content.Context +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.preferencesDataStore +import com.adamratzman.spotify.auth.SpotifyDefaultCredentialStore +import com.illusionman1212.lyricsgrabbr.data.HomeRepository +import com.illusionman1212.lyricsgrabbr.data.LyricsRepository +import com.illusionman1212.lyricsgrabbr.data.SettingsPreferencesRepository + +private const val PREFERENCES_NAME = "preferences" +private val Context.dataStore: DataStore by preferencesDataStore( + name = PREFERENCES_NAME +) + +const val SPOTIFY_REDIRECT_URI = "lyricsgrabbr://spotify-auth" + +class LGApp: Application() { + lateinit var settingsPreferencesRepository: SettingsPreferencesRepository + lateinit var homeRepository: HomeRepository + lateinit var lyricsRepository: LyricsRepository + val credentialStore by lazy { + SpotifyDefaultCredentialStore( + clientId = "10d81ce453e743559ea362df2e6a1fd2", + redirectUri = SPOTIFY_REDIRECT_URI, + applicationContext = applicationContext + ) + } + + override fun onCreate() { + super.onCreate() + settingsPreferencesRepository = SettingsPreferencesRepository(dataStore) + homeRepository = HomeRepository(applicationContext) + lyricsRepository = LyricsRepository(applicationContext) + } +} diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/MainActivity.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/MainActivity.kt new file mode 100644 index 0000000..021fb0c --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/MainActivity.kt @@ -0,0 +1,198 @@ +package com.illusionman1212.lyricsgrabbr + +import android.app.Activity +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent +import android.content.IntentFilter +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInHorizontally +import androidx.compose.animation.slideOutHorizontally +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.core.app.NotificationManagerCompat +import androidx.core.content.ContextCompat +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen +import androidx.lifecycle.viewmodel.compose.viewModel +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import com.illusionman1212.lyricsgrabbr.data.Theme +import com.illusionman1212.lyricsgrabbr.ui.screens.HomePage +import com.illusionman1212.lyricsgrabbr.ui.screens.LyricsPage +import com.illusionman1212.lyricsgrabbr.ui.theme.LyricsGrabbrTheme +import com.illusionman1212.lyricsgrabbr.ui.screens.SettingsPage +import com.illusionman1212.lyricsgrabbr.viewmodels.LyricsViewModel +import com.illusionman1212.lyricsgrabbr.viewmodels.SettingsViewModel +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.runBlocking + +data class NotificationEvent( + val packageName: String, + val artist: String, + val title: String, + val playbackState: Int, + val duration: Long +) + +class MainActivity : ComponentActivity() { + var lastNotification: MutableStateFlow = MutableStateFlow(null) + + override fun onCreate(savedInstanceState: Bundle?) { + installSplashScreen() + enableEdgeToEdge() + super.onCreate(savedInstanceState) + + setContent { + val context = LocalContext.current + val activity = context as Activity + val application = activity.application as LGApp + + val settingsViewModel: SettingsViewModel = viewModel( + factory = SettingsViewModel.Factory + ) + val lyricsViewModel: LyricsViewModel = viewModel( + factory = LyricsViewModel.Factory + ) + + val appTheme = remember { mutableIntStateOf(Theme.SYSTEM.ordinal) } + val navController = rememberNavController() + + LaunchedEffect(settingsViewModel.uiState) { + settingsViewModel.uiState.collect { newState -> + if (appTheme.intValue != newState.appTheme) { + appTheme.intValue = newState.appTheme + } + } + } + + runBlocking { + settingsViewModel.updateSpotifyAuthStatus(application.credentialStore.spotifyToken?.refreshToken != null) + appTheme.intValue = settingsViewModel.getAppTheme() + } + + val darkTheme = when (appTheme.intValue) { + Theme.LIGHT.ordinal -> false + Theme.DARK.ordinal -> true + else -> isSystemInDarkTheme() + } + + LyricsGrabbrTheme(darkTheme = darkTheme) { + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + NavHost( + navController = navController, + startDestination = Routes.Home.route, + enterTransition = { + slideInHorizontally( + initialOffsetX = { 1000 }, + animationSpec = tween(300) + ) + fadeIn(animationSpec = tween(300)) + }, + exitTransition = { + slideOutHorizontally( + targetOffsetX = { -1000 }, + animationSpec = tween(300) + ) + fadeOut(animationSpec = tween(300)) + }, + ) { + composable(Routes.Home.route) { + HomePage( + navigateToSettings = { + navController.navigate(Routes.Settings.route) + }, + navigateToLyrics = { + navController.navigate(Routes.Lyrics.route) + }, + lyricsViewModel = lyricsViewModel, + settingsViewModel = settingsViewModel, + goBack = { finish() }, + lastNotification = lastNotification, + ) + } + composable(Routes.Lyrics.route) { + LyricsPage( + goBack = { + navController.popBackStack() + }, + lyricsViewModel = lyricsViewModel, + ) + } + composable(Routes.Settings.route) { + SettingsPage( + goBack = { + navController.popBackStack() + }, + viewModel = settingsViewModel, + ) + } + } + } + } + } + } + + override fun onResume() { + super.onResume() + + startListening() + } + + private fun isPermissionGranted(): Boolean { + val packageName = packageName + val pkgs = NotificationManagerCompat.getEnabledListenerPackages(applicationContext) + + return pkgs.contains(packageName) + } + + private fun startListening() { + val isServiceRunning = NotificationListener.isRunning.value + + if (!isPermissionGranted() || isServiceRunning) { + return + } + + val listenerIntent = Intent(applicationContext, NotificationListener::class.java) + listenerIntent.action = NotificationListener.START_FOREGROUND_SERVICE_ACTION + + val filter = IntentFilter() + filter.addAction(NotificationListener.NOTIFICATION_INTENT) + LocalBroadcastManager.getInstance(applicationContext).registerReceiver(NotificationReceiver(), filter) + ContextCompat.startForegroundService(applicationContext, listenerIntent) + } + + inner class NotificationReceiver: BroadcastReceiver() { + override fun onReceive(context: Context, intent: Intent) { + val artist = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_ARTIST) + val songTitle = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_SONG_TITLE) + val playbackState = intent.getIntExtra(NotificationListener.NOTIFICATION_PACKAGE_PLAYBACK_STATE, -1) + val duration = intent.getLongExtra(NotificationListener.NOTIFICATION_PACKAGE_DURATION, -1) + val notifPackageName = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_NAME) + + lastNotification.update { NotificationEvent( + title = songTitle!!, + artist = artist!!, + playbackState = playbackState, + duration = duration, + packageName = notifPackageName!!, + ) } + } + } +} \ No newline at end of file diff --git a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationListener.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/NotificationListener.kt similarity index 63% rename from android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationListener.kt rename to app/src/main/java/com/illusionman1212/lyricsgrabbr/NotificationListener.kt index 4415a96..b30f9de 100644 --- a/android/app/src/main/kotlin/com/illusionware/lyricsgrabbr/lyricsgrabbr/NotificationListener.kt +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/NotificationListener.kt @@ -1,33 +1,33 @@ package com.illusionman1212.lyricsgrabbr +import android.Manifest.permission.POST_NOTIFICATIONS import android.app.Notification import android.app.NotificationChannel import android.app.NotificationManager import android.app.PendingIntent import android.content.Context import android.content.Intent +import android.content.pm.PackageManager.PERMISSION_GRANTED import android.media.MediaMetadata import android.media.session.MediaController import android.media.session.MediaSession import android.media.session.PlaybackState import android.os.Build -import android.os.Handler import android.service.notification.NotificationListenerService import android.service.notification.StatusBarNotification -import android.util.Log import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat +import androidx.core.content.ContextCompat +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update - -/** - * Notification listening service. Intercepts notifications if permission is given to do so. - */ -class NotificationListener : NotificationListenerService() { +class NotificationListener: NotificationListenerService() { private var notificationManager : NotificationManagerCompat? = null override fun onCreate() { super.onCreate() - Log.d("onCreate Service", "creating service") initNotificationChannels(this) notificationManager = NotificationManagerCompat.from(applicationContext) @@ -37,7 +37,6 @@ class NotificationListener : NotificationListenerService() { if (intent != null) { when (intent.action) { START_FOREGROUND_SERVICE_ACTION -> { - Log.d("START", "starting foreground service") startForegroundService() getCurrentNotifications(applicationContext) } @@ -60,31 +59,28 @@ class NotificationListener : NotificationListenerService() { } private fun getStopServiceNotificationAction(): PendingIntent { - val intent = Intent(MainActivity.ACTION_NOTIFICATION_LISTENER_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + val intent = Intent(android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) val pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE) return pendingIntent } private fun startForegroundService() { - val notification: Notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID) - .setContentTitle("Service Running") - .setContentText("Play some songs on a supported player to get lyrics") - .setSmallIcon(R.drawable.ic_notification) - .setShowWhen(false) - .addAction(R.drawable.ic_notification, "Stop Service", getStopServiceNotificationAction()) - .build() + _isRunning.update { true } - notification.flags = Notification.FLAG_FOREGROUND_SERVICE - startForeground(NOTIFICATION_ID, notification) + startForeground(NOTIFICATION_ID, getInitialNotification()) } private fun stopForegroundService() { - stopForeground(true) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + stopForeground(STOP_FOREGROUND_REMOVE) + } else { + stopForeground(true) + } stopSelf() } private fun initNotificationChannels(context: Context) { - if (Build.VERSION.SDK_INT < 26) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { return } val notificationManager = @@ -105,74 +101,83 @@ class NotificationListener : NotificationListenerService() { } } + private fun getInitialNotification(): Notification { + val notification: Notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID) + .setContentTitle(resources.getString(R.string.service_running)) + .setContentText(resources.getString(R.string.service_notif_desc_init)) + .setSmallIcon(R.drawable.ic_notification) + .setShowWhen(false) + .addAction(R.drawable.ic_notification, resources.getString(R.string.stop_service), getStopServiceNotificationAction()) + .build() + + notification.flags = Notification.FLAG_FOREGROUND_SERVICE + + return notification + } + private fun sendNotificationBroadcast(sbn: StatusBarNotification, context: Context) { - // get the media session stuff - val mediaSessionToken = sbn.notification.extras.getParcelable(Notification.EXTRA_MEDIA_SESSION) - if (mediaSessionToken == null) { + if (ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS) != PERMISSION_GRANTED) { return } + // Apparently the new getParcelable API is buggy and throws an exception if used. + // so we continue to use the deprecated API even on newer versions. + // https://issuetracker.google.com/issues/240585930 + val mediaSessionToken = sbn.notification.extras.getParcelable(Notification.EXTRA_MEDIA_SESSION) + ?: return - val mediaCtrl = mediaSessionToken.let { MediaController(context, it) } + val mediaCtrl = MediaController(context, mediaSessionToken) val duration = mediaCtrl.metadata?.getLong(MediaMetadata.METADATA_KEY_DURATION)?.div(1000) val playbackState = mediaCtrl.playbackState?.state val albumArt = mediaCtrl.metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART) - // Retrieve package name to set as title. - val packageName = sbn.packageName // Retrieve extra object from notification to extract payload. val extras = sbn.notification.extras - val packageMessage = extras?.getCharSequence(Notification.EXTRA_TEXT).toString() - val packageText = extras?.getCharSequence("android.title").toString() + val packageArtist = extras?.getCharSequence(Notification.EXTRA_TEXT).toString() + val packageSongTitle = extras?.getCharSequence("android.title").toString() // Pass data from one activity to another. val intent = Intent(NOTIFICATION_INTENT) - intent.putExtra(NOTIFICATION_PACKAGE_NAME, packageName) - intent.putExtra(NOTIFICATION_PACKAGE_MESSAGE, packageMessage) - intent.putExtra(NOTIFICATION_PACKAGE_TEXT, packageText) + intent.putExtra(NOTIFICATION_PACKAGE_NAME, sbn.packageName) + intent.putExtra(NOTIFICATION_PACKAGE_ARTIST, packageArtist) + intent.putExtra(NOTIFICATION_PACKAGE_SONG_TITLE, packageSongTitle) intent.putExtra(NOTIFICATION_PACKAGE_DURATION, duration) intent.putExtra(NOTIFICATION_PACKAGE_PLAYBACK_STATE, playbackState) if (playbackState == PlaybackState.STATE_PAUSED) { - val notification: Notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID) - .setContentTitle("Service Running") - .setContentText("Play some songs on a supported player to get lyrics") - .setSmallIcon(R.drawable.ic_notification) - .setShowWhen(false) - .addAction(R.drawable.ic_notification, "Stop Service", getStopServiceNotificationAction()) - .build() - - notification.flags = Notification.FLAG_FOREGROUND_SERVICE - notificationManager?.notify(NOTIFICATION_ID, notification) + notificationManager?.notify(NOTIFICATION_ID, getInitialNotification()) } else { val notificationIntent = Intent(this, MainActivity::class.java).apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK } val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE) val notification: Notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID) - .setContentTitle("Playing [${packageText}] By [${packageMessage}]") - .setContentText("Tap to get lyrics") + .setContentTitle(resources.getString(R.string.now_playing, "[${packageSongTitle}]", "[${packageArtist}]")) + .setContentText(resources.getString(R.string.service_notif_desc_playing)) .setSmallIcon(R.drawable.ic_notification) .setLargeIcon(albumArt) .setShowWhen(false) .setContentIntent(pendingIntent) - .addAction(R.drawable.ic_notification, "Stop Service", getStopServiceNotificationAction()) + .addAction(R.drawable.ic_notification, resources.getString(R.string.stop_service), getStopServiceNotificationAction()) .build() notification.flags = Notification.FLAG_FOREGROUND_SERVICE notificationManager?.notify(NOTIFICATION_ID, notification) } - sendBroadcast(intent) + LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(intent) } companion object { + private val _isRunning = MutableStateFlow(false) + val isRunning = _isRunning.asStateFlow() + const val NOTIFICATION_INTENT = "notification_event" const val NOTIFICATION_PACKAGE_NAME = "package_name" - const val NOTIFICATION_PACKAGE_MESSAGE = "package_message" - const val NOTIFICATION_PACKAGE_TEXT = "package_text" + const val NOTIFICATION_PACKAGE_ARTIST = "package_artist" + const val NOTIFICATION_PACKAGE_SONG_TITLE = "package_song_title" const val NOTIFICATION_PACKAGE_PLAYBACK_STATE = "package_playback_state" const val NOTIFICATION_PACKAGE_DURATION = "package_duration" - const val NOTIFICATION_ID = 12251999 + const val NOTIFICATION_ID = 1 const val NOTIFICATION_CHANNEL_ID = "Lyrics" const val START_FOREGROUND_SERVICE_ACTION = "START_SERVICE" } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/Routes.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/Routes.kt new file mode 100644 index 0000000..3e19227 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/Routes.kt @@ -0,0 +1,8 @@ +package com.illusionman1212.lyricsgrabbr + +sealed class Routes(val route: String) { + object Home : Routes("home") + object Lyrics : Routes("lyrics") + object Settings : Routes("settings") +} + diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/SpotifyPkceLoginActivityImpl.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/SpotifyPkceLoginActivityImpl.kt new file mode 100644 index 0000000..1d4cee6 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/SpotifyPkceLoginActivityImpl.kt @@ -0,0 +1,29 @@ +package com.illusionman1212.lyricsgrabbr + +import android.widget.Toast +import com.adamratzman.spotify.SpotifyClientApi +import com.adamratzman.spotify.SpotifyScope +import com.adamratzman.spotify.auth.pkce.AbstractSpotifyPkceLoginActivity +import com.illusionman1212.lyricsgrabbr.viewmodels.SettingsViewModel + +class SpotifyPkceLoginActivityImpl: AbstractSpotifyPkceLoginActivity() { + override val clientId: String = CLIENT_ID + override val redirectUri: String = SPOTIFY_REDIRECT_URI + override val scopes: List = listOf(SpotifyScope.UserReadCurrentlyPlaying) + + override fun onFailure(exception: Exception) { + Toast.makeText(this, "Failed to authenticate", Toast.LENGTH_SHORT).show() + settingsViewModel?.updateSpotifyAuthStatus(false) + } + + override fun onSuccess(api: SpotifyClientApi) { + (application as LGApp).credentialStore.setSpotifyApi(api) + Toast.makeText(this, "Successfully authenticated", Toast.LENGTH_SHORT).show() + settingsViewModel?.updateSpotifyAuthStatus(true) + } + + companion object { + var CLIENT_ID = "" + var settingsViewModel: SettingsViewModel? = null + } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/HomeRepository.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/HomeRepository.kt new file mode 100644 index 0000000..41d907a --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/HomeRepository.kt @@ -0,0 +1,69 @@ +package com.illusionman1212.lyricsgrabbr.data + +import android.content.Context +import android.net.Uri +import androidx.core.app.NotificationManagerCompat +import com.illusionman1212.lyricsgrabbr.R +import com.illusionman1212.lyricsgrabbr.data.network.GET +import com.illusionman1212.lyricsgrabbr.data.network.NetworkHelper +import com.illusionman1212.lyricsgrabbr.utils.await +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.Json +import okio.IOException +import java.net.SocketTimeoutException + +@Serializable +data class ErrorResponse( + val error: Boolean, + val matches: Int?, +) + +class HomeRepository(private val context: Context) { + private val networkHelper = NetworkHelper(context) + private val json = Json { + ignoreUnknownKeys = true + } + + fun isPermissionGranted(): Boolean { + val packageName = context.packageName + val pkgs = NotificationManagerCompat.getEnabledListenerPackages(context) + + return pkgs.contains(packageName) + } + + suspend fun makeSearchRequest(song: String, artist: String): Pair { + val builder = Uri.Builder() + val url = builder.scheme("https") + .authority("api.illusionman1212.com") + .appendPath("lyrics") + .appendPath("search") + .appendQueryParameter("q", "$song $artist") + .appendQueryParameter("disableFuzzy", "true") + .build() + + try { + val res = networkHelper.client.newCall( + GET(url.toString()) + ).await() + + if (!res.isSuccessful) { + val errRes = json.decodeFromString(ErrorResponse.serializer(), res.body!!.string()) + + // matches is only null if there's an error. otherwise it's 0 when there are no results + if (errRes.matches == null) { + return Pair(context.resources.getString(R.string.generic_error), false) + } + + return Pair(null, false) + } + + return Pair(res.body?.string(), true) + } catch (e: IOException) { + if (e.cause is SocketTimeoutException) { + return Pair(context.resources.getString(R.string.timeout), false) + } + + return Pair(context.resources.getString(R.string.generic_error), false) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/LyricsRepository.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/LyricsRepository.kt new file mode 100644 index 0000000..820cd21 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/LyricsRepository.kt @@ -0,0 +1,133 @@ +package com.illusionman1212.lyricsgrabbr.data + +import android.content.Context +import android.net.Uri +import android.util.Log +import com.illusionman1212.lyricsgrabbr.R +import com.illusionman1212.lyricsgrabbr.data.network.GET +import com.illusionman1212.lyricsgrabbr.data.network.NetworkHelper +import com.illusionman1212.lyricsgrabbr.utils.await +import it.skrape.core.htmlDocument +import it.skrape.selects.ElementNotFoundException +import it.skrape.selects.html5.div +import kotlinx.serialization.Serializable +import kotlinx.serialization.json.Json +import org.jsoup.Jsoup +import org.jsoup.internal.StringUtil +import org.jsoup.nodes.Element +import org.jsoup.nodes.Node +import org.jsoup.nodes.TextNode +import org.jsoup.select.NodeVisitor + +@Serializable +data class LyricLine( + val startTimeMs: ULong, + val words: String, +) + +@Serializable +data class Lyrics( + val syncType: String, + val lines: List, + val language: String, +) + +@Serializable +data class SuccessResponse( + val lyrics: Lyrics, +) + +class LyricsRepository(private val context: Context) { + private val networkHelper = NetworkHelper(context) + private val json = Json { + ignoreUnknownKeys = true + } + + suspend fun fetchLyricsFromSpotify(trackId: String): Pair { + val builder = Uri.Builder() + val url = builder.scheme("https") + .authority("api.lyricstify.vercel.app") + .appendPath("v1") + .appendPath("lyrics") + .appendPath(trackId) + .build() + + val res = networkHelper.client.newCall( + GET(url.toString()) + ).await() + + if (res.isSuccessful) { + return Pair(json.decodeFromString(SuccessResponse.serializer(), res.body!!.string()) + .lyrics + .lines.joinToString(separator = "\n") { it.words }, true) + } else { + if (res.code == 404) { + return Pair(context.resources.getString(R.string.spotify_no_lyrics_error), false) + } + + return Pair(context.resources.getString(R.string.generic_error), false) + } + } + + fun fetchLyricsFromGenius(url: Uri): String { + // TODO: write a custom fetcher for skrape.it to use our OkHttp client + // and get rid of jsoup. Or better yet, maybe skrape.it will be fixed in the future + // and we can just use its built in BrowserFetcher + val doc = Jsoup.connect(url.toString()).userAgent(USER_AGENT).get() + + try { + val lyrics = htmlDocument(doc.toString()) { + // set relaxed for instrumental songs + relaxed = true + + findFirst { + div { + withAttributeKey = "data-lyrics-container" + findAll { + this + }.joinToString(separator = "\n") { + val accum = StringUtil.borrowBuilder() + it.element.text() + + it.element.traverse(object : NodeVisitor { + override fun head(node: Node, depth: Int) { + if (node is TextNode) { + accum.append(node.text().trim()) + // append space here to get proper spacing when there's a tag or other inline text tags + accum.append(" ") + } else if (node is Element) { + if (accum.isNotEmpty() && node.normalName() == "br") { + accum.append("\n") + } + } + } + + override fun tail(node: Node, depth: Int) { + // since we append a space after every text node, we only append a newline if + // the last char isn't a space + val lastCharIsWhitespace = accum.isNotEmpty() && accum[accum.length - 1] == ' ' + if (node is Element) { + if (node.isBlock && node.nextSibling() is TextNode && !lastCharIsWhitespace) { + accum.append("\n") + } + } + } + }) + + accum + } + } + }.replace("\n\n\n", "\n\n") + } + + return lyrics + } catch (e: ElementNotFoundException) { + // TODO: relaxed is broken in skrape.it, so we have to catch this exception + return "" + } + } + + companion object { + private const val USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.3" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/SettingsPreferencesRepository.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/SettingsPreferencesRepository.kt new file mode 100644 index 0000000..32f9db0 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/SettingsPreferencesRepository.kt @@ -0,0 +1,39 @@ +package com.illusionman1212.lyricsgrabbr.data + +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.intPreferencesKey +import kotlinx.coroutines.flow.map + +enum class Theme { + LIGHT, + DARK, + SYSTEM, +} + +data class SettingsPreferences( + val appTheme: Int = Theme.SYSTEM.ordinal, +) + +class SettingsPreferencesRepository( + private val dataStore: DataStore +) { + companion object { + private val APP_THEME = intPreferencesKey("app_theme") + } + + val preferences = dataStore.data.map { mapSettingsPreferences(it) } + + suspend fun setTheme(theme: Theme) { + dataStore.edit { prefs -> + prefs[APP_THEME] = theme.ordinal + } + } + + private fun mapSettingsPreferences(prefs: Preferences): SettingsPreferences { + return SettingsPreferences( + prefs[APP_THEME] ?: Theme.SYSTEM.ordinal, + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/network/NetworkHelper.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/network/NetworkHelper.kt new file mode 100644 index 0000000..c868d4c --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/network/NetworkHelper.kt @@ -0,0 +1,24 @@ +package com.illusionman1212.lyricsgrabbr.data.network + +import android.content.Context +import okhttp3.Cache +import okhttp3.OkHttpClient +import java.io.File +import java.util.concurrent.TimeUnit + +class NetworkHelper(context: Context) { + private val cacheDir = File(context.cacheDir, "network_cache") + private val cacheSize = 5L * 1024 * 1024 // 5 MiB + + private val baseClientBuilder: OkHttpClient.Builder + get() { + val builder = OkHttpClient.Builder() + .connectTimeout(30, TimeUnit.SECONDS) + .readTimeout(30, TimeUnit.SECONDS) + .callTimeout(2, TimeUnit.MINUTES) + + return builder + } + + val client by lazy { baseClientBuilder.cache(Cache(cacheDir, cacheSize)).build() } +} diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/network/Requests.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/network/Requests.kt new file mode 100644 index 0000000..5a29fc3 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/data/network/Requests.kt @@ -0,0 +1,31 @@ +package com.illusionman1212.lyricsgrabbr.data.network + +import okhttp3.CacheControl +import okhttp3.Headers +import okhttp3.HttpUrl +import okhttp3.HttpUrl.Companion.toHttpUrl +import okhttp3.Request +import java.util.concurrent.TimeUnit + +private val DEFAULT_CACHE_CONTROL = CacheControl.Builder().maxAge(10, TimeUnit.MINUTES).build() +private val DEFAULT_HEADERS = Headers.Builder().build() + +fun GET( + url: String, + headers: Headers = DEFAULT_HEADERS, + cache: CacheControl = DEFAULT_CACHE_CONTROL, +): Request { + return GET(url.toHttpUrl(), headers, cache) +} + +fun GET( + url: HttpUrl, + headers: Headers = DEFAULT_HEADERS, + cache: CacheControl = DEFAULT_CACHE_CONTROL, +): Request { + return Request.Builder() + .url(url) + .headers(headers) + .cacheControl(cache) + .build() +} diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/ForwardingPainter.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/ForwardingPainter.kt new file mode 100644 index 0000000..1e30dcf --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/ForwardingPainter.kt @@ -0,0 +1,77 @@ +package com.illusionman1212.lyricsgrabbr.ui.components + +import androidx.compose.ui.geometry.Size +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.drawIntoCanvas +import androidx.compose.ui.graphics.nativeCanvas +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.graphics.withSave + +const val DefaultAlpha = 1f + +fun forwardingPainter( + painter: Painter, + alpha: Float = DefaultAlpha, + colorFilter: ColorFilter? = null, + size: Size, + onDraw: DrawScope.(ForwardingDrawInfo) -> Unit = DefaultOnDraw, +): Painter = ForwardingPainter(painter, alpha, colorFilter, size, onDraw) + +data class ForwardingDrawInfo( + val painter: Painter, + val alpha: Float, + val colorFilter: ColorFilter?, + val size: Size, +) + +private class ForwardingPainter( + private val painter: Painter, + private var alpha: Float, + private var colorFilter: ColorFilter?, + private val size: Size, + private val onDraw: DrawScope.(ForwardingDrawInfo) -> Unit, +) : Painter() { + + private var info = newInfo() + + override val intrinsicSize get() = painter.intrinsicSize + + override fun applyAlpha(alpha: Float): Boolean { + if (alpha != DefaultAlpha) { + this.alpha = alpha + this.info = newInfo() + } + return true + } + + override fun applyColorFilter(colorFilter: ColorFilter?): Boolean { + if (colorFilter != null) { + this.colorFilter = colorFilter + this.info = newInfo() + } + return true + } + + override fun DrawScope.onDraw() = onDraw(info) + + private fun newInfo() = ForwardingDrawInfo(painter, alpha, colorFilter, size) +} + +private val DefaultOnDraw: DrawScope.(ForwardingDrawInfo) -> Unit = { info -> + val size = info.size + + drawIntoCanvas { + val width = it.nativeCanvas.width.toFloat() + val height = it.nativeCanvas.height.toFloat() + val left = (width - size.width) / 2f + val top = (height - size.height) / 2f + + it.withSave { + it.translate(left, top) + with(info.painter) { + draw(size, info.alpha, info.colorFilter) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/LGAlertDialog.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/LGAlertDialog.kt new file mode 100644 index 0000000..d5dcc96 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/LGAlertDialog.kt @@ -0,0 +1,53 @@ +package com.illusionman1212.lyricsgrabbr.ui.components + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.wrapContentHeight +import androidx.compose.foundation.layout.wrapContentWidth +import androidx.compose.material3.AlertDialog +import androidx.compose.material3.AlertDialogDefaults +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.DialogProperties +import com.illusionman1212.lyricsgrabbr.ui.theme.Typography + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun LGAlertDialog( + onDismiss: () -> Unit, + modifier: Modifier = Modifier, + properties: DialogProperties = DialogProperties(), + title: String, + buttons: @Composable () -> Unit, + content: @Composable () -> Unit +) { + AlertDialog( + onDismissRequest = onDismiss, + properties = properties, + ) { + Surface ( + modifier = Modifier.wrapContentHeight().wrapContentWidth(), + shape = MaterialTheme.shapes.large, + tonalElevation = AlertDialogDefaults.TonalElevation + ) { + Column( + modifier = modifier.padding(24.dp), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + Text(text = title, style = Typography.titleLarge) + content() + Row(horizontalArrangement = Arrangement.End, modifier = Modifier.fillMaxWidth()) { + buttons() + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/LGIconButton.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/LGIconButton.kt new file mode 100644 index 0000000..6e6c38e --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/LGIconButton.kt @@ -0,0 +1,74 @@ +package com.illusionman1212.lyricsgrabbr.ui.components + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.BoxScope +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.IconButton +import androidx.compose.material3.PlainTooltipBox +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.Layout +import androidx.compose.ui.layout.layoutId + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun LGIconButton( + tooltip: String, + onClick: () -> Unit, + badge: (@Composable BoxScope.() -> Unit)? = null, + content: @Composable () -> Unit +) { + Layout( + content = { + PlainTooltipBox( + tooltip = { + Text(text = tooltip) + }, + ) { + IconButton( + onClick = onClick, + Modifier.tooltipAnchor(), + ) { + content() + } + } + Box(Modifier.layoutId("badge")) { + badge?.let { it() } + } + } + ) { measurables, constraints -> + val iconPlaceable = measurables[0].measure(constraints) + val badgePlaceable = measurables.firstOrNull { it.layoutId == "badge" }?.measure(constraints) + + layout(iconPlaceable.width, iconPlaceable.height) { + iconPlaceable.placeRelative(0, 0) + badgePlaceable?.placeRelative( + x = iconPlaceable.width - badgePlaceable.width - 16, + y = 16, + ) + } + } + +// PlainTooltipBox(tooltip = { +// Text(text = tooltip) +// }) { +// if (badge != null) { +// IconButton( +// onClick = onClick, +// Modifier.tooltipAnchor(), +// ) { +// BadgedBox(badge = badge) { +// content() +// } +// } +// } else { +// IconButton( +// onClick = onClick, +// Modifier.tooltipAnchor(), +// ) { +// content() +// } +// } +// } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/LGRadioButton.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/LGRadioButton.kt new file mode 100644 index 0000000..f1c713f --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/components/LGRadioButton.kt @@ -0,0 +1,28 @@ +package com.illusionman1212.lyricsgrabbr.ui.components + +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material3.RadioButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview + +@Composable +fun LGRadioButton(text: String, onClick: () -> Unit, selected: Boolean) { + Box (Modifier.clickable { onClick() }.fillMaxWidth()) { + Row(verticalAlignment = Alignment.CenterVertically) { + RadioButton(selected = selected, onClick = onClick) + Text(text = text) + } + } +} + +@Composable +@Preview(showBackground = true) +fun LGRadioButtonPreview() { + LGRadioButton(text = "Radio Button", onClick = {}, selected = true) +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/screens/Home.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/screens/Home.kt new file mode 100644 index 0000000..1127aa2 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/screens/Home.kt @@ -0,0 +1,552 @@ +package com.illusionman1212.lyricsgrabbr.ui.screens + +import android.Manifest.permission.POST_NOTIFICATIONS +import android.app.Activity +import android.content.pm.PackageManager.PERMISSION_GRANTED +import android.net.Uri +import androidx.activity.compose.rememberLauncherForActivityResult +import androidx.activity.result.contract.ActivityResultContracts +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.clickable +import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.text.ClickableText +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.BrokenImage +import androidx.compose.material.icons.filled.Image +import androidx.compose.material.icons.filled.LibraryMusic +import androidx.compose.material.icons.filled.MusicNote +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.CenterAlignedTopAppBar +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Divider +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FilledTonalButton +import androidx.compose.material3.Icon +import androidx.compose.material3.LocalContentColor +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.ModalBottomSheet +import androidx.compose.material3.Scaffold +import androidx.compose.material3.SheetState +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.rememberModalBottomSheetState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.vector.rememberVectorPainter +import androidx.compose.ui.hapticfeedback.HapticFeedbackType +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.platform.LocalHapticFeedback +import androidx.compose.ui.platform.LocalLifecycleOwner +import androidx.compose.ui.platform.LocalUriHandler +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.DpSize +import androidx.compose.ui.unit.TextUnit +import androidx.compose.ui.unit.TextUnitType +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.DialogProperties +import androidx.core.app.ActivityCompat +import androidx.lifecycle.Lifecycle +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.compose.currentStateAsState +import androidx.lifecycle.viewmodel.compose.viewModel +import com.illusionman1212.lyricsgrabbr.NotificationEvent +import com.illusionman1212.lyricsgrabbr.R +import com.illusionman1212.lyricsgrabbr.ui.components.LGAlertDialog +import com.illusionman1212.lyricsgrabbr.ui.components.LGIconButton +import com.illusionman1212.lyricsgrabbr.viewmodels.HomeViewModel +import com.illusionman1212.lyricsgrabbr.viewmodels.SearchResult +import kotlinx.coroutines.flow.MutableStateFlow +import coil.compose.AsyncImage +import com.illusionman1212.lyricsgrabbr.LGApp +import com.illusionman1212.lyricsgrabbr.ui.components.forwardingPainter +import com.illusionman1212.lyricsgrabbr.utils.annotatedStringResource +import com.illusionman1212.lyricsgrabbr.viewmodels.LyricsViewModel +import com.illusionman1212.lyricsgrabbr.viewmodels.SettingsViewModel +import kotlinx.coroutines.launch + + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun HomePage( + navigateToSettings: () -> Unit, + navigateToLyrics: () -> Unit, + goBack: () -> Unit, + homeViewModel: HomeViewModel = viewModel( + factory = HomeViewModel.Factory, + ), + settingsViewModel: SettingsViewModel, + lyricsViewModel: LyricsViewModel, + lastNotification: MutableStateFlow +) { + val context = LocalContext.current + val application = (context as Activity).application as LGApp + val lifecycleOwner = LocalLifecycleOwner.current + + val lifecycleState by lifecycleOwner.lifecycle.currentStateAsState() + val scope = rememberCoroutineScope() + + val sheetState = rememberModalBottomSheetState( + skipPartiallyExpanded = true + ) + var artistUri by remember { mutableStateOf(Uri.EMPTY) } + var songUri by remember { mutableStateOf(Uri.EMPTY) } + var showBottomSheet by remember { mutableStateOf(false) } + var listeningPermission = homeViewModel.getListeningPermission() + var notificationPermission by remember { mutableStateOf( + ActivityCompat.checkSelfPermission(context, POST_NOTIFICATIONS) == PERMISSION_GRANTED + ) } + var shouldShowNotificationPermissionRationale by remember { mutableStateOf( + ActivityCompat.shouldShowRequestPermissionRationale( + context as android.app.Activity, + POST_NOTIFICATIONS + ) + )} + + val launcher = rememberLauncherForActivityResult( + ActivityResultContracts.RequestPermission() + ) { isGranted -> + notificationPermission = isGranted + + // we hide the rationale after launching once because launching again doesn't seem work + shouldShowNotificationPermissionRationale = false + } + + val song = lastNotification.collectAsStateWithLifecycle().value + val uiState = homeViewModel.uiState.collectAsStateWithLifecycle().value + var getLyricsFromSpotify by remember { mutableStateOf(false)} + + LaunchedEffect(Unit) { + if (!shouldShowNotificationPermissionRationale) + launcher.launch(POST_NOTIFICATIONS) + } + + LaunchedEffect(lifecycleState) { + when (lifecycleState) { + Lifecycle.State.RESUMED -> { + listeningPermission = homeViewModel.getListeningPermission() + } + else -> {} + } + } + + LaunchedEffect(song) { + if (song != null && song.title != uiState.notification?.title && song.artist != uiState.notification?.artist) { + val spotifyApi = application.credentialStore.getSpotifyClientPkceApi() + val useSpotifyApi = song.packageName == "com.spotify.music" && spotifyApi != null + getLyricsFromSpotify = useSpotifyApi + + homeViewModel.setSong(song) + + if (useSpotifyApi) { + homeViewModel.makeRequestToSpotify(spotifyApi!!) + } else { + homeViewModel.makeRequestToGenius(song.title, song.artist) + } + } + } + + Scaffold( + topBar = { + CenterAlignedTopAppBar( + title = { Text(text = stringResource(id = R.string.app_name)) }, + actions = { + LGIconButton( + tooltip = stringResource(id = R.string.settings), + onClick = navigateToSettings, + ) { + Icon( + Icons.Filled.Settings, + contentDescription = stringResource(id = R.string.settings) + ) + } + } + ) + }, + ) { padding -> + Column( + Modifier + .padding(padding) + .padding(top = 16.dp) + .fillMaxSize(), + horizontalAlignment = Alignment.CenterHorizontally + ) { + if (!notificationPermission && shouldShowNotificationPermissionRationale) { + LGAlertDialog( + properties = DialogProperties( + dismissOnBackPress = true, + dismissOnClickOutside = false, + ), + onDismiss = goBack, + title = stringResource(id = R.string.notification_post_permission), + buttons = { + TextButton( + onClick = { + launcher.launch(POST_NOTIFICATIONS) + } + ) { + Text(stringResource(id = R.string.grant_permission)) + } + } + ) { + Text( + text = stringResource(id = R.string.notification_post_permission_desc), + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.padding(bottom = 16.dp) + ) + } + } + if (!listeningPermission && notificationPermission) { + LGAlertDialog( + properties = DialogProperties( + dismissOnBackPress = true, + dismissOnClickOutside = false, + ), + onDismiss = goBack, + title = stringResource(id = R.string.notification_listen_permission), + buttons = { + TextButton( + onClick = { + context.startActivity( + android.content.Intent( + android.provider.Settings.ACTION_NOTIFICATION_LISTENER_SETTINGS + ) + ) + } + ) { + Text(stringResource(id = R.string.open_settings)) + } + } + ) { + Text( + text = stringResource(id = R.string.notification_listen_desc), + style = MaterialTheme.typography.bodyMedium, + modifier = Modifier.padding(bottom = 16.dp) + ) + } + } + + Column( + horizontalAlignment = Alignment.CenterHorizontally, + ) { + if (song == null) { + Column( + Modifier.padding(horizontal = 24.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( text = stringResource(id = R.string.no_supported_player), style = MaterialTheme.typography.headlineSmall ) + if (!notificationPermission) { + Text( + text = stringResource(id = R.string.notification_post_permission_not_granted).uppercase(), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.error, + textAlign = TextAlign.Center, + ) + } + } + Spacer(Modifier.weight(1f)) + } else { + Column( + Modifier + .fillMaxWidth() + .weight(1f), + verticalArrangement = Arrangement.spacedBy(36.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text( + modifier = Modifier.padding(horizontal = 16.dp), + text = song.title, + style = MaterialTheme.typography.headlineMedium, + textAlign = TextAlign.Center, + fontWeight = FontWeight.Bold, + ) + Text( + modifier = Modifier.padding(horizontal = 16.dp), + text = song.artist, + style = MaterialTheme.typography.headlineSmall, + textAlign = TextAlign.Center, + ) + } + Row( + Modifier.fillMaxSize(), + horizontalArrangement = Arrangement.Center, + verticalAlignment = Alignment.CenterVertically, + ) { + if (uiState.isLoading) { + CircularProgressIndicator() + } else { + if (uiState.error != null) { + Column( + verticalArrangement = Arrangement.spacedBy(16.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Text( + text = uiState.error, + style = MaterialTheme.typography.titleLarge, + textAlign = TextAlign.Center, + fontStyle = FontStyle.Italic, + fontWeight = FontWeight.Medium, + color = MaterialTheme.colorScheme.error + ) + FilledTonalButton( + onClick = { + homeViewModel.makeRequestToGenius(song.title, song.artist) + } + ) { + Text(stringResource(id = R.string.retry)) + } + } + } else { + Results( + uiState.results, + showBottomSheet = { artistUrl, songUrl -> + showBottomSheet = !(artistUrl == Uri.EMPTY && songUrl == Uri.EMPTY) + artistUri = artistUrl + songUri = songUrl + }, + navigateToLyrics = navigateToLyrics, + setLyricsTitle = { id, title, subtitle, url -> + lyricsViewModel.onSongChange(id, title, subtitle, url, getLyricsFromSpotify) + }, + ) + } + } + } + } + } + Column( + Modifier.height(36.dp), + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.Center + ) { + val linkColor = MaterialTheme.colorScheme.surfaceTint + val text = annotatedStringResource(id = R.string.powered_by) { + when (it.key) { + "href" -> SpanStyle(color = linkColor) + else -> null + } + } + + val textColor = LocalContentColor.current + val uriHandler = LocalUriHandler.current + + ClickableText( + text, + onClick = { offset -> + text.getStringAnnotations(tag = "href", start = offset, end = offset) + .firstOrNull() + ?.let { + uriHandler.openUri(it.item) + } + }, + style = MaterialTheme.typography.bodyMedium.copy(color = textColor, fontStyle = FontStyle.Italic), + ) + } + } + } + + if (showBottomSheet) { + LongClickBottomSheet( + onDismiss = { + scope.launch { + sheetState.hide() + showBottomSheet = false + } + }, + sheetState = sheetState, + artistUri = artistUri, + songUri = songUri, + ) + } + } +} + +@Composable +fun Results( + results: List, + navigateToLyrics: () -> Unit, + setLyricsTitle: (id: String, title: String, subtitle: String, url: Uri) -> Unit, + showBottomSheet: (artistUrl: Uri, songUrl: Uri) -> Unit, +) { + if (results.isEmpty()) { + Text(stringResource(id = R.string.no_results), style = MaterialTheme.typography.titleLarge) + } else { + Column( + Modifier.fillMaxSize(), + verticalArrangement = Arrangement.spacedBy(24.dp), + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + stringResource(id = R.string.found_results, results.size), + style = MaterialTheme.typography.titleMedium, + fontWeight = FontWeight.Bold, + fontStyle = FontStyle.Italic, + ) + LazyColumn { + items(results) { + ResultListItem( + it, + onClick = { + setLyricsTitle(it.id, it.title, it.artist, it.url) + navigateToLyrics() + }, + onLongClick = { + showBottomSheet(it.artistUrl, it.url) + } + ) + + if (it != results.last()) + Divider() + } + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun LongClickBottomSheet( + onDismiss: () -> Unit, + sheetState: SheetState, + artistUri: Uri, + songUri: Uri, +) { + val uriHandler = LocalUriHandler.current + + ModalBottomSheet( + dragHandle = {}, + onDismissRequest = onDismiss, + sheetState = sheetState, + windowInsets = WindowInsets(top = 0.dp), + ) { + Column { + if (artistUri != Uri.EMPTY) { + Row( + Modifier + .fillMaxWidth() + .clickable { uriHandler.openUri(artistUri.toString()) } + .padding(horizontal = 24.dp, vertical = 20.dp), + horizontalArrangement = Arrangement.spacedBy(16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon(Icons.Filled.LibraryMusic, contentDescription = "Music Library") + Text(stringResource(id = R.string.open_artist_page), fontWeight = FontWeight.Bold) + } + } + if (songUri != Uri.EMPTY) { + Row( + Modifier + .fillMaxWidth() + .clickable { uriHandler.openUri(songUri.toString()) } + .padding(horizontal = 24.dp, vertical = 20.dp), + horizontalArrangement = Arrangement.spacedBy(16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon(Icons.Filled.MusicNote, contentDescription = "Music Note") + Text(stringResource(id = R.string.open_song_page), fontWeight = FontWeight.Bold) + } + } + } + } +} + +@OptIn(ExperimentalFoundationApi::class) +@Composable +fun ResultListItem( + item: SearchResult, + onClick: () -> Unit, + onLongClick: () -> Unit, +) { + val haptic = LocalHapticFeedback.current + + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(16.dp), + modifier = Modifier + .fillMaxWidth() + .combinedClickable( + onClick = onClick, + onLongClick = { + onLongClick() + haptic.performHapticFeedback(HapticFeedbackType.LongPress) + }, + ) + ) { + val color = LocalContentColor.current + val density = LocalDensity.current + + AsyncImage( + item.thumbnail, + error = forwardingPainter( + rememberVectorPainter(image = Icons.Filled.BrokenImage), + colorFilter = ColorFilter.tint(color), + size = with(density) { DpSize(40.dp, 40.dp).toSize() }, + ), + fallback = rememberVectorPainter(Icons.Filled.Image), + contentDescription = "Thumbnail for ${item.title}", + modifier = Modifier.size(75.dp), + contentScale = ContentScale.Crop, + ) + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text( + item.title, + fontSize = TextUnit(18F, TextUnitType.Sp), + fontWeight = FontWeight.Black, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + Text( + item.artist, + style = MaterialTheme.typography.bodyMedium, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + } +} + +@Composable +@Preview(showBackground = true) +fun ResultListItemPreview() { + ResultListItem( + item = SearchResult( + "Test", + "Artist", + id = "1", + url = Uri.EMPTY, + artistUrl = Uri.EMPTY, + thumbnail = Uri.EMPTY + ), + onClick = {}, + onLongClick = {}, + ) +} diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/screens/Lyrics.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/screens/Lyrics.kt new file mode 100644 index 0000000..9295e24 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/screens/Lyrics.kt @@ -0,0 +1,152 @@ +package com.illusionman1212.lyricsgrabbr.ui.screens + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.filled.MusicNote +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.material3.TextFieldDefaults +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.ImeAction +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import androidx.lifecycle.viewmodel.compose.viewModel +import com.illusionman1212.lyricsgrabbr.R +import com.illusionman1212.lyricsgrabbr.ui.components.LGIconButton +import com.illusionman1212.lyricsgrabbr.viewmodels.LyricsViewModel + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun LyricsPage( + goBack: () -> Unit, + lyricsViewModel: LyricsViewModel = viewModel( + factory = LyricsViewModel.Factory + ), +) { + val uiState = lyricsViewModel.uiState.collectAsStateWithLifecycle().value + + LaunchedEffect(uiState.song, uiState.artist, uiState.url) { + if (uiState.useSpotifyApi) { + lyricsViewModel.fetchLyricsFromSpotify() + } else { + lyricsViewModel.fetchLyricsFromGenius() + } + } + + Scaffold( + topBar = { + TopAppBar( + title = { + Column { + Text( + uiState.song, + fontWeight = FontWeight.Black, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + Text( + uiState.artist, + style = MaterialTheme.typography.bodyMedium, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + }, + navigationIcon = { + LGIconButton( + tooltip = stringResource(id = R.string.go_back), + onClick = goBack + ) { + Icon( + imageVector = Icons.Filled.ArrowBack, + contentDescription = stringResource( + id = R.string.go_back + ) + ) + } + }, + ) + }, + ) { padding -> + Column( + Modifier + .padding(padding) + .fillMaxSize() + .then( + if (!uiState.isLoading && uiState.lyrics.isNotEmpty()) Modifier.verticalScroll( + rememberScrollState() + ) else Modifier + ), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally, + ) { + if (uiState.isLoading) { + CircularProgressIndicator() + } else { + if (uiState.lyrics.isEmpty()) { + Instrumental() + } else { + Column(Modifier.padding(top = 12.dp, start = 12.dp, end = 12.dp, bottom = 32.dp)) { + SelectionContainer { + TextField( + value = uiState.lyrics, + onValueChange = {}, + keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done), + readOnly = true, + colors = TextFieldDefaults.colors( + focusedContainerColor = Color.Transparent, + unfocusedContainerColor = Color.Transparent, + focusedIndicatorColor = Color.Transparent, + unfocusedIndicatorColor = Color.Transparent, + ), + ) + } + } + } + } + } + } +} + +@Composable +@Preview(showBackground = true) +fun Instrumental() { + Column( + verticalArrangement = Arrangement.spacedBy(8.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Icon( + Icons.Filled.MusicNote, + contentDescription = "Music Note", + modifier = Modifier.size(50.dp) + ) + Text( + stringResource(id = R.string.instrumental), + fontStyle = FontStyle.Italic + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/screens/Settings.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/screens/Settings.kt new file mode 100644 index 0000000..d42e40a --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/screens/Settings.kt @@ -0,0 +1,404 @@ +package com.illusionman1212.lyricsgrabbr.ui.screens + +import android.app.Activity +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.statusBarsPadding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.text.ClickableText +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material.icons.filled.Check +import androidx.compose.material.icons.outlined.Palette +import androidx.compose.material3.Icon +import androidx.compose.material3.LocalContentColor +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Switch +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.TextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.graphics.painter.Painter +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalLayoutDirection +import androidx.compose.ui.platform.LocalUriHandler +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.text.style.TextDecoration +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.LayoutDirection +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.adamratzman.spotify.SpotifyClientApi +import com.adamratzman.spotify.SpotifyException +import com.adamratzman.spotify.auth.pkce.startSpotifyClientPkceLoginActivity +import com.illusionman1212.lyricsgrabbr.LGApp +import com.illusionman1212.lyricsgrabbr.R +import com.illusionman1212.lyricsgrabbr.SpotifyPkceLoginActivityImpl +import com.illusionman1212.lyricsgrabbr.ui.components.LGAlertDialog +import com.illusionman1212.lyricsgrabbr.ui.components.LGRadioButton +import com.illusionman1212.lyricsgrabbr.ui.theme.ColorSecondaryLight +import com.illusionman1212.lyricsgrabbr.data.Theme +import com.illusionman1212.lyricsgrabbr.ui.components.LGIconButton +import com.illusionman1212.lyricsgrabbr.utils.annotatedStringResource +import com.illusionman1212.lyricsgrabbr.viewmodels.SettingsState +import com.illusionman1212.lyricsgrabbr.viewmodels.SettingsViewModel +import kotlinx.coroutines.runBlocking + +private val Themes = hashMapOf( + Theme.LIGHT.ordinal to R.string.theme_light, + Theme.DARK.ordinal to R.string.theme_dark, + Theme.SYSTEM.ordinal to R.string.theme_system +) + +// TODO: this is here as a reference because I think I will need a guard in the future +fun Activity.guardValidSpotifyApi( + classBackTo: Class, + alreadyTriedToReauthenticate: Boolean = false, + block: suspend (api: SpotifyClientApi) -> T +): T? { + return runBlocking { + val app = (application as LGApp) + + try { + val token = app.credentialStore.spotifyToken + ?: throw SpotifyException.ReAuthenticationNeededException() + val usesPkceAuth = token.refreshToken != null + val api = (if (usesPkceAuth) app.credentialStore.getSpotifyClientPkceApi() + else app.credentialStore.getSpotifyImplicitGrantApi()) + ?: throw SpotifyException.ReAuthenticationNeededException() + + block(api) + } catch (e: SpotifyException) { + e.printStackTrace() + val api = app.credentialStore.getSpotifyClientPkceApi()!! + if (!alreadyTriedToReauthenticate) { + try { + api.refreshToken() + app.credentialStore.spotifyToken = api.token + block(api) + } catch (e: SpotifyException.ReAuthenticationNeededException) { + e.printStackTrace() + return@runBlocking guardValidSpotifyApi( + classBackTo = classBackTo, + alreadyTriedToReauthenticate = true, + block = block + ) + } catch (e: IllegalArgumentException) { + e.printStackTrace() + return@runBlocking guardValidSpotifyApi( + classBackTo = classBackTo, + alreadyTriedToReauthenticate = true, + block = block + ) + } + } else { + //pkceClassBackTo = classBackTo + startSpotifyClientPkceLoginActivity(SpotifyPkceLoginActivityImpl::class.java) + null + } + } + } +} + +@Composable +fun SettingsPage( + goBack: () -> Unit, + viewModel: SettingsViewModel, +) { + val uiState by viewModel.uiState.collectAsStateWithLifecycle() + + Scaffold( + topBar = { + // TODO: on RTL languages all newer(only?) android systems change the direction of the status bar + // including all its children, so we need to figure out how to position stuff to the right + CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(4.dp), + modifier = Modifier + .statusBarsPadding() + .padding(vertical = 8.dp, horizontal = 4.dp), + ) { + LGIconButton(tooltip = stringResource(id = R.string.go_back), onClick = goBack) { + Icon( + imageVector = Icons.Filled.ArrowBack, + contentDescription = stringResource( + id = R.string.go_back + ) ) + } + Text(text = stringResource(id = R.string.settings), style = MaterialTheme.typography.titleLarge) + } + } + }, + ) { padding -> + Column( + Modifier + .fillMaxSize() + .padding(padding) + .padding(vertical = 16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp) + ) { + Appearance(viewModel, uiState) + Lyrics(viewModel, uiState) + } + } +} + +@Composable +fun Appearance(viewModel: SettingsViewModel, uiState: SettingsState) { + var themeOpenDialog by remember { mutableStateOf(false) } + + SettingGroup(title = stringResource(id = R.string.appearance)) { + DialogSetting( + title = stringResource(id = R.string.theme), + value = Themes[uiState.appTheme]?.let { stringResource(it) } ?: "None", + icon = Icons.Outlined.Palette, + onClick = { themeOpenDialog = true } + ) + } + if (themeOpenDialog) { + ThemeDialog( + uiState = uiState, + onDismiss = { themeOpenDialog = false }, + onThemeChange = { + viewModel.setTheme(it) + } + ) + } +} + +@Composable +fun ThemeDialog( + uiState: SettingsState, + onDismiss: () -> Unit, + onThemeChange: (v: Theme) -> Unit +) { + LGAlertDialog( + onDismiss = onDismiss, + title = stringResource(id = R.string.theme), + buttons = { + TextButton(onClick = onDismiss) { + Text(stringResource(id = R.string.cancel)) + } + }, + modifier = Modifier.fillMaxWidth() + ) { + Column { + LGRadioButton( + text = stringResource(id = R.string.theme_light), + onClick = { + onThemeChange(Theme.LIGHT) + }, + selected = uiState.appTheme == Theme.LIGHT.ordinal, + ) + LGRadioButton( + text = stringResource(id = R.string.theme_dark), + onClick = { + onThemeChange(Theme.DARK) + }, + selected = uiState.appTheme == Theme.DARK.ordinal, + ) + LGRadioButton( + text = stringResource(id = R.string.theme_system), + onClick = { + onThemeChange(Theme.SYSTEM) + }, + selected = uiState.appTheme == Theme.SYSTEM.ordinal, + ) + } + } +} + +@Composable +fun Lyrics(viewModel: SettingsViewModel, uiState: SettingsState) { + val context = LocalContext.current + val activity = context as Activity + val application = activity.application as LGApp + + var isDialogOpen by remember { mutableStateOf(false) } + var spotifyIdValue by remember { mutableStateOf("") } + + SettingGroup(stringResource(id = R.string.lyrics)) { + ToggleSetting( + title = stringResource(id = R.string.use_spotify_api), + checked = uiState.isSpotifyAuthed, + icon = painterResource(id = R.drawable.spotify), + onClick = { + if (uiState.isSpotifyAuthed) { + application.credentialStore.clear() + viewModel.updateSpotifyAuthStatus(false) + } else { + isDialogOpen = true + } + }, + ) + } + + if (isDialogOpen) { + LGAlertDialog( + onDismiss = { isDialogOpen = false }, + title = stringResource(id = R.string.spotify_client_id), + buttons = { + TextButton(onClick = { isDialogOpen = false }) { + Text(stringResource(id = R.string.cancel)) + } + TextButton(onClick = { + SpotifyPkceLoginActivityImpl.CLIENT_ID = spotifyIdValue + SpotifyPkceLoginActivityImpl.settingsViewModel = viewModel + activity.startSpotifyClientPkceLoginActivity(SpotifyPkceLoginActivityImpl::class.java) + isDialogOpen = false + }) { + Text(stringResource(id = R.string.confirm)) + } + } + ) { + val linkColor = MaterialTheme.colorScheme.surfaceTint + val spotifyDesc = annotatedStringResource(R.string.spotify_client_id_desc) { + when (it.key) { + "href" -> SpanStyle(color = linkColor, textDecoration = TextDecoration.Underline) + else -> null + } + } + val textColor = LocalContentColor.current + val uriHandler = LocalUriHandler.current + + ClickableText( + spotifyDesc, + onClick = { offset -> + spotifyDesc.getStringAnnotations(tag = "href", start = offset, end = offset) + .firstOrNull() + ?.let { + uriHandler.openUri(it.item) + } + }, + style = MaterialTheme.typography.bodyMedium.copy(color = textColor), + ) + + TextField( + value = spotifyIdValue, + onValueChange = { spotifyIdValue = it }, + placeholder = { + Text(stringResource(id = R.string.not_set)) + }, + visualTransformation = PasswordVisualTransformation(), + ) + } + } +} + +@Composable +fun SettingGroup(title: String, content: @Composable () -> Unit) { + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Header(title) + Spacer(modifier = Modifier.size(2.dp)) + content() + } +} + +@Composable +fun Header(title: String) { + Row(Modifier.padding(start = 56.dp)) { + Text(text = title, color = MaterialTheme.colorScheme.primary) + } +} + +@Composable +fun DialogSetting( + title: String, + value: String, + icon: ImageVector?, + onClick: () -> Unit, + singleLine : Boolean = false, + enabled: Boolean = true +) { + Box( + Modifier + .fillMaxWidth() + .alpha(if (enabled) 1f else 0.5f) + .then(if (enabled) Modifier.clickable { onClick() } else Modifier) + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + modifier = Modifier.padding(vertical = 8.dp) + ) { + if (icon != null) { + Icon(imageVector = icon, contentDescription = null, modifier = Modifier.width(56.dp)) + } else { + Box(modifier = Modifier.width(56.dp)) + } + Column(verticalArrangement = Arrangement.spacedBy(4.dp)) { + Text(text = title, color = MaterialTheme.colorScheme.onBackground) + Text( + text = value, + color = ColorSecondaryLight, + fontSize = 14.sp, + maxLines = if (singleLine) 1 else Int.MAX_VALUE, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.padding(end = 24.dp) + ) + } + } + } +} + +@Composable +fun ToggleSetting( + title: String, + icon: Painter? = null, + checked: Boolean, + onClick: (Boolean) -> Unit) +{ + Box( + modifier = Modifier.clickable onClick@{ + onClick(!checked) + }, + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier.padding(top = 8.dp, end = 24.dp, bottom = 8.dp), + ) { + if (icon != null) { + Icon(painter = icon, contentDescription = null, Modifier.width(56.dp)) + } else { + Box(modifier = Modifier.width(56.dp)) + } + Text(text = title, color = MaterialTheme.colorScheme.onBackground, modifier = Modifier.weight(1.0f)) + Switch( + checked = checked, + onCheckedChange = null, + thumbContent = if (checked) { + { + Icon( + imageVector = Icons.Default.Check, + contentDescription = null, + modifier = Modifier.size(16.dp) + ) + } + } else null + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/theme/Color.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/theme/Color.kt new file mode 100644 index 0000000..b217ccd --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/theme/Color.kt @@ -0,0 +1,93 @@ +package com.illusionman1212.lyricsgrabbr.ui.theme + +import androidx.compose.ui.graphics.Color + +//val Purple80 = Color(0xFFD0BCFF) +//val PurpleGrey80 = Color(0xFFCCC2DC) +//val Pink80 = Color(0xFFEFB8C8) +// +//val Purple40 = Color(0xFF6650a4) +//val PurpleGrey40 = Color(0xFF625b71) +//val Pink40 = Color(0xFF7D5260) +// +//val ColorSecondaryLight = Color(0xFF999999) + +val ColorPrimaryLight = Color(0xFFFFFFFF) +val ColorPrimaryVariantLight = Color(0xFFEFEFEF) +val ColorOnPrimaryLight = Color(0xFF000000) +val ColorSecondaryLight = Color(0xFF999999) +val ColorSecondaryVariantLight = Color(0xFF888888) +val ColorOnSecondaryLight = Color(0xFF111111) +val ColorAmoledLight = Color(0xFFFFFFFF) + +val ColorPrimaryDark = Color(0xFF222222) +val ColorPrimaryVariantDark = Color(0xFF202020) +val ColorOnPrimaryDark = Color(0xFFFFFFFF) +val ColorSecondaryDark = Color(0xFF696969) +val ColorSecondaryVariantDark = Color(0xFF515151) +val ColorOnSecondaryDark = Color(0xDFFFFFFF) +val ColorAmoledDark = Color(0xFF000000) + +val md_theme_light_primary = Color(0xFF7C44A8) +val md_theme_light_onPrimary = Color(0xFFFFFFFF) +val md_theme_light_primaryContainer = Color(0xFFF2DAFF) +val md_theme_light_onPrimaryContainer = Color(0xFF2E004D) +val md_theme_light_secondary = Color(0xFF675A6E) +val md_theme_light_onSecondary = Color(0xFFFFFFFF) +val md_theme_light_secondaryContainer = Color(0xFFEEDDF5) +val md_theme_light_onSecondaryContainer = Color(0xFF221829) +val md_theme_light_tertiary = Color(0xFF99405F) +val md_theme_light_onTertiary = Color(0xFFFFFFFF) +val md_theme_light_tertiaryContainer = Color(0xFFFFD9E1) +val md_theme_light_onTertiaryContainer = Color(0xFF3F001C) +val md_theme_light_error = Color(0xFFBA1A1A) +val md_theme_light_errorContainer = Color(0xFFFFDAD6) +val md_theme_light_onError = Color(0xFFFFFFFF) +val md_theme_light_onErrorContainer = Color(0xFF410002) +val md_theme_light_background = Color(0xFFFFFBFF) +val md_theme_light_onBackground = Color(0xFF1D1B1E) +val md_theme_light_surface = Color(0xFFFFFBFF) +val md_theme_light_onSurface = Color(0xFF1D1B1E) +val md_theme_light_surfaceVariant = Color(0xFFEADFEA) +val md_theme_light_onSurfaceVariant = Color(0xFF4B454D) +val md_theme_light_outline = Color(0xFF7C757E) +val md_theme_light_inverseOnSurface = Color(0xFFF6EFF3) +val md_theme_light_inverseSurface = Color(0xFF322F33) +val md_theme_light_inversePrimary = Color(0xFFE1B6FF) +val md_theme_light_shadow = Color(0xFF000000) +val md_theme_light_surfaceTint = Color(0xFF7C44A8) +val md_theme_light_outlineVariant = Color(0xFFCDC3CE) +val md_theme_light_scrim = Color(0xFF000000) + +val md_theme_dark_primary = Color(0xFFE1B6FF) +val md_theme_dark_onPrimary = Color(0xFF4B0A76) +val md_theme_dark_primaryContainer = Color(0xFF632A8E) +val md_theme_dark_onPrimaryContainer = Color(0xFFF2DAFF) +val md_theme_dark_secondary = Color(0xFFD2C1D9) +val md_theme_dark_onSecondary = Color(0xFF372C3F) +val md_theme_dark_secondaryContainer = Color(0xFF4E4256) +val md_theme_dark_onSecondaryContainer = Color(0xFFEEDDF5) +val md_theme_dark_tertiary = Color(0xFFFFB1C6) +val md_theme_dark_onTertiary = Color(0xFF5E1131) +val md_theme_dark_tertiaryContainer = Color(0xFF7B2947) +val md_theme_dark_onTertiaryContainer = Color(0xFFFFD9E1) +val md_theme_dark_error = Color(0xFFFFB4AB) +val md_theme_dark_errorContainer = Color(0xFF93000A) +val md_theme_dark_onError = Color(0xFF690005) +val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6) +val md_theme_dark_background = Color(0xFF1D1B1E) +val md_theme_dark_onBackground = Color(0xFFE7E1E5) +val md_theme_dark_surface = Color(0xFF1D1B1E) +val md_theme_dark_onSurface = Color(0xFFE7E1E5) +val md_theme_dark_surfaceVariant = Color(0xFF4B454D) +val md_theme_dark_onSurfaceVariant = Color(0xFFCDC3CE) +val md_theme_dark_outline = Color(0xFF968E98) +val md_theme_dark_inverseOnSurface = Color(0xFF1D1B1E) +val md_theme_dark_inverseSurface = Color(0xFFE7E1E5) +val md_theme_dark_inversePrimary = Color(0xFF7C44A8) +val md_theme_dark_shadow = Color(0xFF000000) +val md_theme_dark_surfaceTint = Color(0xFFE1B6FF) +val md_theme_dark_outlineVariant = Color(0xFF4B454D) +val md_theme_dark_scrim = Color(0xFF000000) + +val seed = Color(0xFF662D91) \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/theme/Theme.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/theme/Theme.kt new file mode 100644 index 0000000..3efdedd --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/theme/Theme.kt @@ -0,0 +1,138 @@ +package com.illusionman1212.lyricsgrabbr.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.activity.ComponentActivity +import androidx.activity.SystemBarStyle +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat +import androidx.activity.enableEdgeToEdge +import androidx.compose.runtime.DisposableEffect + +private val LightColorScheme = lightColorScheme( + primary = md_theme_light_primary, + onPrimary = md_theme_light_onPrimary, + primaryContainer = md_theme_light_primaryContainer, + onPrimaryContainer = md_theme_light_onPrimaryContainer, + secondary = md_theme_light_secondary, + onSecondary = md_theme_light_onSecondary, + secondaryContainer = md_theme_light_secondaryContainer, + onSecondaryContainer = md_theme_light_onSecondaryContainer, + tertiary = md_theme_light_tertiary, + onTertiary = md_theme_light_onTertiary, + tertiaryContainer = md_theme_light_tertiaryContainer, + onTertiaryContainer = md_theme_light_onTertiaryContainer, + error = md_theme_light_error, + errorContainer = md_theme_light_errorContainer, + onError = md_theme_light_onError, + onErrorContainer = md_theme_light_onErrorContainer, + background = md_theme_light_background, + onBackground = md_theme_light_onBackground, + surface = md_theme_light_surface, + onSurface = md_theme_light_onSurface, + surfaceVariant = md_theme_light_surfaceVariant, + onSurfaceVariant = md_theme_light_onSurfaceVariant, + outline = md_theme_light_outline, + inverseOnSurface = md_theme_light_inverseOnSurface, + inverseSurface = md_theme_light_inverseSurface, + inversePrimary = md_theme_light_inversePrimary, + surfaceTint = md_theme_light_surfaceTint, + outlineVariant = md_theme_light_outlineVariant, + scrim = md_theme_light_scrim, +) + +private val DarkColorScheme = darkColorScheme( + primary = md_theme_dark_primary, + onPrimary = md_theme_dark_onPrimary, + primaryContainer = md_theme_dark_primaryContainer, + onPrimaryContainer = md_theme_dark_onPrimaryContainer, + secondary = md_theme_dark_secondary, + onSecondary = md_theme_dark_onSecondary, + secondaryContainer = md_theme_dark_secondaryContainer, + onSecondaryContainer = md_theme_dark_onSecondaryContainer, + tertiary = md_theme_dark_tertiary, + onTertiary = md_theme_dark_onTertiary, + tertiaryContainer = md_theme_dark_tertiaryContainer, + onTertiaryContainer = md_theme_dark_onTertiaryContainer, + error = md_theme_dark_error, + errorContainer = md_theme_dark_errorContainer, + onError = md_theme_dark_onError, + onErrorContainer = md_theme_dark_onErrorContainer, + background = md_theme_dark_background, + onBackground = md_theme_dark_onBackground, + surface = md_theme_dark_surface, + onSurface = md_theme_dark_onSurface, + surfaceVariant = md_theme_dark_surfaceVariant, + onSurfaceVariant = md_theme_dark_onSurfaceVariant, + outline = md_theme_dark_outline, + inverseOnSurface = md_theme_dark_inverseOnSurface, + inverseSurface = md_theme_dark_inverseSurface, + inversePrimary = md_theme_dark_inversePrimary, + surfaceTint = md_theme_dark_surfaceTint, + outlineVariant = md_theme_dark_outlineVariant, + scrim = md_theme_dark_scrim, +) + + +@Composable +fun LyricsGrabbrTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val context = LocalContext.current + + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = Color.Transparent.toArgb() + window.navigationBarColor = Color.Transparent.toArgb() + // allows pages to extend to the status bar + WindowCompat.setDecorFitsSystemWindows(window, false) + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme + } + } + + DisposableEffect(darkTheme) { + (context as ComponentActivity).enableEdgeToEdge( + statusBarStyle = SystemBarStyle.auto( + android.graphics.Color.TRANSPARENT, + android.graphics.Color.TRANSPARENT + ), + navigationBarStyle = SystemBarStyle.auto( + android.graphics.Color.TRANSPARENT, + android.graphics.Color.TRANSPARENT + ) + ) + + onDispose {} + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content, + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/theme/Type.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/theme/Type.kt new file mode 100644 index 0000000..07867e9 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.illusionman1212.lyricsgrabbr.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/utils/OkHttpExtensions.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/utils/OkHttpExtensions.kt new file mode 100644 index 0000000..c4e40a4 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/utils/OkHttpExtensions.kt @@ -0,0 +1,58 @@ +package com.illusionman1212.lyricsgrabbr.utils + +import kotlinx.coroutines.ExperimentalCoroutinesApi +import kotlinx.coroutines.suspendCancellableCoroutine +import okhttp3.Call +import okhttp3.Response +import okhttp3.Callback +import okio.IOException +import kotlin.coroutines.resumeWithException + +// Based on https://github.com/gildor/kotlin-coroutines-okhttp +@OptIn(ExperimentalCoroutinesApi::class) +private suspend fun Call.await(callStack: Array): Response { + return suspendCancellableCoroutine { continuation -> + val callback = + object : Callback { + override fun onResponse(call: Call, response: Response) { + continuation.resume(response) { + response.body?.close() + } + } + + override fun onFailure(call: Call, e: IOException) { + // Don't bother with resuming the continuation if it is already cancelled. + if (continuation.isCancelled) return + val exception = IOException(e.message, e).apply { stackTrace = callStack } + continuation.resumeWithException(exception) + } + } + + enqueue(callback) + + continuation.invokeOnCancellation { + try { + cancel() + } catch (ex: Throwable) { + // Ignore cancel exception + } + } + } +} + +suspend fun Call.await(): Response { + val callStack = Exception().stackTrace.run { copyOfRange(1, size) } + return await(callStack) +} + +suspend fun Call.awaitSuccess(): Response { + val callStack = Exception().stackTrace.run { copyOfRange(1, size) } + val response = await(callStack) + if (!response.isSuccessful) { + response.close() + throw HttpException(response.code).apply { stackTrace = callStack } + } + return response +} + +class HttpException(code: Int) : IllegalStateException("HTTP error $code") \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/utils/Resources.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/utils/Resources.kt new file mode 100644 index 0000000..5c1d602 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/utils/Resources.kt @@ -0,0 +1,34 @@ +package com.illusionman1212.lyricsgrabbr.utils + +import android.text.Annotation +import android.text.SpannedString +import androidx.annotation.StringRes +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.text.AnnotatedString +import androidx.compose.ui.text.SpanStyle + +// Native stylization is coming soon +// https://issuetracker.google.com/issues/139320238 +@Composable +fun annotatedStringResource( + @StringRes id: Int, + spanStyles: (Annotation) -> SpanStyle? = { null } +): AnnotatedString { + val resources = LocalContext.current.resources + val spannedString = SpannedString(resources.getText(id)) + val resultBuilder = AnnotatedString.Builder() + resultBuilder.append(spannedString.toString()) + spannedString.getSpans(0, spannedString.length, Annotation::class.java).forEach { annotation -> + val spanStart = spannedString.getSpanStart(annotation) + val spanEnd = spannedString.getSpanEnd(annotation) + resultBuilder.addStringAnnotation( + tag = annotation.key, + annotation = annotation.value, + start = spanStart, + end = spanEnd + ) + spanStyles(annotation)?.let { resultBuilder.addStyle(it, spanStart, spanEnd) } + } + return resultBuilder.toAnnotatedString() +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/HomeViewModel.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/HomeViewModel.kt new file mode 100644 index 0000000..8a0de9e --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/HomeViewModel.kt @@ -0,0 +1,170 @@ +package com.illusionman1212.lyricsgrabbr.viewmodels + +import android.content.Context +import android.net.Uri +import androidx.core.net.toUri +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY +import androidx.lifecycle.viewModelScope +import androidx.lifecycle.viewmodel.initializer +import androidx.lifecycle.viewmodel.viewModelFactory +import com.adamratzman.spotify.SpotifyClientApi +import com.illusionman1212.lyricsgrabbr.LGApp +import com.illusionman1212.lyricsgrabbr.NotificationEvent +import com.illusionman1212.lyricsgrabbr.R +import com.illusionman1212.lyricsgrabbr.data.HomeRepository +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import kotlinx.serialization.* +import kotlinx.serialization.builtins.serializer +import kotlinx.serialization.descriptors.SerialDescriptor +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder +import kotlinx.serialization.json.Json + +object UriSerializer : KSerializer { + override val descriptor: SerialDescriptor = String.serializer().descriptor + + override fun deserialize(decoder: Decoder): Uri { + return Uri.parse(decoder.decodeString()) + } + + override fun serialize(encoder: Encoder, value: Uri) { + encoder.encodeString(value.toString()) + } +} + +data class SearchResult( + val title: String, + val artist: String, + val url: Uri, + val artistUrl: Uri, + val thumbnail: Uri, + val id: String, +) + +@Serializable +data class Resources( + @Serializable(with = UriSerializer::class) + val thumbnail: Uri, +) + +@Serializable +data class Artist( + val name: String, + @Serializable(with = UriSerializer::class) + val url: Uri, +) + +@Serializable +data class Meta( + val title: String, + val primaryArtist: Artist, +) + +@Serializable +data class IntermediateResult( + @Serializable(with = UriSerializer::class) + val url: Uri, + val meta: Meta, + val resources: Resources, + val id: Int, +) + +@Serializable +data class SearchResultsResponse( + val all: List +) + +data class HomeState( + val isLoading: Boolean = false, + val results: List = emptyList(), + val notification: NotificationEvent? = null, + val error: String? = null, +) + +class HomeViewModel(private val context: Context, private val homeRepository: HomeRepository): ViewModel() { + private val _uiState = MutableStateFlow(HomeState()) + val uiState = _uiState.asStateFlow() + private val json = Json { + ignoreUnknownKeys = true + } + + fun getListeningPermission(): Boolean { + return homeRepository.isPermissionGranted() + } + + fun setSong(song: NotificationEvent) { + _uiState.value = _uiState.value.copy(isLoading = true, notification = song, error = null) + } + + fun makeRequestToSpotify(spotifyApi: SpotifyClientApi) { + viewModelScope.launch { + val track = spotifyApi.player.getCurrentlyPlaying()?.item + + if (track?.id == null) { + _uiState.value = _uiState.value.copy( + isLoading = false, + error = context.resources.getString(R.string.no_spotify_song_playing) + ) + } else { + _uiState.value = _uiState.value.copy( + isLoading = false, + error = null, + results = listOf(SearchResult( + title = _uiState.value.notification!!.title, + artist = _uiState.value.notification!!.artist, + url = track.asTrack?.externalUrls?.spotify?.toUri() ?: Uri.EMPTY, + artistUrl = track.asTrack?.artists?.get(0)?.externalUrls?.spotify?.toUri() ?: Uri.EMPTY, + thumbnail = track.asTrack?.album?.images?.get(0)?.url?.toUri() ?: Uri.EMPTY, + id = track.id!!, + )) + ) + } + } + } + + fun makeRequestToGenius(song: String, artist: String) { + viewModelScope.launch { + _uiState.update { HomeState(true, uiState.value.results, uiState.value.notification, null) } + + withContext(Dispatchers.IO) { + val (res, isSuccess) = homeRepository.makeSearchRequest(song, artist) + if (isSuccess) { + val results = json.decodeFromString(SearchResultsResponse.serializer(), res!!).all.map { + SearchResult( + title = it.meta.title, + artist = it.meta.primaryArtist.name, + url = it.url, + artistUrl = it.meta.primaryArtist.url, + thumbnail = it.resources.thumbnail, + id = it.id.toString() + ) + } + _uiState.update { HomeState(false, results, uiState.value.notification, null) } + } else { + _uiState.update { HomeState( + false, + emptyList(), + uiState.value.notification, + res + ) } + } + } + } + } + + companion object { + val Factory: ViewModelProvider.Factory = viewModelFactory { + initializer { + val application = (this[APPLICATION_KEY] as LGApp) + HomeViewModel(application.applicationContext, application.homeRepository) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/LyricsViewModel.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/LyricsViewModel.kt new file mode 100644 index 0000000..678230e --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/LyricsViewModel.kt @@ -0,0 +1,78 @@ +package com.illusionman1212.lyricsgrabbr.viewmodels + +import android.net.Uri +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY +import androidx.lifecycle.viewModelScope +import androidx.lifecycle.viewmodel.initializer +import androidx.lifecycle.viewmodel.viewModelFactory +import com.illusionman1212.lyricsgrabbr.LGApp +import com.illusionman1212.lyricsgrabbr.data.LyricsRepository +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext + +data class LyricsState( + // set by Home screen + val song: String = "", + val artist: String = "", + val url: Uri = Uri.EMPTY, + val trackId: String = "", + val useSpotifyApi: Boolean = false, + + // set by Lyrics screen + val lyrics: String = "", + val isLoading: Boolean = true, + + val error: String? = null, +) + +class LyricsViewModel(private val lyricsRepository: LyricsRepository): ViewModel() { + private val _uiState = MutableStateFlow(LyricsState()) + val uiState = _uiState.asStateFlow() + + fun onSongChange(trackId: String, title: String, subtitle: String, url: Uri, useSpotifyApi: Boolean) { + _uiState.update { + it.copy(song = title, artist = subtitle, url = url, useSpotifyApi = useSpotifyApi, trackId = trackId) + } + } + + fun fetchLyricsFromSpotify() { + _uiState.value = _uiState.value.copy(isLoading = true, lyrics = "") + + viewModelScope.launch { + withContext(Dispatchers.IO) { + val (lyrics, isSuccess) = lyricsRepository.fetchLyricsFromSpotify(uiState.value.trackId) + if (isSuccess) { + _uiState.value = _uiState.value.copy(isLoading = false, lyrics = lyrics) + } else { + _uiState.value = _uiState.value.copy(isLoading = false, error = lyrics, lyrics = "") + } + } + } + } + + fun fetchLyricsFromGenius() { + _uiState.value = _uiState.value.copy(isLoading = true, lyrics = "") + + viewModelScope.launch { + withContext(Dispatchers.IO) { + val lyrics = lyricsRepository.fetchLyricsFromGenius(uiState.value.url) + _uiState.value = _uiState.value.copy(isLoading = false, lyrics = lyrics) + } + } + } + + companion object { + val Factory: ViewModelProvider.Factory = viewModelFactory { + initializer { + val application = (this[APPLICATION_KEY] as LGApp) + LyricsViewModel(application.lyricsRepository) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/SettingsViewModel.kt b/app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/SettingsViewModel.kt new file mode 100644 index 0000000..4402d73 --- /dev/null +++ b/app/src/main/java/com/illusionman1212/lyricsgrabbr/viewmodels/SettingsViewModel.kt @@ -0,0 +1,60 @@ +package com.illusionman1212.lyricsgrabbr.viewmodels + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProvider.AndroidViewModelFactory.Companion.APPLICATION_KEY +import androidx.lifecycle.viewModelScope +import androidx.lifecycle.viewmodel.initializer +import androidx.lifecycle.viewmodel.viewModelFactory +import com.illusionman1212.lyricsgrabbr.LGApp +import com.illusionman1212.lyricsgrabbr.data.SettingsPreferencesRepository +import com.illusionman1212.lyricsgrabbr.data.Theme +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.collectLatest +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.launch + +data class SettingsState( + val appTheme: Int = Theme.SYSTEM.ordinal, + val isSpotifyAuthed: Boolean = false, +) + +class SettingsViewModel(private val settingsPrefsRepo: SettingsPreferencesRepository): ViewModel() { + private val _uiState = MutableStateFlow(SettingsState()) + val uiState = _uiState.asStateFlow() + + suspend fun getAppTheme(): Int { + return settingsPrefsRepo.preferences.first().appTheme + } + + fun setTheme(theme: Theme) { + viewModelScope.launch(Dispatchers.IO) { + settingsPrefsRepo.setTheme(theme) + } + } + + fun updateSpotifyAuthStatus(isAuthed: Boolean) { + _uiState.value = _uiState.value.copy(isSpotifyAuthed = isAuthed) + } + + init { + viewModelScope.launch { + settingsPrefsRepo.preferences.collectLatest { + _uiState.value = _uiState.value.copy( + appTheme = it.appTheme, + ) + } + } + } + + companion object { + val Factory: ViewModelProvider.Factory = viewModelFactory { + initializer { + val application = (this[APPLICATION_KEY] as LGApp) + SettingsViewModel(application.settingsPreferencesRepository) + } + } + } +} diff --git a/android/app/src/main/res/drawable-anydpi-v24/ic_notification.xml b/app/src/main/res/drawable-anydpi-v24/ic_notification.xml similarity index 100% rename from android/app/src/main/res/drawable-anydpi-v24/ic_notification.xml rename to app/src/main/res/drawable-anydpi-v24/ic_notification.xml diff --git a/android/app/src/main/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png similarity index 100% rename from android/app/src/main/res/drawable-hdpi/ic_notification.png rename to app/src/main/res/drawable-hdpi/ic_notification.png diff --git a/android/app/src/main/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_notification.png similarity index 100% rename from android/app/src/main/res/drawable-mdpi/ic_notification.png rename to app/src/main/res/drawable-mdpi/ic_notification.png diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_launcher_foreground.xml rename to app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/android/app/src/main/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_notification.png similarity index 100% rename from android/app/src/main/res/drawable-xhdpi/ic_notification.png rename to app/src/main/res/drawable-xhdpi/ic_notification.png diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_notification.png similarity index 100% rename from android/app/src/main/res/drawable-xxhdpi/ic_notification.png rename to app/src/main/res/drawable-xxhdpi/ic_notification.png diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from android/app/src/main/res/drawable/ic_launcher_background.xml rename to app/src/main/res/drawable/ic_launcher_background.xml diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..262283d --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/launch_background.xml b/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from android/app/src/main/res/drawable/launch_background.xml rename to app/src/main/res/drawable/launch_background.xml diff --git a/app/src/main/res/drawable/spotify.xml b/app/src/main/res/drawable/spotify.xml new file mode 100644 index 0000000..1ba7ba6 --- /dev/null +++ b/app/src/main/res/drawable/spotify.xml @@ -0,0 +1,9 @@ + + + diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml new file mode 100644 index 0000000..b8af128 --- /dev/null +++ b/app/src/main/res/values-ar/strings.xml @@ -0,0 +1,52 @@ + + + Lyrics Grabbr + + + رجوع + إلغاء + تأكيد + لقد انتهت مهلة الطلب، حاول مرة أخرى لاحقًا + لقد حدث خطأ، حاول مرة أخرى لاحقاً + أعد المحاولة + عذرًا، لا يحتوي Spotify على كلمات لهذه الأغنية + + + لا يوجد مشغل مدعوم قيد التشغيل + فتح الإعدادات + إذن قراءة الإشعارات + هذا التطبيق يحتاج إذن قراءة الإشعارات للعمل بشكل صحيح. يرجى منح الإذن في شاشة الإعدادات التالية.\nإحذر أن الطريقة الوحيدة لإيقاف الخدمة هي إبطال إذن قراءة الإشعارات. + لم يتم العثور على نتائج + تم العثور على %1$d نتيجة + مشغل بواسطةgeniURL + افتح صفحة الأغنية + افتح صفحة الفنان + مطلوب إذن الإشعارات + يتطلب هذا التطبيق أذونات الإشعارات لبدء خدمة مقدمة بغرض الاستماع إلى إشعارات الموسيقى، ولا يمكن أن يعمل بدونها. + لم يتم منح إذن الإشعارات، لن يعمل التطبيق بشكل صحيح + منح الإذن + No song is playing on Spotify + + + الإعدادات + المظهر + مظهر التطبيق + نهار + ليلي + استخدم مظهر النظام + استخدم Spotify للكلمات + Spotify Client ID + خالي + يمكن لهذا التطبيق استخدام واجهة برمجة تطبيقات الويب الخاصة بـ Spotify للحصول على كلمات الأغاني. تحتاج إلى تقديم Spotify Client ID لاستخدام هذه الميزة. يمكنك الحصول على واحدة من هنا.\nلا يعمل هذا إلا إذا كنت تقوم بتشغيل الموسيقى من مشغل Spotify. + + + كلمات الأغنية + هذه الأغنية موسيقية + + + الخدمة قيد التشغيل + وقف الخدمة + قم بتشغيل بعض الأغاني على مشغل مدعوم للحصول على كلمات الأغاني + انقر للحصول على كلمات الأغاني + يتم الآن تشغيل %1$s لـ %2$s + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..e0e1a50 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,51 @@ + + Lyrics Grabbr + + + Go Back + Cancel + Confirm + Request has timed out, try again later + An error has occurred, try again later + Retry + Sorry, Spotify doesn\'t have lyrics for this song + + + No supported player is running + Open Settings + Notification Listening Permission + This app requires permission to listen to notifications to function properly. Please grant permission in the next screen.\nBEWARE that the only way to stop the service is to revoke the notification listening permission. + No results found + Found %1$d result(s) + Powered By geniURL + Open Song Page + Open Artist Page + Notification Permission Required + LyricsGrabbr requires notification permissions to start a foreground service for the purpose of listening to music notifications, and cannot function without it. + Notification permission is not granted, the app will not function properly + Grant Permission + No song is playing on Spotify + + + Settings + Appearance + Theme + Light + Dark + Use System Theme + Use Spotify for lyrics + Spotify Client ID + Not Set + This app can use Spotify\'s Web API to get lyrics. You need to provide a Spotify Client ID to use this feature. You can get one from here.\nThis only works if you\'re playing music from the Spotify player. + + + Lyrics + This song is an instrumental + + + Service Running + Stop Service + Play some songs on a supported player to get lyrics + Tap to get lyrics + Now Playing %1$s By %2$s + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..35968ee --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/backup_rules.xml b/app/src/main/res/xml/backup_rules.xml new file mode 100644 index 0000000..fa0f996 --- /dev/null +++ b/app/src/main/res/xml/backup_rules.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml new file mode 100644 index 0000000..9ee9997 --- /dev/null +++ b/app/src/main/res/xml/data_extraction_rules.xml @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/test/java/com/illusionman1212/lyricsgrabbr/ExampleUnitTest.kt b/app/src/test/java/com/illusionman1212/lyricsgrabbr/ExampleUnitTest.kt new file mode 100644 index 0000000..2d5aaa0 --- /dev/null +++ b/app/src/test/java/com/illusionman1212/lyricsgrabbr/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.illusionman1212.lyricsgrabbr + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..55ea678 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,5 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id("com.android.application") version "8.2.1" apply false + id("org.jetbrains.kotlin.android") version "1.9.0" apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..41d7819 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=UTF-8 +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Kotlin code style for this project: "official" or "obsolete": +kotlin.code.style=official +# Enables namespacing of each library's R class so that its R class includes only the +# resources declared in the library itself and none from the library's dependencies, +# thereby reducing the size of the R class for that library +android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e708b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties similarity index 80% rename from android/gradle/wrapper/gradle-wrapper.properties rename to gradle/wrapper/gradle-wrapper.properties index 595fb86..9f59ffd 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 23 08:50:38 CEST 2017 +#Tue Jan 09 20:42:38 EET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/lib/lyrics.dart b/lib/lyrics.dart deleted file mode 100644 index dcbfee4..0000000 --- a/lib/lyrics.dart +++ /dev/null @@ -1,123 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:web_scraper/web_scraper.dart'; - -class LyricsPage extends StatefulWidget { - const LyricsPage({ - Key? key, - required this.title, - required this.artist, - required this.url, - }) : super(key: key); - - final String title; - final String artist; - final String url; - - @override - State createState() => _LyricsPageState(); -} - -class _LyricsPageState extends State { - bool fetching = false; - String? lyrics; - bool instrumental = false; - - @override - void initState() { - super.initState(); - initPlatformState(); - } - - Future initPlatformState() async { - setState(() => fetching = true); - - final webScraper = WebScraper('https://genius.com'); - - String path = widget.url.split('genius.com/')[1]; - String fullLyrics = ''; - if (await webScraper.loadWebPage('/$path?react=1')) { - webScraper - .loadFromString(webScraper.getPageContent().replaceAll('
', '\n')); - var element = webScraper - .getElement("div[data-lyrics-container]", ['data-lyrics-container']); - for (var section in element) { - fullLyrics += section['title'] + '\n'; - } - setState(() { - lyrics = fullLyrics; - instrumental = fullLyrics.isEmpty; - fetching = false; - }); - } - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - widget.title, - style: const TextStyle( - fontWeight: FontWeight.bold, - ), - ), - Text( - widget.artist, - style: const TextStyle( - fontSize: 13, - ), - ), - ], - ), - ), - body: Center( - child: fetching - ? const Column( - children: [ - Expanded( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [CircularProgressIndicator(value: null)], - ), - ), - ], - ) - : instrumental - ? const Center( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Icon(Icons.music_note, size: 50), - SizedBox(width: 20, height: 20), - Text( - 'This Song is an Instrumental', - style: TextStyle( - fontSize: 20, - fontStyle: FontStyle.italic, - ), - ), - ], - ), - ) - : SizedBox( - width: MediaQuery.of(context).size.width, - child: SingleChildScrollView( - child: Container( - padding: const EdgeInsets.all(30), - child: SelectableText( - lyrics ?? '', - style: const TextStyle( - fontSize: 16, - ), - ), - ), - ), - ), - ), - ); - } -} diff --git a/lib/main.dart b/lib/main.dart deleted file mode 100644 index caec3ab..0000000 --- a/lib/main.dart +++ /dev/null @@ -1,322 +0,0 @@ -import 'dart:async'; -import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:provider/provider.dart'; -import 'notification_listener.dart'; -import 'search_result.dart'; -import 'package:http/http.dart' as http; -import 'dart:convert' as convert; -import 'package:shared_preferences/shared_preferences.dart'; - -import 'settings.dart'; -import 'theme_provider.dart'; - -Future main() async { - runApp(const LyricsGrabbr()); -} - -class LyricsGrabbr extends StatefulWidget { - const LyricsGrabbr({Key? key}) : super(key: key); - - @override - State createState() => _LyricsGrabbrState(); -} - -class _LyricsGrabbrState extends State { - @override - Widget build(BuildContext context) { - return FutureBuilder( - future: SharedPreferences.getInstance(), - builder: (_, snapshot) { - final prefTheme = snapshot.data?.getString("theme"); - - var themeMode = ThemeMode.system; - if (prefTheme == AppTheme.Dark.name) { - themeMode = ThemeMode.dark; - } else if (prefTheme == AppTheme.Light.name) { - themeMode = ThemeMode.light; - } else if (prefTheme == AppTheme.System.name) { - themeMode = ThemeMode.system; - } - - return snapshot.hasData ? ChangeNotifierProvider( - create: (context) => ThemeProvider(themeMode), - builder: (context, _) { - final themeProvider = Provider.of(context); - - return MaterialApp( - title: 'Lyrics Grabbr', - theme: MyThemes.lightTheme, - darkTheme: MyThemes.darkTheme, - themeMode: themeProvider.themeMode, - home: const HomePage(title: 'Lyrics Grabbr'), - ); - } - ) : Container(); - } - ); - } -} - -class HomePage extends StatefulWidget { - const HomePage({Key? key, required this.title}) : super(key: key); - - final String title; - - @override - State createState() => _HomePageState(); -} - -class _HomePageState extends State with WidgetsBindingObserver { - late AndroidNotificationListener _notifications; - BuildContext? permissionDialogCtx; - NotificationEvent? lastNotification; - bool running = false; - bool searching = false; - final List searchResults = []; - - @override - void initState() { - WidgetsBinding.instance.addObserver(this); - super.initState(); - initPlatformState(); - } - - @override - void dispose() { - WidgetsBinding.instance.removeObserver(this); - super.dispose(); - } - - @override - void didChangeAppLifecycleState(AppLifecycleState state) async { - if (state == AppLifecycleState.resumed) { - if (permissionDialogCtx == null) { - return; - } - - var perm = await AndroidNotificationListener.hasPermission; - - if (perm != null && perm) { - Navigator.pop(permissionDialogCtx!); - startListening(); - } - } - } - - void _showNotificationPermDialog() { - showDialog( - context: context, - barrierDismissible: false, - builder: (BuildContext buildCtx) { - permissionDialogCtx = buildCtx; - - return WillPopScope( - onWillPop: () { - SystemNavigator.pop(); - return Future.value(false); - }, - child: AlertDialog( - title: const Text( - 'Notifications Access Permission', - style: TextStyle(fontWeight: FontWeight.bold), - ), - content: const Text( - 'This app requires permission to listen to notifications to function properly. Please grant permission in the next screen. BEWARE that the only way to stop the service is to revoke the notification listening permission.', - ), - actions: [ - TextButton( - onPressed: () async { - await AndroidNotificationListener - .openPermissionSettings(); - }, - child: const Text('OK')), - ], - ), - ); - }); - } - - Future initPlatformState() async { - var perm = await AndroidNotificationListener.hasPermission; - - if (perm != null && perm) { - startListening(); - } else { - _showNotificationPermDialog(); - } - } - - void onData(NotificationEvent event) { - if (event.playbackState == PlaybackState.STATE_INVALID) { - return; - } - - if (lastNotification?.songTitle != event.songTitle && - lastNotification?.artist != event.artist) { - searchLyrics(event.songTitle, event.artist); - - setState(() { - searchResults.clear(); - lastNotification = event; - }); - } - } - - void startListening() { - _notifications = AndroidNotificationListener(); - - _notifications.notificationStream.listen(onData); - setState(() => running = true); - } - - void searchLyrics( - String song, - String artist, - ) async { - setState(() { - searching = true; - }); - - // TODO: build an httpclient to reuse between requests. - final uri = Uri.https( - 'api.illusionman1212.com', - '/lyrics/search', - {'q': '$song $artist'}, - ); - - var response = await http.get(uri); - if (response.statusCode == 200) { - final jsonRes = convert.jsonDecode(response.body) as Map; - List results = jsonRes['all']; - - for (var result in results) { - var myResult = SearchResult.fromJson(result); - setState(() { - searchResults.add(myResult); - }); - } - - setState(() { - searching = false; - }); - } else { - // TODO: display error - print('error in http get'); - setState(() { - searching = false; - }); - } - } - - Widget _buildResults() { - return ListView.separated( - itemBuilder: (_, i) { - return searchResults[i]; - }, - itemCount: searchResults.length, - separatorBuilder: (BuildContext context, int index) { - return const Divider(height: 1); - }, - ); - } - - List _buildPage() { - if (lastNotification != null) { - return [ - Container( - padding: const EdgeInsets.all(20), - child: RichText( - text: TextSpan( - text: lastNotification?.songTitle, - style: TextStyle( - fontSize: 24.0, - color: Theme.of(context).textTheme.bodyLarge?.color, - fontWeight: FontWeight.w700, - ), - children: [ - const TextSpan( - text: '\n', - ), - TextSpan( - text: lastNotification?.artist, - style: TextStyle( - fontSize: 20.0, - color: Theme.of(context).textTheme.bodyMedium?.color, - ), - ) - ]), - textAlign: TextAlign.center, - ), - ), - Container( - child: searching - ? Expanded( - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: const [CircularProgressIndicator(value: null)])) - : Flexible( - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - Container( - padding: const EdgeInsets.symmetric(horizontal: 10), - margin: const EdgeInsets.symmetric(vertical: 10), - child: Text( - running - ? 'Found ${searchResults.length} result(s)' - : "", - style: TextStyle( - fontSize: 15, - color: Theme.of(context).textTheme.bodyText1?.color, - fontWeight: FontWeight.bold, - fontStyle: FontStyle.italic, - ), - ), - ), - Flexible(child: _buildResults()), - ], - ), - ), - ), - ]; - } - - return [ - const Padding( - padding: EdgeInsets.symmetric(vertical: 16), - child: Text("No supported player is running", - style: TextStyle(fontSize: 24)), - ), - ]; - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: Text(widget.title), - centerTitle: true, - actions: [ - IconButton( - icon: const Icon(Icons.settings), - tooltip: "Settings", - splashRadius: 20, - onPressed: () { - Navigator.of(context).push( - MaterialPageRoute(builder: (context) => const SettingsPage())); - }, - ), - ], - ), - body: Center( - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: _buildPage(), - ), - ), - ); - } -} diff --git a/lib/notification_listener.dart b/lib/notification_listener.dart deleted file mode 100644 index 1d954d3..0000000 --- a/lib/notification_listener.dart +++ /dev/null @@ -1,85 +0,0 @@ -import 'dart:async'; -import 'package:flutter/services.dart'; -import 'dart:io' show Platform; - -class NotificationException implements Exception { - final String _cause; - - NotificationException(this._cause); - - @override - String toString() { - return _cause; - } -} - -abstract class PlaybackState { - static const STATE_INVALID = -1; - static const STATE_PAUSED = 2; - static const STATE_PLAYING = 3; -} - -class NotificationEvent { - final String artist; - final String packageName; - final String songTitle; - final int playbackState; - final int duration; - - final DateTime timeStamp; - - const NotificationEvent( - {required this.packageName, - required this.artist, - required this.timeStamp, - required this.songTitle, - required this.playbackState, - required this.duration}); - - factory NotificationEvent.fromMap(Map map) { - DateTime time = DateTime.now(); - String name = map['packageName']; - String message = map['packageMessage']; - String text = map['packageText']; - int playbackState = map['packagePlaybackState']; - int duration = map['packageDuration']; - - return NotificationEvent( - packageName: name, - artist: message, - timeStamp: time, - songTitle: text, - playbackState: playbackState, - duration: duration); - } -} - -NotificationEvent _notificationEvent(dynamic data) { - return NotificationEvent.fromMap(data); -} - -class AndroidNotificationListener { - static const EventChannel _notificationEventChannel = - EventChannel('notifications.eventChannel'); - static const MethodChannel _methodChannel = - MethodChannel('notifications/method'); - - Stream get notificationStream { - if (Platform.isAndroid) { - Stream _notificationStream = _notificationEventChannel - .receiveBroadcastStream() - .map((event) => _notificationEvent(event)); - return _notificationStream; - } - throw NotificationException( - 'Notification API exclusively available on Android!'); - } - - static Future get hasPermission async { - return await _methodChannel.invokeMethod('plugin.hasPermission'); - } - - static Future openPermissionSettings() async { - return await _methodChannel.invokeMethod('plugin.openPermissionSettings'); - } -} diff --git a/lib/search_result.dart b/lib/search_result.dart deleted file mode 100644 index a700dc8..0000000 --- a/lib/search_result.dart +++ /dev/null @@ -1,171 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:url_launcher/url_launcher.dart'; - -import 'lyrics.dart'; - -class SearchResult extends StatelessWidget { - const SearchResult( - {Key? key, - required this.title, - required this.artist, - required this.url, - required this.artistUrl, - required this.thumbnail, - required this.id}) - : super(key: key); - - final String title; - final String artist; - final Uri url; - final Uri artistUrl; - final String thumbnail; - final int id; - - SearchResult.fromJson(Map json, {Key? key}) - : title = json['meta']['title'], - artist = json['meta']['primaryArtist']['name'], - url = Uri.parse(json['url']), - artistUrl = Uri.parse(json['meta']['primaryArtist']['url']), - thumbnail = json['resources']['thumbnail'], - id = json['id'], - super(key: key); - - List _buildOptions() { - return [ - OptionItem( - title: "Open Artist Page in Genius", - icon: Icons.library_music, - onTap: () async { - if (!await launchUrl(artistUrl)) { - throw 'could not launch $artistUrl'; - } - }), - OptionItem( - title: "Open Song Page in Genius", - icon: Icons.music_note, - onTap: () async { - if (!await launchUrl(url)) { - throw 'could not launch $url'; - } - }) - ]; - } - - void _showOptionsBottomSheet(BuildContext context) { - showModalBottomSheet( - context: context, - builder: (context) { - return ConstrainedBox( - constraints: BoxConstraints( - maxHeight: - (MediaQuery.of(context).size.height - kToolbarHeight) / 2, - ), - child: Column( - mainAxisSize: MainAxisSize.min, - children: _buildOptions(), - ), - ); - }); - } - - @override - Widget build(BuildContext context) { - return Material( - child: InkWell( - onTap: () { - Navigator.of(context).push( - MaterialPageRoute( - builder: (context) => LyricsPage( - title: title, - artist: artist, - url: url.toString(), - ), - ), - ); - }, - onLongPress: () => _showOptionsBottomSheet(context), - child: Ink( - height: 75, - child: Row( - children: [ - Container( - margin: const EdgeInsets.only(right: 20), - child: Image.network( - thumbnail, - width: 75, - height: 75, - fit: BoxFit.cover, - errorBuilder: (context, error, stackTrace) { - return const Center( - child: SizedBox( - width: 75, - height: 75, - child: Icon(Icons.broken_image, size: 40)), - ); - }, - ), - ), - Flexible( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Text( - title, - style: TextStyle( - color: Theme.of(context).textTheme.bodyLarge?.color, - fontSize: 18, - fontWeight: FontWeight.bold, - ), - overflow: TextOverflow.ellipsis, - ), - Text( - artist, - style: TextStyle( - color: Theme.of(context).textTheme.titleMedium?.color, - fontSize: 14, - ), - overflow: TextOverflow.ellipsis, - ), - ], - ), - ), - ], - ), - ), - ), - ); - } -} - -class OptionItem extends StatelessWidget { - final String title; - final IconData icon; - final void Function()? onTap; - - const OptionItem( - {Key? key, required this.title, required this.icon, this.onTap}) - : super(key: key); - - @override - Widget build(BuildContext context) { - return InkWell( - onTap: onTap, - child: Ink( - padding: const EdgeInsets.all(20), - child: Row( - children: [ - Container( - margin: const EdgeInsets.only(right: 15), - child: Icon(icon), - ), - Text( - title, - style: const TextStyle(fontSize: 17, fontWeight: FontWeight.w600), - ), - ], - ), - ), - ); - } -} diff --git a/lib/settings.dart b/lib/settings.dart deleted file mode 100644 index 61ab279..0000000 --- a/lib/settings.dart +++ /dev/null @@ -1,188 +0,0 @@ -// ignore_for_file: constant_identifier_names - -import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; -import 'package:shared_preferences/shared_preferences.dart'; - -import 'theme_provider.dart'; - -enum AppTheme { - Dark, - Light, - System -} - -class Setting extends StatelessWidget { - final String title; - final String? desc; - final void Function() onTap; - - const Setting({ - Key? key, - required this.title, - this.desc, - required this.onTap, - }) : super(key: key); - - @override - Widget build(BuildContext context) { - return Material( - child: InkWell( - onTap: onTap, - child: Ink( - child: Container( - padding: const EdgeInsets.all(16), - child: Row( - children: [ - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(title, style: const TextStyle(fontSize: 16)), - if (desc != null) - Text(desc!, - style: const TextStyle(color: Colors.grey)), - ]), - ), - ], - ), - ), - ), - ), - ); - } -} - -class SettingsPage extends StatefulWidget { - const SettingsPage({Key? key}) : super(key: key); - - @override - State createState() => _SettingsPageState(); -} - -class _SettingsPageState extends State { - final Future _prefs = SharedPreferences.getInstance(); - late SharedPreferences prefs; - String? activeTheme; - - @override - void initState() { - super.initState(); - initPlatformState(); - } - - Future initPlatformState() async { - prefs = await _prefs; - - setState(() { - activeTheme = prefs.getString("theme") ?? AppTheme.System.name; - }); - } - - Widget _buildSettingsGroup(String groupTitle, List items) { - return Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.symmetric(horizontal: 16), - child: Text(groupTitle, - style: const TextStyle(color: Colors.deepPurple)), - ), - ...items, - ], - ); - } - - List _buildSettingsList(BuildContext context) { - return [ - _buildSettingsGroup("Customization", [ - Setting( - title: "Theme", - desc: activeTheme, - onTap: () { - final provider = Provider.of(context, listen: false); - - showDialog( - context: context, - builder: (BuildContext buildCtx) { - return Dialog( - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(2)), - child: Container( - padding: const EdgeInsets.symmetric(vertical: 16), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: - const EdgeInsets.symmetric(horizontal: 20), - child: Text("Theme", - style: Theme.of(context).textTheme.headline6), - ), - Padding( - padding: const EdgeInsets.symmetric(vertical: 8), - child: Column( - children: [ - RadioListTile( - value: AppTheme.System.name, - groupValue: activeTheme, - title: Text("Use System Default", style: Theme.of(context).textTheme.bodyText1), - onChanged: (String? value) => setState(() { - provider.changeTheme(ThemeMode.system); - activeTheme = AppTheme.System.name; - prefs.setString("theme", AppTheme.System.name); - Navigator.pop(context); - })), - RadioListTile( - value: AppTheme.Dark.name, - groupValue: activeTheme, - title: Text("Dark", style: Theme.of(context).textTheme.bodyText1), - onChanged: (String? value) => setState(() { - provider.changeTheme(ThemeMode.dark); - activeTheme = AppTheme.Dark.name; - prefs.setString("theme", AppTheme.Dark.name); - Navigator.pop(context); - })), - RadioListTile( - value: AppTheme.Light.name, - groupValue: activeTheme, - title: Text("Light", style: Theme.of(context).textTheme.bodyText1), - onChanged: (String? value) => setState(() { - provider.changeTheme(ThemeMode.light); - activeTheme = AppTheme.Light.name; - prefs.setString("theme", AppTheme.Light.name); - Navigator.pop(context); - })), - ], - ), - ), - ], - ), - ), - ); - }); - }) - ]) - ]; - } - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text("Settings"), - ), - body: ListView.separated( - itemBuilder: (_, i) { - return _buildSettingsList(context)[i]; - }, - separatorBuilder: (_, __) { - return const SizedBox(height: 15); - }, - itemCount: 1, - padding: const EdgeInsets.symmetric(vertical: 20), - ), - ); - } -} diff --git a/lib/theme_provider.dart b/lib/theme_provider.dart deleted file mode 100644 index c21211a..0000000 --- a/lib/theme_provider.dart +++ /dev/null @@ -1,43 +0,0 @@ -import 'package:flutter/material.dart'; - -class ThemeProvider extends ChangeNotifier { - ThemeMode themeMode; - - ThemeProvider(this.themeMode); - - bool get isDarkMode => themeMode == ThemeMode.dark; - - void changeTheme(ThemeMode mode) { - themeMode = mode; - - notifyListeners(); - } -} - -class MyThemes { - static final darkTheme = ThemeData( - primarySwatch: Colors.deepPurple, - dialogTheme: const DialogTheme(backgroundColor: Color(0xFF202020)), - unselectedWidgetColor: Colors.white, - canvasColor: Colors.black, - bottomSheetTheme: const BottomSheetThemeData(backgroundColor: Color(0xFF202020)), - dividerColor: Colors.white, - iconTheme: const IconThemeData(color: Colors.white), - textTheme: const TextTheme( - bodyText1: TextStyle(color: Colors.white, fontSize: 16), - bodyText2: TextStyle(color: Colors.white), - subtitle1: TextStyle(color: Colors.grey), - subtitle2: TextStyle(color: Colors.white), - headline6: TextStyle(color: Colors.white), - ), - ); - - static final lightTheme = ThemeData( - primarySwatch: Colors.purple, - dividerColor: Colors.black, - textTheme: const TextTheme( - bodyText1: TextStyle(fontSize: 16), - subtitle1: TextStyle(color: Colors.black54), - ), - ); -} diff --git a/pubspec.lock b/pubspec.lock deleted file mode 100644 index cd953f4..0000000 --- a/pubspec.lock +++ /dev/null @@ -1,442 +0,0 @@ -# Generated by pub -# See https://dart.dev/tools/pub/glossary#lockfile -packages: - async: - dependency: transitive - description: - name: async - sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" - url: "https://pub.dev" - source: hosted - version: "2.11.0" - boolean_selector: - dependency: transitive - description: - name: boolean_selector - sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - characters: - dependency: transitive - description: - name: characters - sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" - url: "https://pub.dev" - source: hosted - version: "1.3.0" - clock: - dependency: transitive - description: - name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" - source: hosted - version: "1.1.1" - collection: - dependency: transitive - description: - name: collection - sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" - url: "https://pub.dev" - source: hosted - version: "1.17.1" - csslib: - dependency: transitive - description: - name: csslib - sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - fake_async: - dependency: transitive - description: - name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" - source: hosted - version: "1.3.1" - ffi: - dependency: transitive - description: - name: ffi - sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99 - url: "https://pub.dev" - source: hosted - version: "2.0.2" - file: - dependency: transitive - description: - name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" - url: "https://pub.dev" - source: hosted - version: "6.1.4" - flutter: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" - flutter_lints: - dependency: "direct dev" - description: - name: flutter_lints - sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" - url: "https://pub.dev" - source: hosted - version: "2.0.2" - flutter_test: - dependency: "direct dev" - description: flutter - source: sdk - version: "0.0.0" - flutter_web_plugins: - dependency: transitive - description: flutter - source: sdk - version: "0.0.0" - html: - dependency: transitive - description: - name: html - sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a" - url: "https://pub.dev" - source: hosted - version: "0.15.4" - http: - dependency: "direct main" - description: - name: http - sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" - url: "https://pub.dev" - source: hosted - version: "0.13.6" - http_parser: - dependency: transitive - description: - name: http_parser - sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" - url: "https://pub.dev" - source: hosted - version: "4.0.2" - js: - dependency: transitive - description: - name: js - sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" - source: hosted - version: "0.6.7" - lints: - dependency: transitive - description: - name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - matcher: - dependency: transitive - description: - name: matcher - sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" - url: "https://pub.dev" - source: hosted - version: "0.12.15" - material_color_utilities: - dependency: transitive - description: - name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.dev" - source: hosted - version: "0.2.0" - meta: - dependency: transitive - description: - name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" - url: "https://pub.dev" - source: hosted - version: "1.9.1" - nested: - dependency: transitive - description: - name: nested - sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - path: - dependency: transitive - description: - name: path - sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" - url: "https://pub.dev" - source: hosted - version: "1.8.3" - path_provider_linux: - dependency: transitive - description: - name: path_provider_linux - sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57 - url: "https://pub.dev" - source: hosted - version: "2.1.11" - path_provider_platform_interface: - dependency: transitive - description: - name: path_provider_platform_interface - sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec" - url: "https://pub.dev" - source: hosted - version: "2.0.6" - path_provider_windows: - dependency: transitive - description: - name: path_provider_windows - sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96" - url: "https://pub.dev" - source: hosted - version: "2.1.7" - platform: - dependency: transitive - description: - name: platform - sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" - url: "https://pub.dev" - source: hosted - version: "3.1.0" - plugin_platform_interface: - dependency: transitive - description: - name: plugin_platform_interface - sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - provider: - dependency: "direct main" - description: - name: provider - sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f - url: "https://pub.dev" - source: hosted - version: "6.0.5" - shared_preferences: - dependency: "direct main" - description: - name: shared_preferences - sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1" - url: "https://pub.dev" - source: hosted - version: "2.2.0" - shared_preferences_android: - dependency: transitive - description: - name: shared_preferences_android - sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076 - url: "https://pub.dev" - source: hosted - version: "2.2.0" - shared_preferences_foundation: - dependency: transitive - description: - name: shared_preferences_foundation - sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4 - url: "https://pub.dev" - source: hosted - version: "2.3.2" - shared_preferences_linux: - dependency: transitive - description: - name: shared_preferences_linux - sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1" - url: "https://pub.dev" - source: hosted - version: "2.3.0" - shared_preferences_platform_interface: - dependency: transitive - description: - name: shared_preferences_platform_interface - sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1" - url: "https://pub.dev" - source: hosted - version: "2.3.0" - shared_preferences_web: - dependency: transitive - description: - name: shared_preferences_web - sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a" - url: "https://pub.dev" - source: hosted - version: "2.2.0" - shared_preferences_windows: - dependency: transitive - description: - name: shared_preferences_windows - sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d - url: "https://pub.dev" - source: hosted - version: "2.3.0" - sky_engine: - dependency: transitive - description: flutter - source: sdk - version: "0.0.99" - source_span: - dependency: transitive - description: - name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.dev" - source: hosted - version: "1.9.1" - stack_trace: - dependency: transitive - description: - name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.dev" - source: hosted - version: "1.11.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.dev" - source: hosted - version: "2.1.1" - string_scanner: - dependency: transitive - description: - name: string_scanner - sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" - source: hosted - version: "1.2.0" - term_glyph: - dependency: transitive - description: - name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb - url: "https://pub.dev" - source: hosted - version: "0.5.1" - typed_data: - dependency: transitive - description: - name: typed_data - sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c - url: "https://pub.dev" - source: hosted - version: "1.3.2" - url_launcher: - dependency: "direct main" - description: - name: url_launcher - sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e" - url: "https://pub.dev" - source: hosted - version: "6.1.12" - url_launcher_android: - dependency: transitive - description: - name: url_launcher_android - sha256: "15f5acbf0dce90146a0f5a2c4a002b1814a6303c4c5c075aa2623b2d16156f03" - url: "https://pub.dev" - source: hosted - version: "6.0.36" - url_launcher_ios: - dependency: transitive - description: - name: url_launcher_ios - sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" - url: "https://pub.dev" - source: hosted - version: "6.1.4" - url_launcher_linux: - dependency: transitive - description: - name: url_launcher_linux - sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" - url: "https://pub.dev" - source: hosted - version: "3.0.5" - url_launcher_macos: - dependency: transitive - description: - name: url_launcher_macos - sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1" - url: "https://pub.dev" - source: hosted - version: "3.0.6" - url_launcher_platform_interface: - dependency: transitive - description: - name: url_launcher_platform_interface - sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea - url: "https://pub.dev" - source: hosted - version: "2.1.3" - url_launcher_web: - dependency: transitive - description: - name: url_launcher_web - sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4 - url: "https://pub.dev" - source: hosted - version: "2.0.18" - url_launcher_windows: - dependency: transitive - description: - name: url_launcher_windows - sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422" - url: "https://pub.dev" - source: hosted - version: "3.0.7" - vector_math: - dependency: transitive - description: - name: vector_math - sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" - source: hosted - version: "2.1.4" - web_scraper: - dependency: "direct main" - description: - name: web_scraper - sha256: "34d41de25c1aaeeca2cd91c1d062ee3126f59db6c84ec32da17d44d082ecc177" - url: "https://pub.dev" - source: hosted - version: "0.1.4" - win32: - dependency: transitive - description: - name: win32 - sha256: dfdf0136e0aa7a1b474ea133e67cb0154a0acd2599c4f3ada3b49d38d38793ee - url: "https://pub.dev" - source: hosted - version: "5.0.5" - xdg_directories: - dependency: transitive - description: - name: xdg_directories - sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff - url: "https://pub.dev" - source: hosted - version: "1.0.1" -sdks: - dart: ">=3.0.0 <4.0.0" - flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml deleted file mode 100644 index 5db48ab..0000000 --- a/pubspec.yaml +++ /dev/null @@ -1,90 +0,0 @@ -name: lyricsgrabbr -description: App that listens to your notifications and provides lyrics for the currently playing song. - -# The following line prevents the package from being accidentally published to -# pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev - -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 0.3.5+4 - -environment: - sdk: ">=3.0.0 <4.0.0" - -# Dependencies specify other packages that your package needs in order to work. -# To automatically upgrade your package dependencies to the latest versions -# consider running `flutter pub upgrade --major-versions`. Alternatively, -# dependencies can be manually updated by changing the version numbers below to -# the latest version available on pub.dev. To see which dependencies have newer -# versions available, run `flutter pub outdated`. -dependencies: - flutter: - sdk: flutter - - http: ^0.13.4 - url_launcher: ^6.0.20 - web_scraper: ^0.1.4 - shared_preferences: ^2.0.15 - provider: ^6.0.3 - -dev_dependencies: - flutter_test: - sdk: flutter - - # The "flutter_lints" package below contains a set of recommended lints to - # encourage good coding practices. The lint set provided by the package is - # activated in the `analysis_options.yaml` file located at the root of your - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. - flutter_lints: ^2.0.2 - -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter. -flutter: - - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. - uses-material-design: true - - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..cf28755 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,18 @@ +pluginManagement { + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + +rootProject.name = "Lyrics Grabbr" +include(":app") + \ No newline at end of file