diff --git a/README.md b/README.md index bfaf618..f0205f4 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,14 @@
- -

Vibe Music

-

A Flutter application for streaming music from YouTube Music

- - Latest release - Commits since latest release - Commits per month - Last release + +

Gyavun (Formerly Vibe Music)

+

A Flutter application for streaming music from Jio Saavn

+ + Latest release + Commits since latest release + Commits per month + Last release -## Join Our Discord server -[![Join our Discord server!](https://invidget.switchblade.xyz/YtxYgGSYwN)](http://discord.gg/YtxYgGSYwN) -
--- @@ -28,31 +25,28 @@

## Features / TODO -- [x] Play (almost) any song or video from YouTube Music +- [x] Play (almost) any song with high quality from Jio Saavn - [x] Background playback - [x] Search for Songs, Artists and Playlists - [x] Reorder songs in playlist or queue - [x] Dark Mode -- [x] Multiple Language Support - [x] Change Audio Quality - [x] Material You theme - [x] Dynamic theme support -- [x] Change location - [x] Add to favorites - [x] Change direction from right to left -- [x] Search Suggestions - [x] Save history locally - [x] Download songs locally +- [ ] support for other Music Providers +- [ ] Multiple Language Support - [ ] Save playlist ## Installation [Get it on GitHub](https://github.com/sheikhhaziq/vibemusic/releases/latest) -[Get it on IzzyOnDroid](https://apt.izzysoft.de/fdroid/index/apk/com.webyte.vibe_music) + height="80">](https://github.com/sheikhhaziq/gyavun/releases/latest) + ## Contributing @@ -64,8 +58,8 @@ Please make sure to update tests as appropriate. ## 👩‍💻👨‍💻 Our valuable Contributors -

- +

+

## Disclaimer diff --git a/android/app/build.gradle b/android/app/build.gradle index a8682da..fea6d29 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -31,7 +31,8 @@ if (keystorePropertiesFile.exists()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } android { - compileSdkVersion 33 + namespace "com.webyte.gyavun" + compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion compileOptions { @@ -48,18 +49,16 @@ android { } defaultConfig { - multiDexEnabled true - vectorDrawables.useSupportLibrary = true // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.webyte.vibe_music.beta" + applicationId "com.webyte.gyavun" // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion 19 - targetSdkVersion flutter.targetSdkVersion + targetSdkVersion 33 versionCode flutterVersionCode.toInteger() versionName flutterVersionName + multiDexEnabled true } - signingConfigs { release { keyAlias keystoreProperties['keyAlias'] @@ -68,11 +67,13 @@ android { storePassword keystoreProperties['storePassword'] } } - buildTypes { - release { - signingConfig signingConfigs.release - } - } + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.release + } + } } flutter { @@ -80,5 +81,5 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index 57aa82c..399f698 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,10 +1,7 @@ - + - - diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index ba783e1..655313a 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,21 +1,27 @@ - - - - - + - - + + + + + + + + + + + + android:appCategory="audio"> + + + + + + + @@ -48,12 +60,12 @@ - - - + + + - + diff --git a/android/app/src/main/kotlin/com/webyte/vibe_music/beta/MainActivity.kt b/android/app/src/main/kotlin/com/webyte/gyavun/MainActivity.kt similarity index 73% rename from android/app/src/main/kotlin/com/webyte/vibe_music/beta/MainActivity.kt rename to android/app/src/main/kotlin/com/webyte/gyavun/MainActivity.kt index 3ce6f31..249821f 100644 --- a/android/app/src/main/kotlin/com/webyte/vibe_music/beta/MainActivity.kt +++ b/android/app/src/main/kotlin/com/webyte/gyavun/MainActivity.kt @@ -1,4 +1,4 @@ -package com.webyte.vibe_music.beta +package com.webyte.gyavun import io.flutter.embedding.android.FlutterActivity diff --git a/android/app/src/main/res/anim/in_animation.xml b/android/app/src/main/res/anim/in_animation.xml new file mode 100644 index 0000000..16f186c --- /dev/null +++ b/android/app/src/main/res/anim/in_animation.xml @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/anim/out_animation.xml b/android/app/src/main/res/anim/out_animation.xml new file mode 100644 index 0000000..0b9b073 --- /dev/null +++ b/android/app/src/main/res/anim/out_animation.xml @@ -0,0 +1,18 @@ + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/drawable-hdpi/audio_service_fast_forward.png b/android/app/src/main/res/drawable-hdpi/audio_service_fast_forward.png new file mode 100644 index 0000000..8061600 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/audio_service_fast_forward.png differ diff --git a/android/app/src/main/res/drawable-hdpi/audio_service_fast_rewind.png b/android/app/src/main/res/drawable-hdpi/audio_service_fast_rewind.png new file mode 100644 index 0000000..7d968af Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/audio_service_fast_rewind.png differ diff --git a/android/app/src/main/res/drawable-hdpi/audio_service_pause.png b/android/app/src/main/res/drawable-hdpi/audio_service_pause.png new file mode 100644 index 0000000..4bc28c2 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/audio_service_pause.png differ diff --git a/android/app/src/main/res/drawable-hdpi/audio_service_play_arrow.png b/android/app/src/main/res/drawable-hdpi/audio_service_play_arrow.png new file mode 100644 index 0000000..fb44ea9 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/audio_service_play_arrow.png differ diff --git a/android/app/src/main/res/drawable-hdpi/audio_service_skip_next.png b/android/app/src/main/res/drawable-hdpi/audio_service_skip_next.png new file mode 100644 index 0000000..41204bc Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/audio_service_skip_next.png differ diff --git a/android/app/src/main/res/drawable-hdpi/audio_service_skip_previous.png b/android/app/src/main/res/drawable-hdpi/audio_service_skip_previous.png new file mode 100644 index 0000000..fb68dd3 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/audio_service_skip_previous.png differ diff --git a/android/app/src/main/res/drawable-hdpi/audio_service_stop.png b/android/app/src/main/res/drawable-hdpi/audio_service_stop.png new file mode 100644 index 0000000..043a65e Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/audio_service_stop.png differ diff --git a/android/app/src/main/res/drawable-hdpi/ic_stat_music_note.png b/android/app/src/main/res/drawable-hdpi/ic_stat_music_note.png new file mode 100644 index 0000000..ba87115 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_stat_music_note.png differ diff --git a/android/app/src/main/res/drawable-mdpi/audio_service_fast_forward.png b/android/app/src/main/res/drawable-mdpi/audio_service_fast_forward.png new file mode 100644 index 0000000..23a080b Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/audio_service_fast_forward.png differ diff --git a/android/app/src/main/res/drawable-mdpi/audio_service_fast_rewind.png b/android/app/src/main/res/drawable-mdpi/audio_service_fast_rewind.png new file mode 100644 index 0000000..deb2c14 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/audio_service_fast_rewind.png differ diff --git a/android/app/src/main/res/drawable-mdpi/audio_service_pause.png b/android/app/src/main/res/drawable-mdpi/audio_service_pause.png new file mode 100644 index 0000000..131482b Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/audio_service_pause.png differ diff --git a/android/app/src/main/res/drawable-mdpi/audio_service_play_arrow.png b/android/app/src/main/res/drawable-mdpi/audio_service_play_arrow.png new file mode 100644 index 0000000..bc1c78d Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/audio_service_play_arrow.png differ diff --git a/android/app/src/main/res/drawable-mdpi/audio_service_skip_next.png b/android/app/src/main/res/drawable-mdpi/audio_service_skip_next.png new file mode 100644 index 0000000..b446b6b Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/audio_service_skip_next.png differ diff --git a/android/app/src/main/res/drawable-mdpi/audio_service_skip_previous.png b/android/app/src/main/res/drawable-mdpi/audio_service_skip_previous.png new file mode 100644 index 0000000..3bdafcf Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/audio_service_skip_previous.png differ diff --git a/android/app/src/main/res/drawable-mdpi/audio_service_stop.png b/android/app/src/main/res/drawable-mdpi/audio_service_stop.png new file mode 100644 index 0000000..dcf8c7a Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/audio_service_stop.png differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_stat_music_note.png b/android/app/src/main/res/drawable-mdpi/ic_stat_music_note.png new file mode 100644 index 0000000..3d931dd Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_stat_music_note.png differ diff --git a/android/app/src/main/res/drawable-v21/next.xml b/android/app/src/main/res/drawable-v21/next.xml deleted file mode 100644 index 1b4d432..0000000 --- a/android/app/src/main/res/drawable-v21/next.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable-v21/pause.xml b/android/app/src/main/res/drawable-v21/pause.xml deleted file mode 100644 index c959ec6..0000000 --- a/android/app/src/main/res/drawable-v21/pause.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable-v21/play.xml b/android/app/src/main/res/drawable-v21/play.xml deleted file mode 100644 index ec2a52a..0000000 --- a/android/app/src/main/res/drawable-v21/play.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable-v21/previous.xml b/android/app/src/main/res/drawable-v21/previous.xml deleted file mode 100644 index bef0e49..0000000 --- a/android/app/src/main/res/drawable-v21/previous.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable-v21/stop.xml b/android/app/src/main/res/drawable-v21/stop.xml deleted file mode 100644 index af5e34e..0000000 --- a/android/app/src/main/res/drawable-v21/stop.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/android/app/src/main/res/drawable-xhdpi/audio_service_fast_forward.png b/android/app/src/main/res/drawable-xhdpi/audio_service_fast_forward.png new file mode 100644 index 0000000..ccafa85 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/audio_service_fast_forward.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/audio_service_fast_rewind.png b/android/app/src/main/res/drawable-xhdpi/audio_service_fast_rewind.png new file mode 100644 index 0000000..adffa06 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/audio_service_fast_rewind.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/audio_service_pause.png b/android/app/src/main/res/drawable-xhdpi/audio_service_pause.png new file mode 100644 index 0000000..89f014b Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/audio_service_pause.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/audio_service_play_arrow.png b/android/app/src/main/res/drawable-xhdpi/audio_service_play_arrow.png new file mode 100644 index 0000000..9471209 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/audio_service_play_arrow.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/audio_service_skip_next.png b/android/app/src/main/res/drawable-xhdpi/audio_service_skip_next.png new file mode 100644 index 0000000..c70b028 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/audio_service_skip_next.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/audio_service_skip_previous.png b/android/app/src/main/res/drawable-xhdpi/audio_service_skip_previous.png new file mode 100644 index 0000000..c9378d3 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/audio_service_skip_previous.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/audio_service_stop.png b/android/app/src/main/res/drawable-xhdpi/audio_service_stop.png new file mode 100644 index 0000000..714223b Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/audio_service_stop.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/ic_stat_music_note.png b/android/app/src/main/res/drawable-xhdpi/ic_stat_music_note.png new file mode 100644 index 0000000..42a08dd Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_stat_music_note.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/audio_service_fast_forward.png b/android/app/src/main/res/drawable-xxhdpi/audio_service_fast_forward.png new file mode 100644 index 0000000..0d72433 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/audio_service_fast_forward.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/audio_service_fast_rewind.png b/android/app/src/main/res/drawable-xxhdpi/audio_service_fast_rewind.png new file mode 100644 index 0000000..5f47607 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/audio_service_fast_rewind.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/audio_service_pause.png b/android/app/src/main/res/drawable-xxhdpi/audio_service_pause.png new file mode 100644 index 0000000..599d386 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/audio_service_pause.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/audio_service_play_arrow.png b/android/app/src/main/res/drawable-xxhdpi/audio_service_play_arrow.png new file mode 100644 index 0000000..8bbc92b Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/audio_service_play_arrow.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/audio_service_skip_next.png b/android/app/src/main/res/drawable-xxhdpi/audio_service_skip_next.png new file mode 100644 index 0000000..471ad2f Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/audio_service_skip_next.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/audio_service_skip_previous.png b/android/app/src/main/res/drawable-xxhdpi/audio_service_skip_previous.png new file mode 100644 index 0000000..81cb886 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/audio_service_skip_previous.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/audio_service_stop.png b/android/app/src/main/res/drawable-xxhdpi/audio_service_stop.png new file mode 100644 index 0000000..135886b Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/audio_service_stop.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_stat_music_note.png b/android/app/src/main/res/drawable-xxhdpi/ic_stat_music_note.png new file mode 100644 index 0000000..e80edc8 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_stat_music_note.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/audio_service_fast_forward.png b/android/app/src/main/res/drawable-xxxhdpi/audio_service_fast_forward.png new file mode 100644 index 0000000..1357d6d Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/audio_service_fast_forward.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/audio_service_fast_rewind.png b/android/app/src/main/res/drawable-xxxhdpi/audio_service_fast_rewind.png new file mode 100644 index 0000000..fde4e87 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/audio_service_fast_rewind.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/audio_service_pause.png b/android/app/src/main/res/drawable-xxxhdpi/audio_service_pause.png new file mode 100644 index 0000000..bcf65ae Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/audio_service_pause.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/audio_service_play_arrow.png b/android/app/src/main/res/drawable-xxxhdpi/audio_service_play_arrow.png new file mode 100644 index 0000000..0a628f6 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/audio_service_play_arrow.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/audio_service_skip_next.png b/android/app/src/main/res/drawable-xxxhdpi/audio_service_skip_next.png new file mode 100644 index 0000000..f186e90 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/audio_service_skip_next.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/audio_service_skip_previous.png b/android/app/src/main/res/drawable-xxxhdpi/audio_service_skip_previous.png new file mode 100644 index 0000000..ffd15b2 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/audio_service_skip_previous.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/audio_service_stop.png b/android/app/src/main/res/drawable-xxxhdpi/audio_service_stop.png new file mode 100644 index 0000000..5832297 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/audio_service_stop.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_stat_music_note.png b/android/app/src/main/res/drawable-xxxhdpi/ic_stat_music_note.png new file mode 100644 index 0000000..62c7fea Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_stat_music_note.png differ diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09b..345888d 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,6 @@ - - + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 036d09b..0000000 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index bd84ba3..41729ea 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png new file mode 100644 index 0000000..3d20505 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index aabbf33..1e0df41 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..fa3fa2d Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 24927a0..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png deleted file mode 100644 index ee0a9eb..0000000 Binary files a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 990e0b8..ec89197 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png new file mode 100644 index 0000000..249716f Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index 66da31d..d3134ee 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..1f33578 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 56b8c47..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 794ff16..c39bfe6 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png new file mode 100644 index 0000000..eedc9ad Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index 7683c55..70bbc2d 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..1872c68 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index b46d7bb..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 0f6d688..c282f70 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..12d70df Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index b2d96ce..52eb576 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..7895443 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8c893d4..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 79f1f93..5274adc 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..a68c170 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index f93adec..8a9a189 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..7e73c7f Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 7a93bc8..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/raw/keep.xml b/android/app/src/main/res/raw/keep.xml new file mode 100644 index 0000000..0a4bfd5 --- /dev/null +++ b/android/app/src/main/res/raw/keep.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/android/app/src/main/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml new file mode 100644 index 0000000..7781ac8 --- /dev/null +++ b/android/app/src/main/res/values/attrs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..b2bffa8 --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + #FFE1F5FE + #FF81D4FA + #FF039BE5 + #FF01579B + \ No newline at end of file diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml new file mode 100644 index 0000000..4db8c59 --- /dev/null +++ b/android/app/src/main/res/values/dimens.xml @@ -0,0 +1,10 @@ + + + + + 0dp + + \ No newline at end of file diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml index a9825df..beab31f 100644 --- a/android/app/src/main/res/values/ic_launcher_background.xml +++ b/android/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #2b0632 + #000000 \ No newline at end of file diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..4d33afb --- /dev/null +++ b/android/app/src/main/res/values/strings.xml @@ -0,0 +1,6 @@ + + + Play + Add widget + BlackHole Music + \ No newline at end of file diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index cb1ef88..6aff15b 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -3,16 +3,34 @@ + + + + diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..dcd8899 --- /dev/null +++ b/android/app/src/main/res/values/themes.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index 300f427..399f698 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - + '); + Map fetchedLyrics = {}; + if (rawLyrics.length > 1) { + fetchedLyrics = json.decode(rawLyrics[1]) as Map; + } else { + fetchedLyrics = json.decode(rawLyrics[0]) as Map; + } + final String lyrics = + fetchedLyrics['lyrics'].toString().replaceAll('
', '\n'); + return lyrics; + } catch (e) { + Logger.root.severe('Error in getSaavnLyrics', e); + return ''; + } + } + + Future> getSpotifyLyrics( + String title, + String artist, + ) async { + Map result = { + 'lyrics': '', + 'type': 'text', + 'source': 'Spotify', + }; + + try { + accessToken ??= await getAccessToken(); + final value = await SpotifyApi().searchTrack( + accessToken: accessToken!, + query: '$title - $artist', + limit: 1, + ); + Map res = await getSpotifyLyricsFromId( + value['tracks']['items'][0]['id'].toString()); + result = res; + } catch (err) { + // print(err.toString()); + } + return result; + } + + Future getAccessToken() async { + RegExp re = RegExp( + r'