feat: Modernisation UI/UX et configuration Flutter multi-plateforme

Phase 1 - Corrections Critiques:
- Fixed memory leaks dans music_provider.dart (stream subscriptions)
- Fixed race conditions dans search_provider.dart (stale results)
- Fixed token refresh errors dans api_service.dart
- Improved error handling avec messages utilisateur
- Changed API URL to HTTPS by default

Phase 2 - Améliorations UX Desktop:
- Ajouté cursor pointers sur tous les éléments cliquables
- Implémenté hover states avec effets néon glow (200ms transitions)
- Créé skeleton loading states avec shimmer animation
- Ajouté widgets: ClickableWrapper, ErrorDisplay, SkeletonLoading
- Enhanced visual feedback pour desktop users

Phase 3 - Configuration Flutter:
- Configuré Android (Gradle 8.1.0, Kotlin 1.9.0, minSdk 21, targetSdk 34)
- Créé launcher icons cyberpunk néon (5 densités)
- Configuré Windows desktop (structure complète)
- Activé Linux desktop support
- Ajouté package équatable pour entités de domaine
- Corrigé imports (colors.dart, auth_provider.dart)
- Fixed Dio API compatibility (RequestOptions)

Documentation:
- STYLE_GUIDE.md: Guide complet (100+ pages)
- DESIGN_IMPLEMENTATION_GUIDE.md: Implémentation Flutter
- BUILD_STATUS.md: Status builds + troubleshooting
- QUICKSTART_BUILDS.md: Guide rapide
- BUILD_INDEX.md: Index documentation
- PHASE_1_CORRECTIONS.md: Corrections Phase 1
- PHASE_2_UX_IMPROVEMENTS.md: Améliorations Phase 2
- PR_REVIEW_SUMMARY.md: Revue code complète
- CODE_ANALYSIS_AND_PRIORITIES.md: Analyse code

Scripts & Builds:
- BUILD_ALL.sh: Script automatisé builds multi-plateforme
- builds/: Structure avec README par plateforme
- design-system/: Système de design complet

Backend:
- Ajouté streaming HTTP Range pour audio progressif
- Enhanced YouTube service avec métadonnées complètes
- Improved error handling et validation

Generated with [Claude Code](https://claude.com/claude-code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
This commit is contained in:
root
2026-01-19 07:44:40 +00:00
parent a89c7894cf
commit 85dad89d5b
100 changed files with 13570 additions and 323 deletions
+18
View File
@@ -0,0 +1,18 @@
gradle-wrapper.jar
/.gradle
/local.properties
/Dart_Toolchain
Generated plugin registrations
*.iml
*.ipr
*.iws
.idea/
.DS_Store
.capture/
*.swp
项目中本地生成的文件
/debug/
/profile/
/packages/
/.gradle/
/build/
+49
View File
@@ -0,0 +1,49 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "com.google.gms.google-services"
}
android {
namespace "com.audiohm.audiOhm"
compileSdk 34
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
defaultConfig {
applicationId "com.audiohm.audiOhm"
minSdk 21
targetSdk 34
versionCode 1
versionName "1.0.0"
multiDexEnabled true
}
buildTypes {
release {
signingConfig signingConfigs.debug
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-rules.pro')
}
}
signingConfigs {
debug {
storeFile file('debug.keystore')
storePassword 'android'
keyAlias 'androiddebugkey'
keyPassword 'android'
}
}
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
+18
View File
@@ -0,0 +1,18 @@
{
"project_info": {
"project_number": "your-project-number",
"firebase_url": "https://your-project-id.firebaseio.com",
"project_id": "your-project-id",
"storage_bucket": "your-project-id.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:123456789:android:abcdef",
"android_client_info": {
"package_name": "com.audiohm.audiOhm"
}
}
}
]
}
@@ -0,0 +1,43 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.audiohm.audiOhm">
<uses-permission android:name="android.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<application
android:label="AudiOhm"
android:name=".Application"
android:icon="@mipmap/ic_launcher"
android:usesCleartextTrafficPermitted="true"
android:networkSecurityConfig="@xml/network_security_config">
<activity
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|layoutDirection|locale"
android:hardwareAccelerated="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<service
android:name="com.ryanheise.audioservice.AudioService"
android:exported="false"
android:foregroundServiceType="mediaPlayback">
<intent-filter>
<action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter>
</service>
</application>
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</manifest>
@@ -0,0 +1,89 @@
package io.flutter.plugins;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import io.flutter.Log;
import io.flutter.embedding.engine.FlutterEngine;
/**
* Generated file. Do not edit.
* This file is generated by the Flutter tool based on the
* plugins that support the Android platform.
*/
@Keep
public final class GeneratedPluginRegistrant {
private static final String TAG = "GeneratedPluginRegistrant";
public static void registerWith(@NonNull FlutterEngine flutterEngine) {
try {
flutterEngine.getPlugins().add(new com.ryanheise.audioservice.AudioServicePlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin audio_service, com.ryanheise.audioservice.AudioServicePlugin", e);
}
try {
flutterEngine.getPlugins().add(new com.ryanheise.audio_session.AudioSessionPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin audio_session, com.ryanheise.audio_session.AudioSessionPlugin", e);
}
try {
flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.connectivity.ConnectivityPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin connectivity_plus, dev.fluttercommunity.plus.connectivity.ConnectivityPlugin", e);
}
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin flutter_plugin_android_lifecycle, io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin", e);
}
try {
flutterEngine.getPlugins().add(new com.it_nomads.fluttersecurestorage.FlutterSecureStoragePlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin flutter_secure_storage, com.it_nomads.fluttersecurestorage.FlutterSecureStoragePlugin", e);
}
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.imagepicker.ImagePickerPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin image_picker_android, io.flutter.plugins.imagepicker.ImagePickerPlugin", e);
}
try {
flutterEngine.getPlugins().add(new com.ryanheise.just_audio.JustAudioPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin just_audio, com.ryanheise.just_audio.JustAudioPlugin", e);
}
try {
flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin package_info_plus, dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin", e);
}
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin path_provider_android, io.flutter.plugins.pathprovider.PathProviderPlugin", e);
}
try {
flutterEngine.getPlugins().add(new com.baseflow.permissionhandler.PermissionHandlerPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin permission_handler_android, com.baseflow.permissionhandler.PermissionHandlerPlugin", e);
}
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin shared_preferences_android, io.flutter.plugins.sharedpreferences.SharedPreferencesPlugin", e);
}
try {
flutterEngine.getPlugins().add(new com.tekartik.sqflite.SqflitePlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin sqflite_android, com.tekartik.sqflite.SqflitePlugin", e);
}
try {
flutterEngine.getPlugins().add(new eu.simonbinder.sqlite3_flutter_libs.Sqlite3FlutterLibsPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin sqlite3_flutter_libs, eu.simonbinder.sqlite3_flutter_libs.Sqlite3FlutterLibsPlugin", e);
}
try {
flutterEngine.getPlugins().add(new io.flutter.plugins.urllauncher.UrlLauncherPlugin());
} catch (Exception e) {
Log.e(TAG, "Error registering plugin url_launcher_android, io.flutter.plugins.urllauncher.UrlLauncherPlugin", e);
}
}
}
@@ -0,0 +1,9 @@
package com.audiohm.audiOhm
import io.flutter.app.FlutterApplication
class Application: FlutterApplication() {
override fun onCreate() {
super.onCreate()
}
}
@@ -0,0 +1,11 @@
package com.audiohm.audiOhm
import io.flutter.embedding.android.FlutterActivity
import io.flutter.embedding.engine.FlutterEngine
import io.flutter.plugins.GeneratedPluginRegistrant
class MainActivity: FlutterActivity() {
override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
GeneratedPluginRegistrant.registerWith(flutterEngine)
}
}
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M40,44 m6,6 l12,0 l-4,-4 l-8,8 m12,0 l-4,-4"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M68,44 m-6,6 l12,0 l-4,4 l-8,-8"/>
</vector>
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<!-- Background Circle - Cyberpunk Gradient -->
<path
android:fillColor="#0A0E27"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<!-- Neon Glow Circle -->
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"
android:fillAlpha="0.2"/>
<!-- Music Note Icon -->
<path
android:fillColor="#00F0FF"
android:pathData="M45,35 L45,35 L45,55 C45,58 47,60 50,60 C55,60 58,55 58,50 C58,43 54,38 50,35 L45,35 Z M45,30 C50,30 54,33 54,38 C54,43 50,46 45,50 L45,50 L40,50 L35,45 L35,45 L35,45 L38,42 C38,39 40,38 42,38 L45,35 Z M45,55 L50,60 L55,65 L65,65 L65,75 L65,85 L60,90 L50,90 L40,90 L35,85 L35,85 L35,75 L40,70 L45,55 Z"/>
<!-- Play Triangle -->
<path
android:fillColor="#F0F4F8"
android:pathData="M50,42 L50,42 L65,50 L50,58 L35,58 L50,42 Z"/>
<!-- Accent Lines - Cyberpunk Style -->
<path
android:fillColor="#BF00FF"
android:fillAlpha="0.8"
android:pathData="M35,65 L40,60 L45,65"/>
<path
android:fillColor="#FF006E"
android:fillAlpha="0.8"
android:pathData="M63,65 L68,60 L73,65"/>
<!-- Glow dots -->
<circle
android:fillColor="#00F0FF"
android:cx="30"
android:cy="45"
android:r="2"/>
<circle
android:fillColor="#00F0FF"
android:cx="78"
android:cy="45"
android:r="2"/>
</vector>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M40,44 m6,6 l12,0 l-4,-4 l-8,8 m12,0 l-4,-4"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M68,44 m-6,6 l12,0 l-4,4 l-8,-8"/>
</vector>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M40,44 m6,6 l12,0 l-4,-4 l-8,8 m12,0 l-4,-4"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M68,44 m-6,6 l12,0 l-4,4 l-8,-8"/>
</vector>
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<!-- Background Circle - Cyberpunk Gradient -->
<path
android:fillColor="#0A0E27"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<!-- Neon Glow Circle -->
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"
android:fillAlpha="0.2"/>
<!-- Music Note Icon -->
<path
android:fillColor="#00F0FF"
android:pathData="M45,35 L45,35 L45,55 C45,58 47,60 50,60 C55,60 58,55 58,50 C58,43 54,38 50,35 L45,35 Z M45,30 C50,30 54,33 54,38 C54,43 50,46 45,50 L45,50 L40,50 L35,45 L35,45 L35,45 L38,42 C38,39 40,38 42,38 L45,35 Z M45,55 L50,60 L55,65 L65,65 L65,75 L65,85 L60,90 L50,90 L40,90 L35,85 L35,85 L35,75 L40,70 L45,55 Z"/>
<!-- Play Triangle -->
<path
android:fillColor="#F0F4F8"
android:pathData="M50,42 L50,42 L65,50 L50,58 L35,58 L50,42 Z"/>
<!-- Accent Lines - Cyberpunk Style -->
<path
android:fillColor="#BF00FF"
android:fillAlpha="0.8"
android:pathData="M35,65 L40,60 L45,65"/>
<path
android:fillColor="#FF006E"
android:fillAlpha="0.8"
android:pathData="M63,65 L68,60 L73,65"/>
<!-- Glow dots -->
<circle
android:fillColor="#00F0FF"
android:cx="30"
android:cy="45"
android:r="2"/>
<circle
android:fillColor="#00F0FF"
android:cx="78"
android:cy="45"
android:r="2"/>
</vector>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M40,44 m6,6 l12,0 l-4,-4 l-8,8 m12,0 l-4,-4"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M68,44 m-6,6 l12,0 l-4,4 l-8,-8"/>
</vector>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M40,44 m6,6 l12,0 l-4,-4 l-8,8 m12,0 l-4,-4"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M68,44 m-6,6 l12,0 l-4,4 l-8,-8"/>
</vector>
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<!-- Background Circle - Cyberpunk Gradient -->
<path
android:fillColor="#0A0E27"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<!-- Neon Glow Circle -->
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"
android:fillAlpha="0.2"/>
<!-- Music Note Icon -->
<path
android:fillColor="#00F0FF"
android:pathData="M45,35 L45,35 L45,55 C45,58 47,60 50,60 C55,60 58,55 58,50 C58,43 54,38 50,35 L45,35 Z M45,30 C50,30 54,33 54,38 C54,43 50,46 45,50 L45,50 L40,50 L35,45 L35,45 L35,45 L38,42 C38,39 40,38 42,38 L45,35 Z M45,55 L50,60 L55,65 L65,65 L65,75 L65,85 L60,90 L50,90 L40,90 L35,85 L35,85 L35,75 L40,70 L45,55 Z"/>
<!-- Play Triangle -->
<path
android:fillColor="#F0F4F8"
android:pathData="M50,42 L50,42 L65,50 L50,58 L35,58 L50,42 Z"/>
<!-- Accent Lines - Cyberpunk Style -->
<path
android:fillColor="#BF00FF"
android:fillAlpha="0.8"
android:pathData="M35,65 L40,60 L45,65"/>
<path
android:fillColor="#FF006E"
android:fillAlpha="0.8"
android:pathData="M63,65 L68,60 L73,65"/>
<!-- Glow dots -->
<circle
android:fillColor="#00F0FF"
android:cx="30"
android:cy="45"
android:r="2"/>
<circle
android:fillColor="#00F0FF"
android:cx="78"
android:cy="45"
android:r="2"/>
</vector>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M40,44 m6,6 l12,0 l-4,-4 l-8,8 m12,0 l-4,-4"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M68,44 m-6,6 l12,0 l-4,4 l-8,-8"/>
</vector>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M40,44 m6,6 l12,0 l-4,-4 l-8,8 m12,0 l-4,-4"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M68,44 m-6,6 l12,0 l-4,4 l-8,-8"/>
</vector>
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<!-- Background Circle - Cyberpunk Gradient -->
<path
android:fillColor="#0A0E27"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<!-- Neon Glow Circle -->
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"
android:fillAlpha="0.2"/>
<!-- Music Note Icon -->
<path
android:fillColor="#00F0FF"
android:pathData="M45,35 L45,35 L45,55 C45,58 47,60 50,60 C55,60 58,55 58,50 C58,43 54,38 50,35 L45,35 Z M45,30 C50,30 54,33 54,38 C54,43 50,46 45,50 L45,50 L40,50 L35,45 L35,45 L35,45 L38,42 C38,39 40,38 42,38 L45,35 Z M45,55 L50,60 L55,65 L65,65 L65,75 L65,85 L60,90 L50,90 L40,90 L35,85 L35,85 L35,75 L40,70 L45,55 Z"/>
<!-- Play Triangle -->
<path
android:fillColor="#F0F4F8"
android:pathData="M50,42 L50,42 L65,50 L50,58 L35,58 L50,42 Z"/>
<!-- Accent Lines - Cyberpunk Style -->
<path
android:fillColor="#BF00FF"
android:fillAlpha="0.8"
android:pathData="M35,65 L40,60 L45,65"/>
<path
android:fillColor="#FF006E"
android:fillAlpha="0.8"
android:pathData="M63,65 L68,60 L73,65"/>
<!-- Glow dots -->
<circle
android:fillColor="#00F0FF"
android:cx="30"
android:cy="45"
android:r="2"/>
<circle
android:fillColor="#00F0FF"
android:cx="78"
android:cy="45"
android:r="2"/>
</vector>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M40,44 m6,6 l12,0 l-4,-4 l-8,8 m12,0 l-4,-4"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M68,44 m-6,6 l12,0 l-4,4 l-8,-8"/>
</vector>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M40,44 m6,6 l12,0 l-4,-4 l-8,8 m12,0 l-4,-4"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M68,44 m-6,6 l12,0 l-4,4 l-8,-8"/>
</vector>
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<!-- Background Circle - Cyberpunk Gradient -->
<path
android:fillColor="#0A0E27"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<!-- Neon Glow Circle -->
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"
android:fillAlpha="0.2"/>
<!-- Music Note Icon -->
<path
android:fillColor="#00F0FF"
android:pathData="M45,35 L45,35 L45,55 C45,58 47,60 50,60 C55,60 58,55 58,50 C58,43 54,38 50,35 L45,35 Z M45,30 C50,30 54,33 54,38 C54,43 50,46 45,50 L45,50 L40,50 L35,45 L35,45 L35,45 L38,42 C38,39 40,38 42,38 L45,35 Z M45,55 L50,60 L55,65 L65,65 L65,75 L65,85 L60,90 L50,90 L40,90 L35,85 L35,85 L35,75 L40,70 L45,55 Z"/>
<!-- Play Triangle -->
<path
android:fillColor="#F0F4F8"
android:pathData="M50,42 L50,42 L65,50 L50,58 L35,58 L50,42 Z"/>
<!-- Accent Lines - Cyberpunk Style -->
<path
android:fillColor="#BF00FF"
android:fillAlpha="0.8"
android:pathData="M35,65 L40,60 L45,65"/>
<path
android:fillColor="#FF006E"
android:fillAlpha="0.8"
android:pathData="M63,65 L68,60 L73,65"/>
<!-- Glow dots -->
<circle
android:fillColor="#00F0FF"
android:cx="30"
android:cy="45"
android:r="2"/>
<circle
android:fillColor="#00F0FF"
android:cx="78"
android:cy="45"
android:r="2"/>
</vector>
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#00F0FF"
android:pathData="M54,10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 C30,10 10,30 10,54 C10,78 30,98 54,98 C78,98 98,78 98,54 C98,30 78,10 54,10 10 Z"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M40,44 m6,6 l12,0 l-4,-4 l-8,8 m12,0 l-4,-4"/>
<path
android:fillColor="#F0F4F8"
android:pathData="M68,44 m-6,6 l12,0 l-4,4 l-8,-8"/>
</vector>
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">@android:color/white</item>
</style>
</resources>
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<base-config cleartextPermitted="false">
<trust-anchors>
<certificates src="system" />
<certificates src="user"/>
</trust-anchors>
</base-config>
<!-- Allow localhost for development -->
<domain-config cleartextPermitted="true">
<domain includeSubdomains="true">localhost</domain>
<domain includeSubdomains="true">10.0.2.2</domain>
<domain includeSubdomains="true">10.0.0.1</domain>
</domain-config>
<!-- Production API -->
<domain-config cleartextPermitted="false">
<domain includeSubdomains="true">api.audiOhm.com</domain>
</domain-config>
</network-security-config>
+21
View File
@@ -0,0 +1,21 @@
buildscript {
ext.kotlin_version = '1.9.0'
repositories {
google()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects {
repositories {
google()
mavenCentral()
}
}
rootProject.name = "audiOhm"
+3
View File
@@ -0,0 +1,3 @@
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+UseCompressedOops
android.useAndroidX=true
android.enableJetifier=true
+7
View File
@@ -0,0 +1,7 @@
pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
@@ -3,14 +3,16 @@ class ApiConstants {
ApiConstants._();
// Base URLs
// Note: Using HTTPS for production. For local development, override with:
// flutter run --dart-define=API_BASE_URL=http://localhost:8000/api/v1
static const String baseUrl = String.fromEnvironment(
'API_BASE_URL',
defaultValue: 'http://localhost:8000/api/v1',
defaultValue: 'https://api.audiOhm.com/api/v1', // Production HTTPS URL
);
static const String wsUrl = String.fromEnvironment(
'WS_BASE_URL',
defaultValue: 'ws://localhost:8000',
defaultValue: 'wss://api.audiOhm.com', // Production WSS URL
);
// Timeout durations
@@ -2,11 +2,12 @@
library;
import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:pretty_dio_logger/pretty_dio_logger.dart';
import '../../../core/constants/api_constants.dart';
import '../../providers/auth_provider.dart';
import '../../../presentation/providers/auth_provider.dart';
/// API Service provider
final apiServiceProvider = Provider<Dio>((ref) {
@@ -26,17 +27,19 @@ final apiServiceProvider = Provider<Dio>((ref) {
final dio = Dio(options);
// Add logger in debug mode
dio.interceptors.add(
PrettyDioLogger(
requestHeader: true,
requestBody: true,
responseBody: true,
responseHeader: false,
error: true,
compact: true,
),
);
// Add logger ONLY in debug mode to prevent exposing sensitive data in production
if (kDebugMode) {
dio.interceptors.add(
PrettyDioLogger(
requestHeader: true,
requestBody: true,
responseBody: true,
responseHeader: false,
error: true,
compact: true,
),
);
}
// Add token refresh interceptor
dio.interceptors.add(
@@ -48,18 +51,42 @@ final apiServiceProvider = Provider<Dio>((ref) {
final newToken = await ref.read(authProvider.notifier).refreshToken();
if (newToken != null) {
// Retry original request with new token
final opts = options.copyWith(
final opts = RequestOptions(
path: error.requestOptions.path,
data: error.requestOptions.data,
onReceiveProgress: error.requestOptions.onReceiveProgress,
onSendProgress: error.requestOptions.onSendProgress,
queryParameters: error.requestOptions.queryParameters,
cancelToken: error.requestOptions.cancelToken,
headers: {
...options.headers,
...error.requestOptions.headers,
'Authorization': 'Bearer $newToken',
},
extra: error.requestOptions.extra,
method: error.requestOptions.method,
responseType: error.requestOptions.responseType,
validateStatus: error.requestOptions.validateStatus,
);
final clonedReq = await dio.fetch(opts..path = error.requestOptions.path);
final clonedReq = await dio.fetch(opts);
return handler.resolve(clonedReq);
}
} catch (e) {
} on DioException catch (e) {
// Log the specific error for debugging
debugPrint('Token refresh failed: ${e.type} - ${e.message}');
// Notify user before logout
// Note: In a real app, you'd want to show a snackbar or dialog here
// For now, we just log the user out with a clear message
debugPrint('Your session has expired. Please log in again.');
// Refresh failed, logout user
ref.read(authProvider.notifier).logout();
await ref.read(authProvider.notifier).logout();
} catch (e) {
// Log unexpected errors
debugPrint('Unexpected error during token refresh: $e');
// Logout on any error
await ref.read(authProvider.notifier).logout();
}
}
return handler.next(error);
@@ -1,13 +1,18 @@
import 'package:flutter/material.dart';
import '../../../core/theme/colors.dart';
import '../../widgets/common/skeleton_loading.dart';
/// Mobile Home Page
/// Mobile Home Page with loading states
class MobileHomePage extends StatelessWidget {
const MobileHomePage({super.key});
@override
Widget build(BuildContext context) {
// TODO: Integrate with actual data provider
// For now, showing skeleton loading as example
final isLoading = false; // Change to true to see skeleton
return CustomScrollView(
slivers: [
// Header
@@ -39,63 +44,68 @@ class MobileHomePage extends StatelessWidget {
),
),
// Content sections
// Content sections or skeleton
SliverToBoxAdapter(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Quick picks grid
GridView.builder(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
childAspectRatio: 2.5,
crossAxisSpacing: 12,
mainAxisSpacing: 12,
),
itemCount: 6,
itemBuilder: (context, index) {
return const _QuickPickCard();
},
),
child: isLoading
? const PageSkeleton(
showHero: false,
sectionCount: 3,
)
: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Quick picks grid
GridView.builder(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
childAspectRatio: 2.5,
crossAxisSpacing: 12,
mainAxisSpacing: 12,
),
itemCount: 6,
itemBuilder: (context, index) {
return const _QuickPickCard();
},
),
const SizedBox(height: 24),
const SizedBox(height: 24),
// Recently played
const _SectionTitle(title: 'Recently Played'),
const SizedBox(height: 12),
SizedBox(
height: 160,
child: ListView.builder(
scrollDirection: Axis.horizontal,
itemCount: 10,
itemBuilder: (context, index) {
return const _AlbumCard();
},
// Recently played
const _SectionTitle(title: 'Recently Played'),
const SizedBox(height: 12),
SizedBox(
height: 160,
child: ListView.builder(
scrollDirection: Axis.horizontal,
itemCount: 10,
itemBuilder: (context, index) {
return const _AlbumCard();
},
),
),
const SizedBox(height: 24),
// Made for you
const _SectionTitle(title: 'Made For You'),
const SizedBox(height: 12),
SizedBox(
height: 160,
child: ListView.builder(
scrollDirection: Axis.horizontal,
itemCount: 8,
itemBuilder: (context, index) {
return const _PlaylistCard();
},
),
),
],
),
),
const SizedBox(height: 24),
// Made for you
const _SectionTitle(title: 'Made For You'),
const SizedBox(height: 12),
SizedBox(
height: 160,
child: ListView.builder(
scrollDirection: Axis.horizontal,
itemCount: 8,
itemBuilder: (context, index) {
return const _PlaylistCard();
},
),
),
],
),
),
),
],
);
@@ -1,6 +1,9 @@
/// Music Provider - Player state management
library;
import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:just_audio/just_audio.dart';
@@ -56,44 +59,65 @@ class PlayerState {
class PlayerNotifier extends StateNotifier<PlayerState> {
PlayerNotifier() : super(const PlayerState()) {
_player = AudioPlayer();
_subscriptions = [];
_init();
}
late final AudioPlayer _player;
final List<StreamSubscription> _subscriptions = [];
void _init() {
_player.positionStream.listen((position) {
// Subscribe to position stream and store subscription
_subscriptions.add(_player.positionStream.listen((position) {
state = state.copyWith(position: position);
});
}));
_player.durationStream.listen((duration) {
// Subscribe to duration stream and store subscription
_subscriptions.add(_player.durationStream.listen((duration) {
state = state.copyWith(duration: duration ?? Duration.zero);
});
}));
_player.playerStateStream.listen((playerState) {
// Subscribe to player state stream and store subscription
_subscriptions.add(_player.playerStateStream.listen((playerState) {
state = state.copyWith(
isPlaying: playerState.playing,
isLoading: playerState.processingState == ProcessingState.loading,
);
});
}));
}
Future<void> loadTrack(Track track) async {
state = state.copyWith(isLoading: true);
state = state.copyWith(isLoading: true, errorMessage: null);
try {
// Get stream URL from API
final streamUrl = track.audioUrl ?? '';
// Validate audio URL exists
final streamUrl = track.audioUrl;
if (streamUrl == null || streamUrl.isEmpty) {
throw Exception('No audio URL available for track: ${track.title}');
}
await _player.setUrl(streamUrl);
if (state.queue.isEmpty) {
state = state.copyWith(queue: [track], currentIndex: 0);
}
} catch (e) {
// Clear error and loading state on success
state = state.copyWith(isLoading: false, errorMessage: null);
} on PlayerException catch (e) {
// Specific audio player errors
debugPrint('Player error loading track: ${e.message}');
state = state.copyWith(
isLoading: false,
errorMessage: e.toString(),
errorMessage: 'Unable to play this track. Please try another.',
);
} catch (e) {
// Network or other errors
debugPrint('Error loading track: $e');
state = state.copyWith(
isLoading: false,
errorMessage: 'An error occurred while loading the track.',
);
}
}
@@ -110,6 +134,15 @@ class PlayerNotifier extends StateNotifier<PlayerState> {
state = state.copyWith(isPlaying: false);
}
/// Convenience method to toggle play/pause
Future<void> togglePlay() async {
if (state.isPlaying) {
await pause();
} else {
await play();
}
}
Future<void> seek(Duration position) async {
await _player.seek(position);
}
@@ -153,6 +186,10 @@ class PlayerNotifier extends StateNotifier<PlayerState> {
@override
void dispose() {
// Cancel all stream subscriptions to prevent memory leaks
for (final subscription in _subscriptions) {
subscription.cancel();
}
_player.dispose();
super.dispose();
}
@@ -2,6 +2,7 @@
library;
import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../infrastructure/datasources/remote/music_api_service.dart';
@@ -71,6 +72,9 @@ class SearchNotifier extends StateNotifier<SearchState> {
}
Future<void> _performSearch(String query) async {
// Store the original query to check for race conditions
final originalQuery = query;
try {
final results = await _musicApiService.search(
query,
@@ -78,29 +82,40 @@ class SearchNotifier extends StateNotifier<SearchState> {
limit: 20,
);
state = SearchState(
query: query,
tracks: (results['tracks'] as List?)
?.map((json) => Track.fromJson(json as Map<String, dynamic>))
.toList() ??
[],
artists: (results['artists'] as List?)
?.map((json) => Artist.fromJson(json as Map<String, dynamic>))
.toList() ??
[],
albums: (results['albums'] as List?)
?.map((json) => Album.fromJson(json as Map<String, dynamic>))
.toList() ??
[],
);
// CRITICAL: Only update state if this is still the current search query
// This prevents race conditions where old search results overwrite newer ones
if (state.query == originalQuery) {
state = SearchState(
query: query,
tracks: (results['tracks'] as List?)
?.map((json) => Track.fromJson(json as Map<String, dynamic>))
.toList() ??
[],
artists: (results['artists'] as List?)
?.map((json) => Artist.fromJson(json as Map<String, dynamic>))
.toList() ??
[],
albums: (results['albums'] as List?)
?.map((json) => Album.fromJson(json as Map<String, dynamic>))
.toList() ??
[],
);
} else {
// This search result is stale, ignore it
debugPrint('Ignoring stale search results for "$originalQuery" (current: "${state.query}")');
}
} catch (e) {
state = SearchState(
query: query,
error: e.toString(),
);
// Only update error state if this is still the current query
if (state.query == originalQuery) {
debugPrint('Search failed for "$originalQuery": $e');
state = SearchState(
query: query,
error: e.toString(),
);
}
} finally {
// Keep isSearching false if this was the latest search
if (state.query == query) {
// Only clear loading state if this is still the current query
if (state.query == originalQuery) {
state = state.copyWith(isSearching: false);
}
}
@@ -4,7 +4,7 @@ library;
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import '../../core/theme/colors.dart';
import '../../../core/theme/colors.dart';
class CachedNetworkImageWithFallback extends StatelessWidget {
final String? imageUrl;
@@ -0,0 +1,54 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
/// Wrapper widget that adds click cursor to clickable elements
/// Usage: ClickableWrapper(child: YourClickableWidget())
class ClickableWrapper extends StatelessWidget {
final Widget child;
final VoidCallback? onTap;
final VoidCallback? onDoubleTap;
final VoidCallback? onLongPress;
final bool isClickable;
const ClickableWrapper({
super.key,
required this.child,
this.onTap,
this.onDoubleTap,
this.onLongPress,
this.isClickable = true,
});
@override
Widget build(BuildContext context) {
if (!isClickable) {
return child;
}
return MouseRegion(
cursor: SystemMouseCursors.click,
child: GestureDetector(
onTap: onTap,
onDoubleTap: onDoubleTap,
onLongPress: onLongPress,
child: child,
),
);
}
}
/// Extension method to wrap any widget with click cursor
extension ClickableWrapperExtension on Widget {
Widget withClickCursor({
VoidCallback? onTap,
VoidCallback? onDoubleTap,
VoidCallback? onLongPress,
}) {
return ClickableWrapper(
onTap: onTap,
onDoubleTap: onDoubleTap,
onLongPress: onLongPress,
child: this,
);
}
}
@@ -0,0 +1,217 @@
import 'package:flutter/material.dart';
import '../../../core/theme/colors.dart';
/// Widget to display error messages in a user-friendly way
class ErrorDisplay extends StatelessWidget {
final String? errorMessage;
final VoidCallback? onRetry;
final Widget? child;
const ErrorDisplay({
super.key,
required this.errorMessage,
this.onRetry,
this.child,
});
@override
Widget build(BuildContext context) {
if (errorMessage == null) {
return child ?? const SizedBox.shrink();
}
return Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
gradient: LinearGradient(
colors: [
AppColors.error.withOpacity(0.1),
AppColors.error.withOpacity(0.05),
],
),
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: AppColors.error.withOpacity(0.3),
width: 1,
),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Row(
children: [
Icon(
Icons.error_outline,
color: AppColors.error,
size: 20,
),
const SizedBox(width: 8),
Expanded(
child: Text(
errorMessage!,
style: const TextStyle(
color: AppColors.textPrimary,
fontSize: 14,
fontWeight: FontWeight.w500,
),
),
),
],
),
if (onRetry != null) ...[
const SizedBox(height: 12),
SizedBox(
width: double.infinity,
child: ElevatedButton(
onPressed: onRetry,
style: ElevatedButton.styleFrom(
backgroundColor: AppColors.error,
foregroundColor: AppColors.textInverted,
padding: const EdgeInsets.symmetric(vertical: 12),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
),
),
child: const Text(
'Retry',
style: TextStyle(
fontWeight: FontWeight.w600,
fontSize: 14,
),
),
),
),
],
],
),
);
}
}
/// Small inline error message for compact spaces
class InlineError extends StatelessWidget {
final String message;
final VoidCallback? onRetry;
const InlineError({
super.key,
required this.message,
this.onRetry,
});
@override
Widget build(BuildContext context) {
return Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
Icons.error_outline,
color: AppColors.error,
size: 16,
),
const SizedBox(width: 6),
Flexible(
child: Text(
message,
style: const TextStyle(
color: AppColors.error,
fontSize: 12,
fontWeight: FontWeight.w500,
),
),
),
if (onRetry != null) ...[
const SizedBox(width: 8),
GestureDetector(
onTap: onRetry,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: AppColors.error.withOpacity(0.1),
borderRadius: BorderRadius.circular(4),
border: Border.all(
color: AppColors.error.withOpacity(0.3),
width: 1,
),
),
child: const Text(
'Retry',
style: TextStyle(
color: AppColors.error,
fontSize: 11,
fontWeight: FontWeight.w600,
),
),
),
),
],
],
);
}
}
/// Snackbar helper to show error messages
class ErrorSnackbar {
static void show(
BuildContext context,
String message, {
VoidCallback? action,
String? actionLabel,
Duration duration = const Duration(seconds: 4),
}) {
final snackBar = SnackBar(
content: Row(
children: [
const Icon(Icons.error_outline, color: Colors.white),
const SizedBox(width: 12),
Expanded(child: Text(message)),
],
),
backgroundColor: AppColors.error,
duration: duration,
action: action != null && actionLabel != null
? SnackBarAction(
label: actionLabel,
textColor: Colors.white,
onPressed: action,
)
: null,
behavior: SnackBarBehavior.floating,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
),
margin: const EdgeInsets.all(16),
);
ScaffoldMessenger.of(context)
..hideCurrentSnackBar()
..showSnackBar(snackBar);
}
static void showInfo(
BuildContext context,
String message, {
Duration duration = const Duration(seconds: 3),
}) {
final snackBar = SnackBar(
content: Row(
children: [
const Icon(Icons.info_outline, color: Colors.white),
const SizedBox(width: 12),
Expanded(child: Text(message)),
],
),
backgroundColor: AppColors.cyan,
duration: duration,
behavior: SnackBarBehavior.floating,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
),
margin: const EdgeInsets.all(16),
);
ScaffoldMessenger.of(context)
..hideCurrentSnackBar()
..showSnackBar(snackBar);
}
}
@@ -4,6 +4,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../core/theme/colors.dart';
import '../../providers/music_provider.dart';
import '../../pages/player/queue_view_page.dart';
import 'error_display.dart';
/// Mini Player Widget
class MiniPlayer extends ConsumerWidget {
@@ -19,56 +20,87 @@ class MiniPlayer extends ConsumerWidget {
final playerState = ref.watch(playerProvider);
final currentTrack = playerState.currentTrack;
final isPlaying = playerState.isPlaying;
final errorMessage = playerState.errorMessage;
return GestureDetector(
onTap: () {
// TODO: Open fullscreen player
},
child: Container(
height: 64,
decoration: BoxDecoration(
color: AppColors.surface,
border: Border(
top: BorderSide(
color: AppColors.cyan.withOpacity(0.2),
width: 1,
),
),
boxShadow: [
BoxShadow(
color: AppColors.cyan.withOpacity(0.1),
blurRadius: 10,
offset: const Offset(0, -2),
),
],
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Row(
children: [
// Album art
_buildAlbumArt(currentTrack),
const SizedBox(width: 12),
// Track info
Expanded(
child: _buildTrackInfo(currentTrack, playerState),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
// Error display (shown above mini player)
if (errorMessage != null)
Container(
width: double.infinity,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
decoration: BoxDecoration(
color: AppColors.error.withOpacity(0.1),
border: Border(
bottom: BorderSide(
color: AppColors.error.withOpacity(0.3),
width: 1,
),
),
),
child: InlineError(
message: errorMessage,
onRetry: () {
// Retry loading the current track
if (currentTrack != null) {
ref.read(playerProvider.notifier).loadTrack(currentTrack);
}
},
),
),
// Mini player
Container(
height: 64,
decoration: BoxDecoration(
color: AppColors.surface,
border: Border(
top: BorderSide(
color: AppColors.cyan.withOpacity(0.2),
width: 1,
),
),
boxShadow: [
BoxShadow(
color: AppColors.cyan.withOpacity(0.1),
blurRadius: 10,
offset: const Offset(0, -2),
),
],
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Row(
children: [
// Album art
_buildAlbumArt(currentTrack),
const SizedBox(width: 12),
const SizedBox(width: 12),
// Controls
if (!compact)
_buildControls(ref, isPlaying)
else
_buildCompactControls(ref, isPlaying),
// Track info
Expanded(
child: _buildTrackInfo(currentTrack, playerState),
),
// Queue button
if (!compact) _buildQueueButton(context, ref),
],
const SizedBox(width: 12),
// Controls
if (!compact)
_buildControls(ref, isPlaying)
else
_buildCompactControls(ref, isPlaying),
// Queue button
if (!compact) _buildQueueButton(context, ref),
],
),
),
),
),
],
),
);
}
@@ -0,0 +1,302 @@
import 'package:flutter/material.dart';
import 'package:shimmer/shimmer.dart';
import '../../../core/theme/colors.dart';
/// Skeleton loading card for albums/playlists/tracks
class ContentCardSkeleton extends StatelessWidget {
final double? width;
final double? height;
const ContentCardSkeleton({
super.key,
this.width,
this.height,
});
@override
Widget build(BuildContext context) {
return Shimmer.fromColors(
baseColor: AppColors.surfaceVariant,
highlightColor: AppColors.surfaceElevated,
child: Container(
width: width,
height: height,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(12),
),
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Image placeholder
Expanded(
child: Container(
width: double.infinity,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8),
),
),
),
const SizedBox(height: 12),
// Title placeholder
Container(
width: double.infinity,
height: 16,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(4),
),
),
const SizedBox(height: 8),
// Subtitle placeholder
Container(
width: 100,
height: 14,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(4),
),
),
],
),
),
),
);
}
}
/// Skeleton for list items (e.g., track list items)
class ListItemSkeleton extends StatelessWidget {
final bool showLeading;
final bool showTrailing;
const ListItemSkeleton({
super.key,
this.showLeading = true,
this.showTrailing = true,
});
@override
Widget build(BuildContext context) {
return Shimmer.fromColors(
baseColor: AppColors.surfaceVariant,
highlightColor: AppColors.surfaceElevated,
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: Row(
children: [
// Leading icon/image
if (showLeading) ...[
Container(
width: 48,
height: 48,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(6),
),
),
const SizedBox(width: 12),
],
// Title and subtitle
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
width: double.infinity,
height: 14,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(4),
),
),
const SizedBox(height: 6),
Container(
width: 150,
height: 12,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(4),
),
),
],
),
),
// Trailing icon
if (showTrailing) ...[
const SizedBox(width: 12),
Container(
width: 24,
height: 24,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(4),
),
),
],
],
),
),
);
}
}
/// Skeleton for search results grid
class SearchGridSkeleton extends StatelessWidget {
final int itemCount;
const SearchGridSkeleton({
super.key,
this.itemCount = 6,
});
@override
Widget build(BuildContext context) {
return GridView.builder(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
childAspectRatio: 1.2,
crossAxisSpacing: 12,
mainAxisSpacing: 12,
),
itemCount: itemCount,
itemBuilder: (context, index) => const ContentCardSkeleton(),
);
}
}
/// Skeleton for horizontal scrolling lists
class HorizontalListSkeleton extends StatelessWidget {
final int itemCount;
final double itemHeight;
final double itemWidth;
const HorizontalListSkeleton({
super.key,
this.itemCount = 6,
this.itemHeight = 160,
this.itemWidth = 120,
});
@override
Widget build(BuildContext context) {
return SizedBox(
height: itemHeight,
child: ListView.separated(
scrollDirection: Axis.horizontal,
itemCount: itemCount,
separatorBuilder: (context, index) => const SizedBox(width: 12),
itemBuilder: (context, index) => ContentCardSkeleton(
width: itemWidth,
height: itemHeight,
),
),
);
}
}
/// Full page skeleton with multiple sections
class PageSkeleton extends StatelessWidget {
final bool showHero;
final int sectionCount;
const PageSkeleton({
super.key,
this.showHero = true,
this.sectionCount = 3,
});
@override
Widget build(BuildContext context) {
return Shimmer.fromColors(
baseColor: AppColors.surfaceVariant,
highlightColor: AppColors.surfaceElevated,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Hero section
if (showHero) ...[
Container(
height: 180,
margin: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(12),
),
),
],
// Sections
...List.generate(
sectionCount,
(index) => Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Section title
Container(
width: 150,
height: 24,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(4),
),
),
const SizedBox(height: 12),
// Horizontal list
SizedBox(
height: 160,
child: ListView.separated(
scrollDirection: Axis.horizontal,
itemCount: 6,
separatorBuilder: (context, index) =>
const SizedBox(width: 12),
itemBuilder: (context, index) => Container(
width: 120,
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(8),
),
),
),
),
],
),
),
),
],
),
);
}
}
/// Circular loading indicator with theme colors
class ThemedCircularProgress extends StatelessWidget {
final double? size;
final double strokeWidth;
const ThemedCircularProgress({
super.key,
this.size,
this.strokeWidth = 3.0,
});
@override
Widget build(BuildContext context) {
return SizedBox(
width: size,
height: size,
child: CircularProgressIndicator(
strokeWidth: strokeWidth,
valueColor: const AlwaysStoppedAnimation<Color>(AppColors.cyan),
backgroundColor: AppColors.surfaceVariant,
),
);
}
}
@@ -1,10 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import '../../../../domain/entities/album.dart';
import '../../../../core/theme/colors.dart';
import '../common/cached_network_image_with_fallback.dart';
/// Search result card for an album
class SearchAlbumCard extends StatelessWidget {
/// Search result card for an album with hover state and click cursor
class SearchAlbumCard extends StatefulWidget {
final Album album;
final VoidCallback? onTap;
@@ -14,70 +16,95 @@ class SearchAlbumCard extends StatelessWidget {
super.key,
});
@override
State<SearchAlbumCard> createState() => _SearchAlbumCardState();
}
class _SearchAlbumCardState extends State<SearchAlbumCard> {
bool _isHovered = false;
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: onTap,
child: Container(
decoration: BoxDecoration(
color: AppColors.surface,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: AppColors.rose.withOpacity(0.3),
return MouseRegion(
onEnter: (_) => setState(() => _isHovered = true),
onExit: (_) => setState(() => _isHovered = false),
cursor: SystemMouseCursors.click,
child: GestureDetector(
onTap: widget.onTap,
child: AnimatedContainer(
duration: const Duration(milliseconds: 200),
decoration: BoxDecoration(
color: AppColors.surface,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: _isHovered
? AppColors.rose
: AppColors.rose.withOpacity(0.3),
width: _isHovered ? 2 : 1,
),
boxShadow: _isHovered
? [
BoxShadow(
color: AppColors.rose.withOpacity(0.3),
blurRadius: 20,
offset: const Offset(0, 4),
),
]
: null,
),
),
child: Column(
children: [
// Album cover or placeholder
Expanded(
child: ClipRRect(
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12),
),
child: Container(
width: double.infinity,
decoration: BoxDecoration(
gradient: AppColors.fullGradient,
child: Column(
children: [
// Album cover or placeholder
Expanded(
child: ClipRRect(
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12),
),
child: CachedNetworkImageWithFallback(
imageUrl: album.imageUrl,
fallbackIcon: Icons.album,
progressColor: AppColors.rose,
child: Container(
width: double.infinity,
decoration: BoxDecoration(
gradient: AppColors.fullGradient,
),
child: CachedNetworkImageWithFallback(
imageUrl: widget.album.imageUrl,
fallbackIcon: Icons.album,
progressColor: AppColors.rose,
),
),
),
),
),
// Album info
Padding(
padding: const EdgeInsets.all(8),
child: Column(
children: [
Text(
album.title,
style: const TextStyle(
color: AppColors.onSurface,
fontWeight: FontWeight.w500,
fontSize: 14,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
),
if (album.artist != null)
// Album info
Padding(
padding: const EdgeInsets.all(8),
child: Column(
children: [
Text(
album.artist!.name,
widget.album.title,
style: const TextStyle(
color: AppColors.muted,
fontSize: 12,
color: AppColors.onSurface,
fontWeight: FontWeight.w500,
fontSize: 14,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
),
],
if (widget.album.artist != null)
Text(
widget.album.artist!.name,
style: const TextStyle(
color: AppColors.muted,
fontSize: 12,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
),
],
),
),
),
],
],
),
),
),
);
@@ -1,10 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import '../../../../domain/entities/artist.dart';
import '../../../../core/theme/colors.dart';
import '../common/cached_network_image_with_fallback.dart';
/// Search result card for an artist
class SearchArtistCard extends StatelessWidget {
/// Search result card for an artist with hover state and click cursor
class SearchArtistCard extends StatefulWidget {
final Artist artist;
final VoidCallback? onTap;
@@ -14,55 +16,80 @@ class SearchArtistCard extends StatelessWidget {
super.key,
});
@override
State<SearchArtistCard> createState() => _SearchArtistCardState();
}
class _SearchArtistCardState extends State<SearchArtistCard> {
bool _isHovered = false;
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: onTap,
child: Container(
decoration: BoxDecoration(
color: AppColors.surface,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: AppColors.violet.withOpacity(0.3),
return MouseRegion(
onEnter: (_) => setState(() => _isHovered = true),
onExit: (_) => setState(() => _isHovered = false),
cursor: SystemMouseCursors.click,
child: GestureDetector(
onTap: widget.onTap,
child: AnimatedContainer(
duration: const Duration(milliseconds: 200),
decoration: BoxDecoration(
color: AppColors.surface,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: _isHovered
? AppColors.violet
: AppColors.violet.withOpacity(0.3),
width: _isHovered ? 2 : 1,
),
boxShadow: _isHovered
? [
BoxShadow(
color: AppColors.violet.withOpacity(0.3),
blurRadius: 20,
offset: const Offset(0, 4),
),
]
: null,
),
),
child: Column(
children: [
// Artist image or placeholder
Expanded(
child: ClipRRect(
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12),
),
child: Container(
width: double.infinity,
decoration: BoxDecoration(
gradient: AppColors.accentGradient,
child: Column(
children: [
// Artist image or placeholder
Expanded(
child: ClipRRect(
borderRadius: const BorderRadius.vertical(
top: Radius.circular(12),
),
child: CachedNetworkImageWithFallback(
imageUrl: artist.imageUrl,
fallbackIcon: Icons.person,
progressColor: AppColors.violet,
child: Container(
width: double.infinity,
decoration: BoxDecoration(
gradient: AppColors.accentGradient,
),
child: CachedNetworkImageWithFallback(
imageUrl: widget.artist.imageUrl,
fallbackIcon: Icons.person,
progressColor: AppColors.violet,
),
),
),
),
),
// Artist name
Padding(
padding: const EdgeInsets.all(8),
child: Text(
artist.name,
style: const TextStyle(
color: AppColors.onSurface,
fontWeight: FontWeight.w500,
fontSize: 14,
// Artist name
Padding(
padding: const EdgeInsets.all(8),
child: Text(
widget.artist.name,
style: const TextStyle(
color: AppColors.onSurface,
fontWeight: FontWeight.w500,
fontSize: 14,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
textAlign: TextAlign.center,
),
),
],
],
),
),
),
);
@@ -1,11 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import '../../../../domain/entities/track.dart';
import '../../../../core/theme/colors.dart';
import '../common/cached_network_image_with_fallback.dart';
/// Search result card for a track
class SearchTrackCard extends StatelessWidget {
/// Search result card for a track with hover state and click cursor
class SearchTrackCard extends StatefulWidget {
final Track track;
final VoidCallback? onTap;
@@ -15,62 +16,87 @@ class SearchTrackCard extends StatelessWidget {
super.key,
});
@override
State<SearchTrackCard> createState() => _SearchTrackCardState();
}
class _SearchTrackCardState extends State<SearchTrackCard> {
bool _isHovered = false;
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: onTap,
child: Container(
decoration: BoxDecoration(
gradient: AppColors.primaryGradient,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: AppColors.cyan.withOpacity(0.3),
return MouseRegion(
onEnter: (_) => setState(() => _isHovered = true),
onExit: (_) => setState(() => _isHovered = false),
cursor: SystemMouseCursors.click,
child: GestureDetector(
onTap: widget.onTap,
child: AnimatedContainer(
duration: const Duration(milliseconds: 200),
decoration: BoxDecoration(
gradient: AppColors.primaryGradient,
borderRadius: BorderRadius.circular(12),
border: Border.all(
color: _isHovered
? AppColors.cyan
: AppColors.cyan.withOpacity(0.3),
width: _isHovered ? 2 : 1,
),
boxShadow: _isHovered
? [
BoxShadow(
color: AppColors.cyan.withOpacity(0.3),
blurRadius: 20,
offset: const Offset(0, 4),
),
]
: null,
),
),
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
// Thumbnail or icon
Expanded(
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
child: SizedBox(
width: double.infinity,
child: CachedNetworkImageWithFallback(
imageUrl: track.imageUrl,
fallbackIcon: Icons.music_note,
progressColor: AppColors.cyan,
fit: BoxFit.cover,
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
// Thumbnail or icon
Expanded(
child: ClipRRect(
borderRadius: BorderRadius.circular(8),
child: SizedBox(
width: double.infinity,
child: CachedNetworkImageWithFallback(
imageUrl: widget.track.imageUrl,
fallbackIcon: Icons.music_note,
progressColor: AppColors.cyan,
fit: BoxFit.cover,
),
),
),
),
),
const SizedBox(height: 12),
// Track info
Text(
track.title,
style: const TextStyle(
color: AppColors.onBackground,
fontWeight: FontWeight.w600,
fontSize: 16,
const SizedBox(height: 12),
// Track info
Text(
widget.track.title,
style: const TextStyle(
color: AppColors.onBackground,
fontWeight: FontWeight.w600,
fontSize: 16,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
maxLines: 2,
overflow: TextOverflow.ellipsis,
),
const SizedBox(height: 4),
Text(
track.artist?.name ?? 'Unknown Artist',
style: const TextStyle(
color: AppColors.onBackground,
fontSize: 14,
const SizedBox(height: 4),
Text(
widget.track.artist?.name ?? 'Unknown Artist',
style: const TextStyle(
color: AppColors.onBackground,
fontSize: 14,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
],
],
),
),
),
),
+106
View File
@@ -0,0 +1,106 @@
# Project-level configuration.
cmake_minimum_required(VERSION 3.10)
project(audiOhm LANGUAGES CXX)
# The name of the executable created for the application. Change this to change
# the on-disk name of your application.
set(BINARY_NAME "audiOhm")
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
# versions of CMake.
cmake_policy(SET CMP0063 NEW)
# Define build configuration option.
get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
if(IS_MULTICONFIG)
set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release"
CACHE STRING "" FORCE)
else()
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
set(CMAKE_BUILD_TYPE "Debug" CACHE
STRING "Flutter build mode" FORCE)
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
"Debug" "Profile" "Release")
endif()
endif()
# Define settings for the Profile build mode.
set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}")
set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}")
set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}")
set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}")
# Use Unicode for all projects.
add_definitions(-DUNICODE -D_UNICODE)
# Compilation settings that should be applied to most targets.
#
# Be cautious about adding new options here, as plugins use this function by
# default. In most cases, you should add new options to specific targets instead
# of modifying this function.
function(APPLY_STANDARD_SETTINGS TARGET)
target_compile_features(${TARGET} PUBLIC cxx_std_17)
target_compile_options(${TARGET} PRIVATE
-Wall -W -Wpointer-arith -Wimplicit-fallthrough -Wno-unused-parameter)
target_compile_options(${TARGET} PRIVATE "$<$<CONFIG:Debug>:-O0 -g>")
target_compile_options(${TARGET} PRIVATE "$<$<CONFIG:Release>:-O3>")
target_compile_options(${TARGET} PRIVATE "$<$<CONFIG:Profile>:-O2>")
endfunction()
# Flutter library and tool build rules.
set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
# Flutter library and tool build rules.
set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter")
add_subdirectory(${FLUTTER_MANAGED_DIR})
# Application build; see runner/CMakeLists.txt.
add_subdirectory("runner")
# Generated plugin build rules, which manage building the plugins and adding
# them to the application.
include(flutter/generated_plugins.cmake)
# === Installation ===
# Support files are copied into place next to the executable, so that it can
# run in place. This is done instead of making a separate bundle (as on Linux)
# so that building and running from within Visual Studio will work.
set(BUILD_BUNDLE_DIR "$<TARGET_FILE_DIR:${BINARY_NAME}>")
# Make the "install" step default, as it's required to run.
set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1)
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE)
endif()
set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data")
set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}"
COMPONENT Runtime)
install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
COMPONENT Runtime)
install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
COMPONENT Runtime)
if(PLUGIN_BUNDLED_LIBRARIES)
install(FILES "${PLUGIN_BUNDLED_LIBRARIES}"
DESTINATION "${INSTALL_BUNDLE_LIB_DIR}"
COMPONENT Runtime)
endif()
# Fully re-copy the assets directory on each build to avoid having stale files
# from a previous install.
set(FLUTTER_ASSET_DIR_NAME "flutter_assets")
install(CODE "
file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\")
" COMPONENT Runtime)
install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}"
DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime)
# Install the AOT library on non-Debug builds only.
install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}"
CONFIGURATIONS Profile;Release
COMPONENT Runtime)
@@ -0,0 +1 @@
/root/.pub-cache/hosted/pub.dev/connectivity_plus-5.0.2/
@@ -0,0 +1 @@
/root/.pub-cache/hosted/pub.dev/file_selector_linux-0.9.4/
@@ -0,0 +1 @@
/root/.pub-cache/hosted/pub.dev/flutter_secure_storage_linux-1.2.3/
@@ -0,0 +1 @@
/root/.pub-cache/hosted/pub.dev/image_picker_linux-0.2.2/
@@ -0,0 +1 @@
/root/.pub-cache/hosted/pub.dev/package_info_plus-5.0.1/
@@ -0,0 +1 @@
/root/.pub-cache/hosted/pub.dev/path_provider_linux-2.2.1/
@@ -0,0 +1 @@
/root/.pub-cache/hosted/pub.dev/shared_preferences_linux-2.4.1/
@@ -0,0 +1 @@
/root/.pub-cache/hosted/pub.dev/sqlite3_flutter_libs-0.5.41/
@@ -0,0 +1 @@
/root/.pub-cache/hosted/pub.dev/url_launcher_linux-3.2.2/
@@ -0,0 +1,21 @@
# Generated code do not commit.
file(TO_CMAKE_PATH "/opt/flutter" FLUTTER_ROOT)
file(TO_CMAKE_PATH "/opt/audiOhm/frontend" PROJECT_DIR)
set(FLUTTER_VERSION "0.1.0+1" PARENT_SCOPE)
set(FLUTTER_VERSION_MAJOR 0 PARENT_SCOPE)
set(FLUTTER_VERSION_MINOR 1 PARENT_SCOPE)
set(FLUTTER_VERSION_PATCH 0 PARENT_SCOPE)
set(FLUTTER_VERSION_BUILD 1 PARENT_SCOPE)
# Environment variables to pass to tool_backend.sh
list(APPEND FLUTTER_TOOL_ENVIRONMENT
"FLUTTER_ROOT=/opt/flutter"
"PROJECT_DIR=/opt/audiOhm/frontend"
"DART_DEFINES=RkxVVFRFUl9WRVJTSU9OPTMuMzguNw==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049M2I2MmVmYzJhMw==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NzhmYzMwMTJlNA==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC43"
"DART_OBFUSCATION=false"
"TRACK_WIDGET_CREATION=true"
"TREE_SHAKE_ICONS=true"
"PACKAGE_CONFIG=/opt/audiOhm/frontend/.dart_tool/package_config.json"
"FLUTTER_TARGET=lib/main.dart"
)
@@ -0,0 +1,27 @@
//
// Generated file. Do not edit.
//
// clang-format off
#include "generated_plugin_registrant.h"
#include <file_selector_linux/file_selector_plugin.h>
#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
#include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
#include <url_launcher_linux/url_launcher_plugin.h>
void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);
g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin");
sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar);
g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
}
@@ -0,0 +1,15 @@
//
// Generated file. Do not edit.
//
// clang-format off
#ifndef GENERATED_PLUGIN_REGISTRANT_
#define GENERATED_PLUGIN_REGISTRANT_
#include <flutter_linux/flutter_linux.h>
// Registers Flutter plugins.
void fl_register_plugins(FlPluginRegistry* registry);
#endif // GENERATED_PLUGIN_REGISTRANT_
@@ -0,0 +1,27 @@
#
# Generated file, do not edit.
#
list(APPEND FLUTTER_PLUGIN_LIST
file_selector_linux
flutter_secure_storage_linux
sqlite3_flutter_libs
url_launcher_linux
)
list(APPEND FLUTTER_FFI_PLUGIN_LIST
)
set(PLUGIN_BUNDLED_LIBRARIES)
foreach(plugin ${FLUTTER_PLUGIN_LIST})
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin})
target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin)
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
endforeach(plugin)
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
endforeach(ffi_plugin)
+43
View File
@@ -0,0 +1,43 @@
cmake_minimum_required(VERSION 3.10)
project(runner LANGUAGES CXX)
# Define the application target. To change its name, change BINARY_NAME in the
# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer
# work.
#
# Any new source files that you add to the application should be added here.
add_executable(${BINARY_NAME}
# "flutter/flutter_window.cc"
# "flutter/flutter_window.h"
# "flutter/engine_connection.cc"
# "flutter/engine_connection.h"
# "flutter/process_launcher.cc"
# "flutter/process_launcher.h"
"main.cpp"
"my_flutter_app.cc"
"my_flutter_app.h"
)
# Apply the standard set of build settings. This can be removed for applications
# that need different build settings.
apply_standard_settings(${BINARY_NAME})
# Add preprocessor definitions for the build version.
target_compile_definitions(${BINARY_NAME} PRIVATE
"FLUTTER_VERSION=\"${FLUTTER_VERSION}\""
"FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}"
"FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}"
"FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}"
"FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}"
)
# Disable Linux macros in Flutter headers.
target_compile_definitions(${BINARY_NAME} PRIVATE "_GNU_SOURCE=1")
# Add dependency libraries and include directories. Add any application-specific
# dependencies here.
target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app)
target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
# Run the Flutter tool portions of the build. This must not be removed.
add_dependencies(${BINARY_NAME} flutter_assemble)
+89
View File
@@ -0,0 +1,89 @@
#include <my_flutter_app.h>
#include <flutter_linux/flutter_linux.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
#include "flutter/generated_plugin_registrant.h"
struct _MyFlutterApp {
GtkApplication parent_instance;
char** dart_entrypoint_arguments;
};
G_DEFINE_TYPE(MyFlutterApp, my_flutter_app, GTK_TYPE_APPLICATION)
// Implements GApplication::activate.
static void my_flutter_app_activate(GApplication* application) {
MyFlutterApp* self = MY_FLUTTER_APP(application);
GtkWindow* window =
GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
// Use a header bar when running in GNOME as this is the common style used
// by applications and is the layout most users expect.
gtk_header_bar_set_show_close_button(GTK_HEADER_BAR(gtk_header_bar_new()),
TRUE);
gtk_window_set_titlebar(window, GTK_HEADER_BAR(gtk_header_bar_new()));
gtk_window_set_default_size(window, 1280, 720);
gtk_widget_show(GTK_WIDGET(window));
g_autoptr(FlutterDartProject) project = flutter_dart_project_new();
flutter_dart_project_set_dart_entrypoint_arguments(
project, self->dart_entrypoint_arguments);
FlView* view = fl_view_new(project);
gtk_widget_show(GTK_WIDGET(view));
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
fl_register_plugins(FL_PLUGIN_REGISTRY(view));
gtk_widget_grab_focus(GTK_WIDGET(view));
}
// Implements GApplication::local_command_line.
static gboolean my_flutter_app_local_command_line(GApplication* application,
gchar*** arguments,
int* exit_status) {
MyFlutterApp* self = MY_FLUTTER_APP(application);
// Strip out the first argument as it is the binary name.
self->dart_entrypoint_arguments = *arguments + 1;
g_autoptr(GError) error = nullptr;
if (!g_application_register(application, nullptr, &error)) {
g_warning("Failed to register: %s", error->message);
*exit_status = 1;
return TRUE;
}
g_application_activate(application);
*exit_status = 0;
return TRUE;
}
// Implements GObject::dispose.
static void my_flutter_app_dispose(GObject* object) {
G_OBJECT_CLASS(my_flutter_app_parent_class)->dispose(object);
}
static void my_flutter_app_class_init(MyFlutterAppClass* klass) {
G_APPLICATION_CLASS(klass)->activate = my_flutter_app_activate;
G_APPLICATION_CLASS(klass)->local_command_line =
my_flutter_app_local_command_line;
G_OBJECT_CLASS(klass)->dispose = my_flutter_app_dispose;
}
static void my_flutter_app_init(MyFlutterApp* self) {}
MyFlutterApp* my_flutter_app_new() {
return MY_FLUTTER_APP(g_object_new(my_flutter_app_get_type(),
"application-id", APPLICATION_ID,
"flags", G_APPLICATION_NON_UNIQUE,
nullptr));
}
int main(int argc, char** argv) {
g_autoptr(MyFlutterApp) app = my_flutter_app_new();
return g_application_run(G_APPLICATION(app), argc, argv);
}
+85
View File
@@ -0,0 +1,85 @@
#include "my_flutter_app.h"
#include <flutter_linux/flutter_linux.h>
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
#include "flutter/generated_plugin_registrant.h"
struct _MyFlutterApp {
GtkApplication parent_instance;
char** dart_entrypoint_arguments;
};
G_DEFINE_TYPE(MyFlutterApp, my_flutter_app, GTK_TYPE_APPLICATION)
// Implements GApplication::activate.
static void my_flutter_app_activate(GApplication* application) {
MyFlutterApp* self = MY_FLUTTER_APP(application);
GtkWindow* window =
GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application)));
// Use a header bar when running in GNOME as this is the common style used
// by applications and is the layout most users expect.
gtk_header_bar_set_show_close_button(GTK_HEADER_BAR(gtk_header_bar_new()),
TRUE);
gtk_window_set_titlebar(window, GTK_HEADER_BAR(gtk_header_bar_new()));
gtk_window_set_default_size(window, 1280, 720);
gtk_widget_show(GTK_WIDGET(window));
g_autoptr(FlutterDartProject) project = flutter_dart_project_new();
flutter_dart_project_set_dart_entrypoint_arguments(
project, self->dart_entrypoint_arguments);
FlView* view = fl_view_new(project);
gtk_widget_show(GTK_WIDGET(view));
gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
fl_register_plugins(FL_PLUGIN_REGISTRY(view));
gtk_widget_grab_focus(GTK_WIDGET(view));
}
// Implements GApplication::local_command_line.
static gboolean my_flutter_app_local_command_line(GApplication* application,
gchar*** arguments,
int* exit_status) {
MyFlutterApp* self = MY_FLUTTER_APP(application);
// Strip out the first argument as it is the binary name.
self->dart_entrypoint_arguments = *arguments + 1;
g_autoptr(GError) error = nullptr;
if (!g_application_register(application, nullptr, &error)) {
g_warning("Failed to register: %s", error->message);
*exit_status = 1;
return TRUE;
}
g_application_activate(application);
*exit_status = 0;
return TRUE;
}
// Implements GObject::dispose.
static void my_flutter_app_dispose(GObject* object) {
G_OBJECT_CLASS(my_flutter_app_parent_class)->dispose(object);
}
static void my_flutter_app_class_init(MyFlutterAppClass* klass) {
G_APPLICATION_CLASS(klass)->activate = my_flutter_app_activate;
G_APPLICATION_CLASS(klass)->local_command_line =
my_flutter_app_local_command_line;
G_OBJECT_CLASS(klass)->dispose = my_flutter_app_dispose;
}
static void my_flutter_app_init(MyFlutterApp* self) {}
MyFlutterApp* my_flutter_app_new() {
return MY_FLUTTER_APP(g_object_new(my_flutter_app_get_type(),
"application-id", APPLICATION_ID,
"flags", G_APPLICATION_NON_UNIQUE,
nullptr));
}
+17
View File
@@ -0,0 +1,17 @@
#ifndef FLUTTER_MY_FLUTTER_APP_H_
#define FLUTTER_MY_FLUTTER_APP_H_
#include <gtk/gtk.h>
G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE(MyFlutterApp, my_flutter_app, MY, FLUTTER_APP,
GtkApplication)
MyFlutterApp* my_flutter_app_new();
#define APPLICATION_ID "com.audiohm.audiOhm"
G_END_DECLS
#endif // FLUTTER_MY_FLUTTER_APP_H_
+1
View File
@@ -42,6 +42,7 @@ dependencies:
intl: ^0.19.0
uuid: ^4.3.1
url_launcher: ^6.2.3
equatable: ^2.0.5
# Icons
cupertino_icons: ^1.0.6