Merge pull request #91 from sheikhhaziq/dev

Changed whole ui and added Jio Saavn support

README.md

@@ -1,17 +1,14 @@
 <div align="center">
-    <img src="https://github.com/sheikhhaziq/vibemusic/blob/main/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" width="128" height="128" style="display: block; margin: 0 auto"/>
-    <h1>Vibe Music</h1>
-    <p>A Flutter application for streaming music from YouTube Music</p>
-    <img src="https://visitor-badge.glitch.me/badge?page_id=sheikhhaziq.visitor-badge-vibemusic&left_color=red&right_color=green" />
-    <a href="https://github.com/sheikhhaziq/vibemusic/releases/latest"><img src="https://img.shields.io/github/v/release/sheikhhaziq/vibemusic?style=flat" alt="Latest release" /></a>
-    <a href="https://github.com/sheikhhaziq/vibemusic/commits"><img src="https://img.shields.io/github/commits-since/sheikhhaziq/vibemusic/latest?style=flat" alt="Commits since latest release" /></a>
-    <a href="https://github.com/sheikhhaziq/vibemusic/commits"><img src="https://img.shields.io/github/commit-activity/m/sheikhhaziq/vibemusic?color=g" alt="Commits per month" /></a>
-    <a href="https://github.com/sheikhhaziq/vibemusic/releases/latest"><img src="https://img.shields.io/github/release-date/sheikhhaziq/vibemusic" alt="Last release" /></a>
+    <img src="./android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" width="128" height="128" style="display: block; margin: 0 auto"/>
+    <h1>Gyavun (Formerly Vibe Music)</h1>
+    <p>A Flutter application for streaming music from Jio Saavn</p>
+    <img src="https://visitor-badge.glitch.me/badge?page_id=sheikhhaziq.visitor-badge-gyavun&left_color=red&right_color=green" />
+    <a href="https://github.com/sheikhhaziq/gyavyn/releases/latest"><img src="https://img.shields.io/github/v/release/sheikhhaziq/gyavun?style=flat" alt="Latest release" /></a>
+    <a href="https://github.com/sheikhhaziq/gyavun/commits"><img src="https://img.shields.io/github/commits-since/sheikhhaziq/gyavun/latest?style=flat" alt="Commits since latest release" /></a>
+    <a href="https://github.com/sheikhhaziq/gyavun/commits"><img src="https://img.shields.io/github/commit-activity/m/sheikhhaziq/gyavun?color=g" alt="Commits per month" /></a>
+    <a href="https://github.com/sheikhhaziq/gyavun/releases/latest"><img src="https://img.shields.io/github/release-date/sheikhhaziq/gyavun" alt="Last release" /></a>
 
-## Join Our Discord server
 
-[![Join our Discord server!](https://invidget.switchblade.xyz/YtxYgGSYwN)](http://discord.gg/YtxYgGSYwN)
-
 </div>
 
 ---
@@ -28,31 +25,28 @@
 </p>
 
 ## 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
 
 [<img src="https://github.com/machiav3lli/oandbackupx/blob/034b226cea5c1b30eb4f6a6f313e4dadcbb0ece4/badge_github.png"
     alt="Get it on GitHub"
-    height="80">](https://github.com/sheikhhaziq/vibemusic/releases/latest)
-[<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png"
-     alt="Get it on IzzyOnDroid"
-     height="80">](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
 
-<p align="center"><a href="https://github.com/sheikhhaziq/vibemusic/graphs/contributors">
-  <img src="https://contributors-img.web.app/image?repo=sheikhhaziq/vibemusic" />
+<p align="center"><a href="https://github.com/sheikhhaziq/gyavun/graphs/contributors">
+  <img src="https://contributors-img.web.app/image?repo=sheikhhaziq/gyavun" />
 </a></p>
 
 ## Disclaimer

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,17 +67,19 @@ 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 {
     source '../..'
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }

android/app/src/debug/AndroidManifest.xml

@@ -1,10 +1,7 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.webyte.vibe_music.beta">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -1,21 +1,27 @@
-<manifest 
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.webyte.vibe_music.beta">
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:remove="android:maxSdkVersion" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:remove="android:maxSdkVersion" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" android:minSdkVersion="30" tools:remove="android:maxSdkVersion" />
+<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.WAKE_LOCK" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-
-   <application
-        android:label="Vibe Music"
+
+
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+
+    <uses-permission android:name="android.permission.WRITE_MEDIA_AUDIO" />
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="29" />
+
+    <uses-permission android:name="android.permission.READ_MEDIA_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+    <application
+        android:label="Gyavun"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:requestLegacyExternalStorage="true"
-        android:usesCleartextTraffic="true">
+        android:appCategory="audio">
+
         <activity
             android:name="com.ryanheise.audioservice.AudioServiceActivity"
             android:exported="true"
@@ -35,8 +41,14 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MUSIC_PLAYER" />
+                <category android:name="android.intent.category.APP_MUSIC" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+
         </activity>
+
+
         <service android:name="com.ryanheise.audioservice.AudioService"
             android:foregroundServiceType="mediaPlayback"
             android:exported="true" tools:ignore="Instantiatable">
@@ -48,12 +60,12 @@
         <!-- ADD THIS "RECEIVER" element -->
         <receiver android:name="com.ryanheise.audioservice.MediaButtonReceiver"
             android:exported="true" tools:ignore="Instantiatable">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
+        <intent-filter>
+            <action android:name="android.intent.action.MEDIA_BUTTON" />
+        </intent-filter>
         </receiver> 
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+            <!-- 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" />

android/app/src/main/kotlin/com/webyte/vibe_music/beta/MainActivity.kt → 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
 

android/app/src/main/res/anim/in_animation.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@android:integer/config_shortAnimTime"
+    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+    android:shareInterpolator="true">
+
+    <alpha
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromAlpha="0"
+        android:toAlpha="1.0" />
+
+    <translate android:fromYDelta="100%p" />
+
+</set>

android/app/src/main/res/anim/out_animation.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:duration="@android:integer/config_shortAnimTime"
+    android:interpolator="@android:anim/accelerate_decelerate_interpolator"
+    android:shareInterpolator="true">
+
+    <alpha
+        android:fillAfter="true"
+        android:fillBefore="true"
+        android:fillEnabled="true"
+        android:fromAlpha="1.0"
+        android:toAlpha="0" />
+
+    <translate
+        android:fromYDelta="0%p"
+        android:toYDelta="-100%p" />
+
+</set>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>

android/app/src/main/res/raw/keep.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+  tools:keep="@drawable/*" />

android/app/src/main/res/values/attrs.xml

@@ -0,0 +1,7 @@
+<resources>
+    <declare-styleable name="AppWidgetAttrs">
+        <attr name="appWidgetPadding" format="dimension" />
+        <attr name="appWidgetInnerRadius" format="dimension" />
+        <attr name="appWidgetRadius" format="dimension" />
+    </declare-styleable>
+</resources>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,6 @@
+<resources>
+    <color name="light_blue_50">#FFE1F5FE</color>
+    <color name="light_blue_200">#FF81D4FA</color>
+    <color name="light_blue_600">#FF039BE5</color>
+    <color name="light_blue_900">#FF01579B</color>
+</resources>

android/app/src/main/res/values/dimens.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!--
+Refer to App Widget Documentation for margin information
+http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
+    -->
+    <dimen name="widget_margin">0dp</dimen>
+
+</resources>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#2b0632</color>
+    <color name="ic_launcher_background">#000000</color>
 </resources>

android/app/src/main/res/values/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="appwidget_text">Play</string>
+    <string name="add_widget">Add widget</string>
+    <string name="app_widget_description">BlackHole Music</string>
+</resources>