Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37b5ca8917
|
||
|
|
6b64ead713
|
||
|
|
841629c6e3 | ||
|
|
c028c23a8c | ||
|
|
52634a98e4 | ||
|
|
f5afb3b25c | ||
|
|
92c610a761 | ||
|
|
0069f62115 | ||
|
|
a40cf85925
|
||
|
|
1d6e533106
|
||
|
|
af9d9c5569 | ||
|
|
1417eef23c
|
||
|
|
cd39204f6a
|
||
|
|
edc1f3a88b
|
||
|
|
0d96d906a4
|
||
|
|
55025d6d11 |
@@ -1,46 +1,110 @@
|
|||||||
# Miscellaneous
|
|
||||||
*.class
|
|
||||||
*.log
|
|
||||||
*.pyc
|
|
||||||
*.swp
|
|
||||||
.DS_Store
|
|
||||||
.atom/
|
|
||||||
.buildlog/
|
|
||||||
.history
|
|
||||||
.svn/
|
|
||||||
|
|
||||||
# IntelliJ related
|
|
||||||
*.iml
|
*.iml
|
||||||
*.ipr
|
.gradle
|
||||||
*.iws
|
/local.properties
|
||||||
.idea/
|
/.idea/caches
|
||||||
|
/.idea/libraries
|
||||||
|
/.idea/modules.xml
|
||||||
|
/.idea/workspace.xml
|
||||||
|
/.idea/navEditor.xml
|
||||||
|
/.idea/assetWizardSettings.xml
|
||||||
|
.DS_Store
|
||||||
|
/build
|
||||||
|
/captures
|
||||||
|
.externalNativeBuild
|
||||||
|
.cxx
|
||||||
|
|
||||||
# The .vscode folder contains launch configuration and tasks you configure in
|
.idea
|
||||||
# VS Code which you may wish to be included in version control, so this line
|
Release*
|
||||||
# is commented out by default.
|
keystore.properties
|
||||||
#.vscode/
|
output.json
|
||||||
|
|
||||||
# Flutter/Dart/Pub related
|
# Built application files
|
||||||
**/doc/api/
|
*.apk
|
||||||
**/ios/Flutter/.last_build_id
|
*.ap_
|
||||||
.dart_tool/
|
|
||||||
.flutter-plugins
|
|
||||||
.flutter-plugins-dependencies
|
|
||||||
.packages
|
|
||||||
.pub-cache/
|
|
||||||
.pub/
|
|
||||||
/build/
|
|
||||||
|
|
||||||
# Web related
|
# Files for the Dalvik VM
|
||||||
lib/generated_plugin_registrant.dart
|
*.dex
|
||||||
|
|
||||||
# Symbolication related
|
# Java class files
|
||||||
app.*.symbols
|
*.class
|
||||||
|
|
||||||
# Obfuscation related
|
# Generated files
|
||||||
app.*.map.json
|
bin/
|
||||||
|
gen/
|
||||||
|
out/
|
||||||
|
|
||||||
# Android Studio will place build artifacts here
|
# Gradle files
|
||||||
/android/app/debug
|
.gradle/
|
||||||
/android/app/profile
|
build/
|
||||||
/android/app/release
|
|
||||||
|
# Local configuration file (sdk path, etc)
|
||||||
|
local.properties
|
||||||
|
|
||||||
|
# Proguard folder generated by Eclipse
|
||||||
|
proguard/
|
||||||
|
|
||||||
|
# Log Files
|
||||||
|
*.log
|
||||||
|
|
||||||
|
# Android Studio Navigation editor temp files
|
||||||
|
.navigation/
|
||||||
|
|
||||||
|
# Android Studio captures folder
|
||||||
|
captures/
|
||||||
|
|
||||||
|
# Intellij
|
||||||
|
*.iml
|
||||||
|
|
||||||
|
# Keystore files
|
||||||
|
*.jks
|
||||||
|
|
||||||
|
# =========================
|
||||||
|
# Operating System Files
|
||||||
|
# =========================
|
||||||
|
|
||||||
|
# OSX
|
||||||
|
# =========================
|
||||||
|
|
||||||
|
.DS_Store
|
||||||
|
.AppleDouble
|
||||||
|
.LSOverride
|
||||||
|
|
||||||
|
# Thumbnails
|
||||||
|
._*
|
||||||
|
|
||||||
|
# Files that might appear in the root of a volume
|
||||||
|
.DocumentRevisions-V100
|
||||||
|
.fseventsd
|
||||||
|
.Spotlight-V100
|
||||||
|
.TemporaryItems
|
||||||
|
.Trashes
|
||||||
|
.VolumeIcon.icns
|
||||||
|
|
||||||
|
# Directories potentially created on remote AFP share
|
||||||
|
.AppleDB
|
||||||
|
.AppleDesktop
|
||||||
|
Network Trash Folder
|
||||||
|
Temporary Items
|
||||||
|
.apdisk
|
||||||
|
|
||||||
|
# Windows
|
||||||
|
# =========================
|
||||||
|
|
||||||
|
# Windows image file caches
|
||||||
|
Thumbs.db
|
||||||
|
ehthumbs.db
|
||||||
|
|
||||||
|
# Folder config file
|
||||||
|
Desktop.ini
|
||||||
|
|
||||||
|
# Recycle Bin used on file shares
|
||||||
|
$RECYCLE.BIN/
|
||||||
|
|
||||||
|
# Windows Installer files
|
||||||
|
*.cab
|
||||||
|
*.msi
|
||||||
|
*.msm
|
||||||
|
*.msp
|
||||||
|
|
||||||
|
# Windows shortcuts
|
||||||
|
*.lnk
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -1,6 +1,10 @@
|
|||||||
# lyricsgrabbr
|
# lyricsgrabbr
|
||||||
App that listens to your notifications and provides lyrics for the currently playing song.
|
App that listens to your notifications and provides lyrics for the currently playing song.
|
||||||
|
|
||||||
|
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
|
||||||
|
alt="Get it on F-Droid"
|
||||||
|
height="80">](https://f-droid.org/packages/com.illusionman1212.lyricsgrabbr/)
|
||||||
|
|
||||||
## Supported players
|
## Supported players
|
||||||
Any player that uses the MediaSession API _should_ be supported
|
Any player that uses the MediaSession API _should_ be supported
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
@@ -1,84 +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'
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
package="com.illusionman1212.lyricsgrabbr">
|
|
||||||
<!-- Flutter needs it to communicate with the running application
|
|
||||||
to allow setting breakpoints, to provide hot reload, etc.
|
|
||||||
-->
|
|
||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
|
||||||
</manifest>
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
package="com.illusionman1212.lyricsgrabbr">
|
|
||||||
|
|
||||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
|
||||||
|
|
||||||
<queries>
|
|
||||||
<intent>
|
|
||||||
<action android:name="android.intent.action.VIEW" />
|
|
||||||
<category android:name="android.intent.category.BROWSABLE" />
|
|
||||||
<data android:scheme="https" />
|
|
||||||
</intent>
|
|
||||||
</queries>
|
|
||||||
<application
|
|
||||||
android:label="Lyrics Grabbr"
|
|
||||||
android:name="${applicationName}"
|
|
||||||
android:icon="@mipmap/ic_launcher">
|
|
||||||
<activity
|
|
||||||
android:name=".MainActivity"
|
|
||||||
android:exported="true"
|
|
||||||
android:launchMode="singleTop"
|
|
||||||
android:theme="@style/LaunchTheme"
|
|
||||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
|
|
||||||
android:hardwareAccelerated="true"
|
|
||||||
android:windowSoftInputMode="adjustResize">
|
|
||||||
<!-- Specifies an Android theme to apply to this Activity as soon as
|
|
||||||
the Android process has started. This theme is visible to the user
|
|
||||||
while the Flutter UI initializes. After that, this theme continues
|
|
||||||
to determine the Window background behind the Flutter UI. -->
|
|
||||||
<meta-data
|
|
||||||
android:name="io.flutter.embedding.android.NormalTheme"
|
|
||||||
android:resource="@style/NormalTheme"
|
|
||||||
/>
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.MAIN"/>
|
|
||||||
<category android:name="android.intent.category.LAUNCHER"/>
|
|
||||||
</intent-filter>
|
|
||||||
</activity>
|
|
||||||
<service
|
|
||||||
android:label="Lyrics Grabbr Notifications Listener"
|
|
||||||
android:name=".NotificationListener"
|
|
||||||
android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
|
|
||||||
android:exported="false">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.service.notification.NotificationListenerService" />
|
|
||||||
</intent-filter>
|
|
||||||
</service>
|
|
||||||
<!-- Don't delete the meta-data below.
|
|
||||||
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
|
||||||
<meta-data
|
|
||||||
android:name="flutterEmbedding"
|
|
||||||
android:value="2" />
|
|
||||||
</application>
|
|
||||||
</manifest>
|
|
||||||
@@ -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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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<String, Any>()
|
|
||||||
map["packageName"] = packageName!!
|
|
||||||
map["packageMessage"] = packageMessage!!
|
|
||||||
map["packageText"] = packageText!!
|
|
||||||
map["packagePlaybackState"] = packagePlaybackState
|
|
||||||
map["packageDuration"] = packageDuration
|
|
||||||
eventSink?.success(map)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
|
|
||||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
|
|
||||||
|
|
||||||
<!-- The background color -->
|
|
||||||
<item android:drawable="@drawable/ic_launcher_background"/>
|
|
||||||
|
|
||||||
<!-- App logo -->
|
|
||||||
<item
|
|
||||||
android:drawable="@drawable/ic_launcher_foreground"
|
|
||||||
android:gravity="center"
|
|
||||||
android:width="400dp"
|
|
||||||
android:height="400dp" />
|
|
||||||
|
|
||||||
</layer-list>
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
|
|
||||||
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
|
|
||||||
<!-- Show a splash screen on the activity. Automatically removed when
|
|
||||||
Flutter draws its first frame -->
|
|
||||||
<item name="android:windowBackground">@drawable/launch_background</item>
|
|
||||||
</style>
|
|
||||||
<!-- Theme applied to the Android Window as soon as the process has started.
|
|
||||||
This theme determines the color of the Android Window while your
|
|
||||||
Flutter UI initializes, as well as behind your Flutter UI while its
|
|
||||||
running.
|
|
||||||
|
|
||||||
This Theme is only used starting with V2 of Flutter's Android embedding. -->
|
|
||||||
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
|
|
||||||
<item name="android:windowBackground">?android:colorBackground</item>
|
|
||||||
</style>
|
|
||||||
</resources>
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
|
|
||||||
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
|
|
||||||
<!-- Show a splash screen on the activity. Automatically removed when
|
|
||||||
Flutter draws its first frame -->
|
|
||||||
<item name="android:windowBackground">@drawable/ic_launcher_background</item>
|
|
||||||
</style>
|
|
||||||
<!-- Theme applied to the Android Window as soon as the process has started.
|
|
||||||
This theme determines the color of the Android Window while your
|
|
||||||
Flutter UI initializes, as well as behind your Flutter UI while its
|
|
||||||
running.
|
|
||||||
|
|
||||||
This Theme is only used starting with V2 of Flutter's Android embedding. -->
|
|
||||||
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
|
|
||||||
<item name="android:windowBackground">?android:colorBackground</item>
|
|
||||||
</style>
|
|
||||||
</resources>
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
package="com.illusionman1212.lyricsgrabbr">
|
|
||||||
<!-- Flutter needs it to communicate with the running application
|
|
||||||
to allow setting breakpoints, to provide hot reload, etc.
|
|
||||||
-->
|
|
||||||
<uses-permission android:name="android.permission.INTERNET"/>
|
|
||||||
</manifest>
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
buildscript {
|
|
||||||
ext.kotlin_version = '1.6.10'
|
|
||||||
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
|
|
||||||
}
|
|
||||||
@@ -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
|
|
||||||
@@ -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"
|
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
/build
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
import java.io.FileInputStream
|
||||||
|
import java.util.Properties
|
||||||
|
import com.android.build.api.variant.FilterConfiguration.FilterType.ABI
|
||||||
|
|
||||||
|
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()) {
|
||||||
|
keystoreProperties.load(FileInputStream(keystorePropertiesFile))
|
||||||
|
}
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace = "com.illusionman1212.lyricsgrabbr"
|
||||||
|
compileSdk = 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
applicationId = "com.illusionman1212.lyricsgrabbr"
|
||||||
|
minSdk = 23
|
||||||
|
targetSdk = 34
|
||||||
|
versionCode = 6
|
||||||
|
versionName = "1.0.0"
|
||||||
|
|
||||||
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
vectorDrawables {
|
||||||
|
useSupportLibrary = true
|
||||||
|
}
|
||||||
|
signingConfig = signingConfigs.getByName("debug")
|
||||||
|
|
||||||
|
// https://developer.android.com/guide/topics/resources/app-languages#gradle-config
|
||||||
|
resourceConfigurations.plus(listOf("en", "ar"))
|
||||||
|
}
|
||||||
|
|
||||||
|
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")
|
||||||
|
|
||||||
|
// https://developer.android.com/build/configure-apk-splits#configure-abi-split
|
||||||
|
splits {
|
||||||
|
abi {
|
||||||
|
// Enables building multiple APKs per ABI.
|
||||||
|
isEnable = true
|
||||||
|
// By default all ABIs are included, so use reset() and include to specify that we only
|
||||||
|
// want APKs for armeabi-v7a, arm64-v8a, x86 and x86_64.
|
||||||
|
// Resets the list of ABIs that Gradle should create APKs for to none.
|
||||||
|
reset()
|
||||||
|
include("x86_64", "x86", "armeabi-v7a", "arm64-v8a")
|
||||||
|
|
||||||
|
isUniversalApk = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
|
}
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = "17"
|
||||||
|
}
|
||||||
|
buildFeatures {
|
||||||
|
compose = true
|
||||||
|
}
|
||||||
|
composeOptions {
|
||||||
|
kotlinCompilerExtensionVersion = "1.5.1"
|
||||||
|
}
|
||||||
|
|
||||||
|
androidComponents {
|
||||||
|
val abiVersionCodes = mapOf(
|
||||||
|
"x86_64" to 1,
|
||||||
|
"x86" to 2,
|
||||||
|
"armeabi-v7a" to 3,
|
||||||
|
"arm64-v8a" to 4,
|
||||||
|
)
|
||||||
|
|
||||||
|
onVariants { variant ->
|
||||||
|
// Assigns a different version code for each output APK
|
||||||
|
// other than the universal APK.
|
||||||
|
variant.outputs.forEach { output ->
|
||||||
|
val name = output.filters.find { it.filterType == ABI }?.identifier
|
||||||
|
|
||||||
|
// Stores the value of abiCodes that is associated with the ABI for this variant.
|
||||||
|
val abiCode = abiVersionCodes[name] ?: 0
|
||||||
|
// Assigns the new version code to output.versionCode, which changes the version code
|
||||||
|
// for only the output APK, not for the variant itself.
|
||||||
|
output.versionCode.set((output.versionCode.get() ?: 0) * 10 + abiCode)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
|
||||||
|
implementation("androidx.core:core-ktx:1.13.1")
|
||||||
|
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.3")
|
||||||
|
implementation("androidx.lifecycle:lifecycle-runtime-compose:2.8.3")
|
||||||
|
implementation("androidx.activity:activity-compose:1.9.0")
|
||||||
|
implementation(platform("androidx.compose:compose-bom:2024.06.00"))
|
||||||
|
implementation("androidx.compose.ui:ui")
|
||||||
|
implementation("androidx.compose.ui:ui-graphics")
|
||||||
|
implementation("androidx.compose.ui:ui-tooling-preview")
|
||||||
|
implementation("androidx.compose.material3:material3:1.2.1")
|
||||||
|
implementation("com.google.android.material:material:1.12.0")
|
||||||
|
implementation("androidx.compose.material:material-icons-extended:1.6.8")
|
||||||
|
implementation("androidx.core:core-splashscreen:1.0.1")
|
||||||
|
implementation("androidx.navigation:navigation-compose:2.7.7")
|
||||||
|
implementation("androidx.datastore:datastore-preferences:1.1.1")
|
||||||
|
implementation("com.squareup.okhttp3:okhttp:4.12.0")
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.2")
|
||||||
|
implementation("io.coil-kt:coil:2.6.0")
|
||||||
|
implementation("io.coil-kt:coil-compose:2.6.0")
|
||||||
|
implementation("org.jsoup:jsoup:1.17.2")
|
||||||
|
|
||||||
|
testImplementation("junit:junit:4.13.2")
|
||||||
|
androidTestImplementation("androidx.test.ext:junit:1.2.1")
|
||||||
|
androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
|
||||||
|
androidTestImplementation(platform("androidx.compose:compose-bom:2024.06.00"))
|
||||||
|
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
|
||||||
|
debugImplementation("androidx.compose.ui:ui-tooling")
|
||||||
|
debugImplementation("androidx.compose.ui:ui-test-manifest")
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# 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
|
||||||
|
|
||||||
|
-dontwarn org.slf4j.impl.StaticLoggerBinder
|
||||||
@@ -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)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||||
|
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||||
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
|
||||||
|
|
||||||
|
<application
|
||||||
|
android:name=".LGApp"
|
||||||
|
android:allowBackup="true"
|
||||||
|
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||||
|
android:fullBackupContent="@xml/backup_rules"
|
||||||
|
android:localeConfig="@xml/locales_config"
|
||||||
|
android:icon="@mipmap/ic_launcher"
|
||||||
|
android:label="@string/app_name"
|
||||||
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
|
android:supportsRtl="true"
|
||||||
|
android:theme="@style/Theme.LyricsGrabbr"
|
||||||
|
tools:targetApi="34">
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name=".MainActivity"
|
||||||
|
android:configChanges="screenSize|screenLayout|keyboardHidden|orientation|locale"
|
||||||
|
android:exported="true"
|
||||||
|
android:theme="@style/Theme.LyricsGrabbr.Splash"
|
||||||
|
>
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
|
</intent-filter>
|
||||||
|
</activity>
|
||||||
|
|
||||||
|
<service
|
||||||
|
android:label="Lyrics Grabbr Notifications Listener"
|
||||||
|
android:name=".NotificationListener"
|
||||||
|
android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
|
||||||
|
android:foregroundServiceType="specialUse"
|
||||||
|
android:exported="false">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="android.service.notification.NotificationListenerService" />
|
||||||
|
</intent-filter>
|
||||||
|
<property
|
||||||
|
android:name="android.app.NOTIFICATION_LISTENER"
|
||||||
|
android:value="Media playback notification listener service" />
|
||||||
|
</service>
|
||||||
|
<service
|
||||||
|
android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
|
||||||
|
android:enabled="false"
|
||||||
|
android:exported="false"
|
||||||
|
>
|
||||||
|
<meta-data
|
||||||
|
android:name="autoStoreLocales"
|
||||||
|
android:value="true"
|
||||||
|
/>
|
||||||
|
</service>
|
||||||
|
</application>
|
||||||
|
</manifest>
|
||||||
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
@@ -0,0 +1,28 @@
|
|||||||
|
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.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<Preferences> by preferencesDataStore(
|
||||||
|
name = PREFERENCES_NAME
|
||||||
|
)
|
||||||
|
|
||||||
|
class LGApp: Application() {
|
||||||
|
lateinit var settingsPreferencesRepository: SettingsPreferencesRepository
|
||||||
|
lateinit var homeRepository: HomeRepository
|
||||||
|
lateinit var lyricsRepository: LyricsRepository
|
||||||
|
|
||||||
|
override fun onCreate() {
|
||||||
|
super.onCreate()
|
||||||
|
settingsPreferencesRepository = SettingsPreferencesRepository(dataStore)
|
||||||
|
homeRepository = HomeRepository(applicationContext)
|
||||||
|
lyricsRepository = LyricsRepository()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,188 @@
|
|||||||
|
package com.illusionman1212.lyricsgrabbr
|
||||||
|
|
||||||
|
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.appcompat.app.AppCompatActivity
|
||||||
|
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.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,
|
||||||
|
)
|
||||||
|
|
||||||
|
class MainActivity : AppCompatActivity() {
|
||||||
|
private var lastNotification: MutableStateFlow<NotificationEvent?> = MutableStateFlow(null)
|
||||||
|
private var isReceiverRunning = false
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
installSplashScreen()
|
||||||
|
enableEdgeToEdge()
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
setContent {
|
||||||
|
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 {
|
||||||
|
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,
|
||||||
|
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() {
|
||||||
|
if (!isPermissionGranted() || isReceiverRunning) {
|
||||||
|
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)
|
||||||
|
isReceiverRunning = true
|
||||||
|
}
|
||||||
|
|
||||||
|
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 notifPackageName = intent.getStringExtra(NotificationListener.NOTIFICATION_PACKAGE_NAME)
|
||||||
|
|
||||||
|
lastNotification.update { NotificationEvent(
|
||||||
|
title = songTitle!!,
|
||||||
|
artist = artist!!,
|
||||||
|
playbackState = playbackState,
|
||||||
|
packageName = notifPackageName!!,
|
||||||
|
) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,33 +1,31 @@
|
|||||||
package com.illusionman1212.lyricsgrabbr
|
package com.illusionman1212.lyricsgrabbr
|
||||||
|
|
||||||
|
import android.Manifest.permission.POST_NOTIFICATIONS
|
||||||
import android.app.Notification
|
import android.app.Notification
|
||||||
import android.app.NotificationChannel
|
import android.app.NotificationChannel
|
||||||
import android.app.NotificationManager
|
import android.app.NotificationManager
|
||||||
import android.app.PendingIntent
|
import android.app.PendingIntent
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
|
import android.content.pm.PackageManager.PERMISSION_GRANTED
|
||||||
import android.media.MediaMetadata
|
import android.media.MediaMetadata
|
||||||
import android.media.session.MediaController
|
import android.media.session.MediaController
|
||||||
import android.media.session.MediaSession
|
import android.media.session.MediaSession
|
||||||
import android.media.session.PlaybackState
|
import android.media.session.PlaybackState
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.Handler
|
|
||||||
import android.service.notification.NotificationListenerService
|
import android.service.notification.NotificationListenerService
|
||||||
import android.service.notification.StatusBarNotification
|
import android.service.notification.StatusBarNotification
|
||||||
import android.util.Log
|
|
||||||
import androidx.core.app.NotificationCompat
|
import androidx.core.app.NotificationCompat
|
||||||
import androidx.core.app.NotificationManagerCompat
|
import androidx.core.app.NotificationManagerCompat
|
||||||
|
import androidx.core.content.ContextCompat
|
||||||
|
import androidx.core.os.BundleCompat
|
||||||
|
import androidx.localbroadcastmanager.content.LocalBroadcastManager
|
||||||
|
|
||||||
|
class NotificationListener: NotificationListenerService() {
|
||||||
/**
|
|
||||||
* Notification listening service. Intercepts notifications if permission is given to do so.
|
|
||||||
*/
|
|
||||||
class NotificationListener : NotificationListenerService() {
|
|
||||||
private var notificationManager : NotificationManagerCompat? = null
|
private var notificationManager : NotificationManagerCompat? = null
|
||||||
|
|
||||||
override fun onCreate() {
|
override fun onCreate() {
|
||||||
super.onCreate()
|
super.onCreate()
|
||||||
Log.d("onCreate Service", "creating service")
|
|
||||||
|
|
||||||
initNotificationChannels(this)
|
initNotificationChannels(this)
|
||||||
notificationManager = NotificationManagerCompat.from(applicationContext)
|
notificationManager = NotificationManagerCompat.from(applicationContext)
|
||||||
@@ -37,7 +35,6 @@ class NotificationListener : NotificationListenerService() {
|
|||||||
if (intent != null) {
|
if (intent != null) {
|
||||||
when (intent.action) {
|
when (intent.action) {
|
||||||
START_FOREGROUND_SERVICE_ACTION -> {
|
START_FOREGROUND_SERVICE_ACTION -> {
|
||||||
Log.d("START", "starting foreground service")
|
|
||||||
startForegroundService()
|
startForegroundService()
|
||||||
getCurrentNotifications(applicationContext)
|
getCurrentNotifications(applicationContext)
|
||||||
}
|
}
|
||||||
@@ -60,31 +57,25 @@ class NotificationListener : NotificationListenerService() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun getStopServiceNotificationAction(): PendingIntent {
|
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.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE)
|
||||||
return pendingIntent
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun startForegroundService() {
|
private fun startForegroundService() {
|
||||||
val notification: Notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
|
startForeground(NOTIFICATION_ID, getInitialNotification())
|
||||||
.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
|
|
||||||
startForeground(NOTIFICATION_ID, notification)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun stopForegroundService() {
|
private fun stopForegroundService() {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
|
||||||
|
stopForeground(STOP_FOREGROUND_REMOVE)
|
||||||
|
} else {
|
||||||
stopForeground(true)
|
stopForeground(true)
|
||||||
|
}
|
||||||
stopSelf()
|
stopSelf()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun initNotificationChannels(context: Context) {
|
private fun initNotificationChannels(context: Context) {
|
||||||
if (Build.VERSION.SDK_INT < 26) {
|
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
val notificationManager =
|
val notificationManager =
|
||||||
@@ -105,73 +96,74 @@ class NotificationListener : NotificationListenerService() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun sendNotificationBroadcast(sbn: StatusBarNotification, context: Context) {
|
private fun getInitialNotification(): Notification {
|
||||||
// get the media session stuff
|
|
||||||
val mediaSessionToken = sbn.notification.extras.getParcelable<MediaSession.Token>(Notification.EXTRA_MEDIA_SESSION)
|
|
||||||
if (mediaSessionToken == null) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val mediaCtrl = mediaSessionToken.let { MediaController(context, it) }
|
|
||||||
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()
|
|
||||||
// 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_DURATION, duration)
|
|
||||||
intent.putExtra(NOTIFICATION_PACKAGE_PLAYBACK_STATE, playbackState)
|
|
||||||
|
|
||||||
if (playbackState == PlaybackState.STATE_PAUSED) {
|
|
||||||
val notification: Notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
|
val notification: Notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
|
||||||
.setContentTitle("Service Running")
|
.setContentTitle(resources.getString(R.string.service_running))
|
||||||
.setContentText("Play some songs on a supported player to get lyrics")
|
.setContentText(resources.getString(R.string.service_notif_desc_init))
|
||||||
.setSmallIcon(R.drawable.ic_notification)
|
.setSmallIcon(R.drawable.ic_notification)
|
||||||
.setShowWhen(false)
|
.setShowWhen(false)
|
||||||
.addAction(R.drawable.ic_notification, "Stop Service", getStopServiceNotificationAction())
|
.addAction(R.drawable.ic_notification, resources.getString(R.string.stop_service), getStopServiceNotificationAction())
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
notification.flags = Notification.FLAG_FOREGROUND_SERVICE
|
notification.flags = Notification.FLAG_FOREGROUND_SERVICE
|
||||||
notificationManager?.notify(NOTIFICATION_ID, notification)
|
|
||||||
|
return notification
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun sendNotificationBroadcast(sbn: StatusBarNotification, context: Context) {
|
||||||
|
if (ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS) != PERMISSION_GRANTED) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val mediaSessionToken = BundleCompat.getParcelable(sbn.notification.extras, Notification.EXTRA_MEDIA_SESSION, MediaSession.Token::class.java)
|
||||||
|
?: return
|
||||||
|
|
||||||
|
val mediaCtrl = MediaController(context, mediaSessionToken)
|
||||||
|
val playbackState = mediaCtrl.playbackState?.state
|
||||||
|
val albumArt = mediaCtrl.metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART)
|
||||||
|
|
||||||
|
// Retrieve extra object from notification to extract payload.
|
||||||
|
val extras = sbn.notification.extras
|
||||||
|
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, sbn.packageName)
|
||||||
|
intent.putExtra(NOTIFICATION_PACKAGE_ARTIST, packageArtist)
|
||||||
|
intent.putExtra(NOTIFICATION_PACKAGE_SONG_TITLE, packageSongTitle)
|
||||||
|
intent.putExtra(NOTIFICATION_PACKAGE_PLAYBACK_STATE, playbackState)
|
||||||
|
|
||||||
|
if (playbackState == PlaybackState.STATE_PAUSED) {
|
||||||
|
notificationManager?.notify(NOTIFICATION_ID, getInitialNotification())
|
||||||
} else {
|
} else {
|
||||||
val notificationIntent = Intent(this, MainActivity::class.java).apply {
|
val notificationIntent = Intent(this, MainActivity::class.java).apply {
|
||||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
|
flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
|
||||||
}
|
}
|
||||||
val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
|
val pendingIntent = PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
|
||||||
val notification: Notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
|
val notification: Notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
|
||||||
.setContentTitle("Playing [${packageText}] By [${packageMessage}]")
|
.setContentTitle(resources.getString(R.string.now_playing, "[${packageSongTitle}]", "[${packageArtist}]"))
|
||||||
.setContentText("Tap to get lyrics")
|
.setContentText(resources.getString(R.string.service_notif_desc_playing))
|
||||||
.setSmallIcon(R.drawable.ic_notification)
|
.setSmallIcon(R.drawable.ic_notification)
|
||||||
.setLargeIcon(albumArt)
|
.setLargeIcon(albumArt)
|
||||||
.setShowWhen(false)
|
.setShowWhen(false)
|
||||||
.setContentIntent(pendingIntent)
|
.setContentIntent(pendingIntent)
|
||||||
.addAction(R.drawable.ic_notification, "Stop Service", getStopServiceNotificationAction())
|
.addAction(R.drawable.ic_notification, resources.getString(R.string.stop_service), getStopServiceNotificationAction())
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
notification.flags = Notification.FLAG_FOREGROUND_SERVICE
|
notification.flags = Notification.FLAG_FOREGROUND_SERVICE
|
||||||
notificationManager?.notify(NOTIFICATION_ID, notification)
|
notificationManager?.notify(NOTIFICATION_ID, notification)
|
||||||
}
|
}
|
||||||
|
|
||||||
sendBroadcast(intent)
|
LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(intent)
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
const val NOTIFICATION_INTENT = "notification_event"
|
const val NOTIFICATION_INTENT = "notification_event"
|
||||||
const val NOTIFICATION_PACKAGE_NAME = "package_name"
|
const val NOTIFICATION_PACKAGE_NAME = "package_name"
|
||||||
const val NOTIFICATION_PACKAGE_MESSAGE = "package_message"
|
const val NOTIFICATION_PACKAGE_ARTIST = "package_artist"
|
||||||
const val NOTIFICATION_PACKAGE_TEXT = "package_text"
|
const val NOTIFICATION_PACKAGE_SONG_TITLE = "package_song_title"
|
||||||
const val NOTIFICATION_PACKAGE_PLAYBACK_STATE = "package_playback_state"
|
const val NOTIFICATION_PACKAGE_PLAYBACK_STATE = "package_playback_state"
|
||||||
const val NOTIFICATION_PACKAGE_DURATION = "package_duration"
|
const val NOTIFICATION_ID = 1
|
||||||
const val NOTIFICATION_ID = 12251999
|
|
||||||
const val NOTIFICATION_CHANNEL_ID = "Lyrics"
|
const val NOTIFICATION_CHANNEL_ID = "Lyrics"
|
||||||
const val START_FOREGROUND_SERVICE_ACTION = "START_SERVICE"
|
const val START_FOREGROUND_SERVICE_ACTION = "START_SERVICE"
|
||||||
}
|
}
|
||||||
@@ -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")
|
||||||
|
}
|
||||||
|
|
||||||
@@ -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<String?, Boolean> {
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
package com.illusionman1212.lyricsgrabbr.data
|
||||||
|
|
||||||
|
import android.net.Uri
|
||||||
|
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
|
||||||
|
|
||||||
|
class LyricsRepository {
|
||||||
|
fun fetchLyricsFromGenius(url: Uri): String {
|
||||||
|
val doc = Jsoup.connect(url.toString()).userAgent(USER_AGENT).get()
|
||||||
|
val divs = doc.select("div[data-lyrics-container]")
|
||||||
|
|
||||||
|
val lyrics = StringUtil.borrowBuilder()
|
||||||
|
|
||||||
|
divs.forEach {
|
||||||
|
it.traverse(object : NodeVisitor {
|
||||||
|
override fun head(node: Node, depth: Int) {
|
||||||
|
if (node is TextNode) {
|
||||||
|
lyrics.append(node.text().trim())
|
||||||
|
// append space here to get proper spacing when there's a <i> tag or other inline text tags
|
||||||
|
lyrics.append(" ")
|
||||||
|
} else if (node is Element) {
|
||||||
|
if (lyrics.isNotEmpty() && node.normalName() == "br") {
|
||||||
|
lyrics.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 = lyrics.isNotEmpty() && lyrics[lyrics.length - 1] == ' '
|
||||||
|
if (node is Element) {
|
||||||
|
if (node.isBlock && node.nextSibling() is TextNode && !lastCharIsWhitespace) {
|
||||||
|
lyrics.append("\n")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
lyrics.append("\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
return lyrics.toString().replace("\n\n\n", "\n\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
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"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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<Preferences>
|
||||||
|
) {
|
||||||
|
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,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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() }
|
||||||
|
}
|
||||||
@@ -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()
|
||||||
|
}
|
||||||
@@ -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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
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.Text
|
||||||
|
import androidx.compose.material3.TooltipBox
|
||||||
|
import androidx.compose.material3.TooltipDefaults
|
||||||
|
import androidx.compose.material3.rememberTooltipState
|
||||||
|
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
|
||||||
|
) {
|
||||||
|
val tooltipState = rememberTooltipState()
|
||||||
|
|
||||||
|
Layout(
|
||||||
|
content = {
|
||||||
|
TooltipBox(
|
||||||
|
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
|
||||||
|
tooltip = {
|
||||||
|
Text(text = tooltip)
|
||||||
|
},
|
||||||
|
state = tooltipState,
|
||||||
|
) {
|
||||||
|
IconButton(
|
||||||
|
onClick = onClick,
|
||||||
|
content = 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()
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
@@ -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)
|
||||||
|
}
|
||||||
@@ -0,0 +1,539 @@
|
|||||||
|
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.ExperimentalMaterial3Api
|
||||||
|
import androidx.compose.material3.FilledTonalButton
|
||||||
|
import androidx.compose.material3.HorizontalDivider
|
||||||
|
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.ui.components.forwardingPainter
|
||||||
|
import com.illusionman1212.lyricsgrabbr.utils.annotatedStringResource
|
||||||
|
import com.illusionman1212.lyricsgrabbr.viewmodels.LyricsViewModel
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
|
||||||
|
|
||||||
|
@OptIn(ExperimentalMaterial3Api::class)
|
||||||
|
@Composable
|
||||||
|
fun HomePage(
|
||||||
|
navigateToSettings: () -> Unit,
|
||||||
|
navigateToLyrics: () -> Unit,
|
||||||
|
goBack: () -> Unit,
|
||||||
|
homeViewModel: HomeViewModel = viewModel(
|
||||||
|
factory = HomeViewModel.Factory,
|
||||||
|
),
|
||||||
|
lyricsViewModel: LyricsViewModel,
|
||||||
|
lastNotification: MutableStateFlow<NotificationEvent?>
|
||||||
|
) {
|
||||||
|
val context = LocalContext.current
|
||||||
|
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 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
|
||||||
|
|
||||||
|
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) {
|
||||||
|
homeViewModel.setSong(song)
|
||||||
|
|
||||||
|
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)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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<SearchResult>,
|
||||||
|
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())
|
||||||
|
HorizontalDivider()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@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 = {},
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
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.CompositionLocalProvider
|
||||||
|
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.platform.LocalLayoutDirection
|
||||||
|
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.LayoutDirection
|
||||||
|
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.utils.mirror
|
||||||
|
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) {
|
||||||
|
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(
|
||||||
|
modifier = Modifier.mirror(),
|
||||||
|
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.error != null) {
|
||||||
|
Text(
|
||||||
|
uiState.error,
|
||||||
|
style = MaterialTheme.typography.bodyMedium,
|
||||||
|
modifier = Modifier.padding(bottom = 32.dp)
|
||||||
|
)
|
||||||
|
} else if (uiState.lyrics.isEmpty()) {
|
||||||
|
Instrumental()
|
||||||
|
} else {
|
||||||
|
|
||||||
|
CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {
|
||||||
|
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
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,317 @@
|
|||||||
|
package com.illusionman1212.lyricsgrabbr.ui.screens
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AppCompatDelegate
|
||||||
|
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.lazy.LazyColumn
|
||||||
|
import androidx.compose.material.icons.Icons
|
||||||
|
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||||
|
import androidx.compose.material.icons.filled.Check
|
||||||
|
import androidx.compose.material.icons.outlined.Palette
|
||||||
|
import androidx.compose.material.icons.outlined.Translate
|
||||||
|
import androidx.compose.material3.Icon
|
||||||
|
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.runtime.Composable
|
||||||
|
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.res.stringResource
|
||||||
|
import androidx.compose.ui.text.style.TextOverflow
|
||||||
|
import androidx.compose.ui.unit.dp
|
||||||
|
import androidx.compose.ui.unit.sp
|
||||||
|
import androidx.core.os.LocaleListCompat
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
|
import com.illusionman1212.lyricsgrabbr.R
|
||||||
|
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.getLangPreferenceDropdownEntries
|
||||||
|
import com.illusionman1212.lyricsgrabbr.viewmodels.SettingsState
|
||||||
|
import com.illusionman1212.lyricsgrabbr.viewmodels.SettingsViewModel
|
||||||
|
|
||||||
|
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
|
||||||
|
)
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun SettingsPage(
|
||||||
|
goBack: () -> Unit,
|
||||||
|
viewModel: SettingsViewModel,
|
||||||
|
) {
|
||||||
|
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
|
Scaffold(
|
||||||
|
topBar = {
|
||||||
|
Row(
|
||||||
|
verticalAlignment = Alignment.CenterVertically,
|
||||||
|
horizontalArrangement = Arrangement.spacedBy(4.dp),
|
||||||
|
modifier = Modifier
|
||||||
|
.statusBarsPadding()
|
||||||
|
.padding(vertical = 8.dp, horizontal = 4.dp)
|
||||||
|
.fillMaxWidth(),
|
||||||
|
) {
|
||||||
|
LGIconButton(tooltip = stringResource(id = R.string.go_back), onClick = goBack) {
|
||||||
|
Icon(
|
||||||
|
imageVector = Icons.AutoMirrored.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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun Appearance(viewModel: SettingsViewModel, uiState: SettingsState) {
|
||||||
|
var themeOpenDialog by remember { mutableStateOf(false) }
|
||||||
|
var languageOpenDialog 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 }
|
||||||
|
)
|
||||||
|
DialogSetting(
|
||||||
|
title = stringResource(id = R.string.language),
|
||||||
|
value = AppCompatDelegate.getApplicationLocales()[0]?.let {
|
||||||
|
AppCompatDelegate.getApplicationLocales()[0]?.getDisplayLanguage(
|
||||||
|
it
|
||||||
|
)
|
||||||
|
}
|
||||||
|
?: stringResource(id = R.string._default),
|
||||||
|
icon = Icons.Outlined.Translate,
|
||||||
|
onClick = { languageOpenDialog = true }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if (themeOpenDialog) {
|
||||||
|
ThemeDialog(
|
||||||
|
uiState = uiState,
|
||||||
|
onDismiss = { themeOpenDialog = false },
|
||||||
|
onThemeChange = {
|
||||||
|
viewModel.setTheme(it)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
if (languageOpenDialog) {
|
||||||
|
LanguageDialog(
|
||||||
|
onDismiss = { languageOpenDialog = false },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@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 LanguageDialog(
|
||||||
|
onDismiss: () -> Unit,
|
||||||
|
) {
|
||||||
|
val langs = LocalContext.current.getLangPreferenceDropdownEntries()
|
||||||
|
|
||||||
|
LGAlertDialog(
|
||||||
|
onDismiss = onDismiss,
|
||||||
|
title = stringResource(id = R.string.language),
|
||||||
|
buttons = {
|
||||||
|
TextButton(onClick = onDismiss) {
|
||||||
|
Text(stringResource(id = R.string.cancel))
|
||||||
|
}
|
||||||
|
},
|
||||||
|
modifier = Modifier.fillMaxWidth()
|
||||||
|
) {
|
||||||
|
LazyColumn {
|
||||||
|
item {
|
||||||
|
LGRadioButton(
|
||||||
|
text = stringResource(id = R.string._default),
|
||||||
|
onClick = {
|
||||||
|
AppCompatDelegate.setApplicationLocales(LocaleListCompat.getEmptyLocaleList())
|
||||||
|
},
|
||||||
|
selected = AppCompatDelegate.getApplicationLocales().isEmpty,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
for ((key, value) in langs) {
|
||||||
|
item {
|
||||||
|
LGRadioButton(
|
||||||
|
text = key,
|
||||||
|
onClick = {
|
||||||
|
AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(value))
|
||||||
|
},
|
||||||
|
selected = AppCompatDelegate.getApplicationLocales()[0]?.language == value,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun SettingGroup(title: String, content: @Composable () -> Unit) {
|
||||||
|
Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
||||||
|
Header(title)
|
||||||
|
Spacer(modifier = Modifier.size(2.dp))
|
||||||
|
content()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
private 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
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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)
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// BUG: color is not being set on older android version (Marshmallow and others).
|
||||||
|
// The navigation bar color causes the nav buttons to be very hard to see
|
||||||
|
// in light mode because the buttons are white.
|
||||||
|
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,
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -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
|
||||||
|
)
|
||||||
|
*/
|
||||||
|
)
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
package com.illusionman1212.lyricsgrabbr.utils
|
||||||
|
|
||||||
|
import android.util.LayoutDirection
|
||||||
|
import androidx.compose.runtime.Stable
|
||||||
|
import androidx.compose.ui.Modifier
|
||||||
|
import androidx.compose.ui.draw.scale
|
||||||
|
import androidx.core.text.layoutDirection
|
||||||
|
import java.util.Locale
|
||||||
|
|
||||||
|
@Stable
|
||||||
|
fun Modifier.mirror(): Modifier {
|
||||||
|
return if (Locale.getDefault().layoutDirection == LayoutDirection.RTL)
|
||||||
|
this.scale(scaleX = -1f, scaleY = 1f)
|
||||||
|
else
|
||||||
|
this
|
||||||
|
}
|
||||||
@@ -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<StackTraceElement>): 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")
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
package com.illusionman1212.lyricsgrabbr.utils
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
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
|
||||||
|
import androidx.core.os.LocaleListCompat
|
||||||
|
import com.illusionman1212.lyricsgrabbr.R
|
||||||
|
import org.xmlpull.v1.XmlPullParser
|
||||||
|
import org.xmlpull.v1.XmlPullParserException
|
||||||
|
import java.io.IOException
|
||||||
|
|
||||||
|
// 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<Annotation>(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()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Context.getLocaleListFromXml(): LocaleListCompat {
|
||||||
|
val tagsList = mutableListOf<CharSequence>()
|
||||||
|
try {
|
||||||
|
val xpp: XmlPullParser = resources.getXml(R.xml.locales_config)
|
||||||
|
while (xpp.eventType != XmlPullParser.END_DOCUMENT) {
|
||||||
|
if (xpp.eventType == XmlPullParser.START_TAG) {
|
||||||
|
if (xpp.name == "locale") {
|
||||||
|
tagsList.add(xpp.getAttributeValue(0))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
xpp.next()
|
||||||
|
}
|
||||||
|
} catch (e: XmlPullParserException) {
|
||||||
|
e.printStackTrace()
|
||||||
|
} catch (e: IOException) {
|
||||||
|
e.printStackTrace()
|
||||||
|
}
|
||||||
|
|
||||||
|
return LocaleListCompat.forLanguageTags(tagsList.joinToString(","))
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fun Context.getLangPreferenceDropdownEntries(): Map<String, String> {
|
||||||
|
val localeList = getLocaleListFromXml()
|
||||||
|
val map = mutableMapOf<String, String>()
|
||||||
|
|
||||||
|
for (a in 0 until localeList.size()) {
|
||||||
|
localeList[a].let {
|
||||||
|
it?.let { it1 -> map.put(it1.getDisplayName(it), it.toLanguageTag()) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map
|
||||||
|
}
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
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.NotificationEvent
|
||||||
|
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<Uri> {
|
||||||
|
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<IntermediateResult>
|
||||||
|
)
|
||||||
|
|
||||||
|
data class HomeState(
|
||||||
|
val isLoading: Boolean = false,
|
||||||
|
val results: List<SearchResult> = emptyList(),
|
||||||
|
val notification: NotificationEvent? = null,
|
||||||
|
val error: String? = null,
|
||||||
|
)
|
||||||
|
|
||||||
|
class HomeViewModel(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 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.homeRepository)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
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 = "",
|
||||||
|
|
||||||
|
// 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) {
|
||||||
|
_uiState.update {
|
||||||
|
it.copy(song = title, artist = subtitle, url = url, trackId = trackId)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
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,
|
||||||
|
)
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 499 B |
|
Before Width: | Height: | Size: 343 B After Width: | Height: | Size: 343 B |
|
Before Width: | Height: | Size: 656 B After Width: | Height: | Size: 656 B |
|
Before Width: | Height: | Size: 941 B After Width: | Height: | Size: 941 B |
@@ -0,0 +1,50 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="108dp"
|
||||||
|
android:height="108dp"
|
||||||
|
android:viewportWidth="108"
|
||||||
|
android:viewportHeight="108">
|
||||||
|
<group android:scaleX="0.75"
|
||||||
|
android:scaleY="0.75">
|
||||||
|
<path
|
||||||
|
android:pathData="M0,144L144,144L144,0L0,0Z"
|
||||||
|
android:strokeAlpha="0"
|
||||||
|
android:fillColor="#662d91"
|
||||||
|
android:strokeColor="#00000000"
|
||||||
|
android:fillType="nonZero"
|
||||||
|
android:fillAlpha="0"/>
|
||||||
|
<group>
|
||||||
|
<clip-path
|
||||||
|
android:pathData="M17.809,17.809L126.191,17.809L126.191,126.191L17.809,126.191Z"/>
|
||||||
|
<path
|
||||||
|
android:pathData="m72.594,88.91c0.546,5.172 -4.992,9.998 -12.37,10.777 -7.378,0.78 -13.803,-2.783 -14.349,-7.955 -0.546,-5.173 4.993,-9.998 12.371,-10.778C65.625,80.175 72.048,83.738 72.594,88.91"
|
||||||
|
android:fillColor="#ffffff"
|
||||||
|
android:strokeColor="#00000000"
|
||||||
|
android:fillType="nonZero"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M72.641,88.905 L69.346,89.625C68.776,89.749 68.265,88.894 68.205,87.715l-1.898,-37.161c-0.072,-1.403 0.52,-2.565 1.193,-2.346L69.827,48.964c0.464,0.152 0.822,0.928 0.871,1.895z"
|
||||||
|
android:fillColor="#ffffff"
|
||||||
|
android:strokeColor="#00000000"
|
||||||
|
android:fillType="nonZero"/>
|
||||||
|
<path
|
||||||
|
android:pathData="m91.303,58.314 l-22.224,-3.077c-1.76,-0.244 -2.991,-1.87 -2.747,-3.631l0.014,-1.268c0.416,-0.968 0.068,-2.973 1.325,-2.798l24.674,3.238c1.257,0.175 2.136,1.335 1.961,2.592l-0.412,2.982c-0.174,1.257 -1.334,2.136 -2.591,1.962"
|
||||||
|
android:fillColor="#ffffff"
|
||||||
|
android:strokeColor="#00000000"
|
||||||
|
android:fillType="nonZero"/>
|
||||||
|
<path
|
||||||
|
android:pathData="m95.572,65.33 l-13.619,4.34c-0.206,0.066 -0.431,-0.107 -0.457,-0.351l-0.009,-0.085c-0.082,-0.774 -0.381,-1.521 -0.854,-2.138 -0.129,-0.17 -0.089,-0.414 0.081,-0.495L93.852,60.464C94.021,60.386 94.999,61.437 94.999,61.437 95.523,62.111 95.844,62.942 95.907,63.794 95.907,63.794 95.831,65.247 95.572,65.33"
|
||||||
|
android:fillColor="#ffffff"
|
||||||
|
android:strokeColor="#00000000"
|
||||||
|
android:fillType="nonZero"/>
|
||||||
|
<path
|
||||||
|
android:pathData="m95.682,80.164 l-13.574,-1.079c-0.134,-0.011 -0.224,-0.173 -0.182,-0.329l0.074,-0.279c0.195,-0.723 0.198,-1.5 0.012,-2.223l-0.052,-0.199c-0.032,-0.125 0.042,-0.255 0.15,-0.261L95.903,74.998C96.03,74.99 96.488,76.374 96.488,76.374 96.7,77.168 96.686,78.028 96.449,78.816 96.449,78.816 95.891,80.181 95.682,80.164"
|
||||||
|
android:fillColor="#ffffff"
|
||||||
|
android:strokeColor="#00000000"
|
||||||
|
android:fillType="nonZero"/>
|
||||||
|
<path
|
||||||
|
android:pathData="m93.176,93.612 l-12.263,-5.156c-0.121,-0.05 -0.154,-0.232 -0.065,-0.367l0.156,-0.242c0.405,-0.627 0.653,-1.365 0.704,-2.108l0.015,-0.205c0.009,-0.128 0.117,-0.229 0.22,-0.203L94.994,88.771C95.115,88.803 95.108,90.257 95.108,90.257 95.056,91.076 94.774,91.888 94.308,92.565 94.308,92.565 93.364,93.691 93.176,93.612"
|
||||||
|
android:fillColor="#ffffff"
|
||||||
|
android:strokeColor="#00000000"
|
||||||
|
android:fillType="nonZero"/>
|
||||||
|
</group>
|
||||||
|
</group>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24"
|
||||||
|
android:viewportHeight="24">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF000000"
|
||||||
|
android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM16.057,16.406c-0.188,0 -0.282,-0.094 -0.47,-0.188c-1.411,-0.847 -3.198,-1.317 -5.079,-1.317c-1.035,0 -2.163,0.188 -3.104,0.376c-0.188,0 -0.376,0.094 -0.47,0.094c-0.376,0 -0.658,-0.282 -0.658,-0.658c0,-0.376 0.188,-0.658 0.564,-0.658c1.223,-0.282 2.446,-0.47 3.763,-0.47c2.163,0 4.139,0.564 5.832,1.505c0.188,0.188 0.376,0.282 0.376,0.658C16.621,16.218 16.339,16.406 16.057,16.406zM17.091,13.773c-0.188,0 -0.376,-0.094 -0.564,-0.188c-1.599,-1.035 -3.857,-1.599 -6.302,-1.599c-1.223,0 -2.352,0.188 -3.198,0.376c-0.188,0.094 -0.282,0.094 -0.47,0.094c-0.47,0 -0.753,-0.376 -0.753,-0.753c0,-0.47 0.188,-0.658 0.658,-0.847c1.129,-0.282 2.258,-0.564 3.857,-0.564c2.634,0 5.079,0.658 7.149,1.881c0.282,0.188 0.47,0.47 0.47,0.753C17.844,13.396 17.562,13.773 17.091,13.773zM18.314,10.762c-0.188,0 -0.282,-0.094 -0.564,-0.188c-1.881,-1.035 -4.609,-1.693 -7.243,-1.693c-1.317,0 -2.728,0.188 -3.951,0.47c-0.188,0 -0.282,0.094 -0.564,0.094C5.428,9.54 5.051,9.069 5.051,8.505c0,-0.564 0.282,-0.847 0.658,-0.941C7.215,7.188 8.814,7 10.507,7c2.916,0 5.926,0.658 8.278,1.881c0.282,0.188 0.564,0.47 0.564,0.941C19.255,10.386 18.878,10.762 18.314,10.762z"/>
|
||||||
|
</vector>
|
||||||
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 5.4 KiB |
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 8.3 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
@@ -0,0 +1,48 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
<string name="app_name">Lyrics Grabbr</string>
|
||||||
|
|
||||||
|
<!-- General -->
|
||||||
|
<string name="go_back">رجوع</string>
|
||||||
|
<string name="cancel">إلغاء</string>
|
||||||
|
<string name="confirm">تأكيد</string>
|
||||||
|
<string name="timeout">لقد انتهت مهلة الطلب، حاول مرة أخرى لاحقًا</string>
|
||||||
|
<string name="generic_error">لقد حدث خطأ، حاول مرة أخرى لاحقاً</string>
|
||||||
|
<string name="retry">أعد المحاولة</string>
|
||||||
|
|
||||||
|
<!-- Home -->
|
||||||
|
<string name="no_supported_player">لا يوجد مشغل مدعوم قيد التشغيل</string>
|
||||||
|
<string name="open_settings">فتح الإعدادات</string>
|
||||||
|
<string name="notification_listen_permission">إذن قراءة الإشعارات</string>
|
||||||
|
<string name="notification_listen_desc">هذا التطبيق يحتاج إذن قراءة الإشعارات للعمل بشكل صحيح. يرجى منح الإذن في شاشة الإعدادات التالية.\nإحذر أن الطريقة الوحيدة لإيقاف الخدمة هي إبطال إذن قراءة الإشعارات.</string>
|
||||||
|
<string name="no_results">لم يتم العثور على نتائج</string>
|
||||||
|
<string name="found_results">تم العثور على %1$d نتيجة</string>
|
||||||
|
<string name="powered_by">مشغل بواسطة<annotation href="https://github.com/sv443/geniURL">geniURL</annotation></string>
|
||||||
|
<string name="open_song_page">افتح صفحة الأغنية</string>
|
||||||
|
<string name="open_artist_page">افتح صفحة الفنان</string>
|
||||||
|
<string name="notification_post_permission">مطلوب إذن الإشعارات</string>
|
||||||
|
<string name="notification_post_permission_desc">يتطلب هذا التطبيق أذونات الإشعارات لبدء خدمة مقدمة بغرض الاستماع إلى إشعارات الموسيقى، ولا يمكن أن يعمل بدونها.</string>
|
||||||
|
<string name="notification_post_permission_not_granted">لم يتم منح إذن الإشعارات، لن يعمل التطبيق بشكل صحيح</string>
|
||||||
|
<string name="grant_permission">منح الإذن</string>
|
||||||
|
|
||||||
|
<!-- Settings -->
|
||||||
|
<string name="settings">الإعدادات</string>
|
||||||
|
<string name="appearance">المظهر</string>
|
||||||
|
<string name="theme">مظهر التطبيق</string>
|
||||||
|
<string name="theme_light">نهار</string>
|
||||||
|
<string name="theme_dark">ليلي</string>
|
||||||
|
<string name="theme_system">استخدم مظهر النظام</string>
|
||||||
|
<string name="language">اللغة</string>
|
||||||
|
<string name="_default">الإفتراضي</string>
|
||||||
|
|
||||||
|
<!-- Lyrics -->
|
||||||
|
<string name="lyrics">كلمات الأغنية</string>
|
||||||
|
<string name="instrumental">هذه الأغنية موسيقية</string>
|
||||||
|
|
||||||
|
<!-- Notification -->
|
||||||
|
<string name="service_running">الخدمة قيد التشغيل</string>
|
||||||
|
<string name="stop_service">وقف الخدمة</string>
|
||||||
|
<string name="service_notif_desc_init">قم بتشغيل بعض الأغاني على مشغل مدعوم للحصول على كلمات الأغاني</string>
|
||||||
|
<string name="service_notif_desc_playing">انقر للحصول على كلمات الأغاني</string>
|
||||||
|
<string name="now_playing">يتم الآن تشغيل %1$s لـ %2$s</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
<resources>
|
||||||
|
<string name="app_name" translatable="false">Lyrics Grabbr</string>
|
||||||
|
|
||||||
|
<!-- General -->
|
||||||
|
<string name="go_back">Go Back</string>
|
||||||
|
<string name="cancel">Cancel</string>
|
||||||
|
<string name="confirm">Confirm</string>
|
||||||
|
<string name="timeout">Request has timed out, try again later</string>
|
||||||
|
<string name="generic_error">An error has occurred, try again later</string>
|
||||||
|
<string name="retry">Retry</string>
|
||||||
|
|
||||||
|
<!-- Home -->
|
||||||
|
<string name="no_supported_player">No supported player is running</string>
|
||||||
|
<string name="open_settings">Open Settings</string>
|
||||||
|
<string name="notification_listen_permission">Notification Listening Permission</string>
|
||||||
|
<string name="notification_listen_desc">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.</string>
|
||||||
|
<string name="no_results">No results found</string>
|
||||||
|
<string name="found_results">Found %1$d result(s)</string>
|
||||||
|
<string name="powered_by">Powered By <annotation href="https://github.com/sv443/geniURL">geniURL</annotation></string>
|
||||||
|
<string name="open_song_page">Open Song Page</string>
|
||||||
|
<string name="open_artist_page">Open Artist Page</string>
|
||||||
|
<string name="notification_post_permission">Notification Permission Required</string>
|
||||||
|
<string name="notification_post_permission_desc">LyricsGrabbr requires notification permissions to start a foreground service for the purpose of listening to music notifications, and cannot function without it.</string>
|
||||||
|
<string name="notification_post_permission_not_granted">Notification permission is not granted, the app will not function properly</string>
|
||||||
|
<string name="grant_permission">Grant Permission</string>
|
||||||
|
|
||||||
|
<!-- Settings -->
|
||||||
|
<string name="settings">Settings</string>
|
||||||
|
<string name="appearance">Appearance</string>
|
||||||
|
<string name="theme">Theme</string>
|
||||||
|
<string name="theme_light">Light</string>
|
||||||
|
<string name="theme_dark">Dark</string>
|
||||||
|
<string name="theme_system">Use System Theme</string>
|
||||||
|
<string name="language">Language</string>
|
||||||
|
<string name="_default">Default</string>
|
||||||
|
|
||||||
|
<!-- Lyrics -->
|
||||||
|
<string name="lyrics">Lyrics</string>
|
||||||
|
<string name="instrumental">This song is an instrumental</string>
|
||||||
|
|
||||||
|
<!-- Notification -->
|
||||||
|
<string name="service_running">Service Running</string>
|
||||||
|
<string name="stop_service">Stop Service</string>
|
||||||
|
<string name="service_notif_desc_init">Play some songs on a supported player to get lyrics</string>
|
||||||
|
<string name="service_notif_desc_playing">Tap to get lyrics</string>
|
||||||
|
<string name="now_playing">Now Playing %1$s By %2$s</string>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
|
||||||
|
<style name="Theme.LyricsGrabbr" parent="Theme.Material3.DayNight.NoActionBar" />
|
||||||
|
|
||||||
|
<style name="Theme.LyricsGrabbr.Splash" parent="Theme.SplashScreen">
|
||||||
|
<item name="windowSplashScreenBackground">#FF662D91</item>
|
||||||
|
|
||||||
|
<item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
|
||||||
|
<item name="windowSplashScreenAnimationDuration">800</item>
|
||||||
|
|
||||||
|
<item name="postSplashScreenTheme">@style/Theme.LyricsGrabbr</item>
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
Sample backup rules file; uncomment and customize as necessary.
|
||||||
|
See https://developer.android.com/guide/topics/data/autobackup
|
||||||
|
for details.
|
||||||
|
Note: This file is ignored for devices older that API 31
|
||||||
|
See https://developer.android.com/about/versions/12/backup-restore
|
||||||
|
-->
|
||||||
|
<full-backup-content>
|
||||||
|
<!--
|
||||||
|
<include domain="sharedpref" path="."/>
|
||||||
|
<exclude domain="sharedpref" path="device.xml"/>
|
||||||
|
-->
|
||||||
|
</full-backup-content>
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?><!--
|
||||||
|
Sample data extraction rules file; uncomment and customize as necessary.
|
||||||
|
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
|
||||||
|
for details.
|
||||||
|
-->
|
||||||
|
<data-extraction-rules>
|
||||||
|
<cloud-backup>
|
||||||
|
<!-- TODO: Use <include> and <exclude> to control what is backed up.
|
||||||
|
<include .../>
|
||||||
|
<exclude .../>
|
||||||
|
-->
|
||||||
|
</cloud-backup>
|
||||||
|
<!--
|
||||||
|
<device-transfer>
|
||||||
|
<include .../>
|
||||||
|
<exclude .../>
|
||||||
|
</device-transfer>
|
||||||
|
-->
|
||||||
|
</data-extraction-rules>
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<locale android:name="en" />
|
||||||
|
<locale android:name="ar" />
|
||||||
|
</locale-config>
|
||||||
@@ -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)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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
|
||||||
|
}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
- Rewrote the app in Kotlin with jetpack compose
|
||||||
|
- Added ability to use Spotify for lyrics
|
||||||
|
Before Width: | Height: | Size: 149 KiB After Width: | Height: | Size: 550 KiB |
|
Before Width: | Height: | Size: 196 KiB After Width: | Height: | Size: 583 KiB |
|
Before Width: | Height: | Size: 427 KiB After Width: | Height: | Size: 145 KiB |
|
Before Width: | Height: | Size: 724 KiB |
@@ -1 +1 @@
|
|||||||
Lyrics grabbr listens to your notifications and provides lyrics for the currently playing song.
|
Lyrics grabbr provides lyrics for the currently playing song
|
||||||
|
|||||||
@@ -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
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
#Fri Jun 23 08:50:38 CEST 2017
|
#Tue Jan 09 20:42:38 EET 2024
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
|
|
||||||
@@ -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" "$@"
|
||||||
@@ -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
|
||||||
@@ -1,102 +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<StatefulWidget> createState() => _LyricsPageState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _LyricsPageState extends State<LyricsPage> {
|
|
||||||
bool fetching = false;
|
|
||||||
String? lyrics;
|
|
||||||
|
|
||||||
@override
|
|
||||||
void initState() {
|
|
||||||
super.initState();
|
|
||||||
initPlatformState();
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> 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('<br>', '\n'));
|
|
||||||
var element = webScraper.getElement("div[data-lyrics-container]", ['data-lyrics-container']);
|
|
||||||
for (var section in element) {
|
|
||||||
fullLyrics += section['title'] + '\n';
|
|
||||||
}
|
|
||||||
setState(() {
|
|
||||||
lyrics = fullLyrics;
|
|
||||||
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
|
|
||||||
? Column(
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: Column(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
|
||||||
children: const [CircularProgressIndicator(value: null)],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
)
|
|
||||||
: SizedBox(
|
|
||||||
width: MediaQuery.of(context).size.width,
|
|
||||||
child: SingleChildScrollView(
|
|
||||||
child: Container(
|
|
||||||
padding: const EdgeInsets.all(30),
|
|
||||||
child: Text(
|
|
||||||
lyrics ?? '',
|
|
||||||
style: const TextStyle(
|
|
||||||
fontSize: 16,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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<void> main() async {
|
|
||||||
runApp(const LyricsGrabbr());
|
|
||||||
}
|
|
||||||
|
|
||||||
class LyricsGrabbr extends StatefulWidget {
|
|
||||||
const LyricsGrabbr({Key? key}) : super(key: key);
|
|
||||||
|
|
||||||
@override
|
|
||||||
State<LyricsGrabbr> createState() => _LyricsGrabbrState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _LyricsGrabbrState extends State<LyricsGrabbr> {
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return FutureBuilder<SharedPreferences>(
|
|
||||||
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<ThemeProvider>(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<HomePage> createState() => _HomePageState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _HomePageState extends State<HomePage> with WidgetsBindingObserver {
|
|
||||||
late AndroidNotificationListener _notifications;
|
|
||||||
BuildContext? permissionDialogCtx;
|
|
||||||
NotificationEvent? lastNotification;
|
|
||||||
bool running = false;
|
|
||||||
bool searching = false;
|
|
||||||
final List<SearchResult> 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<void> 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<String, dynamic>;
|
|
||||||
List<dynamic> 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<Widget> _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(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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<dynamic, dynamic> 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<NotificationEvent> get notificationStream {
|
|
||||||
if (Platform.isAndroid) {
|
|
||||||
Stream<NotificationEvent> _notificationStream = _notificationEventChannel
|
|
||||||
.receiveBroadcastStream()
|
|
||||||
.map((event) => _notificationEvent(event));
|
|
||||||
return _notificationStream;
|
|
||||||
}
|
|
||||||
throw NotificationException(
|
|
||||||
'Notification API exclusively available on Android!');
|
|
||||||
}
|
|
||||||
|
|
||||||
static Future<bool?> get hasPermission async {
|
|
||||||
return await _methodChannel.invokeMethod('plugin.hasPermission');
|
|
||||||
}
|
|
||||||
|
|
||||||
static Future<bool?> openPermissionSettings() async {
|
|
||||||
return await _methodChannel.invokeMethod('plugin.openPermissionSettings');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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 String url;
|
|
||||||
final String artistUrl;
|
|
||||||
final String thumbnail;
|
|
||||||
final int id;
|
|
||||||
|
|
||||||
SearchResult.fromJson(Map<String, dynamic> json, {Key? key})
|
|
||||||
: title = json['meta']['title'],
|
|
||||||
artist = json['meta']['primaryArtist']['name'],
|
|
||||||
url = json['url'],
|
|
||||||
artistUrl = json['meta']['primaryArtist']['url'],
|
|
||||||
thumbnail = json['resources']['thumbnail'],
|
|
||||||
id = json['id'],
|
|
||||||
super(key: key);
|
|
||||||
|
|
||||||
List<Widget> _buildOptions() {
|
|
||||||
return <OptionItem>[
|
|
||||||
OptionItem(
|
|
||||||
title: "Open Artist Page in Genius",
|
|
||||||
icon: Icons.library_music,
|
|
||||||
onTap: () async {
|
|
||||||
if (!await launch(artistUrl)) {
|
|
||||||
throw 'could not launch $artistUrl';
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
OptionItem(
|
|
||||||
title: "Open Song Page in Genius",
|
|
||||||
icon: Icons.music_note,
|
|
||||||
onTap: () async {
|
|
||||||
if (!await launch(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,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
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.bodyText1?.color,
|
|
||||||
fontSize: 18,
|
|
||||||
fontWeight: FontWeight.bold,
|
|
||||||
),
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
),
|
|
||||||
Text(
|
|
||||||
artist,
|
|
||||||
style: TextStyle(
|
|
||||||
color: Theme.of(context).textTheme.subtitle1?.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),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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<SettingsPage> createState() => _SettingsPageState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _SettingsPageState extends State<SettingsPage> {
|
|
||||||
final Future<SharedPreferences> _prefs = SharedPreferences.getInstance();
|
|
||||||
late SharedPreferences prefs;
|
|
||||||
String? activeTheme;
|
|
||||||
|
|
||||||
@override
|
|
||||||
void initState() {
|
|
||||||
super.initState();
|
|
||||||
initPlatformState();
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> initPlatformState() async {
|
|
||||||
prefs = await _prefs;
|
|
||||||
|
|
||||||
setState(() {
|
|
||||||
activeTheme = prefs.getString("theme") ?? AppTheme.System.name;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _buildSettingsGroup(String groupTitle, List<Setting> 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<Widget> _buildSettingsList(BuildContext context) {
|
|
||||||
return [
|
|
||||||
_buildSettingsGroup("Customization", [
|
|
||||||
Setting(
|
|
||||||
title: "Theme",
|
|
||||||
desc: activeTheme,
|
|
||||||
onTap: () {
|
|
||||||
final provider = Provider.of<ThemeProvider>(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),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,474 +0,0 @@
|
|||||||
# Generated by pub
|
|
||||||
# See https://dart.dev/tools/pub/glossary#lockfile
|
|
||||||
packages:
|
|
||||||
args:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: args
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.3.0"
|
|
||||||
async:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: async
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.8.2"
|
|
||||||
boolean_selector:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: boolean_selector
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.1.0"
|
|
||||||
characters:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: characters
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.2.0"
|
|
||||||
charcode:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: charcode
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.3.1"
|
|
||||||
clock:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: clock
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.1.0"
|
|
||||||
collection:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: collection
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.16.0"
|
|
||||||
csslib:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: csslib
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.17.2"
|
|
||||||
dbus:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: dbus
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.7.1"
|
|
||||||
fake_async:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: fake_async
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.3.0"
|
|
||||||
ffi:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: ffi
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.1.2"
|
|
||||||
file:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: file
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "6.1.2"
|
|
||||||
flutter:
|
|
||||||
dependency: "direct main"
|
|
||||||
description: flutter
|
|
||||||
source: sdk
|
|
||||||
version: "0.0.0"
|
|
||||||
flutter_lints:
|
|
||||||
dependency: "direct dev"
|
|
||||||
description:
|
|
||||||
name: flutter_lints
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.0.4"
|
|
||||||
flutter_local_notifications:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: flutter_local_notifications
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "9.3.2"
|
|
||||||
flutter_local_notifications_linux:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: flutter_local_notifications_linux
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.4.2"
|
|
||||||
flutter_local_notifications_platform_interface:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: flutter_local_notifications_platform_interface
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "5.0.0"
|
|
||||||
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"
|
|
||||||
fluttertoast:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: fluttertoast
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "8.0.9"
|
|
||||||
html:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: html
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.15.0"
|
|
||||||
http:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: http
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.13.4"
|
|
||||||
http_parser:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: http_parser
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "4.0.0"
|
|
||||||
js:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: js
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.6.4"
|
|
||||||
lints:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: lints
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.0.1"
|
|
||||||
matcher:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: matcher
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.12.11"
|
|
||||||
material_color_utilities:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: material_color_utilities
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.1.4"
|
|
||||||
meta:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: meta
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.7.0"
|
|
||||||
nested:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: nested
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.0.0"
|
|
||||||
path:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: path
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.8.1"
|
|
||||||
path_provider_linux:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: path_provider_linux
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.1.7"
|
|
||||||
path_provider_platform_interface:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: path_provider_platform_interface
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.0.4"
|
|
||||||
path_provider_windows:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: path_provider_windows
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.0.7"
|
|
||||||
petitparser:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: petitparser
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "4.4.0"
|
|
||||||
platform:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: platform
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "3.1.0"
|
|
||||||
plugin_platform_interface:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: plugin_platform_interface
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.1.2"
|
|
||||||
process:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: process
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "4.2.4"
|
|
||||||
provider:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: provider
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "6.0.3"
|
|
||||||
shared_preferences:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: shared_preferences
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.0.15"
|
|
||||||
shared_preferences_android:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: shared_preferences_android
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.0.12"
|
|
||||||
shared_preferences_ios:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: shared_preferences_ios
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.1.1"
|
|
||||||
shared_preferences_linux:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: shared_preferences_linux
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.1.1"
|
|
||||||
shared_preferences_macos:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: shared_preferences_macos
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.0.4"
|
|
||||||
shared_preferences_platform_interface:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: shared_preferences_platform_interface
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.0.0"
|
|
||||||
shared_preferences_web:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: shared_preferences_web
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.0.4"
|
|
||||||
shared_preferences_windows:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: shared_preferences_windows
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.1.1"
|
|
||||||
sky_engine:
|
|
||||||
dependency: transitive
|
|
||||||
description: flutter
|
|
||||||
source: sdk
|
|
||||||
version: "0.0.99"
|
|
||||||
source_span:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: source_span
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.8.2"
|
|
||||||
stack_trace:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: stack_trace
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.10.0"
|
|
||||||
stream_channel:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: stream_channel
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.1.0"
|
|
||||||
string_scanner:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: string_scanner
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.1.0"
|
|
||||||
term_glyph:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: term_glyph
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.2.0"
|
|
||||||
test_api:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: test_api
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.4.9"
|
|
||||||
timezone:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: timezone
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.8.0"
|
|
||||||
typed_data:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: typed_data
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "1.3.0"
|
|
||||||
url_launcher:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: url_launcher
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "6.0.20"
|
|
||||||
url_launcher_android:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: url_launcher_android
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "6.0.15"
|
|
||||||
url_launcher_ios:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: url_launcher_ios
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "6.0.15"
|
|
||||||
url_launcher_linux:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: url_launcher_linux
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "3.0.0"
|
|
||||||
url_launcher_macos:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: url_launcher_macos
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "3.0.0"
|
|
||||||
url_launcher_platform_interface:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: url_launcher_platform_interface
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.0.5"
|
|
||||||
url_launcher_web:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: url_launcher_web
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.0.9"
|
|
||||||
url_launcher_windows:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: url_launcher_windows
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "3.0.0"
|
|
||||||
vector_math:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: vector_math
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.1.2"
|
|
||||||
web_scraper:
|
|
||||||
dependency: "direct main"
|
|
||||||
description:
|
|
||||||
name: web_scraper
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.1.4"
|
|
||||||
win32:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: win32
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "2.6.1"
|
|
||||||
xdg_directories:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: xdg_directories
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "0.2.0+1"
|
|
||||||
xml:
|
|
||||||
dependency: transitive
|
|
||||||
description:
|
|
||||||
name: xml
|
|
||||||
url: "https://pub.dartlang.org"
|
|
||||||
source: hosted
|
|
||||||
version: "5.3.1"
|
|
||||||
sdks:
|
|
||||||
dart: ">=2.17.0 <3.0.0"
|
|
||||||
flutter: ">=2.10.0"
|
|
||||||
@@ -1,92 +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.2+1
|
|
||||||
|
|
||||||
environment:
|
|
||||||
sdk: ">=2.16.1 <3.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
|
|
||||||
flutter_local_notifications: ^9.3.2
|
|
||||||
url_launcher: ^6.0.20
|
|
||||||
web_scraper: ^0.1.4
|
|
||||||
fluttertoast: ^8.0.9
|
|
||||||
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: ^1.0.0
|
|
||||||
|
|
||||||
# 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
|
|
||||||
@@ -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")
|
||||||
|
|
||||||