updated package id and name

jhelumcorp · Jul 18, 2024 · 3a61dc9 · 3a61dc9
1 parent d8bfaa6
commit 3a61dc9
Show file tree

Hide file tree

Showing 59 changed files with 130 additions and 163 deletions.
diff --git a/.metadata b/.metadata
@@ -15,21 +15,6 @@ migration:
     - platform: root
       create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
       base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-    - platform: android
-      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-    - platform: ios
-      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-    - platform: linux
-      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-    - platform: macos
-      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-    - platform: web
-      create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
-      base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
     - platform: windows
       create_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49
       base_revision: 761747bfc538b5af34aa0d3fac380f1bc331ec49

diff --git a/README.md b/README.md
@@ -1,34 +1,21 @@
-<div align="center">
-    <img src="./android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" width="128" height="128" style="display: block; margin: 0 auto"/>
-    <h1>Gyawun Music</h1>
-    <p>A Flutter application for streaming music from YouTube Music</p>
-    <img src="https://hits.dwyl.com/jhelumcorp/gyawun.svg?style=flat-square" />
-    <a href="https://github.com/sheikhhaziq/gyavyn/releases/latest"><img src="https://img.shields.io/github/v/release/sheikhhaziq/gyawun?style=flat" alt="Latest release" /></a>
-    <a href="https://github.com/sheikhhaziq/gyawun/commits"><img src="https://img.shields.io/github/commits-since/sheikhhaziq/gyawun/latest?style=flat" alt="Commits since latest release" /></a>
-    <a href="https://github.com/sheikhhaziq/gyawun/commits"><img src="https://img.shields.io/github/commit-activity/m/sheikhhaziq/gyawun?color=g" alt="Commits per month" /></a>
-    <a href="https://github.com/sheikhhaziq/gyawun/releases/latest"><img src="https://img.shields.io/github/release-date/sheikhhaziq/gyawun" alt="Last release" /></a>
-
 
 
-
-
-  <a href="https://t.me/jhelumcorp"><img src="https://img.shields.io/badge/Join_us_on_Telegram-0088cc?style=social&logo=telegram" alt="Telergram" height="50"/></a>
-
-
-
-</div>
-
 ---
 
 <p align="center">
    <img src="./cover.png" width="100%" />
 </p>
 
-<p align="center">
-  <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/01.jpg" width="30%" />
-  <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/02.jpg" width="30%" />
-  <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/03.jpg" width="30%" />
-<p>
+<div align="center">
+<h1>Gyawun Music</h1>
+  <img src="https://hits.dwyl.com/jhelumcorp/gyawun.svg?style=flat-square" />
+    <a href="https://github.com/sheikhhaziq/gyavyn/releases/latest"><img src="https://img.shields.io/github/v/release/sheikhhaziq/gyawun?style=flat" alt="Latest release" /></a>
+    <a href="https://github.com/sheikhhaziq/gyawun/commits"><img src="https://img.shields.io/github/commits-since/sheikhhaziq/gyawun/latest?style=flat" alt="Commits since latest release" /></a>
+    <a href="https://github.com/sheikhhaziq/gyawun/commits"><img src="https://img.shields.io/github/commit-activity/m/sheikhhaziq/gyawun?color=g" alt="Commits per month" /></a>
+    <a href="https://github.com/sheikhhaziq/gyawun/releases/latest"><img src="https://img.shields.io/github/release-date/sheikhhaziq/gyawun" alt="Last release" /></a>
+
+  <a href="https://t.me/jhelumcorp"><img src="https://img.shields.io/badge/Join_us_on_Telegram-0088cc?style=social&logo=telegram" alt="Telergram" height="50"/></a>
+</div>
 
 
 ## Features / TODO

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -29,7 +29,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    namespace = "com.jhelum.gyawun.beta"
+    namespace = "com.jhelum.gyawun"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
     compileOptions {
@@ -39,7 +39,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.jhelum.gyawun.beta"
+        applicationId = "com.jhelum.gyawun"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdk = flutter.minSdkVersion

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 
     <application
-        android:label="Gyawun Music Beta"
+        android:label="Gyawun Music"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true"

diff --git a/android/app/src/main/kotlin/com/jhelum/gyawun/beta/MainActivity.kt b/android/app/src/main/kotlin/com/jhelum/gyawun/beta/MainActivity.kt
diff --git a/lib/app_config.dart b/lib/app_config.dart
@@ -1,9 +1,9 @@
-AppConfig appConfig = AppConfig(version: 24, codeName: '2.0.0-beta-4');
+AppConfig appConfig = AppConfig(version: 25, codeName: '2.0.0');
 
 class AppConfig {
   int version;
   String codeName;
-  Uri updateUri =
-      Uri.parse('https://api.github.com/repos/jhelumcorp/gyawun/releases');
+  Uri updateUri = Uri.parse(
+      'https://api.github.com/repos/jhelumcorp/gyawun/releases/latest');
   AppConfig({required this.version, required this.codeName});
 }
diff --git a/lib/main.dart b/lib/main.dart
@@ -9,9 +9,6 @@ import 'package:flutter_acrylic/window_effect.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:get_it/get_it.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:gyawun_beta/services/lyrics.dart';
-import 'package:gyawun_beta/services/yt_account.dart';
-import 'package:gyawun_beta/themes/colors.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:just_audio_background/just_audio_background.dart';
 import 'package:just_audio_media_kit/just_audio_media_kit.dart';
@@ -23,8 +20,11 @@ import 'generated/l10n.dart';
 import 'services/download_manager.dart';
 import 'services/file_storage.dart';
 import 'services/library.dart';
+import 'services/lyrics.dart';
 import 'services/media_player.dart';
 import 'services/settings_manager.dart';
+import 'services/yt_account.dart';
+import 'themes/colors.dart';
 import 'themes/dark.dart';
 import 'themes/light.dart';
 import 'utils/router.dart';

diff --git a/lib/screens/browse_screen/browse_screen.dart b/lib/screens/browse_screen/browse_screen.dart
@@ -4,15 +4,14 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:expandable_text/expandable_text.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:gyawun_beta/generated/l10n.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
-import 'package:gyawun_beta/utils/pprint.dart';
 import 'package:provider/provider.dart';
 
+import '../../generated/l10n.dart';
 import '../../services/bottom_message.dart';
 import '../../services/library.dart';
 import '../../services/media_player.dart';
 import '../../themes/colors.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../utils/bottom_modals.dart';
 import '../../utils/enhanced_image.dart';
 import '../../ytmusic/ytmusic.dart';
@@ -48,8 +47,6 @@ class _BrowseScreenState extends State<BrowseScreen> {
   void didUpdateWidget(covariant BrowseScreen oldWidget) {
     super.didUpdateWidget(oldWidget);
     if (oldWidget.endpoint['browseId'] != widget.endpoint['browseId']) {
-      pprint(oldWidget.endpoint);
-      pprint(widget.endpoint);
       fetchData();
     }
   }

diff --git a/lib/screens/home_screen/chip_screen.dart b/lib/screens/home_screen/chip_screen.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../ytmusic/ytmusic.dart';
 import 'section_item.dart';
 

diff --git a/lib/screens/home_screen/home_screen.dart b/lib/screens/home_screen/home_screen.dart
@@ -3,9 +3,9 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 
 import '../../generated/l10n.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../ytmusic/ytmusic.dart';
 import 'section_item.dart';
 

diff --git a/lib/screens/home_screen/search_screen/search_screen.dart b/lib/screens/home_screen/search_screen/search_screen.dart
@@ -4,11 +4,11 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_typeahead/flutter_typeahead.dart';
 import 'package:get_it/get_it.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 
 import '../../../generated/l10n.dart';
 import '../../../services/media_player.dart';
+import '../../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../../utils/bottom_modals.dart';
 import '../../../ytmusic/ytmusic.dart';
 import '../../browse_screen/browse_screen.dart';

diff --git a/lib/screens/home_screen/section_item.dart b/lib/screens/home_screen/section_item.dart
@@ -7,12 +7,12 @@ import 'package:expandable_text/expandable_text.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:gyawun_beta/generated/l10n.dart';
-import 'package:gyawun_beta/services/bottom_message.dart';
-import 'package:gyawun_beta/themes/text_styles.dart';
-import 'package:gyawun_beta/utils/enhanced_image.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 
+import '../../generated/l10n.dart';
+import '../../services/bottom_message.dart';
+import '../../themes/text_styles.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
+import '../../utils/enhanced_image.dart';
 import '../../utils/extensions.dart';
 import '../../services/media_player.dart';
 import '../../utils/bottom_modals.dart';

diff --git a/lib/screens/main_screen/bottom_player.dart b/lib/screens/main_screen/bottom_player.dart
@@ -5,11 +5,11 @@ import 'package:fluent_ui/fluent_ui.dart' as fluent_ui;
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
-import 'package:gyawun_beta/utils/enhanced_image.dart';
 import 'package:provider/provider.dart';
 
 import '../../services/media_player.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
+import '../../utils/enhanced_image.dart';
 
 class BottomPlayer extends StatelessWidget {
   const BottomPlayer({super.key});

diff --git a/lib/screens/main_screen/lyrics_box.dart b/lib/screens/main_screen/lyrics_box.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_lyric/lyrics_reader.dart';
 import 'package:get_it/get_it.dart';
-import 'package:gyawun_beta/services/media_player.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 import 'package:just_audio_background/just_audio_background.dart';
 import 'package:provider/provider.dart';
 
 import '../../services/lyrics.dart';
+import '../../services/media_player.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 
 class LyricsBox extends StatefulWidget {
   const LyricsBox({required this.currentSong, required this.size, super.key});

diff --git a/lib/screens/main_screen/main_screen.dart b/lib/screens/main_screen/main_screen.dart
@@ -7,17 +7,17 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
-import 'package:gyawun_beta/screens/browse_screen/browse_screen.dart';
-import 'package:gyawun_beta/services/yt_account.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 import 'package:receive_sharing_intent/receive_sharing_intent.dart';
 import 'package:salomon_bottom_bar/salomon_bottom_bar.dart';
 import 'package:window_manager/window_manager.dart';
 
 import '../../generated/l10n.dart';
+import '../../services/yt_account.dart';
 import '../../themes/text_styles.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../utils/bottom_modals.dart';
 import '../../utils/check_update.dart';
+import '../browse_screen/browse_screen.dart';
 import 'bottom_player.dart';
 
 class MainScreen extends StatefulWidget {

diff --git a/lib/screens/main_screen/play_button.dart b/lib/screens/main_screen/play_button.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 
 import '../../services/media_player.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../utils/extensions.dart';
 
 class PlayButton extends StatefulWidget {

diff --git a/lib/screens/main_screen/player_screen.dart b/lib/screens/main_screen/player_screen.dart
@@ -8,13 +8,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
-import 'package:gyawun_beta/generated/l10n.dart';
-import 'package:gyawun_beta/screens/main_screen/lyrics_box.dart';
-import 'package:gyawun_beta/screens/main_screen/main_screen.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
-import 'package:gyawun_beta/utils/enhanced_image.dart';
-import 'package:gyawun_beta/utils/extensions.dart';
-import 'package:gyawun_beta/ytmusic/ytmusic.dart';
+import 'package:gyawun/screens/main_screen/main_screen.dart';
+import 'package:gyawun/utils/extensions.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:just_audio/just_audio.dart';
 import 'package:just_audio_background/just_audio_background.dart';
@@ -24,12 +19,17 @@ import 'package:sliding_up_panel/sliding_up_panel.dart';
 import 'package:text_scroll/text_scroll.dart';
 import 'package:window_manager/window_manager.dart';
 
+import '../../generated/l10n.dart';
 import '../../services/download_manager.dart';
 import '../../services/media_player.dart';
 import '../../themes/colors.dart';
 import '../../themes/dark.dart';
 import '../../themes/text_styles.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../utils/bottom_modals.dart';
+import '../../utils/enhanced_image.dart';
+import '../../ytmusic/ytmusic.dart';
+import 'lyrics_box.dart';
 import 'play_button.dart';
 import 'queue_list.dart';
 

diff --git a/lib/screens/main_screen/queue_list.dart b/lib/screens/main_screen/queue_list.dart
@@ -4,12 +4,12 @@ import 'dart:ui';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:gyawun_beta/generated/l10n.dart';
-import 'package:gyawun_beta/utils/enhanced_image.dart';
 import 'package:just_audio_background/just_audio_background.dart';
 import 'package:provider/provider.dart';
 
+import '../../generated/l10n.dart';
 import '../../services/media_player.dart';
+import '../../utils/enhanced_image.dart';
 
 class QueueList extends StatelessWidget {
   const QueueList({super.key});

diff --git a/lib/screens/saved_screen/download_screen.dart b/lib/screens/saved_screen/download_screen.dart
@@ -5,13 +5,13 @@ import 'package:expandable_text/expandable_text.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_swipe_action_cell/core/cell.dart';
 import 'package:get_it/get_it.dart';
-import 'package:gyawun_beta/generated/l10n.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
-import 'package:gyawun_beta/utils/extensions.dart';
+import 'package:gyawun/utils/extensions.dart';
 
+import '../../generated/l10n.dart';
 import '../../services/bottom_message.dart';
 import '../../services/download_manager.dart';
 import '../../services/media_player.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../utils/bottom_modals.dart';
 
 class DownloadScreen extends StatelessWidget {

diff --git a/lib/screens/saved_screen/favourite_details_screen.dart b/lib/screens/saved_screen/favourite_details_screen.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_swipe_action_cell/core/cell.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 
 import '../../generated/l10n.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../utils/bottom_modals.dart';
 import 'library_tile.dart';
 import 'playlist_details_screen.dart';

diff --git a/lib/screens/saved_screen/history_screen.dart b/lib/screens/saved_screen/history_screen.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_swipe_action_cell/core/cell.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 
 import '../../generated/l10n.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../utils/bottom_modals.dart';
 import '../home_screen/section_item.dart';
 

diff --git a/lib/screens/saved_screen/library_tile.dart b/lib/screens/saved_screen/library_tile.dart
@@ -3,10 +3,10 @@ import 'package:expandable_text/expandable_text.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
-import 'package:gyawun_beta/generated/l10n.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 
+import '../../generated/l10n.dart';
 import '../../services/media_player.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../utils/bottom_modals.dart';
 import '../../utils/extensions.dart';
 

diff --git a/lib/screens/saved_screen/playlist_details_screen.dart b/lib/screens/saved_screen/playlist_details_screen.dart
@@ -7,14 +7,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:flutter_swipe_action_cell/core/cell.dart';
 import 'package:get_it/get_it.dart';
-import 'package:gyawun_beta/generated/l10n.dart';
-import 'package:gyawun_beta/utils/adaptive_widgets/adaptive_widgets.dart';
 import 'package:provider/provider.dart';
 
+import '../../generated/l10n.dart';
 import '../../services/bottom_message.dart';
 import '../../services/library.dart';
 import '../../services/media_player.dart';
 import '../../themes/colors.dart';
+import '../../utils/adaptive_widgets/adaptive_widgets.dart';
 import '../../utils/bottom_modals.dart';
 import '../home_screen/section_item.dart';
 import '../../utils/extensions.dart';