From ec82d199da40ee565324e54790c1027bdb3b4f7c Mon Sep 17 00:00:00 2001 From: Satriyo Aji Nugroho Date: Sun, 16 Aug 2026 15:42:19 +0700 Subject: [PATCH] Several Adjustment to support Android Platform - Adjustment Build Gradle Settings - Gradle Wrapper - Fix adjustment some scripts to accommodate newer Gradle version --- .metadata | 15 +- analysis_options.yaml | 9 + android/app/build.gradle | 51 +- android/app/src/main/AndroidManifest.xml | 2 +- android/build.gradle | 17 +- .../reports/problems/problems-report.html | 663 ++++++++++++++++++ android/gradle.properties | 8 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 6 +- lib/controllers/timer_controller.dart | 49 +- lib/main.dart | 13 +- lib/services/achievement_service.dart | 98 ++- lib/services/web_speech_service.dart | 18 +- lib/views/achievements_view.dart | 96 +-- lib/views/analytics_dashboard_view.dart | 176 +++-- lib/views/audio_settings_view.dart | 111 +-- lib/views/preset_selection_view.dart | 54 +- lib/views/template_management_view.dart | 198 ++++-- lib/views/timer_view.dart | 266 ++++--- lib/views/voice_coaching_settings_view.dart | 260 +++---- lib/views/workout_history_view.dart | 142 ++-- lib/views/workout_session_detail_view.dart | 6 +- .../achievement_notification_widget.dart | 36 +- lib/widgets/save_template_dialog.dart | 126 ++-- web/favicon.png | Bin 0 -> 917 bytes web/icons/Icon-192.png | Bin 0 -> 5292 bytes web/icons/Icon-512.png | Bin 0 -> 8252 bytes web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes web/index.html | 46 ++ web/manifest.json | 35 + windows/.gitignore | 17 + windows/CMakeLists.txt | 108 +++ windows/flutter/CMakeLists.txt | 109 +++ .../flutter/generated_plugin_registrant.cc | 17 + windows/flutter/generated_plugin_registrant.h | 15 + windows/flutter/generated_plugins.cmake | 26 + windows/runner/CMakeLists.txt | 40 ++ windows/runner/Runner.rc | 121 ++++ windows/runner/flutter_window.cpp | 71 ++ windows/runner/flutter_window.h | 33 + windows/runner/main.cpp | 43 ++ windows/runner/resource.h | 16 + windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes windows/runner/runner.exe.manifest | 14 + windows/runner/utils.cpp | 69 ++ windows/runner/utils.h | 19 + windows/runner/win32_window.cpp | 288 ++++++++ windows/runner/win32_window.h | 102 +++ 49 files changed, 2918 insertions(+), 693 deletions(-) create mode 100644 android/build/reports/problems/problems-report.html create mode 100644 web/favicon.png create mode 100644 web/icons/Icon-192.png create mode 100644 web/icons/Icon-512.png create mode 100644 web/icons/Icon-maskable-192.png create mode 100644 web/icons/Icon-maskable-512.png create mode 100644 web/index.html create mode 100644 web/manifest.json create mode 100644 windows/.gitignore create mode 100644 windows/CMakeLists.txt create mode 100644 windows/flutter/CMakeLists.txt create mode 100644 windows/flutter/generated_plugin_registrant.cc create mode 100644 windows/flutter/generated_plugin_registrant.h create mode 100644 windows/flutter/generated_plugins.cmake create mode 100644 windows/runner/CMakeLists.txt create mode 100644 windows/runner/Runner.rc create mode 100644 windows/runner/flutter_window.cpp create mode 100644 windows/runner/flutter_window.h create mode 100644 windows/runner/main.cpp create mode 100644 windows/runner/resource.h create mode 100644 windows/runner/resources/app_icon.ico create mode 100644 windows/runner/runner.exe.manifest create mode 100644 windows/runner/utils.cpp create mode 100644 windows/runner/utils.h create mode 100644 windows/runner/win32_window.cpp create mode 100644 windows/runner/win32_window.h diff --git a/.metadata b/.metadata index d3910a9..ac7818b 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "2663184aa79047d0a33a14a3b607954f8fdd8730" + revision: "4cf24164269a5ebf0c16a028a00727d0e77bbb05" channel: "stable" project_type: app @@ -13,11 +13,14 @@ project_type: app migration: platforms: - platform: root - create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 - base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 - - platform: ios - create_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 - base_revision: 2663184aa79047d0a33a14a3b607954f8fdd8730 + create_revision: 4cf24164269a5ebf0c16a028a00727d0e77bbb05 + base_revision: 4cf24164269a5ebf0c16a028a00727d0e77bbb05 + - platform: web + create_revision: 4cf24164269a5ebf0c16a028a00727d0e77bbb05 + base_revision: 4cf24164269a5ebf0c16a028a00727d0e77bbb05 + - platform: windows + create_revision: 4cf24164269a5ebf0c16a028a00727d0e77bbb05 + base_revision: 4cf24164269a5ebf0c16a028a00727d0e77bbb05 # User provided section diff --git a/analysis_options.yaml b/analysis_options.yaml index 0d29021..bf8d421 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -7,6 +7,15 @@ # The following line activates a set of recommended lints for Flutter apps, # packages, and plugins designed to encourage good coding practices. +analyzer: + exclude: + - build/** + - android/** + - ios/** + - web/** + - windows/** + - macos/** + - linux/** include: package:flutter_lints/flutter.yaml linter: diff --git a/android/app/build.gradle b/android/app/build.gradle index e0b5291..0629286 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,51 +1,46 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'dev.flutter.flutter-gradle-plugin' +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') + if (localPropertiesFile.exists()) { localPropertiesFile.withReader('UTF-8') { reader -> localProperties.load(reader) } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { namespace = "com.settimer.settimer" - compileSdk = 34 // Ensure this is appropriate for AGP 7.3.0 + compileSdk = 36 + ndkVersion = "28.2.13676358" compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_11 + jvmTarget = '17' } defaultConfig { applicationId = "com.settimer.settimer" - minSdk = 21 - targetSdk = 34 // Ensure this is appropriate + minSdkVersion = flutter.minSdkVersion + targetSdk = 36 versionCode = 1 versionName = "1.0.0" - multiDexEnabled true } signingConfigs { debug { - // Default debug signing config } + release { - // TODO: Configure your release signing key - // For now, this block can be empty or set up as needed for release builds. - // Do NOT put 'signingConfig signingConfigs.debug' here! } } @@ -55,18 +50,14 @@ android { debuggable true signingConfig signingConfigs.debug } + release { signingConfig signingConfigs.debug - minifyEnabled true - shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - - // Optimize for distribution - zipAlignEnabled true - debuggable false + minifyEnabled false + shrinkResources false } } - + buildFeatures { buildConfig true } @@ -76,6 +67,6 @@ flutter { source = '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" +flutter { + source = '../..' } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 08275bd..ae73f1c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ android:label="SetTimer" android:name="${applicationName}" android:icon="@mipmap/ic_launcher" - android:roundIcon="@mipmap/ic_launcher_round" + android:roundIcon="@mipmap/ic_launcher" android:allowBackup="false" android:supportsRtl="true" android:theme="@style/LaunchTheme"> diff --git a/android/build.gradle b/android/build.gradle index dcd263b..33c7816 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,16 +1,3 @@ -buildscript { - ext.kotlin_version = '1.9.24' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - allprojects { repositories { google() @@ -19,13 +6,15 @@ allprojects { } rootProject.buildDir = '../build' + subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" } + subprojects { project.evaluationDependsOn(':app') } tasks.register("clean", Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/android/build/reports/problems/problems-report.html b/android/build/reports/problems/problems-report.html new file mode 100644 index 0000000..01fee78 --- /dev/null +++ b/android/build/reports/problems/problems-report.html @@ -0,0 +1,663 @@ + + + + + + + + + + + + + Gradle Configuration Cache + + + +
+ +
+ Loading... +
+ + + + + + diff --git a/android/gradle.properties b/android/gradle.properties index 8804973..1451c01 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,7 +1,7 @@ org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=1G -XX:+HeapDumpOnOutOfMemoryError android.useAndroidX=true -android.enableJetifier=true -android.defaults.buildfeatures.buildconfig=true android.nonTransitiveRClass=false -android.nonFinalResIds=false -org.gradle.java.home=/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index e1ca574..5237aff 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip \ No newline at end of file diff --git a/android/settings.gradle b/android/settings.gradle index a32233a..e14c0be 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.9.24" apply false + id "com.android.application" version "8.11.1" apply false + id "org.jetbrains.kotlin.android" version "2.2.20" apply false } -include ":app" +include ":app" \ No newline at end of file diff --git a/lib/controllers/timer_controller.dart b/lib/controllers/timer_controller.dart index bffd528..a4b66bf 100644 --- a/lib/controllers/timer_controller.dart +++ b/lib/controllers/timer_controller.dart @@ -1,5 +1,4 @@ import 'dart:async'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:wakelock_plus/wakelock_plus.dart'; @@ -49,7 +48,8 @@ class TimerController extends ChangeNotifier with WidgetsBindingObserver { bool clearPreset = true, // Add flag to control preset clearing }) { // Only update if timer is not running - if (_timer.state != TimerState.running && _timer.state != TimerState.resting) { + if (_timer.state != TimerState.running && + _timer.state != TimerState.resting) { final newSetDuration = setDurationSeconds ?? _timer.setDurationSeconds; _timer = _timer.copyWith( @@ -57,18 +57,25 @@ class TimerController extends ChangeNotifier with WidgetsBindingObserver { setDurationSeconds: newSetDuration, restDurationSeconds: restDurationSeconds, restAfterSets: restAfterSets, - remainingSeconds: _timer.state == TimerState.idle ? newSetDuration : _timer.remainingSeconds, + remainingSeconds: _timer.state == TimerState.idle + ? newSetDuration + : _timer.remainingSeconds, currentSet: _timer.state == TimerState.idle ? 1 : _timer.currentSet, - isInRestPeriod: _timer.state == TimerState.idle ? false : _timer.isInRestPeriod, + isInRestPeriod: + _timer.state == TimerState.idle ? false : _timer.isInRestPeriod, ); // Clear preset when settings are manually changed (unless called from loadPreset) if (clearPreset && _currentPreset != null) { // Check if the settings still match the current preset - bool settingsMatch = (totalSets ?? _timer.totalSets) == _currentPreset!.totalSets && - (setDurationSeconds ?? _timer.setDurationSeconds) == _currentPreset!.setDurationSeconds && - (restDurationSeconds ?? _timer.restDurationSeconds) == _currentPreset!.restDurationSeconds && - (restAfterSets ?? _timer.restAfterSets) == _currentPreset!.restAfterSets; + bool settingsMatch = + (totalSets ?? _timer.totalSets) == _currentPreset!.totalSets && + (setDurationSeconds ?? _timer.setDurationSeconds) == + _currentPreset!.setDurationSeconds && + (restDurationSeconds ?? _timer.restDurationSeconds) == + _currentPreset!.restDurationSeconds && + (restAfterSets ?? _timer.restAfterSets) == + _currentPreset!.restAfterSets; if (!settingsMatch) { clearCurrentPreset(); @@ -129,7 +136,8 @@ class TimerController extends ChangeNotifier with WidgetsBindingObserver { // Enable wakelock to prevent screen from sleeping during workout try { await WakelockPlus.enable(); - print('🔒 Screen wakelock enabled - screen will stay on during workout'); + print( + '🔒 Screen wakelock enabled - screen will stay on during workout'); } catch (e) { print('⚠️ Failed to enable wakelock: $e'); } @@ -143,7 +151,8 @@ class TimerController extends ChangeNotifier with WidgetsBindingObserver { } void pauseTimer() async { - if (_timer.state == TimerState.running || _timer.state == TimerState.resting) { + if (_timer.state == TimerState.running || + _timer.state == TimerState.resting) { _countdownTimer?.cancel(); _timer = _timer.copyWith(state: TimerState.paused); @@ -287,7 +296,8 @@ class TimerController extends ChangeNotifier with WidgetsBindingObserver { await _sessionService.completeSession(); // Update achievements and check for new unlocks - final newlyUnlocked = await _achievementService.updateAchievementProgress(); + final newlyUnlocked = + await _achievementService.updateAchievementProgress(); // Show achievement notifications if any achievements were unlocked if (newlyUnlocked.isNotEmpty) { @@ -327,7 +337,8 @@ class TimerController extends ChangeNotifier with WidgetsBindingObserver { } void _handleAppPaused() async { - if (_timer.state == TimerState.running || _timer.state == TimerState.resting) { + if (_timer.state == TimerState.running || + _timer.state == TimerState.resting) { _pausedAt = DateTime.now(); await _sessionService.pauseSession(); print('📱 App paused - Timer will continue in background'); @@ -335,7 +346,9 @@ class TimerController extends ChangeNotifier with WidgetsBindingObserver { } void _handleAppResumed() async { - if (_pausedAt != null && (_timer.state == TimerState.running || _timer.state == TimerState.resting)) { + if (_pausedAt != null && + (_timer.state == TimerState.running || + _timer.state == TimerState.resting)) { final pauseDuration = DateTime.now().difference(_pausedAt!); final secondsPassed = pauseDuration.inSeconds; @@ -344,7 +357,8 @@ class TimerController extends ChangeNotifier with WidgetsBindingObserver { } // Re-enable wakelock when resuming active timer - if (_timer.state == TimerState.running || _timer.state == TimerState.resting) { + if (_timer.state == TimerState.running || + _timer.state == TimerState.resting) { try { await WakelockPlus.enable(); print('🔒 Screen wakelock re-enabled after app resume'); @@ -355,7 +369,8 @@ class TimerController extends ChangeNotifier with WidgetsBindingObserver { await _sessionService.resumeSession(); _pausedAt = null; - print('📱 App resumed - Timer synced after ${secondsPassed}s in background'); + print( + '📱 App resumed - Timer synced after ${secondsPassed}s in background'); } } @@ -457,12 +472,12 @@ class TimerController extends ChangeNotifier with WidgetsBindingObserver { _backgroundService.disableBackgroundMode(); _sessionService.dispose(); WidgetsBinding.instance.removeObserver(this); - + // Ensure wakelock is disabled when disposing WakelockPlus.disable().catchError((e) { print('⚠️ Failed to disable wakelock during dispose: $e'); }); - + super.dispose(); } } diff --git a/lib/main.dart b/lib/main.dart index 4f03e18..b53c34c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -34,7 +34,8 @@ class WorkoutSetTimerApp extends StatelessWidget { return ChangeNotifierProvider( create: (context) { final controller = TimerController(); - controller.initialize(); // Initialize the controller and session service + controller + .initialize(); // Initialize the controller and session service return controller; }, child: MaterialApp( @@ -52,14 +53,16 @@ class WorkoutSetTimerApp extends StatelessWidget { // Improved input decoration theme inputDecorationTheme: InputDecorationTheme( filled: true, - fillColor: Colors.white.withOpacity(0.05), + fillColor: Colors.white.withValues(alpha: 0.05), border: OutlineInputBorder( borderRadius: BorderRadius.circular(12), - borderSide: BorderSide(color: Colors.white.withOpacity(0.2)), + borderSide: + BorderSide(color: Colors.white.withValues(alpha: 0.2)), ), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(12), - borderSide: BorderSide(color: Colors.white.withOpacity(0.2)), + borderSide: + BorderSide(color: Colors.white.withValues(alpha: 0.2)), ), focusedBorder: const OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(12)), @@ -83,7 +86,7 @@ class WorkoutSetTimerApp extends StatelessWidget { outlinedButtonTheme: OutlinedButtonThemeData( style: OutlinedButton.styleFrom( foregroundColor: Colors.white70, - side: BorderSide(color: Colors.white.withOpacity(0.3)), + side: BorderSide(color: Colors.white.withValues(alpha: 0.3)), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(12), ), diff --git a/lib/services/achievement_service.dart b/lib/services/achievement_service.dart index 9576fbf..623b5a7 100644 --- a/lib/services/achievement_service.dart +++ b/lib/services/achievement_service.dart @@ -15,11 +15,15 @@ class AchievementService { final DatabaseService _databaseService = DatabaseService(); final WorkoutSessionService _sessionService = WorkoutSessionService(); - final StreamController _achievementUnlockedController = StreamController.broadcast(); - Stream get achievementUnlocked => _achievementUnlockedController.stream; + final StreamController _achievementUnlockedController = + StreamController.broadcast(); + Stream get achievementUnlocked => + _achievementUnlockedController.stream; - final StreamController> _achievementProgressController = StreamController>.broadcast(); - Stream> get achievementProgress => _achievementProgressController.stream; + final StreamController> _achievementProgressController = + StreamController>.broadcast(); + Stream> get achievementProgress => + _achievementProgressController.stream; List _achievements = []; bool _isInitialized = false; @@ -67,7 +71,10 @@ class AchievementService { final achievements = await getUnlockedAchievements(); final sevenDaysAgo = DateTime.now().subtract(const Duration(days: 7)); - return achievements.where((a) => a.unlockedAt != null && a.unlockedAt!.isAfter(sevenDaysAgo)).toList(); + return achievements + .where( + (a) => a.unlockedAt != null && a.unlockedAt!.isAfter(sevenDaysAgo)) + .toList(); } /// Update achievement progress after workout completion @@ -131,16 +138,22 @@ class AchievementService { return _personalStats['streak'] as int; case AchievementType.totalWorkouts: - return (_personalStats['analytics'] as Map)['totalWorkouts'] as int; + return (_personalStats['analytics'] + as Map)['totalWorkouts'] as int; case AchievementType.totalTime: - return (_personalStats['analytics'] as Map)['totalWorkoutTime'] as int; + return (_personalStats['analytics'] + as Map)['totalWorkoutTime'] as int; case AchievementType.completion: - return ((_personalStats['analytics'] as Map)['averageCompletionRate'] as double).round(); + return ((_personalStats['analytics'] + as Map)['averageCompletionRate'] as double) + .round(); case AchievementType.consistency: - return ((_personalStats['analytics'] as Map)['workoutConsistency'] as double).round(); + return ((_personalStats['analytics'] + as Map)['workoutConsistency'] as double) + .round(); case AchievementType.personal: return await _getPersonalAchievementProgress(achievement); @@ -149,7 +162,8 @@ class AchievementService { /// Get progress for personal achievements with detailed tracking Future _getPersonalAchievementProgress(Achievement achievement) async { - final personalBests = _personalStats['personalBests'] as Map; + final personalBests = + _personalStats['personalBests'] as Map; final sessions = _personalStats['sessions'] as List; switch (achievement.id) { @@ -184,7 +198,8 @@ class AchievementService { /// Check if user achieved speed demon (20 sets in under 10 minutes) bool _checkSpeedDemonAchievement(List sessions) { for (final session in sessions) { - if (session.completedSets >= 20 && session.actualWorkoutDurationSeconds <= 600) { + if (session.completedSets >= 20 && + session.actualWorkoutDurationSeconds <= 600) { return true; } } @@ -193,20 +208,26 @@ class AchievementService { /// Count workouts completed before 7 AM int _countEarlyMorningWorkouts(List sessions) { - return sessions.where((session) => session.isCompleted && session.startTime.hour < 7).length; + return sessions + .where((session) => session.isCompleted && session.startTime.hour < 7) + .length; } /// Count workouts completed after 10 PM int _countLateNightWorkouts(List sessions) { - return sessions.where((session) => session.isCompleted && session.startTime.hour >= 22).length; + return sessions + .where((session) => session.isCompleted && session.startTime.hour >= 22) + .length; } /// Count workouts completed on weekends int _countWeekendWorkouts(List sessions) { final weekendDates = {}; for (final session in sessions) { - if (session.isCompleted && (session.startTime.weekday == 6 || session.startTime.weekday == 7)) { - final dateKey = '${session.startTime.year}-${session.startTime.month}-${session.startTime.day}'; + if (session.isCompleted && + (session.startTime.weekday == 6 || session.startTime.weekday == 7)) { + final dateKey = + '${session.startTime.year}-${session.startTime.month}-${session.startTime.day}'; weekendDates.add(dateKey); } } @@ -215,8 +236,10 @@ class AchievementService { /// Count unique presets used int _countUniquePresets(List sessions) { - final uniquePresets = - sessions.where((session) => session.isCompleted && session.presetId != null).map((session) => session.presetId).toSet(); + final uniquePresets = sessions + .where((session) => session.isCompleted && session.presetId != null) + .map((session) => session.presetId) + .toSet(); return uniquePresets.length; } @@ -232,14 +255,16 @@ class AchievementService { debugPrint('🏆 Achievement Unlocked: ${achievement.title}'); debugPrint(' ${achievement.description}'); debugPrint(' Tier: ${achievement.tier.name.toUpperCase()}'); - debugPrint(' Points: ${AchievementDefinitions.getAchievementPoints(achievement)}'); + debugPrint( + ' Points: ${AchievementDefinitions.getAchievementPoints(achievement)}'); } } /// Get achievement statistics Future> getAchievementStatistics() async { final achievements = await getAllAchievements(); - final unlockedAchievements = achievements.where((a) => a.isUnlocked).toList(); + final unlockedAchievements = + achievements.where((a) => a.isUnlocked).toList(); final tierCounts = {}; final typeCounts = {}; @@ -254,25 +279,30 @@ class AchievementService { return { 'totalAchievements': achievements.length, 'unlockedAchievements': unlockedAchievements.length, - 'completionPercentage': (unlockedAchievements.length / achievements.length * 100).round(), + 'completionPercentage': + (unlockedAchievements.length / achievements.length * 100).round(), 'tierCounts': tierCounts, 'typeCounts': typeCounts, 'recentlyUnlocked': (await getRecentlyUnlockedAchievements()).length, 'totalPoints': totalPoints, 'totalPossiblePoints': AchievementDefinitions.totalPossiblePoints, - 'pointsPercentage': (totalPoints / AchievementDefinitions.totalPossiblePoints * 100).round(), + 'pointsPercentage': + (totalPoints / AchievementDefinitions.totalPossiblePoints * 100) + .round(), }; } /// Get next achievement to unlock for motivation Future getNextAchievementToUnlock() async { final achievements = await getAllAchievements(); - final lockedAchievements = achievements.where((a) => !a.isUnlocked).toList(); + final lockedAchievements = + achievements.where((a) => !a.isUnlocked).toList(); if (lockedAchievements.isEmpty) return null; // Sort by progress percentage (closest to completion first) - lockedAchievements.sort((a, b) => b.progressPercentage.compareTo(a.progressPercentage)); + lockedAchievements + .sort((a, b) => b.progressPercentage.compareTo(a.progressPercentage)); return lockedAchievements.first; } @@ -280,7 +310,9 @@ class AchievementService { /// Get achievements close to unlocking (above 80% progress) Future> getAchievementsCloseToUnlocking() async { final achievements = await getAllAchievements(); - return achievements.where((a) => !a.isUnlocked && a.progressPercentage >= 80).toList(); + return achievements + .where((a) => !a.isUnlocked && a.progressPercentage >= 80) + .toList(); } /// Get user's achievement level based on total points @@ -319,7 +351,9 @@ class AchievementService { 'nextLevel': nextLevel, 'currentPoints': totalPoints, 'pointsForNext': pointsForNext, - 'progress': pointsForNext > 0 ? (totalPoints / (totalPoints + pointsForNext) * 100).round() : 100, + 'progress': pointsForNext > 0 + ? (totalPoints / (totalPoints + pointsForNext) * 100).round() + : 100, }; } @@ -394,10 +428,12 @@ class AchievementUnlockedDialog extends StatefulWidget { }); @override - State createState() => _AchievementUnlockedDialogState(); + State createState() => + _AchievementUnlockedDialogState(); } -class _AchievementUnlockedDialogState extends State with SingleTickerProviderStateMixin { +class _AchievementUnlockedDialogState extends State + with SingleTickerProviderStateMixin { late AnimationController _animationController; late Animation _scaleAnimation; late Animation _rotationAnimation; @@ -452,12 +488,12 @@ class _AchievementUnlockedDialogState extends State w ), borderRadius: BorderRadius.circular(20), border: Border.all( - color: widget.achievement.color.withOpacity(0.5), + color: widget.achievement.color.withValues(alpha: 0.5), width: 2, ), boxShadow: [ BoxShadow( - color: widget.achievement.color.withOpacity(0.2), + color: widget.achievement.color.withValues(alpha: 0.2), blurRadius: 20, spreadRadius: 5, ), @@ -471,7 +507,7 @@ class _AchievementUnlockedDialogState extends State w width: 80, height: 80, decoration: BoxDecoration( - color: widget.achievement.color.withOpacity(0.2), + color: widget.achievement.color.withValues(alpha: 0.2), shape: BoxShape.circle, border: Border.all( color: widget.achievement.color, @@ -513,7 +549,7 @@ class _AchievementUnlockedDialogState extends State w Text( widget.achievement.description, style: TextStyle( - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), fontSize: 16, ), textAlign: TextAlign.center, diff --git a/lib/services/web_speech_service.dart b/lib/services/web_speech_service.dart index 7cfe154..f04e4e5 100644 --- a/lib/services/web_speech_service.dart +++ b/lib/services/web_speech_service.dart @@ -10,14 +10,14 @@ class WebSpeechService { WebSpeechService._internal(); bool _isSupported = false; - List _availableVoices = []; + final List _availableVoices = []; WebSpeechVoice? _selectedVoice; - + // Voice settings double _rate = 1.0; double _pitch = 1.0; double _volume = 1.0; - String _preferredLanguage = 'en-US'; + final String _preferredLanguage = 'en-US'; String _preferredGender = 'female'; // Getters @@ -39,7 +39,8 @@ class WebSpeechService { // Only initialize on web - the actual web implementation would go here // For now, we'll set it as not supported to avoid compilation issues print('🌐 Web Speech API initialization (web platform detected)'); - _isSupported = false; // Will be properly implemented when running on actual web + _isSupported = + false; // Will be properly implemented when running on actual web } /// Set voice preferences @@ -77,7 +78,7 @@ class WebSpeechService { print('⚠️ Web Speech API only works on web platforms'); return; } - + if (!_isSupported || text.isEmpty) { print('⚠️ Web Speech API not supported or text is empty'); return; @@ -90,7 +91,7 @@ class WebSpeechService { /// Stop current speech Future stop() async { if (!kIsWeb) return; - + if (_isSupported) { print('🛑 Web Speech stopped'); } @@ -98,7 +99,8 @@ class WebSpeechService { /// Test voice with a sample message Future testVoice() async { - await speak('Hello! This is a test of the Web Speech API. The voice quality is much better than the default text-to-speech.'); + await speak( + 'Hello! This is a test of the Web Speech API. The voice quality is much better than the default text-to-speech.'); } } @@ -122,4 +124,4 @@ class WebSpeechVoice { String toString() { return 'WebSpeechVoice(name: $name, lang: $lang, gender: $gender, local: $isLocal)'; } -} \ No newline at end of file +} diff --git a/lib/views/achievements_view.dart b/lib/views/achievements_view.dart index 4116baa..aae1af5 100644 --- a/lib/views/achievements_view.dart +++ b/lib/views/achievements_view.dart @@ -10,7 +10,8 @@ class AchievementsView extends StatefulWidget { State createState() => _AchievementsViewState(); } -class _AchievementsViewState extends State with TickerProviderStateMixin { +class _AchievementsViewState extends State + with TickerProviderStateMixin { final AchievementService _achievementService = AchievementService(); late TabController _tabController; @@ -145,12 +146,13 @@ class _AchievementsViewState extends State with TickerProvider decoration: BoxDecoration( gradient: LinearGradient( colors: [ - const Color(0xFF00D4AA).withOpacity(0.2), - const Color(0xFF00D4AA).withOpacity(0.1), + const Color(0xFF00D4AA).withValues(alpha: 0.2), + const Color(0xFF00D4AA).withValues(alpha: 0.1), ], ), borderRadius: BorderRadius.circular(16), - border: Border.all(color: const Color(0xFF00D4AA).withOpacity(0.3)), + border: + Border.all(color: const Color(0xFF00D4AA).withValues(alpha: 0.3)), ), child: Column( children: [ @@ -164,7 +166,7 @@ class _AchievementsViewState extends State with TickerProvider gradient: LinearGradient( colors: [ const Color(0xFF00D4AA), - const Color(0xFF00D4AA).withOpacity(0.7), + const Color(0xFF00D4AA).withValues(alpha: 0.7), ], ), ), @@ -190,7 +192,7 @@ class _AchievementsViewState extends State with TickerProvider Text( '${_userLevel['currentPoints']} points', style: TextStyle( - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), fontSize: 14, ), ), @@ -211,7 +213,7 @@ class _AchievementsViewState extends State with TickerProvider Text( 'Unlocked', style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 12, ), ), @@ -230,14 +232,14 @@ class _AchievementsViewState extends State with TickerProvider Text( 'Progress to ${_userLevel['nextLevel']}', style: TextStyle( - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), fontSize: 14, ), ), Text( '${_userLevel['pointsForNext']} points needed', style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 12, ), ), @@ -248,8 +250,9 @@ class _AchievementsViewState extends State with TickerProvider borderRadius: BorderRadius.circular(4), child: LinearProgressIndicator( value: _userLevel['progress'] / 100.0, - backgroundColor: Colors.white.withOpacity(0.1), - valueColor: const AlwaysStoppedAnimation(Color(0xFF00D4AA)), + backgroundColor: Colors.white.withValues(alpha: 0.1), + valueColor: + const AlwaysStoppedAnimation(Color(0xFF00D4AA)), minHeight: 6, ), ), @@ -281,12 +284,13 @@ class _AchievementsViewState extends State with TickerProvider } Widget _buildAchievementsByType(AchievementType type) { - final typeAchievements = _allAchievements.where((a) => a.type == type).toList() - ..sort((a, b) { - if (a.isUnlocked && !b.isUnlocked) return -1; - if (!a.isUnlocked && b.isUnlocked) return 1; - return a.targetValue.compareTo(b.targetValue); - }); + final typeAchievements = + _allAchievements.where((a) => a.type == type).toList() + ..sort((a, b) { + if (a.isUnlocked && !b.isUnlocked) return -1; + if (!a.isUnlocked && b.isUnlocked) return 1; + return a.targetValue.compareTo(b.targetValue); + }); return ListView.builder( padding: const EdgeInsets.all(16), @@ -314,17 +318,19 @@ class _AchievementsViewState extends State with TickerProvider gradient: LinearGradient( colors: isUnlocked ? [ - achievement.color.withOpacity(0.2), - achievement.color.withOpacity(0.1), + achievement.color.withValues(alpha: 0.2), + achievement.color.withValues(alpha: 0.1), ] : [ - Colors.white.withOpacity(0.05), - Colors.white.withOpacity(0.02), + Colors.white.withValues(alpha: 0.05), + Colors.white.withValues(alpha: 0.02), ], ), borderRadius: BorderRadius.circular(16), border: Border.all( - color: isUnlocked ? achievement.color.withOpacity(0.3) : Colors.white.withOpacity(0.1), + color: isUnlocked + ? achievement.color.withValues(alpha: 0.3) + : Colors.white.withValues(alpha: 0.1), ), ), child: Row( @@ -335,11 +341,15 @@ class _AchievementsViewState extends State with TickerProvider height: 50, decoration: BoxDecoration( shape: BoxShape.circle, - color: isUnlocked ? achievement.color.withOpacity(0.2) : Colors.white.withOpacity(0.1), + color: isUnlocked + ? achievement.color.withValues(alpha: 0.2) + : Colors.white.withValues(alpha: 0.1), ), child: Icon( achievement.icon, - color: isUnlocked ? achievement.color : Colors.white.withOpacity(0.5), + color: isUnlocked + ? achievement.color + : Colors.white.withValues(alpha: 0.5), size: 24, ), ), @@ -356,7 +366,9 @@ class _AchievementsViewState extends State with TickerProvider child: Text( achievement.title, style: TextStyle( - color: isUnlocked ? Colors.white : Colors.white.withOpacity(0.8), + color: isUnlocked + ? Colors.white + : Colors.white.withValues(alpha: 0.8), fontSize: 16, fontWeight: FontWeight.bold, ), @@ -369,7 +381,7 @@ class _AchievementsViewState extends State with TickerProvider Text( achievement.description, style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 14, ), ), @@ -401,9 +413,11 @@ class _AchievementsViewState extends State with TickerProvider children: [ Expanded( child: Text( - _achievementService.formatAchievementProgress(achievement), + _achievementService + .formatAchievementProgress(achievement), style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: + Colors.white.withValues(alpha: 0.6), fontSize: 12, ), ), @@ -423,8 +437,10 @@ class _AchievementsViewState extends State with TickerProvider borderRadius: BorderRadius.circular(2), child: LinearProgressIndicator( value: progress / 100, - backgroundColor: Colors.white.withOpacity(0.1), - valueColor: const AlwaysStoppedAnimation(Color(0xFF00D4AA)), + backgroundColor: + Colors.white.withValues(alpha: 0.1), + valueColor: const AlwaysStoppedAnimation( + Color(0xFF00D4AA)), minHeight: 3, ), ), @@ -468,9 +484,9 @@ class _AchievementsViewState extends State with TickerProvider return Container( padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2), decoration: BoxDecoration( - color: tierColor.withOpacity(0.2), + color: tierColor.withValues(alpha: 0.2), borderRadius: BorderRadius.circular(8), - border: Border.all(color: tierColor.withOpacity(0.5)), + border: Border.all(color: tierColor.withValues(alpha: 0.5)), ), child: Text( tierText.toUpperCase(), @@ -504,8 +520,8 @@ class _AchievementsViewState extends State with TickerProvider shape: BoxShape.circle, gradient: LinearGradient( colors: [ - achievement.color.withOpacity(0.3), - achievement.color.withOpacity(0.1), + achievement.color.withValues(alpha: 0.3), + achievement.color.withValues(alpha: 0.1), ], ), ), @@ -529,7 +545,7 @@ class _AchievementsViewState extends State with TickerProvider Text( achievement.description, style: TextStyle( - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), fontSize: 14, ), textAlign: TextAlign.center, @@ -537,9 +553,10 @@ class _AchievementsViewState extends State with TickerProvider const SizedBox(height: 16), if (achievement.isUnlocked) ...[ Container( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), + padding: + const EdgeInsets.symmetric(horizontal: 16, vertical: 8), decoration: BoxDecoration( - color: achievement.color.withOpacity(0.2), + color: achievement.color.withValues(alpha: 0.2), borderRadius: BorderRadius.circular(12), ), child: Row( @@ -565,7 +582,8 @@ class _AchievementsViewState extends State with TickerProvider Column( children: [ Text( - _achievementService.formatAchievementProgress(achievement), + _achievementService + .formatAchievementProgress(achievement), style: const TextStyle( color: Color(0xFF00D4AA), fontSize: 16, @@ -576,7 +594,7 @@ class _AchievementsViewState extends State with TickerProvider Text( _achievementService.getMotivationMessage(achievement), style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 12, ), textAlign: TextAlign.center, diff --git a/lib/views/analytics_dashboard_view.dart b/lib/views/analytics_dashboard_view.dart index 7168b51..ab9fb0f 100644 --- a/lib/views/analytics_dashboard_view.dart +++ b/lib/views/analytics_dashboard_view.dart @@ -11,7 +11,8 @@ class AnalyticsDashboardView extends StatefulWidget { State createState() => _AnalyticsDashboardViewState(); } -class _AnalyticsDashboardViewState extends State with SingleTickerProviderStateMixin { +class _AnalyticsDashboardViewState extends State + with SingleTickerProviderStateMixin { late TabController _tabController; final WorkoutSessionService _sessionService = WorkoutSessionService(); final AchievementService _achievementService = AchievementService(); @@ -39,7 +40,8 @@ class _AnalyticsDashboardViewState extends State with Si try { final analytics = await _sessionService.getAdvancedAnalytics(); - final intensityAnalysis = await _sessionService.getWorkoutIntensityAnalysis(); + final intensityAnalysis = + await _sessionService.getWorkoutIntensityAnalysis(); final streak = await _sessionService.getWorkoutStreak(); setState(() { @@ -102,7 +104,9 @@ class _AnalyticsDashboardViewState extends State with Si } Widget _buildOverviewTab() { - if (_analytics == null) return const Center(child: Text('No data available')); + if (_analytics == null) { + return const Center(child: Text('No data available')); + } return RefreshIndicator( onRefresh: _loadData, @@ -147,15 +151,15 @@ class _AnalyticsDashboardViewState extends State with Si begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - const Color(0xFFFF6B35).withOpacity(0.8), - const Color(0xFFFF8E53).withOpacity(0.6), - const Color(0xFFFFB366).withOpacity(0.4), + const Color(0xFFFF6B35).withValues(alpha: 0.8), + const Color(0xFFFF8E53).withValues(alpha: 0.6), + const Color(0xFFFFB366).withValues(alpha: 0.4), ], ), borderRadius: BorderRadius.circular(20), boxShadow: [ BoxShadow( - color: const Color(0xFFFF6B35).withOpacity(0.3), + color: const Color(0xFFFF6B35).withValues(alpha: 0.3), blurRadius: 20, offset: const Offset(0, 10), ), @@ -170,11 +174,11 @@ class _AnalyticsDashboardViewState extends State with Si Container( padding: const EdgeInsets.all(12), decoration: BoxDecoration( - color: Colors.white.withOpacity(0.2), + color: Colors.white.withValues(alpha: 0.2), shape: BoxShape.circle, boxShadow: [ BoxShadow( - color: Colors.white.withOpacity(0.3), + color: Colors.white.withValues(alpha: 0.3), blurRadius: 15, spreadRadius: 2, ), @@ -240,7 +244,7 @@ class _AnalyticsDashboardViewState extends State with Si return Container( padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), decoration: BoxDecoration( - color: Colors.white.withOpacity(0.15), + color: Colors.white.withValues(alpha: 0.15), borderRadius: BorderRadius.circular(12), ), child: Row( @@ -278,15 +282,20 @@ class _AnalyticsDashboardViewState extends State with Si crossAxisSpacing: 16, mainAxisSpacing: 16, children: [ - _buildStatCard('Total Workouts', '$totalWorkouts', Icons.fitness_center, const Color(0xFF00D4AA)), - _buildStatCard('Total Time', _formatDuration(totalTime), Icons.timer, const Color(0xFF2196F3)), - _buildStatCard('Avg Completion', '${avgCompletion.toInt()}%', Icons.check_circle, const Color(0xFF4CAF50)), - _buildStatCard('Consistency', '${consistency.toInt()}%', Icons.trending_up, const Color(0xFFFF9800)), + _buildStatCard('Total Workouts', '$totalWorkouts', Icons.fitness_center, + const Color(0xFF00D4AA)), + _buildStatCard('Total Time', _formatDuration(totalTime), Icons.timer, + const Color(0xFF2196F3)), + _buildStatCard('Avg Completion', '${avgCompletion.toInt()}%', + Icons.check_circle, const Color(0xFF4CAF50)), + _buildStatCard('Consistency', '${consistency.toInt()}%', + Icons.trending_up, const Color(0xFFFF9800)), ], ); } - Widget _buildStatCard(String title, String value, IconData icon, Color color) { + Widget _buildStatCard( + String title, String value, IconData icon, Color color) { return Container( padding: const EdgeInsets.all(16), decoration: BoxDecoration( @@ -299,7 +308,7 @@ class _AnalyticsDashboardViewState extends State with Si ], ), borderRadius: BorderRadius.circular(16), - border: Border.all(color: color.withOpacity(0.2)), + border: Border.all(color: color.withValues(alpha: 0.2)), ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -311,7 +320,7 @@ class _AnalyticsDashboardViewState extends State with Si Container( padding: const EdgeInsets.all(4), decoration: BoxDecoration( - color: color.withOpacity(0.1), + color: color.withValues(alpha: 0.1), borderRadius: BorderRadius.circular(8), ), child: Icon(Icons.trending_up, color: color, size: 16), @@ -330,7 +339,7 @@ class _AnalyticsDashboardViewState extends State with Si Text( title, style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 12, ), ), @@ -373,23 +382,39 @@ class _AnalyticsDashboardViewState extends State with Si child: BarChart( BarChartData( alignment: BarChartAlignment.spaceAround, - maxY: frequency.values.isNotEmpty ? frequency.values.reduce((a, b) => a > b ? a : b).toDouble() * 1.2 : 10, + maxY: frequency.values.isNotEmpty + ? frequency.values + .reduce((a, b) => a > b ? a : b) + .toDouble() * + 1.2 + : 10, barTouchData: BarTouchData(enabled: true), titlesData: FlTitlesData( show: true, - rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), - topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + rightTitles: const AxisTitles( + sideTitles: SideTitles(showTitles: false)), + topTitles: const AxisTitles( + sideTitles: SideTitles(showTitles: false)), bottomTitles: AxisTitles( sideTitles: SideTitles( showTitles: true, getTitlesWidget: (value, meta) { - const days = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; + const days = [ + 'Mon', + 'Tue', + 'Wed', + 'Thu', + 'Fri', + 'Sat', + 'Sun' + ]; if (value.toInt() >= 0 && value.toInt() < days.length) { return Padding( padding: const EdgeInsets.only(top: 8), child: Text( days[value.toInt()], - style: const TextStyle(color: Colors.white70, fontSize: 12), + style: const TextStyle( + color: Colors.white70, fontSize: 12), ), ); } @@ -405,7 +430,8 @@ class _AnalyticsDashboardViewState extends State with Si getTitlesWidget: (value, meta) { return Text( value.toInt().toString(), - style: const TextStyle(color: Colors.white70, fontSize: 12), + style: const TextStyle( + color: Colors.white70, fontSize: 12), ); }, ), @@ -423,7 +449,15 @@ class _AnalyticsDashboardViewState extends State with Si } List _buildBarGroups(Map frequency) { - const dayOrder = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']; + const dayOrder = [ + 'Monday', + 'Tuesday', + 'Wednesday', + 'Thursday', + 'Friday', + 'Saturday', + 'Sunday' + ]; return dayOrder.asMap().entries.map((entry) { final index = entry.key; final day = entry.value; @@ -444,7 +478,8 @@ class _AnalyticsDashboardViewState extends State with Si } Widget _buildTimeOfDayChart() { - final timeDistribution = _analytics!['timeOfDayDistribution'] as Map; + final timeDistribution = + _analytics!['timeOfDayDistribution'] as Map; if (timeDistribution.isEmpty) return const SizedBox(); return Container( @@ -560,7 +595,8 @@ class _AnalyticsDashboardViewState extends State with Si final presets = _analytics!['mostUsedPresets'] as Map; if (presets.isEmpty) return const SizedBox(); - final sortedPresets = presets.entries.toList()..sort((a, b) => b.value.compareTo(a.value)); + final sortedPresets = presets.entries.toList() + ..sort((a, b) => b.value.compareTo(a.value)); return Container( padding: const EdgeInsets.all(20), @@ -594,12 +630,14 @@ class _AnalyticsDashboardViewState extends State with Si Expanded( child: Text( entry.key, - style: const TextStyle(color: Colors.white, fontSize: 14), + style: + const TextStyle(color: Colors.white, fontSize: 14), ), ), Text( '${entry.value} uses', - style: const TextStyle(color: Colors.white70, fontSize: 14), + style: + const TextStyle(color: Colors.white70, fontSize: 14), ), ], ), @@ -610,7 +648,8 @@ class _AnalyticsDashboardViewState extends State with Si } Widget _buildMonthlyProgressChart() { - final monthlyProgress = _analytics!['monthlyProgress'] as Map>; + final monthlyProgress = + _analytics!['monthlyProgress'] as Map>; if (monthlyProgress.isEmpty) return const SizedBox(); return Container( @@ -644,22 +683,26 @@ class _AnalyticsDashboardViewState extends State with Si LineChartData( gridData: const FlGridData(show: false), titlesData: FlTitlesData( - rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), - topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + rightTitles: const AxisTitles( + sideTitles: SideTitles(showTitles: false)), + topTitles: const AxisTitles( + sideTitles: SideTitles(showTitles: false)), bottomTitles: AxisTitles( sideTitles: SideTitles( showTitles: true, reservedSize: 30, getTitlesWidget: (value, meta) { final months = monthlyProgress.keys.toList(); - if (value.toInt() >= 0 && value.toInt() < months.length) { + if (value.toInt() >= 0 && + value.toInt() < months.length) { final monthKey = months[value.toInt()]; final parts = monthKey.split('-'); return Padding( padding: const EdgeInsets.only(top: 8), child: Text( '${parts[1]}/${parts[0].substring(2)}', - style: const TextStyle(color: Colors.white70, fontSize: 10), + style: const TextStyle( + color: Colors.white70, fontSize: 10), ), ); } @@ -674,7 +717,8 @@ class _AnalyticsDashboardViewState extends State with Si getTitlesWidget: (value, meta) { return Text( value.toInt().toString(), - style: const TextStyle(color: Colors.white70, fontSize: 12), + style: const TextStyle( + color: Colors.white70, fontSize: 12), ); }, ), @@ -690,7 +734,7 @@ class _AnalyticsDashboardViewState extends State with Si dotData: const FlDotData(show: true), belowBarData: BarAreaData( show: true, - color: const Color(0xFF00D4AA).withOpacity(0.2), + color: const Color(0xFF00D4AA).withValues(alpha: 0.2), ), ), ], @@ -702,8 +746,10 @@ class _AnalyticsDashboardViewState extends State with Si ); } - List _buildMonthlySpots(Map> monthlyProgress) { - final sortedEntries = monthlyProgress.entries.toList()..sort((a, b) => a.key.compareTo(b.key)); + List _buildMonthlySpots( + Map> monthlyProgress) { + final sortedEntries = monthlyProgress.entries.toList() + ..sort((a, b) => a.key.compareTo(b.key)); return sortedEntries.asMap().entries.map((entry) { final index = entry.key; @@ -819,7 +865,8 @@ class _AnalyticsDashboardViewState extends State with Si child: LinearProgressIndicator( value: consistency / 100, backgroundColor: Colors.white24, - valueColor: const AlwaysStoppedAnimation(Color(0xFF00D4AA)), + valueColor: + const AlwaysStoppedAnimation(Color(0xFF00D4AA)), ), ), const SizedBox(width: 16), @@ -949,7 +996,9 @@ class _AnalyticsDashboardViewState extends State with Si } Widget _buildProgressTab() { - if (_analytics == null) return const Center(child: Text('No data available')); + if (_analytics == null) { + return const Center(child: Text('No data available')); + } return SingleChildScrollView( padding: const EdgeInsets.all(16), @@ -1028,7 +1077,9 @@ class _AnalyticsDashboardViewState extends State with Si final isCompleted = _currentStreak >= milestone; final isNext = !isCompleted && (_currentStreak < milestone) && - (milestones.indexOf(milestone) == 0 || _currentStreak >= milestones[milestones.indexOf(milestone) - 1]); + (milestones.indexOf(milestone) == 0 || + _currentStreak >= + milestones[milestones.indexOf(milestone) - 1]); return Padding( padding: const EdgeInsets.only(bottom: 12), @@ -1041,10 +1092,12 @@ class _AnalyticsDashboardViewState extends State with Si color: isCompleted ? const Color(0xFFFF6B35) : isNext - ? const Color(0xFFFF6B35).withOpacity(0.3) - : Colors.grey.withOpacity(0.2), + ? const Color(0xFFFF6B35).withValues(alpha: 0.3) + : Colors.grey.withValues(alpha: 0.2), shape: BoxShape.circle, - border: isNext ? Border.all(color: const Color(0xFFFF6B35), width: 2) : null, + border: isNext + ? Border.all(color: const Color(0xFFFF6B35), width: 2) + : null, ), child: Center( child: isCompleted @@ -1052,7 +1105,8 @@ class _AnalyticsDashboardViewState extends State with Si : Text( '$milestone', style: TextStyle( - color: isNext ? const Color(0xFFFF6B35) : Colors.grey, + color: + isNext ? const Color(0xFFFF6B35) : Colors.grey, fontSize: 12, fontWeight: FontWeight.bold, ), @@ -1069,7 +1123,8 @@ class _AnalyticsDashboardViewState extends State with Si style: TextStyle( color: isCompleted ? Colors.white : Colors.white70, fontSize: 16, - fontWeight: isCompleted ? FontWeight.bold : FontWeight.normal, + fontWeight: + isCompleted ? FontWeight.bold : FontWeight.normal, ), ), if (isNext) @@ -1126,7 +1181,8 @@ class _AnalyticsDashboardViewState extends State with Si future: _achievementService.getAchievementsByType(AchievementType.streak), builder: (context, snapshot) { if (!snapshot.hasData) { - return const Center(child: CircularProgressIndicator(color: Color(0xFF00D4AA))); + return const Center( + child: CircularProgressIndicator(color: Color(0xFF00D4AA))); } final streakAchievements = snapshot.data!; @@ -1138,12 +1194,13 @@ class _AnalyticsDashboardViewState extends State with Si begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - const Color(0xFFFF6B35).withOpacity(0.1), - const Color(0xFFFF8E53).withOpacity(0.05), + const Color(0xFFFF6B35).withValues(alpha: 0.1), + const Color(0xFFFF8E53).withValues(alpha: 0.05), ], ), borderRadius: BorderRadius.circular(16), - border: Border.all(color: const Color(0xFFFF6B35).withOpacity(0.3)), + border: Border.all( + color: const Color(0xFFFF6B35).withValues(alpha: 0.3)), ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -1166,7 +1223,8 @@ class _AnalyticsDashboardViewState extends State with Si ], ), const SizedBox(height: 16), - ...streakAchievements.map((achievement) => _buildStreakAchievementCard(achievement)), + ...streakAchievements.map( + (achievement) => _buildStreakAchievementCard(achievement)), ], ), ); @@ -1184,9 +1242,13 @@ class _AnalyticsDashboardViewState extends State with Si margin: const EdgeInsets.only(bottom: 12), padding: const EdgeInsets.all(16), decoration: BoxDecoration( - color: isUnlocked ? const Color(0xFFFF6B35).withOpacity(0.2) : Colors.white.withOpacity(0.05), + color: isUnlocked + ? const Color(0xFFFF6B35).withValues(alpha: 0.2) + : Colors.white.withValues(alpha: 0.05), borderRadius: BorderRadius.circular(12), - border: isUnlocked ? Border.all(color: const Color(0xFFFF6B35).withOpacity(0.5)) : Border.all(color: Colors.white.withOpacity(0.1)), + border: isUnlocked + ? Border.all(color: const Color(0xFFFF6B35).withValues(alpha: 0.5)) + : Border.all(color: Colors.white.withValues(alpha: 0.1)), ), child: Row( children: [ @@ -1194,7 +1256,9 @@ class _AnalyticsDashboardViewState extends State with Si width: 50, height: 50, decoration: BoxDecoration( - color: isUnlocked ? achievement.color : Colors.grey.withOpacity(0.3), + color: isUnlocked + ? achievement.color + : Colors.grey.withValues(alpha: 0.3), shape: BoxShape.circle, ), child: Center( @@ -1223,7 +1287,7 @@ class _AnalyticsDashboardViewState extends State with Si Text( achievement.description, style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 12, ), ), @@ -1231,7 +1295,7 @@ class _AnalyticsDashboardViewState extends State with Si if (!isUnlocked) ...[ LinearProgressIndicator( value: progressPercentage / 100, - backgroundColor: Colors.white.withOpacity(0.1), + backgroundColor: Colors.white.withValues(alpha: 0.1), valueColor: const AlwaysStoppedAnimation( Color(0xFFFF6B35), ), diff --git a/lib/views/audio_settings_view.dart b/lib/views/audio_settings_view.dart index 36e9cd4..efd8185 100644 --- a/lib/views/audio_settings_view.dart +++ b/lib/views/audio_settings_view.dart @@ -9,7 +9,8 @@ class AudioSettingsView extends StatefulWidget { State createState() => _AudioSettingsViewState(); } -class _AudioSettingsViewState extends State with TickerProviderStateMixin { +class _AudioSettingsViewState extends State + with TickerProviderStateMixin { final AudioService _audioService = AudioService(); late AnimationController _fadeController; late Animation _fadeAnimation; @@ -94,12 +95,12 @@ class _AudioSettingsViewState extends State with TickerProvid shape: BoxShape.circle, gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.12), - Colors.white.withOpacity(0.06), + Colors.white.withValues(alpha: 0.12), + Colors.white.withValues(alpha: 0.06), ], ), border: Border.all( - color: Colors.white.withOpacity(0.15), + color: Colors.white.withValues(alpha: 0.15), width: 1, ), ), @@ -128,7 +129,7 @@ class _AudioSettingsViewState extends State with TickerProvid Text( 'Customize your workout audio experience', style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 14, ), ), @@ -142,8 +143,8 @@ class _AudioSettingsViewState extends State with TickerProvid shape: BoxShape.circle, gradient: LinearGradient( colors: [ - const Color(0xFF00D4AA).withOpacity(0.2), - const Color(0xFF00D4AA).withOpacity(0.1), + const Color(0xFF00D4AA).withValues(alpha: 0.2), + const Color(0xFF00D4AA).withValues(alpha: 0.1), ], ), ), @@ -197,28 +198,30 @@ class _AudioSettingsViewState extends State with TickerProvid gradient: isSelected ? LinearGradient( colors: [ - color.withOpacity(0.2), - color.withOpacity(0.1), + color.withValues(alpha: 0.2), + color.withValues(alpha: 0.1), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ) : LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: isSelected ? color.withOpacity(0.5) : Colors.white.withOpacity(0.12), + color: isSelected + ? color.withValues(alpha: 0.5) + : Colors.white.withValues(alpha: 0.12), width: isSelected ? 2 : 1, ), boxShadow: isSelected ? [ BoxShadow( - color: color.withOpacity(0.3), + color: color.withValues(alpha: 0.3), blurRadius: 12, offset: const Offset(0, 4), ), @@ -243,11 +246,11 @@ class _AudioSettingsViewState extends State with TickerProvid decoration: BoxDecoration( shape: BoxShape.circle, gradient: LinearGradient( - colors: [color, color.withOpacity(0.7)], + colors: [color, color.withValues(alpha: 0.7)], ), boxShadow: [ BoxShadow( - color: color.withOpacity(0.4), + color: color.withValues(alpha: 0.4), blurRadius: 6, offset: const Offset(0, 2), ), @@ -281,7 +284,7 @@ class _AudioSettingsViewState extends State with TickerProvid child: Text( pack.description, style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 9, ), textAlign: TextAlign.center, @@ -295,7 +298,7 @@ class _AudioSettingsViewState extends State with TickerProvid Text( _audioService.getSoundPackInfo(pack)['intensity'] ?? '', style: TextStyle( - color: _getSoundPackColor(pack).withOpacity(0.8), + color: _getSoundPackColor(pack).withValues(alpha: 0.8), fontSize: 8, fontWeight: FontWeight.w600, ), @@ -308,10 +311,11 @@ class _AudioSettingsViewState extends State with TickerProvid if (isSelected) ...[ const SizedBox(height: 4), Container( - padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 2), + padding: + const EdgeInsets.symmetric(horizontal: 6, vertical: 2), decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), - color: color.withOpacity(0.2), + color: color.withValues(alpha: 0.2), ), child: Text( 'ACTIVE', @@ -348,14 +352,14 @@ class _AudioSettingsViewState extends State with TickerProvid borderRadius: BorderRadius.circular(16), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: Colors.white.withOpacity(0.12), + color: Colors.white.withValues(alpha: 0.12), width: 1, ), ), @@ -415,7 +419,7 @@ class _AudioSettingsViewState extends State with TickerProvid height: 32, decoration: BoxDecoration( shape: BoxShape.circle, - color: color.withOpacity(0.2), + color: color.withValues(alpha: 0.2), ), child: Icon( icon, @@ -438,7 +442,7 @@ class _AudioSettingsViewState extends State with TickerProvid padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), - color: color.withOpacity(0.2), + color: color.withValues(alpha: 0.2), ), child: Text( '${(value * 100).round()}%', @@ -455,9 +459,9 @@ class _AudioSettingsViewState extends State with TickerProvid SliderTheme( data: SliderTheme.of(context).copyWith( activeTrackColor: color, - inactiveTrackColor: Colors.white.withOpacity(0.2), + inactiveTrackColor: Colors.white.withValues(alpha: 0.2), thumbColor: color, - overlayColor: color.withOpacity(0.2), + overlayColor: color.withValues(alpha: 0.2), trackHeight: 4, thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8), ), @@ -482,14 +486,14 @@ class _AudioSettingsViewState extends State with TickerProvid borderRadius: BorderRadius.circular(12), gradient: LinearGradient( colors: [ - const Color(0xFF00D4AA).withOpacity(0.1), - const Color(0xFF00D4AA).withOpacity(0.05), + const Color(0xFF00D4AA).withValues(alpha: 0.1), + const Color(0xFF00D4AA).withValues(alpha: 0.05), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: const Color(0xFF00D4AA).withOpacity(0.3), + color: const Color(0xFF00D4AA).withValues(alpha: 0.3), width: 1, ), ), @@ -500,7 +504,7 @@ class _AudioSettingsViewState extends State with TickerProvid height: 36, decoration: BoxDecoration( shape: BoxShape.circle, - color: const Color(0xFF00D4AA).withOpacity(0.2), + color: const Color(0xFF00D4AA).withValues(alpha: 0.2), ), child: const Icon( Icons.volume_up, @@ -524,7 +528,7 @@ class _AudioSettingsViewState extends State with TickerProvid Text( 'Reset to optimized loud settings', style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 12, ), ), @@ -535,10 +539,10 @@ class _AudioSettingsViewState extends State with TickerProvid onPressed: () async { await _audioService.resetVolumeToDefaults(); setState(() {}); - + // Play test sound to demonstrate new volume await _audioService.testSound(SoundType.setEnd); - + // Show feedback HapticFeedback.lightImpact(); ScaffoldMessenger.of(context).showSnackBar( @@ -587,14 +591,14 @@ class _AudioSettingsViewState extends State with TickerProvid borderRadius: BorderRadius.circular(16), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: Colors.white.withOpacity(0.12), + color: Colors.white.withValues(alpha: 0.12), width: 1, ), ), @@ -639,7 +643,7 @@ class _AudioSettingsViewState extends State with TickerProvid height: 40, decoration: BoxDecoration( shape: BoxShape.circle, - color: color.withOpacity(0.2), + color: color.withValues(alpha: 0.2), ), child: Icon( icon, @@ -663,7 +667,7 @@ class _AudioSettingsViewState extends State with TickerProvid Text( subtitle, style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 13, ), ), @@ -678,10 +682,10 @@ class _AudioSettingsViewState extends State with TickerProvid // Then update UI state setState(() {}); }, - activeColor: color, - activeTrackColor: color.withOpacity(0.3), - inactiveThumbColor: Colors.white.withOpacity(0.5), - inactiveTrackColor: Colors.white.withOpacity(0.2), + activeThumbColor: color, + activeTrackColor: color.withValues(alpha: 0.3), + inactiveThumbColor: Colors.white.withValues(alpha: 0.5), + inactiveTrackColor: Colors.white.withValues(alpha: 0.2), ), ], ); @@ -703,14 +707,14 @@ class _AudioSettingsViewState extends State with TickerProvid borderRadius: BorderRadius.circular(16), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: Colors.white.withOpacity(0.12), + color: Colors.white.withValues(alpha: 0.12), width: 1, ), ), @@ -788,12 +792,12 @@ class _AudioSettingsViewState extends State with TickerProvid borderRadius: BorderRadius.circular(12), gradient: LinearGradient( colors: [ - color.withOpacity(0.2), - color.withOpacity(0.1), + color.withValues(alpha: 0.2), + color.withValues(alpha: 0.1), ], ), border: Border.all( - color: color.withOpacity(0.3), + color: color.withValues(alpha: 0.3), width: 1, ), ), @@ -836,8 +840,8 @@ class _AudioSettingsViewState extends State with TickerProvid shape: BoxShape.circle, gradient: LinearGradient( colors: [ - const Color(0xFF00D4AA).withOpacity(0.2), - const Color(0xFF00D4AA).withOpacity(0.1), + const Color(0xFF00D4AA).withValues(alpha: 0.2), + const Color(0xFF00D4AA).withValues(alpha: 0.1), ], ), ), @@ -863,7 +867,7 @@ class _AudioSettingsViewState extends State with TickerProvid Text( subtitle, style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 13, ), ), @@ -876,13 +880,14 @@ class _AudioSettingsViewState extends State with TickerProvid Color _getSoundPackColor(SoundPack pack) { final colorString = _audioService.getSoundPackColor(pack); - return Color(int.parse(colorString.substring(1, 7), radix: 16) + 0xFF000000); + return Color( + int.parse(colorString.substring(1, 7), radix: 16) + 0xFF000000); } Future _selectSoundPack(SoundPack pack) async { // Save the sound pack setting first await _audioService.setSoundPack(pack); - + // Update UI state setState(() {}); diff --git a/lib/views/preset_selection_view.dart b/lib/views/preset_selection_view.dart index 8b2b855..2de46c4 100644 --- a/lib/views/preset_selection_view.dart +++ b/lib/views/preset_selection_view.dart @@ -47,7 +47,9 @@ class _PresetSelectionViewState extends State { List get _filteredPresets { if (_selectedCategory == 'All') return _presets; - return _presets.where((preset) => preset.category == _selectedCategory).toList(); + return _presets + .where((preset) => preset.category == _selectedCategory) + .toList(); } @override @@ -71,7 +73,8 @@ class _PresetSelectionViewState extends State { children: [ _buildHeader(), if (_isLoading) - const Expanded(child: Center(child: CircularProgressIndicator())) + const Expanded( + child: Center(child: CircularProgressIndicator())) else ...[ _buildCategoryFilter(), Expanded(child: _buildPresetGrid()), @@ -93,9 +96,9 @@ class _PresetSelectionViewState extends State { height: 48, decoration: BoxDecoration( shape: BoxShape.circle, - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), border: Border.all( - color: Colors.white.withOpacity(0.2), + color: Colors.white.withValues(alpha: 0.2), width: 1, ), ), @@ -124,7 +127,7 @@ class _PresetSelectionViewState extends State { Text( 'Quick start with proven routines', style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 14, ), ), @@ -137,9 +140,9 @@ class _PresetSelectionViewState extends State { height: 48, decoration: BoxDecoration( shape: BoxShape.circle, - color: Colors.blue.withOpacity(0.2), + color: Colors.blue.withValues(alpha: 0.2), border: Border.all( - color: Colors.blue.withOpacity(0.4), + color: Colors.blue.withValues(alpha: 0.4), width: 1, ), ), @@ -179,14 +182,16 @@ class _PresetSelectionViewState extends State { _selectedCategory = category; }); }, - backgroundColor: Colors.white.withOpacity(0.1), - selectedColor: const Color(0xFF00D4AA).withOpacity(0.3), + backgroundColor: Colors.white.withValues(alpha: 0.1), + selectedColor: const Color(0xFF00D4AA).withValues(alpha: 0.3), labelStyle: TextStyle( color: isSelected ? const Color(0xFF00D4AA) : Colors.white70, fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal, ), side: BorderSide( - color: isSelected ? const Color(0xFF00D4AA) : Colors.white.withOpacity(0.2), + color: isSelected + ? const Color(0xFF00D4AA) + : Colors.white.withValues(alpha: 0.2), ), ), ); @@ -203,7 +208,7 @@ class _PresetSelectionViewState extends State { child: Text( 'No presets found', style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 16, ), ), @@ -231,9 +236,9 @@ class _PresetSelectionViewState extends State { return Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(16), - color: Colors.white.withOpacity(0.05), + color: Colors.white.withValues(alpha: 0.05), border: Border.all( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), width: 1, ), ), @@ -255,7 +260,8 @@ class _PresetSelectionViewState extends State { height: 40, decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), - color: _getCategoryColor(preset.category).withOpacity(0.2), + color: _getCategoryColor(preset.category) + .withValues(alpha: 0.2), ), child: Icon( _getCategoryIcon(preset.iconName ?? 'timer'), @@ -265,10 +271,12 @@ class _PresetSelectionViewState extends State { ), const Spacer(), Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + padding: const EdgeInsets.symmetric( + horizontal: 8, vertical: 4), decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), - color: _getCategoryColor(preset.category).withOpacity(0.2), + color: _getCategoryColor(preset.category) + .withValues(alpha: 0.2), ), child: Text( preset.category, @@ -297,7 +305,7 @@ class _PresetSelectionViewState extends State { child: Text( preset.description, style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 12, ), maxLines: 2, @@ -324,13 +332,13 @@ class _PresetSelectionViewState extends State { Icon( Icons.fitness_center, size: 12, - color: Colors.white.withOpacity(0.5), + color: Colors.white.withValues(alpha: 0.5), ), const SizedBox(width: 4), Text( '${preset.totalSets} sets', style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 11, ), ), @@ -342,14 +350,14 @@ class _PresetSelectionViewState extends State { Icon( Icons.schedule, size: 12, - color: Colors.white.withOpacity(0.5), + color: Colors.white.withValues(alpha: 0.5), ), const SizedBox(width: 4), Expanded( child: Text( preset.formattedDuration, style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 11, ), maxLines: 1, @@ -364,13 +372,13 @@ class _PresetSelectionViewState extends State { Icon( Icons.timer, size: 12, - color: Colors.white.withOpacity(0.5), + color: Colors.white.withValues(alpha: 0.5), ), const SizedBox(width: 4), Text( preset.estimatedDuration, style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 11, ), ), diff --git a/lib/views/template_management_view.dart b/lib/views/template_management_view.dart index 6877cff..e8d56db 100644 --- a/lib/views/template_management_view.dart +++ b/lib/views/template_management_view.dart @@ -32,7 +32,8 @@ class _TemplateManagementViewState extends State { try { final allPresets = await _presetService.getAllPresets(); - final customPresets = allPresets.where((preset) => !preset.isDefault).toList(); + final customPresets = + allPresets.where((preset) => !preset.isDefault).toList(); final categories = await _presetService.getCategories(); setState(() { @@ -50,7 +51,9 @@ class _TemplateManagementViewState extends State { List get _filteredPresets { if (_selectedCategory == 'All') return _customPresets; - return _customPresets.where((preset) => preset.category == _selectedCategory).toList(); + return _customPresets + .where((preset) => preset.category == _selectedCategory) + .toList(); } @override @@ -74,7 +77,10 @@ class _TemplateManagementViewState extends State { children: [ _buildModernHeader(), if (_isLoading) - const Expanded(child: Center(child: CircularProgressIndicator(color: Color(0xFF00D4AA)))) + const Expanded( + child: Center( + child: CircularProgressIndicator( + color: Color(0xFF00D4AA)))) else ...[ if (_categories.length > 1) _buildCategoryFilter(), Expanded(child: _buildContent()), @@ -99,12 +105,12 @@ class _TemplateManagementViewState extends State { shape: BoxShape.circle, gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.12), - Colors.white.withOpacity(0.06), + Colors.white.withValues(alpha: 0.12), + Colors.white.withValues(alpha: 0.06), ], ), border: Border.all( - color: Colors.white.withOpacity(0.15), + color: Colors.white.withValues(alpha: 0.15), width: 1, ), ), @@ -133,7 +139,7 @@ class _TemplateManagementViewState extends State { Text( 'Manage your custom workout templates', style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 14, ), ), @@ -166,14 +172,16 @@ class _TemplateManagementViewState extends State { _selectedCategory = category; }); }, - backgroundColor: Colors.white.withOpacity(0.1), - selectedColor: const Color(0xFF00D4AA).withOpacity(0.3), + backgroundColor: Colors.white.withValues(alpha: 0.1), + selectedColor: const Color(0xFF00D4AA).withValues(alpha: 0.3), labelStyle: TextStyle( color: isSelected ? const Color(0xFF00D4AA) : Colors.white70, fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal, ), side: BorderSide( - color: isSelected ? const Color(0xFF00D4AA) : Colors.white.withOpacity(0.2), + color: isSelected + ? const Color(0xFF00D4AA) + : Colors.white.withValues(alpha: 0.2), ), ), ); @@ -214,20 +222,22 @@ class _TemplateManagementViewState extends State { shape: BoxShape.circle, gradient: LinearGradient( colors: [ - const Color(0xFF00D4AA).withOpacity(0.2), - const Color(0xFF00D4AA).withOpacity(0.1), + const Color(0xFF00D4AA).withValues(alpha: 0.2), + const Color(0xFF00D4AA).withValues(alpha: 0.1), ], ), ), child: Icon( Icons.library_add_outlined, size: 40, - color: const Color(0xFF00D4AA).withOpacity(0.7), + color: const Color(0xFF00D4AA).withValues(alpha: 0.7), ), ), const SizedBox(height: 24), Text( - _customPresets.isEmpty ? 'No Custom Templates' : 'No Templates in "$_selectedCategory"', + _customPresets.isEmpty + ? 'No Custom Templates' + : 'No Templates in "$_selectedCategory"', style: const TextStyle( fontSize: 20, fontWeight: FontWeight.w600, @@ -242,7 +252,7 @@ class _TemplateManagementViewState extends State { textAlign: TextAlign.center, style: TextStyle( fontSize: 14, - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), ), ), ], @@ -257,14 +267,14 @@ class _TemplateManagementViewState extends State { borderRadius: BorderRadius.circular(16), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: Colors.white.withOpacity(0.12), + color: Colors.white.withValues(alpha: 0.12), width: 1, ), ), @@ -288,7 +298,8 @@ class _TemplateManagementViewState extends State { gradient: LinearGradient( colors: [ _getCategoryColor(preset.category), - _getCategoryColor(preset.category).withOpacity(0.7), + _getCategoryColor(preset.category) + .withValues(alpha: 0.7), ], ), ), @@ -315,7 +326,7 @@ class _TemplateManagementViewState extends State { Text( preset.description, style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 13, ), maxLines: 1, @@ -325,20 +336,23 @@ class _TemplateManagementViewState extends State { ), ), PopupMenuButton( - onSelected: (action) => _handlePresetAction(action, preset), + onSelected: (action) => + _handlePresetAction(action, preset), color: const Color(0xFF2A2A2A), icon: Icon( Icons.more_vert, - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), ), itemBuilder: (context) => [ const PopupMenuItem( value: 'edit', child: Row( children: [ - Icon(Icons.edit, color: Color(0xFF00D4AA), size: 20), + Icon(Icons.edit, + color: Color(0xFF00D4AA), size: 20), SizedBox(width: 12), - Text('Edit', style: TextStyle(color: Colors.white)), + Text('Edit', + style: TextStyle(color: Colors.white)), ], ), ), @@ -348,7 +362,8 @@ class _TemplateManagementViewState extends State { children: [ Icon(Icons.delete, color: Colors.red, size: 20), SizedBox(width: 12), - Text('Delete', style: TextStyle(color: Colors.red)), + Text('Delete', + style: TextStyle(color: Colors.red)), ], ), ), @@ -361,15 +376,17 @@ class _TemplateManagementViewState extends State { padding: const EdgeInsets.all(12), decoration: BoxDecoration( borderRadius: BorderRadius.circular(10), - color: Colors.black.withOpacity(0.3), + color: Colors.black.withValues(alpha: 0.3), ), child: Row( children: [ _buildStatChip('${preset.totalSets} sets', Icons.repeat), const SizedBox(width: 8), - _buildStatChip('${preset.setDurationSeconds}s work', Icons.play_arrow), + _buildStatChip('${preset.setDurationSeconds}s work', + Icons.play_arrow), const SizedBox(width: 8), - _buildStatChip('${preset.restDurationSeconds}s rest', Icons.pause), + _buildStatChip( + '${preset.restDurationSeconds}s rest', Icons.pause), ], ), ), @@ -378,10 +395,12 @@ class _TemplateManagementViewState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + padding: const EdgeInsets.symmetric( + horizontal: 8, vertical: 4), decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), - color: _getCategoryColor(preset.category).withOpacity(0.2), + color: _getCategoryColor(preset.category) + .withValues(alpha: 0.2), ), child: Text( preset.category, @@ -395,7 +414,7 @@ class _TemplateManagementViewState extends State { Text( preset.estimatedDuration, style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 12, fontWeight: FontWeight.w500, ), @@ -414,7 +433,7 @@ class _TemplateManagementViewState extends State { return Container( padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 3), decoration: BoxDecoration( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), borderRadius: BorderRadius.circular(6), ), child: Row( @@ -425,7 +444,7 @@ class _TemplateManagementViewState extends State { Text( text, style: TextStyle( - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), fontSize: 10, fontWeight: FontWeight.w500, ), @@ -457,7 +476,8 @@ class _TemplateManagementViewState extends State { } void _loadPreset(PresetModel preset) { - final timerController = Provider.of(context, listen: false); + final timerController = + Provider.of(context, listen: false); timerController.updateTimerSettings( totalSets: preset.totalSets, @@ -485,15 +505,17 @@ class _TemplateManagementViewState extends State { context: context, builder: (context) => AlertDialog( backgroundColor: const Color(0xFF1A1A1A), - title: const Text('Delete Template', style: TextStyle(color: Colors.white)), + title: const Text('Delete Template', + style: TextStyle(color: Colors.white)), content: Text( 'Are you sure you want to delete "${preset.name}"? This action cannot be undone.', - style: TextStyle(color: Colors.white.withOpacity(0.8)), + style: TextStyle(color: Colors.white.withValues(alpha: 0.8)), ), actions: [ TextButton( onPressed: () => Navigator.of(context).pop(false), - child: const Text('Cancel', style: TextStyle(color: Colors.white70)), + child: + const Text('Cancel', style: TextStyle(color: Colors.white70)), ), TextButton( onPressed: () => Navigator.of(context).pop(true), @@ -516,7 +538,8 @@ class _TemplateManagementViewState extends State { } void _showSaveCurrentTemplateDialog() { - final timerController = Provider.of(context, listen: false); + final timerController = + Provider.of(context, listen: false); showDialog( context: context, @@ -677,7 +700,8 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { widget.onSaved?.call(); ScaffoldMessenger.of(context).showSnackBar( SnackBar( - content: Text('Template "${updatedTemplate.name}" updated successfully!'), + content: Text( + 'Template "${updatedTemplate.name}" updated successfully!'), backgroundColor: const Color(0xFF00D4AA), ), ); @@ -710,7 +734,7 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { color: const Color(0xFF1A1A1A), borderRadius: BorderRadius.circular(20), border: Border.all( - color: const Color(0xFF00D4AA).withOpacity(0.3), + color: const Color(0xFF00D4AA).withValues(alpha: 0.3), width: 1, ), ), @@ -723,7 +747,7 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - const Color(0xFF00D4AA).withOpacity(0.1), + const Color(0xFF00D4AA).withValues(alpha: 0.1), Colors.transparent, ], ), @@ -737,7 +761,7 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { Container( padding: const EdgeInsets.all(6), decoration: BoxDecoration( - color: const Color(0xFF00D4AA).withOpacity(0.2), + color: const Color(0xFF00D4AA).withValues(alpha: 0.2), borderRadius: BorderRadius.circular(10), ), child: const Icon( @@ -787,23 +811,28 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { const SizedBox(height: 6), TextFormField( controller: _nameController, - style: const TextStyle(color: Colors.white, fontSize: 14), + style: + const TextStyle(color: Colors.white, fontSize: 14), decoration: InputDecoration( hintText: 'Enter template name', - hintStyle: TextStyle(color: Colors.white.withOpacity(0.5)), + hintStyle: TextStyle( + color: Colors.white.withValues(alpha: 0.5)), filled: true, - fillColor: Colors.white.withOpacity(0.05), + fillColor: Colors.white.withValues(alpha: 0.05), border: OutlineInputBorder( borderRadius: BorderRadius.circular(10), - borderSide: BorderSide(color: Colors.white.withOpacity(0.2)), + borderSide: BorderSide( + color: Colors.white.withValues(alpha: 0.2)), ), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(10), - borderSide: BorderSide(color: Colors.white.withOpacity(0.2)), + borderSide: BorderSide( + color: Colors.white.withValues(alpha: 0.2)), ), focusedBorder: const OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10)), - borderSide: BorderSide(color: Color(0xFF00D4AA), width: 2), + borderSide: + BorderSide(color: Color(0xFF00D4AA), width: 2), ), contentPadding: const EdgeInsets.all(14), ), @@ -828,24 +857,29 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { const SizedBox(height: 6), TextFormField( controller: _descriptionController, - style: const TextStyle(color: Colors.white, fontSize: 14), + style: + const TextStyle(color: Colors.white, fontSize: 14), maxLines: 2, decoration: InputDecoration( hintText: 'Describe your workout routine...', - hintStyle: TextStyle(color: Colors.white.withOpacity(0.5)), + hintStyle: TextStyle( + color: Colors.white.withValues(alpha: 0.5)), filled: true, - fillColor: Colors.white.withOpacity(0.05), + fillColor: Colors.white.withValues(alpha: 0.05), border: OutlineInputBorder( borderRadius: BorderRadius.circular(10), - borderSide: BorderSide(color: Colors.white.withOpacity(0.2)), + borderSide: BorderSide( + color: Colors.white.withValues(alpha: 0.2)), ), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(10), - borderSide: BorderSide(color: Colors.white.withOpacity(0.2)), + borderSide: BorderSide( + color: Colors.white.withValues(alpha: 0.2)), ), focusedBorder: const OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10)), - borderSide: BorderSide(color: Color(0xFF00D4AA), width: 2), + borderSide: + BorderSide(color: Color(0xFF00D4AA), width: 2), ), contentPadding: const EdgeInsets.all(14), ), @@ -869,23 +903,27 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { ), const SizedBox(height: 6), DropdownButtonFormField( - value: _selectedCategory, - style: const TextStyle(color: Colors.white, fontSize: 14), + initialValue: _selectedCategory, + style: + const TextStyle(color: Colors.white, fontSize: 14), dropdownColor: const Color(0xFF2A2A2A), decoration: InputDecoration( filled: true, - fillColor: Colors.white.withOpacity(0.05), + fillColor: Colors.white.withValues(alpha: 0.05), border: OutlineInputBorder( borderRadius: BorderRadius.circular(10), - borderSide: BorderSide(color: Colors.white.withOpacity(0.2)), + borderSide: BorderSide( + color: Colors.white.withValues(alpha: 0.2)), ), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(10), - borderSide: BorderSide(color: Colors.white.withOpacity(0.2)), + borderSide: BorderSide( + color: Colors.white.withValues(alpha: 0.2)), ), focusedBorder: const OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10)), - borderSide: BorderSide(color: Color(0xFF00D4AA), width: 2), + borderSide: + BorderSide(color: Color(0xFF00D4AA), width: 2), ), contentPadding: const EdgeInsets.all(14), ), @@ -916,7 +954,8 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { GridView.builder( shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), - gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( + gridDelegate: + const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 4, crossAxisSpacing: 6, mainAxisSpacing: 6, @@ -936,13 +975,20 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { decoration: BoxDecoration( gradient: isSelected ? const LinearGradient( - colors: [Color(0xFF00D4AA), Color(0xFF00B4AA)], + colors: [ + Color(0xFF00D4AA), + Color(0xFF00B4AA) + ], ) : null, - color: isSelected ? null : Colors.white.withOpacity(0.1), + color: isSelected + ? null + : Colors.white.withValues(alpha: 0.1), borderRadius: BorderRadius.circular(8), border: Border.all( - color: isSelected ? const Color(0xFF00D4AA) : Colors.white.withOpacity(0.2), + color: isSelected + ? const Color(0xFF00D4AA) + : Colors.white.withValues(alpha: 0.2), width: isSelected ? 2 : 1, ), ), @@ -951,7 +997,9 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { children: [ Icon( _getIconData(iconData['name']!), - color: isSelected ? Colors.white : Colors.white70, + color: isSelected + ? Colors.white + : Colors.white70, size: 16, ), const SizedBox(height: 2), @@ -959,8 +1007,12 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { iconData['label']!, style: TextStyle( fontSize: 7, - color: isSelected ? Colors.white : Colors.white70, - fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal, + color: isSelected + ? Colors.white + : Colors.white70, + fontWeight: isSelected + ? FontWeight.w600 + : FontWeight.normal, ), textAlign: TextAlign.center, maxLines: 1, @@ -984,7 +1036,7 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { decoration: BoxDecoration( border: Border( top: BorderSide( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), width: 1, ), ), @@ -993,10 +1045,13 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { children: [ Expanded( child: OutlinedButton( - onPressed: _isLoading ? null : () => Navigator.of(context).pop(false), + onPressed: _isLoading + ? null + : () => Navigator.of(context).pop(false), style: OutlinedButton.styleFrom( foregroundColor: Colors.white70, - side: BorderSide(color: Colors.white.withOpacity(0.3)), + side: BorderSide( + color: Colors.white.withValues(alpha: 0.3)), padding: const EdgeInsets.symmetric(vertical: 12), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), @@ -1024,7 +1079,8 @@ class _EditTemplateDialogState extends State<_EditTemplateDialog> { height: 14, child: CircularProgressIndicator( strokeWidth: 2, - valueColor: AlwaysStoppedAnimation(Colors.white), + valueColor: + AlwaysStoppedAnimation(Colors.white), ), ) : const Text('Update Template'), diff --git a/lib/views/timer_view.dart b/lib/views/timer_view.dart index ce7bf5f..3e7a0c6 100644 --- a/lib/views/timer_view.dart +++ b/lib/views/timer_view.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import '../controllers/timer_controller.dart'; import '../models/timer_model.dart'; @@ -97,8 +96,10 @@ class _TimerViewState extends State with TickerProviderStateMixin { } final screenSize = MediaQuery.of(context).size; - final isSmallScreen = screenSize.height < 700 || screenSize.width < 400; - final isVerySmallScreen = screenSize.height < 600 || screenSize.width < 350; + final isSmallScreen = + screenSize.height < 700 || screenSize.width < 400; + final isVerySmallScreen = + screenSize.height < 600 || screenSize.width < 350; // Responsive spacing final headerSpacing = isVerySmallScreen @@ -137,7 +138,8 @@ class _TimerViewState extends State with TickerProviderStateMixin { ), child: SafeArea( child: Padding( - padding: EdgeInsets.symmetric(horizontal: sidePadding, vertical: 12.0), + padding: EdgeInsets.symmetric( + horizontal: sidePadding, vertical: 12.0), child: Column( children: [ // Header with settings @@ -197,20 +199,20 @@ class _TimerViewState extends State with TickerProviderStateMixin { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.03), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.03), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), borderRadius: BorderRadius.circular(16), border: Border.all( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), width: 1, ), boxShadow: [ BoxShadow( - color: Colors.black.withOpacity(0.15), + color: Colors.black.withValues(alpha: 0.15), blurRadius: 10, offset: const Offset(0, 2), ), @@ -230,7 +232,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { ), boxShadow: [ BoxShadow( - color: const Color(0xFF00D4AA).withOpacity(0.3), + color: const Color(0xFF00D4AA).withValues(alpha: 0.3), blurRadius: 8, spreadRadius: 0, ), @@ -269,7 +271,10 @@ class _TimerViewState extends State with TickerProviderStateMixin { style: TextStyle( fontWeight: FontWeight.w400, fontSize: 11, - color: presetName != null ? const Color(0xFF00D4AA).withOpacity(0.8) : Colors.white.withOpacity(0.6), + color: presetName != null + ? const Color(0xFF00D4AA) + .withValues(alpha: 0.8) + : Colors.white.withValues(alpha: 0.6), letterSpacing: 0.1, height: 1.0, ), @@ -292,7 +297,8 @@ class _TimerViewState extends State with TickerProviderStateMixin { const SizedBox(width: 12), // Action buttons with better spacing - _buildHeaderActionButtons(controller, isVerySmallScreen, isSmallScreen), + _buildHeaderActionButtons( + controller, isVerySmallScreen, isSmallScreen), ], ), ); @@ -312,13 +318,13 @@ class _TimerViewState extends State with TickerProviderStateMixin { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - const Color(0xFFFF6B35).withOpacity(0.3), - const Color(0xFFFF8E53).withOpacity(0.2), + const Color(0xFFFF6B35).withValues(alpha: 0.3), + const Color(0xFFFF8E53).withValues(alpha: 0.2), ], ), borderRadius: BorderRadius.circular(12), border: Border.all( - color: const Color(0xFFFF6B35).withOpacity(0.4), + color: const Color(0xFFFF6B35).withValues(alpha: 0.4), width: 1, ), ), @@ -345,7 +351,8 @@ class _TimerViewState extends State with TickerProviderStateMixin { ); } - Widget _buildHeaderActionButtons(TimerController controller, bool isVerySmallScreen, bool isSmallScreen) { + Widget _buildHeaderActionButtons( + TimerController controller, bool isVerySmallScreen, bool isSmallScreen) { final buttonSize = isVerySmallScreen ? 40.0 : 44.0; final buttonSpacing = isVerySmallScreen ? 8.0 : 10.0; @@ -355,8 +362,8 @@ class _TimerViewState extends State with TickerProviderStateMixin { // Quick access - Presets _buildModernHeaderButton( icon: Icons.library_books_outlined, - color: Colors.white.withOpacity(0.06), - iconColor: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.06), + iconColor: Colors.white.withValues(alpha: 0.8), size: buttonSize, onPressed: () => Navigator.push( context, @@ -370,7 +377,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { // History _buildModernHeaderButton( icon: Icons.analytics_outlined, - color: const Color(0xFF2196F3).withOpacity(0.12), + color: const Color(0xFF2196F3).withValues(alpha: 0.12), iconColor: const Color(0xFF2196F3), size: buttonSize, onPressed: () => Navigator.push( @@ -385,7 +392,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { // More options menu - consolidated for clean look _buildModernHeaderButton( icon: Icons.tune_rounded, - color: const Color(0xFF00D4AA).withOpacity(0.12), + color: const Color(0xFF00D4AA).withValues(alpha: 0.12), iconColor: const Color(0xFF00D4AA), size: buttonSize, onPressed: () => _showQuickActionsMenu(context, controller), @@ -410,19 +417,21 @@ class _TimerViewState extends State with TickerProviderStateMixin { color: color, borderRadius: BorderRadius.circular(14), border: Border.all( - color: isHighlighted ? const Color(0xFF00D4AA).withOpacity(0.3) : Colors.white.withOpacity(0.12), + color: isHighlighted + ? const Color(0xFF00D4AA).withValues(alpha: 0.3) + : Colors.white.withValues(alpha: 0.12), width: 1, ), boxShadow: [ if (isHighlighted) BoxShadow( - color: const Color(0xFF00D4AA).withOpacity(0.2), + color: const Color(0xFF00D4AA).withValues(alpha: 0.2), blurRadius: 8, offset: const Offset(0, 2), ) else BoxShadow( - color: Colors.black.withOpacity(0.1), + color: Colors.black.withValues(alpha: 0.1), blurRadius: 4, offset: const Offset(0, 1), ), @@ -477,7 +486,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { ), boxShadow: [ BoxShadow( - color: const Color(0xFF00FF88).withOpacity(0.5), + color: const Color(0xFF00FF88).withValues(alpha: 0.5), blurRadius: 30, spreadRadius: 10, ), @@ -510,7 +519,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { Text( 'Great job! You completed all sets.', style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 16, ), ), @@ -572,11 +581,11 @@ class _TimerViewState extends State with TickerProviderStateMixin { height: 70, decoration: BoxDecoration( shape: BoxShape.circle, - color: color.withOpacity(isPrimary ? 1.0 : 0.3), + color: color.withValues(alpha: isPrimary ? 1.0 : 0.3), boxShadow: isPrimary ? [ BoxShadow( - color: color.withOpacity(0.4), + color: color.withValues(alpha: 0.4), blurRadius: 20, spreadRadius: 5, ), @@ -596,7 +605,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { Text( label, style: TextStyle( - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), fontSize: 12, fontWeight: FontWeight.w500, ), @@ -608,7 +617,9 @@ class _TimerViewState extends State with TickerProviderStateMixin { Widget _buildProgressSection(TimerModel timer) { final screenSize = MediaQuery.of(context).size; final isSmallScreen = screenSize.height < 700 || screenSize.width < 400; - final primaryColor = timer.isInRestPeriod ? const Color(0xFFFF6B35) : const Color(0xFF00D4AA); + final primaryColor = timer.isInRestPeriod + ? const Color(0xFFFF6B35) + : const Color(0xFF00D4AA); return Container( padding: const EdgeInsets.all(20), @@ -617,19 +628,19 @@ class _TimerViewState extends State with TickerProviderStateMixin { borderRadius: BorderRadius.circular(20), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.06), - Colors.white.withOpacity(0.02), + Colors.white.withValues(alpha: 0.06), + Colors.white.withValues(alpha: 0.02), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), width: 1, ), boxShadow: [ BoxShadow( - color: Colors.black.withOpacity(0.15), + color: Colors.black.withValues(alpha: 0.15), blurRadius: 12, offset: const Offset(0, 4), ), @@ -652,12 +663,12 @@ class _TimerViewState extends State with TickerProviderStateMixin { padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), ), child: Text( 'of', style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: isSmallScreen ? 13 : 14, fontWeight: FontWeight.w500, ), @@ -666,7 +677,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { const SizedBox(width: 12), _buildSetCounterBadge( value: timer.totalSets, - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), isActive: false, isSmallScreen: isSmallScreen, ), @@ -685,19 +696,20 @@ class _TimerViewState extends State with TickerProviderStateMixin { Text( 'Workout Progress', style: TextStyle( - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), fontSize: 13, fontWeight: FontWeight.w600, letterSpacing: 0.5, ), ), Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2), + padding: + const EdgeInsets.symmetric(horizontal: 8, vertical: 2), decoration: BoxDecoration( borderRadius: BorderRadius.circular(10), - color: primaryColor.withOpacity(0.15), + color: primaryColor.withValues(alpha: 0.15), border: Border.all( - color: primaryColor.withOpacity(0.3), + color: primaryColor.withValues(alpha: 0.3), width: 1, ), ), @@ -719,8 +731,8 @@ class _TimerViewState extends State with TickerProviderStateMixin { borderRadius: BorderRadius.circular(4), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.05), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.05), ], ), ), @@ -756,26 +768,28 @@ class _TimerViewState extends State with TickerProviderStateMixin { gradient: isActive ? LinearGradient( colors: [ - color.withOpacity(0.2), - color.withOpacity(0.1), + color.withValues(alpha: 0.2), + color.withValues(alpha: 0.1), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ) : LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], ), border: Border.all( - color: isActive ? color.withOpacity(0.4) : Colors.white.withOpacity(0.2), + color: isActive + ? color.withValues(alpha: 0.4) + : Colors.white.withValues(alpha: 0.2), width: 1.5, ), boxShadow: isActive ? [ BoxShadow( - color: color.withOpacity(0.2), + color: color.withValues(alpha: 0.2), blurRadius: 8, offset: const Offset(0, 2), ), @@ -796,26 +810,32 @@ class _TimerViewState extends State with TickerProviderStateMixin { Widget _buildAnimatedTimerCircle(TimerModel timer) { final isRest = timer.isInRestPeriod; - final primaryColor = isRest ? const Color(0xFFFF6B35) : const Color(0xFF00D4AA); - final isRunning = timer.state == TimerState.running || timer.state == TimerState.resting; + final primaryColor = + isRest ? const Color(0xFFFF6B35) : const Color(0xFF00D4AA); + final isRunning = + timer.state == TimerState.running || timer.state == TimerState.resting; return LayoutBuilder( builder: (context, constraints) { final screenSize = MediaQuery.of(context).size; final isSmallScreen = screenSize.height < 700 || screenSize.width < 400; - final isVerySmallScreen = screenSize.height < 600 || screenSize.width < 350; + final isVerySmallScreen = + screenSize.height < 600 || screenSize.width < 350; // Calculate optimal circle size based on available space and screen characteristics final availableWidth = constraints.maxWidth; final availableHeight = constraints.maxHeight; - final minDimension = availableWidth < availableHeight ? availableWidth : availableHeight; + final minDimension = + availableWidth < availableHeight ? availableWidth : availableHeight; // Calculate max allowed size first final maxAllowedSize = minDimension * 0.9; const absoluteMinSize = 80.0; // Reduced absolute minimum // Ensure we have a valid range for clamping - final effectiveMinSize = absoluteMinSize > maxAllowedSize ? maxAllowedSize * 0.8 : absoluteMinSize; + final effectiveMinSize = absoluteMinSize > maxAllowedSize + ? maxAllowedSize * 0.8 + : absoluteMinSize; // More conservative sizing to prevent overflow double circleSize; @@ -831,7 +851,9 @@ class _TimerViewState extends State with TickerProviderStateMixin { circleSize = circleSize.clamp(effectiveMinSize, maxAllowedSize); // Calculate progress - final totalDuration = timer.isInRestPeriod ? timer.restDurationSeconds : timer.setDurationSeconds; + final totalDuration = timer.isInRestPeriod + ? timer.restDurationSeconds + : timer.setDurationSeconds; final elapsed = totalDuration - timer.remainingSeconds; final progressValue = totalDuration > 0 ? elapsed / totalDuration : 0.0; @@ -858,16 +880,16 @@ class _TimerViewState extends State with TickerProviderStateMixin { shape: BoxShape.circle, gradient: RadialGradient( colors: [ - primaryColor.withOpacity(0.2), - primaryColor.withOpacity(0.1), - primaryColor.withOpacity(0.05), + primaryColor.withValues(alpha: 0.2), + primaryColor.withValues(alpha: 0.1), + primaryColor.withValues(alpha: 0.05), Colors.transparent, ], stops: const [0.0, 0.3, 0.6, 1.0], ), boxShadow: [ BoxShadow( - color: primaryColor.withOpacity(0.4), + color: primaryColor.withValues(alpha: 0.4), blurRadius: circleSize * 0.12, spreadRadius: 0, ), @@ -884,12 +906,12 @@ class _TimerViewState extends State with TickerProviderStateMixin { shape: BoxShape.circle, gradient: RadialGradient( colors: [ - Colors.black.withOpacity(0.6), - Colors.black.withOpacity(0.8), + Colors.black.withValues(alpha: 0.6), + Colors.black.withValues(alpha: 0.8), ], ), border: Border.all( - color: primaryColor.withOpacity(0.3), + color: primaryColor.withValues(alpha: 0.3), width: 2, ), ), @@ -903,8 +925,10 @@ class _TimerViewState extends State with TickerProviderStateMixin { child: CircularProgressIndicator( value: progressValue, strokeWidth: (circleSize * 0.025).clamp(4.0, 8.0), - backgroundColor: Colors.white.withOpacity(0.1), - valueColor: AlwaysStoppedAnimation(primaryColor), + backgroundColor: + Colors.white.withValues(alpha: 0.1), + valueColor: + AlwaysStoppedAnimation(primaryColor), strokeCap: StrokeCap.round, ), ), @@ -928,12 +952,13 @@ class _TimerViewState extends State with TickerProviderStateMixin { gradient: LinearGradient( colors: [ primaryColor, - primaryColor.withOpacity(0.8), + primaryColor.withValues(alpha: 0.8), ], ), boxShadow: [ BoxShadow( - color: primaryColor.withOpacity(0.5), + color: + primaryColor.withValues(alpha: 0.5), blurRadius: 12, offset: const Offset(0, 2), ), @@ -960,9 +985,9 @@ class _TimerViewState extends State with TickerProviderStateMixin { ), decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), - color: Colors.black.withOpacity(0.5), + color: Colors.black.withValues(alpha: 0.5), border: Border.all( - color: Colors.white.withOpacity(0.2), + color: Colors.white.withValues(alpha: 0.2), width: 1, ), ), @@ -973,7 +998,9 @@ class _TimerViewState extends State with TickerProviderStateMixin { fontWeight: FontWeight.w300, color: Colors.white, height: 1.0, - fontFeatures: const [FontFeature.tabularFigures()], + fontFeatures: const [ + FontFeature.tabularFigures() + ], ), ), ), @@ -988,7 +1015,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { ), decoration: BoxDecoration( borderRadius: BorderRadius.circular(16), - color: primaryColor.withOpacity(0.2), + color: primaryColor.withValues(alpha: 0.2), ), child: Text( '${(progressValue * 100).toInt()}%', @@ -1010,13 +1037,15 @@ class _TimerViewState extends State with TickerProviderStateMixin { ), decoration: BoxDecoration( borderRadius: BorderRadius.circular(10), - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), ), child: Text( _getStateText(timer.state), style: TextStyle( - fontSize: (circleSize * 0.035).clamp(9.0, 11.0), - color: Colors.white.withOpacity(0.7), + fontSize: + (circleSize * 0.035).clamp(9.0, 11.0), + color: + Colors.white.withValues(alpha: 0.7), letterSpacing: 0.5, fontWeight: FontWeight.w500, ), @@ -1038,7 +1067,8 @@ class _TimerViewState extends State with TickerProviderStateMixin { ); } - Widget _buildEnhancedControlButtons(TimerController controller, TimerModel timer) { + Widget _buildEnhancedControlButtons( + TimerController controller, TimerModel timer) { final screenSize = MediaQuery.of(context).size; final isSmallScreen = screenSize.height < 700 || screenSize.width < 400; final isVerySmallScreen = screenSize.height < 600 || screenSize.width < 350; @@ -1066,19 +1096,19 @@ class _TimerViewState extends State with TickerProviderStateMixin { borderRadius: BorderRadius.circular(24), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: Colors.white.withOpacity(0.12), + color: Colors.white.withValues(alpha: 0.12), width: 1, ), boxShadow: [ BoxShadow( - color: Colors.black.withOpacity(0.2), + color: Colors.black.withValues(alpha: 0.2), blurRadius: 12, offset: const Offset(0, 4), ), @@ -1091,7 +1121,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { _buildControlButton( icon: Icons.refresh_rounded, onPressed: controller.resetTimer, - color: Colors.white.withOpacity(0.2), + color: Colors.white.withValues(alpha: 0.2), size: sideButtonSize, label: 'Reset', isEnabled: timer.state != TimerState.idle, @@ -1100,13 +1130,23 @@ class _TimerViewState extends State with TickerProviderStateMixin { // Main play/pause button _buildControlButton( - icon: timer.state == TimerState.running || timer.state == TimerState.resting ? Icons.pause_rounded : Icons.play_arrow_rounded, - onPressed: - timer.state == TimerState.running || timer.state == TimerState.resting ? controller.pauseTimer : controller.startTimer, - color: timer.isInRestPeriod ? const Color(0xFFFF6B35) : const Color(0xFF00D4AA), + icon: timer.state == TimerState.running || + timer.state == TimerState.resting + ? Icons.pause_rounded + : Icons.play_arrow_rounded, + onPressed: timer.state == TimerState.running || + timer.state == TimerState.resting + ? controller.pauseTimer + : controller.startTimer, + color: timer.isInRestPeriod + ? const Color(0xFFFF6B35) + : const Color(0xFF00D4AA), size: mainButtonSize, isMain: true, - label: timer.state == TimerState.running || timer.state == TimerState.resting ? 'Pause' : 'Start', + label: timer.state == TimerState.running || + timer.state == TimerState.resting + ? 'Pause' + : 'Start', isEnabled: true, isSmallScreen: isVerySmallScreen, ), @@ -1115,10 +1155,11 @@ class _TimerViewState extends State with TickerProviderStateMixin { _buildControlButton( icon: Icons.tune_rounded, onPressed: () => _showSettingsModal(context, controller), - color: Colors.white.withOpacity(0.2), + color: Colors.white.withValues(alpha: 0.2), size: sideButtonSize, label: 'Settings', - isEnabled: timer.state == TimerState.idle || timer.state == TimerState.paused, + isEnabled: timer.state == TimerState.idle || + timer.state == TimerState.paused, isSmallScreen: isVerySmallScreen, ), ], @@ -1136,8 +1177,9 @@ class _TimerViewState extends State with TickerProviderStateMixin { bool isEnabled = true, bool isSmallScreen = false, }) { - final buttonColor = isEnabled ? color : Colors.grey.withOpacity(0.3); - final iconColor = isEnabled ? Colors.white : Colors.white.withOpacity(0.5); + final buttonColor = isEnabled ? color : Colors.grey.withValues(alpha: 0.3); + final iconColor = + isEnabled ? Colors.white : Colors.white.withValues(alpha: 0.5); final labelFontSize = isSmallScreen ? 10.0 : 12.0; return Column( @@ -1152,7 +1194,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { ? RadialGradient( colors: [ buttonColor, - buttonColor.withOpacity(0.8), + buttonColor.withValues(alpha: 0.8), ], ) : null, @@ -1160,7 +1202,9 @@ class _TimerViewState extends State with TickerProviderStateMixin { boxShadow: isEnabled ? [ BoxShadow( - color: isMain ? buttonColor.withOpacity(0.5) : Colors.black.withOpacity(0.3), + color: isMain + ? buttonColor.withValues(alpha: 0.5) + : Colors.black.withValues(alpha: 0.3), blurRadius: isMain ? 20 : 10, spreadRadius: isMain ? 2 : 1, offset: const Offset(0, 3), @@ -1185,7 +1229,9 @@ class _TimerViewState extends State with TickerProviderStateMixin { Text( label, style: TextStyle( - color: isEnabled ? Colors.white.withOpacity(0.8) : Colors.white.withOpacity(0.4), + color: isEnabled + ? Colors.white.withValues(alpha: 0.8) + : Colors.white.withValues(alpha: 0.4), fontSize: labelFontSize, fontWeight: FontWeight.w500, ), @@ -1271,7 +1317,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { width: 36, height: 3, decoration: BoxDecoration( - color: Colors.white.withOpacity(0.3), + color: Colors.white.withValues(alpha: 0.3), borderRadius: BorderRadius.circular(2), ), ), @@ -1285,8 +1331,8 @@ class _TimerViewState extends State with TickerProviderStateMixin { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - const Color(0xFF00D4AA).withOpacity(0.2), - const Color(0xFF00D4AA).withOpacity(0.1), + const Color(0xFF00D4AA).withValues(alpha: 0.2), + const Color(0xFF00D4AA).withValues(alpha: 0.1), ], ), borderRadius: BorderRadius.circular(12), @@ -1390,12 +1436,12 @@ class _TimerViewState extends State with TickerProviderStateMixin { borderRadius: BorderRadius.circular(16), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.05), - Colors.white.withOpacity(0.02), + Colors.white.withValues(alpha: 0.05), + Colors.white.withValues(alpha: 0.02), ], ), border: Border.all( - color: Colors.white.withOpacity(0.08), + color: Colors.white.withValues(alpha: 0.08), width: 1, ), ), @@ -1411,7 +1457,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { Container( padding: const EdgeInsets.all(10), decoration: BoxDecoration( - color: color.withOpacity(0.15), + color: color.withValues(alpha: 0.15), borderRadius: BorderRadius.circular(12), ), child: Icon( @@ -1437,7 +1483,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { Text( subtitle, style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 13, ), ), @@ -1446,7 +1492,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { ), Icon( Icons.arrow_forward_ios_rounded, - color: Colors.white.withOpacity(0.3), + color: Colors.white.withValues(alpha: 0.3), size: 16, ), ], @@ -1490,13 +1536,13 @@ class _TimerViewState extends State with TickerProviderStateMixin { begin: Alignment.centerLeft, end: Alignment.centerRight, colors: [ - const Color(0xFFFF6B35).withOpacity(0.2), - const Color(0xFFFF8E53).withOpacity(0.1), + const Color(0xFFFF6B35).withValues(alpha: 0.2), + const Color(0xFFFF8E53).withValues(alpha: 0.1), ], ), borderRadius: BorderRadius.circular(16), border: Border.all( - color: const Color(0xFFFF6B35).withOpacity(0.3), + color: const Color(0xFFFF6B35).withValues(alpha: 0.3), width: 1, ), ), @@ -1531,7 +1577,7 @@ class _TimerViewState extends State with TickerProviderStateMixin { Text( _getStreakMessage(streak), style: TextStyle( - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), fontSize: 14, ), textAlign: TextAlign.center, @@ -1621,13 +1667,16 @@ class _SettingsModalState extends State<_SettingsModal> { _buildSlider('Total Sets', _totalSets, 1, 20, (value) { setState(() => _totalSets = value.round()); }, context), - _buildSlider('Set Duration (seconds)', _setDuration, 10, 300, (value) { + _buildSlider('Set Duration (seconds)', _setDuration, 10, 300, + (value) { setState(() => _setDuration = value.round()); }, context), - _buildSlider('Rest Duration (seconds)', _restDuration, 5, 120, (value) { + _buildSlider('Rest Duration (seconds)', _restDuration, 5, 120, + (value) { setState(() => _restDuration = value.round()); }, context), - _buildSlider('Rest After Sets', _restAfterSets, 1, 5, (value) { + _buildSlider('Rest After Sets', _restAfterSets, 1, 5, + (value) { setState(() => _restAfterSets = value.round()); }, context), ], @@ -1707,7 +1756,8 @@ class _SettingsModalState extends State<_SettingsModal> { ); } - Widget _buildSlider(String label, int value, int min, int max, ValueChanged onChanged, BuildContext context) { + Widget _buildSlider(String label, int value, int min, int max, + ValueChanged onChanged, BuildContext context) { return Padding( padding: const EdgeInsets.only(bottom: 20), child: Column( @@ -1738,9 +1788,9 @@ class _SettingsModalState extends State<_SettingsModal> { SliderTheme( data: SliderTheme.of(context).copyWith( activeTrackColor: const Color(0xFF00D4AA), - inactiveTrackColor: Colors.white.withOpacity(0.2), + inactiveTrackColor: Colors.white.withValues(alpha: 0.2), thumbColor: const Color(0xFF00D4AA), - overlayColor: const Color(0xFF00D4AA).withOpacity(0.2), + overlayColor: const Color(0xFF00D4AA).withValues(alpha: 0.2), trackHeight: 4, ), child: Slider( diff --git a/lib/views/voice_coaching_settings_view.dart b/lib/views/voice_coaching_settings_view.dart index e86229e..2599401 100644 --- a/lib/views/voice_coaching_settings_view.dart +++ b/lib/views/voice_coaching_settings_view.dart @@ -7,10 +7,12 @@ class VoiceCoachingSettingsView extends StatefulWidget { const VoiceCoachingSettingsView({super.key}); @override - State createState() => _VoiceCoachingSettingsViewState(); + State createState() => + _VoiceCoachingSettingsViewState(); } -class _VoiceCoachingSettingsViewState extends State with TickerProviderStateMixin { +class _VoiceCoachingSettingsViewState extends State + with TickerProviderStateMixin { final VoiceCoachingService _voiceService = VoiceCoachingService(); late AnimationController _fadeController; late Animation _fadeAnimation; @@ -97,12 +99,12 @@ class _VoiceCoachingSettingsViewState extends State w shape: BoxShape.circle, gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.12), - Colors.white.withOpacity(0.06), + Colors.white.withValues(alpha: 0.12), + Colors.white.withValues(alpha: 0.06), ], ), border: Border.all( - color: Colors.white.withOpacity(0.15), + color: Colors.white.withValues(alpha: 0.15), width: 1, ), ), @@ -131,7 +133,7 @@ class _VoiceCoachingSettingsViewState extends State w Text( 'Personalize your workout voice coach', style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 14, ), ), @@ -145,8 +147,8 @@ class _VoiceCoachingSettingsViewState extends State w shape: BoxShape.circle, gradient: LinearGradient( colors: [ - const Color(0xFF9C27B0).withOpacity(0.2), - const Color(0xFF9C27B0).withOpacity(0.1), + const Color(0xFF9C27B0).withValues(alpha: 0.2), + const Color(0xFF9C27B0).withValues(alpha: 0.1), ], ), ), @@ -177,14 +179,14 @@ class _VoiceCoachingSettingsViewState extends State w borderRadius: BorderRadius.circular(16), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: Colors.white.withOpacity(0.12), + color: Colors.white.withValues(alpha: 0.12), width: 1, ), ), @@ -245,21 +247,24 @@ class _VoiceCoachingSettingsViewState extends State w ); } - Widget _buildGenderOption(String label, IconData icon, VoiceGender gender, bool isSelected) { + Widget _buildGenderOption( + String label, IconData icon, VoiceGender gender, bool isSelected) { return Container( decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), gradient: isSelected ? LinearGradient( colors: [ - const Color(0xFF9C27B0).withOpacity(0.2), - const Color(0xFF9C27B0).withOpacity(0.1), + const Color(0xFF9C27B0).withValues(alpha: 0.2), + const Color(0xFF9C27B0).withValues(alpha: 0.1), ], ) : null, - color: isSelected ? null : Colors.white.withOpacity(0.05), + color: isSelected ? null : Colors.white.withValues(alpha: 0.05), border: Border.all( - color: isSelected ? const Color(0xFF9C27B0) : Colors.white.withOpacity(0.2), + color: isSelected + ? const Color(0xFF9C27B0) + : Colors.white.withValues(alpha: 0.2), width: isSelected ? 2 : 1, ), ), @@ -272,11 +277,11 @@ class _VoiceCoachingSettingsViewState extends State w await _voiceService.setVoiceGender(gender); // Then update UI state setState(() {}); - + // Play a test sample so user can hear the difference immediately await Future.delayed(const Duration(milliseconds: 300)); await _voiceService.testVoice(); - + // Show feedback HapticFeedback.lightImpact(); }, @@ -294,7 +299,8 @@ class _VoiceCoachingSettingsViewState extends State w Text( label, style: TextStyle( - color: isSelected ? const Color(0xFF9C27B0) : Colors.white70, + color: + isSelected ? const Color(0xFF9C27B0) : Colors.white70, fontSize: 14, fontWeight: FontWeight.w600, ), @@ -347,28 +353,30 @@ class _VoiceCoachingSettingsViewState extends State w gradient: isSelected ? LinearGradient( colors: [ - color.withOpacity(0.2), - color.withOpacity(0.1), + color.withValues(alpha: 0.2), + color.withValues(alpha: 0.1), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ) : LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: isSelected ? color.withOpacity(0.5) : Colors.white.withOpacity(0.12), + color: isSelected + ? color.withValues(alpha: 0.5) + : Colors.white.withValues(alpha: 0.12), width: isSelected ? 2 : 1, ), boxShadow: isSelected ? [ BoxShadow( - color: color.withOpacity(0.3), + color: color.withValues(alpha: 0.3), blurRadius: 12, offset: const Offset(0, 4), ), @@ -396,11 +404,11 @@ class _VoiceCoachingSettingsViewState extends State w decoration: BoxDecoration( shape: BoxShape.circle, gradient: LinearGradient( - colors: [color, color.withOpacity(0.7)], + colors: [color, color.withValues(alpha: 0.7)], ), boxShadow: [ BoxShadow( - color: color.withOpacity(0.4), + color: color.withValues(alpha: 0.4), blurRadius: 8, offset: const Offset(0, 2), ), @@ -426,7 +434,7 @@ class _VoiceCoachingSettingsViewState extends State w Text( styleInfo['description'] as String, style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 11, ), textAlign: TextAlign.center, @@ -457,14 +465,14 @@ class _VoiceCoachingSettingsViewState extends State w borderRadius: BorderRadius.circular(16), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: Colors.white.withOpacity(0.12), + color: Colors.white.withValues(alpha: 0.12), width: 1, ), ), @@ -524,7 +532,7 @@ class _VoiceCoachingSettingsViewState extends State w height: 32, decoration: BoxDecoration( shape: BoxShape.circle, - color: color.withOpacity(0.2), + color: color.withValues(alpha: 0.2), ), child: Icon( icon, @@ -547,7 +555,7 @@ class _VoiceCoachingSettingsViewState extends State w padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), - color: color.withOpacity(0.2), + color: color.withValues(alpha: 0.2), ), child: Text( _formatSliderValue(label, value), @@ -564,9 +572,9 @@ class _VoiceCoachingSettingsViewState extends State w SliderTheme( data: SliderTheme.of(context).copyWith( activeTrackColor: color, - inactiveTrackColor: Colors.white.withOpacity(0.2), + inactiveTrackColor: Colors.white.withValues(alpha: 0.2), thumbColor: color, - overlayColor: color.withOpacity(0.2), + overlayColor: color.withValues(alpha: 0.2), trackHeight: 4, thumbShape: const RoundSliderThumbShape(enabledThumbRadius: 8), ), @@ -602,14 +610,14 @@ class _VoiceCoachingSettingsViewState extends State w borderRadius: BorderRadius.circular(16), gradient: LinearGradient( colors: [ - Colors.white.withOpacity(0.08), - Colors.white.withOpacity(0.04), + Colors.white.withValues(alpha: 0.08), + Colors.white.withValues(alpha: 0.04), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: Colors.white.withOpacity(0.12), + color: Colors.white.withValues(alpha: 0.12), width: 1, ), ), @@ -664,12 +672,12 @@ class _VoiceCoachingSettingsViewState extends State w borderRadius: BorderRadius.circular(16), gradient: LinearGradient( colors: [ - const Color(0xFF9C27B0).withOpacity(0.2), - const Color(0xFF9C27B0).withOpacity(0.1), + const Color(0xFF9C27B0).withValues(alpha: 0.2), + const Color(0xFF9C27B0).withValues(alpha: 0.1), ], ), border: Border.all( - color: const Color(0xFF9C27B0).withOpacity(0.3), + color: const Color(0xFF9C27B0).withValues(alpha: 0.3), width: 1, ), ), @@ -725,7 +733,7 @@ class _VoiceCoachingSettingsViewState extends State w height: 40, decoration: BoxDecoration( shape: BoxShape.circle, - color: color.withOpacity(0.2), + color: color.withValues(alpha: 0.2), ), child: Icon( icon, @@ -749,7 +757,7 @@ class _VoiceCoachingSettingsViewState extends State w Text( subtitle, style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 13, ), ), @@ -764,10 +772,10 @@ class _VoiceCoachingSettingsViewState extends State w // Then update UI state setState(() {}); }, - activeColor: color, - activeTrackColor: color.withOpacity(0.3), - inactiveThumbColor: Colors.white.withOpacity(0.5), - inactiveTrackColor: Colors.white.withOpacity(0.2), + activeThumbColor: color, + activeTrackColor: color.withValues(alpha: 0.3), + inactiveThumbColor: Colors.white.withValues(alpha: 0.5), + inactiveTrackColor: Colors.white.withValues(alpha: 0.2), ), ], ); @@ -783,8 +791,8 @@ class _VoiceCoachingSettingsViewState extends State w shape: BoxShape.circle, gradient: LinearGradient( colors: [ - const Color(0xFF9C27B0).withOpacity(0.2), - const Color(0xFF9C27B0).withOpacity(0.1), + const Color(0xFF9C27B0).withValues(alpha: 0.2), + const Color(0xFF9C27B0).withValues(alpha: 0.1), ], ), ), @@ -810,7 +818,7 @@ class _VoiceCoachingSettingsViewState extends State w Text( subtitle, style: TextStyle( - color: Colors.white.withOpacity(0.6), + color: Colors.white.withValues(alpha: 0.6), fontSize: 13, ), ), @@ -862,22 +870,24 @@ class _VoiceCoachingSettingsViewState extends State w gradient: isSelected ? LinearGradient( colors: [ - color.withOpacity(0.2), - color.withOpacity(0.1), + color.withValues(alpha: 0.2), + color.withValues(alpha: 0.1), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ) : LinearGradient( colors: [ - Colors.white.withOpacity(available ? 0.08 : 0.04), - Colors.white.withOpacity(available ? 0.04 : 0.02), + Colors.white.withValues(alpha: available ? 0.08 : 0.04), + Colors.white.withValues(alpha: available ? 0.04 : 0.02), ], begin: Alignment.topLeft, end: Alignment.bottomRight, ), border: Border.all( - color: isSelected ? color.withOpacity(0.5) : Colors.white.withOpacity(available ? 0.12 : 0.06), + color: isSelected + ? color.withValues(alpha: 0.5) + : Colors.white.withValues(alpha: available ? 0.12 : 0.06), width: isSelected ? 2 : 1, ), ), @@ -885,65 +895,74 @@ class _VoiceCoachingSettingsViewState extends State w color: Colors.transparent, child: InkWell( borderRadius: BorderRadius.circular(12), - onTap: available ? () async { - // Switch TTS provider - await _voiceService.setTtsProvider(provider); - setState(() {}); - - // Test the new voice immediately - await Future.delayed(const Duration(milliseconds: 300)); - await _voiceService.testVoice(); - - HapticFeedback.lightImpact(); - - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('Voice quality changed to ${providerInfo['name']}! Listen to the difference!'), - backgroundColor: color, - behavior: SnackBarBehavior.floating, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), - duration: const Duration(seconds: 3), - ), - ); - } : () { - // Show unavailable message with helpful hint - final String platformHint = kIsWeb - ? 'This feature is not yet fully implemented.' - : 'Try running the app in a web browser (Chrome/Safari) for better voice quality!'; - - ScaffoldMessenger.of(context).showSnackBar( - SnackBar( - content: Text('${providerInfo['name']} is not available on this platform. $platformHint'), - backgroundColor: Colors.orange, - behavior: SnackBarBehavior.floating, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)), - duration: const Duration(seconds: 4), - ), - ); - }, + onTap: available + ? () async { + // Switch TTS provider + await _voiceService.setTtsProvider(provider); + setState(() {}); + + // Test the new voice immediately + await Future.delayed(const Duration(milliseconds: 300)); + await _voiceService.testVoice(); + + HapticFeedback.lightImpact(); + + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text( + 'Voice quality changed to ${providerInfo['name']}! Listen to the difference!'), + backgroundColor: color, + behavior: SnackBarBehavior.floating, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8)), + duration: const Duration(seconds: 3), + ), + ); + } + : () { + // Show unavailable message with helpful hint + const String platformHint = kIsWeb + ? 'This feature is not yet fully implemented.' + : 'Try running the app in a web browser (Chrome/Safari) for better voice quality!'; + + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text( + '${providerInfo['name']} is not available on this platform. $platformHint'), + backgroundColor: Colors.orange, + behavior: SnackBarBehavior.floating, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(8)), + duration: const Duration(seconds: 4), + ), + ); + }, child: Padding( padding: const EdgeInsets.all(16), child: Row( children: [ - Container( - width: 48, - height: 48, - decoration: BoxDecoration( - shape: BoxShape.circle, - gradient: available - ? LinearGradient( - colors: [color, color.withOpacity(0.7)], - ) - : LinearGradient( - colors: [Colors.grey.withOpacity(0.5), Colors.grey.withOpacity(0.3)], - ), - ), - child: Icon( - providerInfo['icon'] as IconData, - color: available ? Colors.white : Colors.grey.shade400, - size: 24, - ), + Container( + width: 48, + height: 48, + decoration: BoxDecoration( + shape: BoxShape.circle, + gradient: available + ? LinearGradient( + colors: [color, color.withValues(alpha: 0.7)], + ) + : LinearGradient( + colors: [ + Colors.grey.withValues(alpha: 0.5), + Colors.grey.withValues(alpha: 0.3) + ], + ), ), + child: Icon( + providerInfo['icon'] as IconData, + color: available ? Colors.white : Colors.grey.shade400, + size: 24, + ), + ), const SizedBox(width: 16), Expanded( child: Column( @@ -953,7 +972,7 @@ class _VoiceCoachingSettingsViewState extends State w Text( providerInfo['name'] as String, style: TextStyle( - color: available + color: available ? (isSelected ? color : Colors.white) : Colors.grey, fontSize: 16, @@ -964,9 +983,9 @@ class _VoiceCoachingSettingsViewState extends State w Text( providerInfo['description'] as String, style: TextStyle( - color: available - ? Colors.white.withOpacity(0.7) - : Colors.grey.withOpacity(0.7), + color: available + ? Colors.white.withValues(alpha: 0.7) + : Colors.grey.withValues(alpha: 0.7), fontSize: 12, ), ), @@ -975,12 +994,13 @@ class _VoiceCoachingSettingsViewState extends State w ), if (providerInfo['badge'] != null) Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + padding: + const EdgeInsets.symmetric(horizontal: 8, vertical: 4), decoration: BoxDecoration( borderRadius: BorderRadius.circular(8), - color: available - ? color.withOpacity(0.2) - : Colors.grey.withOpacity(0.2), + color: available + ? color.withValues(alpha: 0.2) + : Colors.grey.withValues(alpha: 0.2), ), child: Text( providerInfo['badge'] as String, @@ -1000,8 +1020,8 @@ class _VoiceCoachingSettingsViewState extends State w } Map _getTtsProviderInfo(TtsProvider provider) { - final bool isWeb = kIsWeb; - + const bool isWeb = kIsWeb; + switch (provider) { case TtsProvider.device: return { @@ -1015,7 +1035,7 @@ class _VoiceCoachingSettingsViewState extends State w case TtsProvider.cloud: return { 'name': isWeb ? 'Web Speech API' : 'Cloud TTS', - 'description': isWeb + 'description': isWeb ? 'High-quality browser voices (web only)' : 'Premium cloud voices (web only for now)', 'icon': isWeb ? Icons.web : Icons.cloud_off, diff --git a/lib/views/workout_history_view.dart b/lib/views/workout_history_view.dart index b25a9d7..51c9deb 100644 --- a/lib/views/workout_history_view.dart +++ b/lib/views/workout_history_view.dart @@ -11,7 +11,8 @@ class WorkoutHistoryView extends StatefulWidget { State createState() => _WorkoutHistoryViewState(); } -class _WorkoutHistoryViewState extends State with SingleTickerProviderStateMixin { +class _WorkoutHistoryViewState extends State + with SingleTickerProviderStateMixin { final WorkoutSessionService _sessionService = WorkoutSessionService(); late TabController _tabController; @@ -79,7 +80,8 @@ class _WorkoutHistoryViewState extends State with SingleTick case 'This Week': filteredSessions = await _sessionService.getThisWeeksWorkouts(); final now = DateTime.now(); - final startOfWeek = DateTime(now.year, now.month, now.day - now.weekday + 1); + final startOfWeek = + DateTime(now.year, now.month, now.day - now.weekday + 1); filteredStats = await _sessionService.getWorkoutStatistics( startDate: startOfWeek, endDate: now, @@ -189,13 +191,13 @@ class _WorkoutHistoryViewState extends State with SingleTick begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - const Color(0xFFFF6B35).withOpacity(0.15), - const Color(0xFFFF8E53).withOpacity(0.08), + const Color(0xFFFF6B35).withValues(alpha: 0.15), + const Color(0xFFFF8E53).withValues(alpha: 0.08), ], ), borderRadius: BorderRadius.circular(16), border: Border.all( - color: const Color(0xFFFF6B35).withOpacity(0.3), + color: const Color(0xFFFF6B35).withValues(alpha: 0.3), width: 1, ), ), @@ -204,7 +206,7 @@ class _WorkoutHistoryViewState extends State with SingleTick Container( padding: const EdgeInsets.all(12), decoration: BoxDecoration( - color: const Color(0xFFFF6B35).withOpacity(0.2), + color: const Color(0xFFFF6B35).withValues(alpha: 0.2), shape: BoxShape.circle, ), child: const Text( @@ -220,7 +222,7 @@ class _WorkoutHistoryViewState extends State with SingleTick Text( 'Current Streak', style: TextStyle( - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), fontSize: 14, fontWeight: FontWeight.w500, ), @@ -239,12 +241,13 @@ class _WorkoutHistoryViewState extends State with SingleTick ), if (streak >= 7) Container( - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), + padding: + const EdgeInsets.symmetric(horizontal: 12, vertical: 6), decoration: BoxDecoration( - color: const Color(0xFFFFD700).withOpacity(0.2), + color: const Color(0xFFFFD700).withValues(alpha: 0.2), borderRadius: BorderRadius.circular(12), border: Border.all( - color: const Color(0xFFFFD700).withOpacity(0.5), + color: const Color(0xFFFFD700).withValues(alpha: 0.5), ), ), child: const Row( @@ -290,13 +293,14 @@ class _WorkoutHistoryViewState extends State with SingleTick selected: isSelected, onSelected: (_) => _filterSessions(filter), backgroundColor: const Color(0xFF2A2A2A), - selectedColor: const Color(0xFF00D4AA).withOpacity(0.2), + selectedColor: const Color(0xFF00D4AA).withValues(alpha: 0.2), labelStyle: TextStyle( color: isSelected ? const Color(0xFF00D4AA) : Colors.white70, fontWeight: isSelected ? FontWeight.bold : FontWeight.normal, ), side: BorderSide( - color: isSelected ? const Color(0xFF00D4AA) : Colors.transparent, + color: + isSelected ? const Color(0xFF00D4AA) : Colors.transparent, ), ), ); @@ -329,7 +333,7 @@ class _WorkoutHistoryViewState extends State with SingleTick shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(12), side: BorderSide( - color: _getStatusColor(session.status).withOpacity(0.3), + color: _getStatusColor(session.status).withValues(alpha: 0.3), width: 1, ), ), @@ -451,7 +455,7 @@ class _WorkoutHistoryViewState extends State with SingleTick return Container( padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), decoration: BoxDecoration( - color: _getStatusColor(status).withOpacity(0.2), + color: _getStatusColor(status).withValues(alpha: 0.2), borderRadius: BorderRadius.circular(12), border: Border.all( color: _getStatusColor(status), @@ -613,14 +617,15 @@ class _WorkoutHistoryViewState extends State with SingleTick ); } - Widget _buildStatCard(String title, String value, IconData icon, Color color) { + Widget _buildStatCard( + String title, String value, IconData icon, Color color) { return Container( padding: const EdgeInsets.all(16), decoration: BoxDecoration( color: const Color(0xFF1A1A1A), borderRadius: BorderRadius.circular(12), border: Border.all( - color: color.withOpacity(0.3), + color: color.withValues(alpha: 0.3), width: 1, ), ), @@ -721,7 +726,20 @@ class _WorkoutHistoryViewState extends State with SingleTick } String _formatDateTime(DateTime dateTime) { - final months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; + final months = [ + 'Jan', + 'Feb', + 'Mar', + 'Apr', + 'May', + 'Jun', + 'Jul', + 'Aug', + 'Sep', + 'Oct', + 'Nov', + 'Dec' + ]; return '${months[dateTime.month - 1]} ${dateTime.day}, ${dateTime.year} • ${dateTime.hour.toString().padLeft(2, '0')}:${dateTime.minute.toString().padLeft(2, '0')}'; } @@ -743,7 +761,8 @@ class _WorkoutHistoryViewState extends State with SingleTick } Widget _buildWorkoutFrequencyChart() { - final frequency = _advancedAnalytics!['workoutFrequency'] as Map; + final frequency = + _advancedAnalytics!['workoutFrequency'] as Map; if (frequency.isEmpty) return const SizedBox(); return Container( @@ -752,7 +771,7 @@ class _WorkoutHistoryViewState extends State with SingleTick color: const Color(0xFF1A1A1A), borderRadius: BorderRadius.circular(16), border: Border.all( - color: const Color(0xFF00D4AA).withOpacity(0.2), + color: const Color(0xFF00D4AA).withValues(alpha: 0.2), ), ), child: Column( @@ -772,13 +791,26 @@ class _WorkoutHistoryViewState extends State with SingleTick child: BarChart( BarChartData( alignment: BarChartAlignment.spaceAround, - maxY: frequency.values.isNotEmpty ? frequency.values.reduce((a, b) => a > b ? a : b).toDouble() * 1.2 : 10, + maxY: frequency.values.isNotEmpty + ? frequency.values + .reduce((a, b) => a > b ? a : b) + .toDouble() * + 1.2 + : 10, barTouchData: BarTouchData( enabled: true, touchTooltipData: BarTouchTooltipData( tooltipBgColor: const Color(0xFF2A2A2A), getTooltipItem: (group, groupIndex, rod, rodIndex) { - final days = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; + final days = [ + 'Mon', + 'Tue', + 'Wed', + 'Thu', + 'Fri', + 'Sat', + 'Sun' + ]; return BarTooltipItem( '${days[group.x]}: ${rod.toY.round()} workouts', const TextStyle(color: Colors.white, fontSize: 14), @@ -788,19 +820,30 @@ class _WorkoutHistoryViewState extends State with SingleTick ), titlesData: FlTitlesData( show: true, - rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), - topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + rightTitles: const AxisTitles( + sideTitles: SideTitles(showTitles: false)), + topTitles: const AxisTitles( + sideTitles: SideTitles(showTitles: false)), bottomTitles: AxisTitles( sideTitles: SideTitles( showTitles: true, getTitlesWidget: (value, meta) { - const days = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']; + const days = [ + 'Mon', + 'Tue', + 'Wed', + 'Thu', + 'Fri', + 'Sat', + 'Sun' + ]; if (value.toInt() >= 0 && value.toInt() < days.length) { return Padding( padding: const EdgeInsets.only(top: 8), child: Text( days[value.toInt()], - style: const TextStyle(color: Colors.white70, fontSize: 12), + style: const TextStyle( + color: Colors.white70, fontSize: 12), ), ); } @@ -816,7 +859,8 @@ class _WorkoutHistoryViewState extends State with SingleTick getTitlesWidget: (value, meta) { return Text( value.toInt().toString(), - style: const TextStyle(color: Colors.white70, fontSize: 12), + style: const TextStyle( + color: Colors.white70, fontSize: 12), ); }, ), @@ -834,7 +878,15 @@ class _WorkoutHistoryViewState extends State with SingleTick } List _buildBarGroups(Map frequency) { - const dayOrder = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']; + const dayOrder = [ + 'Monday', + 'Tuesday', + 'Wednesday', + 'Thursday', + 'Friday', + 'Saturday', + 'Sunday' + ]; return dayOrder.asMap().entries.map((entry) { final index = entry.key; final day = entry.value; @@ -872,11 +924,11 @@ class _WorkoutHistoryViewState extends State with SingleTick ), borderRadius: BorderRadius.circular(20), border: Border.all( - color: const Color(0xFF00D4AA).withOpacity(0.2), + color: const Color(0xFF00D4AA).withValues(alpha: 0.2), ), boxShadow: [ BoxShadow( - color: const Color(0xFF00D4AA).withOpacity(0.1), + color: const Color(0xFF00D4AA).withValues(alpha: 0.1), blurRadius: 20, offset: const Offset(0, 10), ), @@ -890,7 +942,7 @@ class _WorkoutHistoryViewState extends State with SingleTick Container( padding: const EdgeInsets.all(8), decoration: BoxDecoration( - color: const Color(0xFF00D4AA).withOpacity(0.2), + color: const Color(0xFF00D4AA).withValues(alpha: 0.2), borderRadius: BorderRadius.circular(12), ), child: const Icon( @@ -926,9 +978,9 @@ class _WorkoutHistoryViewState extends State with SingleTick height: 140, decoration: BoxDecoration( shape: BoxShape.circle, - color: Colors.white.withOpacity(0.05), + color: Colors.white.withValues(alpha: 0.05), border: Border.all( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), width: 2, ), ), @@ -972,7 +1024,7 @@ class _WorkoutHistoryViewState extends State with SingleTick Text( 'Consistent', style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 12, fontWeight: FontWeight.w500, ), @@ -1001,7 +1053,7 @@ class _WorkoutHistoryViewState extends State with SingleTick ), Container( width: 1, - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), margin: const EdgeInsets.symmetric(horizontal: 8), ), Expanded( @@ -1009,12 +1061,12 @@ class _WorkoutHistoryViewState extends State with SingleTick 'Total Days', totalDays.toString(), Icons.calendar_today, - Colors.white.withOpacity(0.7), + Colors.white.withValues(alpha: 0.7), ), ), Container( width: 1, - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), margin: const EdgeInsets.symmetric(horizontal: 8), ), Expanded( @@ -1035,10 +1087,12 @@ class _WorkoutHistoryViewState extends State with SingleTick Container( padding: const EdgeInsets.all(16), decoration: BoxDecoration( - color: _getConsistencyMessageColor(consistency).withOpacity(0.1), + color: _getConsistencyMessageColor(consistency) + .withValues(alpha: 0.1), borderRadius: BorderRadius.circular(12), border: Border.all( - color: _getConsistencyMessageColor(consistency).withOpacity(0.3), + color: _getConsistencyMessageColor(consistency) + .withValues(alpha: 0.3), ), ), child: Row( @@ -1053,7 +1107,7 @@ class _WorkoutHistoryViewState extends State with SingleTick child: Text( _getConsistencyMessage(consistency), style: TextStyle( - color: Colors.white.withOpacity(0.9), + color: Colors.white.withValues(alpha: 0.9), fontSize: 14, fontWeight: FontWeight.w500, ), @@ -1067,7 +1121,8 @@ class _WorkoutHistoryViewState extends State with SingleTick ); } - Widget _buildConsistencyStatItem(String label, String value, IconData icon, Color color) { + Widget _buildConsistencyStatItem( + String label, String value, IconData icon, Color color) { return Column( mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.min, @@ -1091,7 +1146,7 @@ class _WorkoutHistoryViewState extends State with SingleTick Text( label, style: TextStyle( - color: Colors.white.withOpacity(0.7), + color: Colors.white.withValues(alpha: 0.7), fontSize: 12, fontWeight: FontWeight.w500, ), @@ -1164,7 +1219,10 @@ class _WorkoutHistoryViewState extends State with SingleTick ), Text( value, - style: const TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.bold), + style: const TextStyle( + color: Colors.white, + fontSize: 14, + fontWeight: FontWeight.bold), ), ], ), diff --git a/lib/views/workout_session_detail_view.dart b/lib/views/workout_session_detail_view.dart index 1b87a24..cda598a 100644 --- a/lib/views/workout_session_detail_view.dart +++ b/lib/views/workout_session_detail_view.dart @@ -51,7 +51,7 @@ class WorkoutSessionDetailView extends StatelessWidget { color: const Color(0xFF1A1A1A), borderRadius: BorderRadius.circular(16), border: Border.all( - color: _getStatusColor(session.status).withOpacity(0.3), + color: _getStatusColor(session.status).withValues(alpha: 0.3), width: 2, ), ), @@ -293,7 +293,7 @@ class WorkoutSessionDetailView extends StatelessWidget { color: const Color(0xFF1A1A1A), borderRadius: BorderRadius.circular(12), border: Border.all( - color: color.withOpacity(0.3), + color: color.withValues(alpha: 0.3), width: 1, ), ), @@ -327,7 +327,7 @@ class WorkoutSessionDetailView extends StatelessWidget { return Container( padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), decoration: BoxDecoration( - color: _getStatusColor(status).withOpacity(0.2), + color: _getStatusColor(status).withValues(alpha: 0.2), borderRadius: BorderRadius.circular(16), border: Border.all( color: _getStatusColor(status), diff --git a/lib/widgets/achievement_notification_widget.dart b/lib/widgets/achievement_notification_widget.dart index addfb3b..7cfe8d0 100644 --- a/lib/widgets/achievement_notification_widget.dart +++ b/lib/widgets/achievement_notification_widget.dart @@ -13,10 +13,12 @@ class AchievementNotificationWidget extends StatefulWidget { }); @override - State createState() => _AchievementNotificationWidgetState(); + State createState() => + _AchievementNotificationWidgetState(); } -class _AchievementNotificationWidgetState extends State with TickerProviderStateMixin { +class _AchievementNotificationWidgetState + extends State with TickerProviderStateMixin { late AnimationController _slideController; late AnimationController _scaleController; late Animation _slideAnimation; @@ -114,8 +116,8 @@ class _AchievementNotificationWidgetState extends State 0.5 ? Colors.black87 : Colors.white, + color: tierColor.computeLuminance() > 0.5 + ? Colors.black87 + : Colors.white, fontSize: 10, fontWeight: FontWeight.bold, ), diff --git a/lib/widgets/save_template_dialog.dart b/lib/widgets/save_template_dialog.dart index 92d803b..3ca2f99 100644 --- a/lib/widgets/save_template_dialog.dart +++ b/lib/widgets/save_template_dialog.dart @@ -128,7 +128,9 @@ class _SaveTemplateDialogState extends State { constraints: BoxConstraints( maxWidth: isSmallScreen ? screenSize.width * 0.95 : 420, maxHeight: isKeyboardVisible - ? screenSize.height - keyboardHeight - 60 // Conservative space for keyboard + ? screenSize.height - + keyboardHeight - + 60 // Conservative space for keyboard : screenSize.height * 0.85, ), child: Container( @@ -136,12 +138,12 @@ class _SaveTemplateDialogState extends State { color: const Color(0xFF1A1A1A), borderRadius: BorderRadius.circular(20), border: Border.all( - color: const Color(0xFF00D4AA).withOpacity(0.3), + color: const Color(0xFF00D4AA).withValues(alpha: 0.3), width: 1, ), boxShadow: [ BoxShadow( - color: const Color(0xFF00D4AA).withOpacity(0.1), + color: const Color(0xFF00D4AA).withValues(alpha: 0.1), blurRadius: 20, spreadRadius: 5, ), @@ -156,7 +158,7 @@ class _SaveTemplateDialogState extends State { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - const Color(0xFF00D4AA).withOpacity(0.1), + const Color(0xFF00D4AA).withValues(alpha: 0.1), Colors.transparent, ], begin: Alignment.topCenter, @@ -172,7 +174,7 @@ class _SaveTemplateDialogState extends State { Container( padding: const EdgeInsets.all(6), decoration: BoxDecoration( - color: const Color(0xFF00D4AA).withOpacity(0.2), + color: const Color(0xFF00D4AA).withValues(alpha: 0.2), borderRadius: BorderRadius.circular(10), ), child: const Icon( @@ -226,13 +228,14 @@ class _SaveTemplateDialogState extends State { decoration: BoxDecoration( gradient: LinearGradient( colors: [ - const Color(0xFF00D4AA).withOpacity(0.1), - const Color(0xFF00D4AA).withOpacity(0.05), + const Color(0xFF00D4AA).withValues(alpha: 0.1), + const Color(0xFF00D4AA).withValues(alpha: 0.05), ], ), borderRadius: BorderRadius.circular(10), border: Border.all( - color: const Color(0xFF00D4AA).withOpacity(0.3), + color: const Color(0xFF00D4AA) + .withValues(alpha: 0.3), width: 1, ), ), @@ -251,7 +254,8 @@ class _SaveTemplateDialogState extends State { Text( 'Current Settings', style: TextStyle( - color: Colors.white.withOpacity(0.9), + color: + Colors.white.withValues(alpha: 0.9), fontWeight: FontWeight.w600, fontSize: 12, ), @@ -263,10 +267,18 @@ class _SaveTemplateDialogState extends State { spacing: 6, runSpacing: 4, children: [ - _buildSettingChip('${widget.currentSettings.totalSets} sets', Icons.repeat), - _buildSettingChip('${widget.currentSettings.setDurationSeconds}s work', Icons.play_arrow), - _buildSettingChip('${widget.currentSettings.restDurationSeconds}s rest', Icons.pause), - _buildSettingChip('Rest after ${widget.currentSettings.restAfterSets}', Icons.schedule), + _buildSettingChip( + '${widget.currentSettings.totalSets} sets', + Icons.repeat), + _buildSettingChip( + '${widget.currentSettings.setDurationSeconds}s work', + Icons.play_arrow), + _buildSettingChip( + '${widget.currentSettings.restDurationSeconds}s rest', + Icons.pause), + _buildSettingChip( + 'Rest after ${widget.currentSettings.restAfterSets}', + Icons.schedule), ], ), ], @@ -279,7 +291,8 @@ class _SaveTemplateDialogState extends State { 'Template Name', TextFormField( controller: _nameController, - style: const TextStyle(color: Colors.white, fontSize: 14), + style: const TextStyle( + color: Colors.white, fontSize: 14), decoration: _buildInputDecoration( 'e.g., My Custom HIIT', Icons.edit, @@ -311,7 +324,8 @@ class _SaveTemplateDialogState extends State { 'Description', TextFormField( controller: _descriptionController, - style: const TextStyle(color: Colors.white, fontSize: 14), + style: const TextStyle( + color: Colors.white, fontSize: 14), maxLines: isKeyboardVisible ? 1 : 2, decoration: _buildInputDecoration( 'Describe your workout routine...', @@ -338,8 +352,9 @@ class _SaveTemplateDialogState extends State { _buildInputSection( 'Category', DropdownButtonFormField( - value: _selectedCategory, - style: const TextStyle(color: Colors.white, fontSize: 14), + initialValue: _selectedCategory, + style: const TextStyle( + color: Colors.white, fontSize: 14), dropdownColor: const Color(0xFF2A2A2A), decoration: _buildInputDecoration( 'Select category', @@ -367,7 +382,8 @@ class _SaveTemplateDialogState extends State { GridView.builder( shrinkWrap: true, physics: const NeverScrollableScrollPhysics(), - gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( + gridDelegate: + const SliverGridDelegateWithFixedCrossAxisCount( crossAxisCount: 4, crossAxisSpacing: 6, mainAxisSpacing: 6, @@ -376,7 +392,8 @@ class _SaveTemplateDialogState extends State { itemCount: _iconOptions.length, itemBuilder: (context, index) { final iconData = _iconOptions[index]; - final isSelected = _selectedIcon == iconData['name']; + final isSelected = + _selectedIcon == iconData['name']; return GestureDetector( onTap: () { setState(() { @@ -387,22 +404,33 @@ class _SaveTemplateDialogState extends State { decoration: BoxDecoration( gradient: isSelected ? const LinearGradient( - colors: [Color(0xFF00D4AA), Color(0xFF00B4AA)], + colors: [ + Color(0xFF00D4AA), + Color(0xFF00B4AA) + ], ) : null, - color: isSelected ? null : Colors.white.withOpacity(0.1), + color: isSelected + ? null + : Colors.white.withValues(alpha: 0.1), borderRadius: BorderRadius.circular(8), border: Border.all( - color: isSelected ? const Color(0xFF00D4AA) : Colors.white.withOpacity(0.2), + color: isSelected + ? const Color(0xFF00D4AA) + : Colors.white + .withValues(alpha: 0.2), width: isSelected ? 2 : 1, ), ), child: Column( - mainAxisAlignment: MainAxisAlignment.center, + mainAxisAlignment: + MainAxisAlignment.center, children: [ Icon( _getIconData(iconData['name']!), - color: isSelected ? Colors.white : Colors.white70, + color: isSelected + ? Colors.white + : Colors.white70, size: 16, ), const SizedBox(height: 2), @@ -410,8 +438,12 @@ class _SaveTemplateDialogState extends State { iconData['label']!, style: TextStyle( fontSize: 7, - color: isSelected ? Colors.white : Colors.white70, - fontWeight: isSelected ? FontWeight.w600 : FontWeight.normal, + color: isSelected + ? Colors.white + : Colors.white70, + fontWeight: isSelected + ? FontWeight.w600 + : FontWeight.normal, ), textAlign: TextAlign.center, maxLines: 1, @@ -437,7 +469,7 @@ class _SaveTemplateDialogState extends State { decoration: BoxDecoration( border: Border( top: BorderSide( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), width: 1, ), ), @@ -446,18 +478,23 @@ class _SaveTemplateDialogState extends State { children: [ Expanded( child: OutlinedButton( - onPressed: _isLoading ? null : () => Navigator.of(context).pop(false), + onPressed: _isLoading + ? null + : () => Navigator.of(context).pop(false), style: OutlinedButton.styleFrom( foregroundColor: Colors.white70, - side: BorderSide(color: Colors.white.withOpacity(0.3)), - padding: EdgeInsets.symmetric(vertical: isKeyboardVisible ? 10 : 12), + side: BorderSide( + color: Colors.white.withValues(alpha: 0.3)), + padding: EdgeInsets.symmetric( + vertical: isKeyboardVisible ? 10 : 12), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), ), ), child: const Text( 'Cancel', - style: TextStyle(fontWeight: FontWeight.w600, fontSize: 14), + style: TextStyle( + fontWeight: FontWeight.w600, fontSize: 14), ), ), ), @@ -470,11 +507,13 @@ class _SaveTemplateDialogState extends State { backgroundColor: const Color(0xFF00D4AA), foregroundColor: Colors.white, elevation: 0, - padding: EdgeInsets.symmetric(vertical: isKeyboardVisible ? 10 : 12), + padding: EdgeInsets.symmetric( + vertical: isKeyboardVisible ? 10 : 12), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), ), - shadowColor: const Color(0xFF00D4AA).withOpacity(0.3), + shadowColor: + const Color(0xFF00D4AA).withValues(alpha: 0.3), ), child: _isLoading ? const SizedBox( @@ -482,7 +521,8 @@ class _SaveTemplateDialogState extends State { height: 14, child: CircularProgressIndicator( strokeWidth: 2, - valueColor: AlwaysStoppedAnimation(Colors.white), + valueColor: AlwaysStoppedAnimation( + Colors.white), ), ) : const Row( @@ -492,7 +532,9 @@ class _SaveTemplateDialogState extends State { SizedBox(width: 4), Text( 'Save Template', - style: TextStyle(fontWeight: FontWeight.bold, fontSize: 13), + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 13), ), ], ), @@ -512,7 +554,7 @@ class _SaveTemplateDialogState extends State { return Container( padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 3), decoration: BoxDecoration( - color: Colors.white.withOpacity(0.1), + color: Colors.white.withValues(alpha: 0.1), borderRadius: BorderRadius.circular(6), ), child: Row( @@ -527,7 +569,7 @@ class _SaveTemplateDialogState extends State { Text( text, style: TextStyle( - color: Colors.white.withOpacity(0.8), + color: Colors.white.withValues(alpha: 0.8), fontSize: 10, fontWeight: FontWeight.w500, ), @@ -544,7 +586,7 @@ class _SaveTemplateDialogState extends State { Text( label, style: TextStyle( - color: Colors.white.withOpacity(0.9), + color: Colors.white.withValues(alpha: 0.9), fontSize: 13, fontWeight: FontWeight.w600, ), @@ -559,7 +601,7 @@ class _SaveTemplateDialogState extends State { return InputDecoration( hintText: hint, hintStyle: TextStyle( - color: Colors.white.withOpacity(0.5), + color: Colors.white.withValues(alpha: 0.5), fontSize: 13, ), prefixIcon: Icon( @@ -568,18 +610,18 @@ class _SaveTemplateDialogState extends State { size: 18, ), filled: true, - fillColor: Colors.white.withOpacity(0.05), + fillColor: Colors.white.withValues(alpha: 0.05), border: OutlineInputBorder( borderRadius: BorderRadius.circular(10), borderSide: BorderSide( - color: Colors.white.withOpacity(0.2), + color: Colors.white.withValues(alpha: 0.2), width: 1, ), ), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(10), borderSide: BorderSide( - color: Colors.white.withOpacity(0.2), + color: Colors.white.withValues(alpha: 0.2), width: 1, ), ), diff --git a/web/favicon.png b/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/web/index.html b/web/index.html new file mode 100644 index 0000000..6781da3 --- /dev/null +++ b/web/index.html @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + settimer + + + + + + + diff --git a/web/manifest.json b/web/manifest.json new file mode 100644 index 0000000..db73034 --- /dev/null +++ b/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "settimer", + "short_name": "settimer", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/windows/.gitignore b/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt new file mode 100644 index 0000000..f0ec684 --- /dev/null +++ b/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(settimer 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 "settimer") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# 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 /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# 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 "$") +# 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}") + +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() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# 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) diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..6dfdf77 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,17 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + AudioplayersWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("AudioplayersWindowsPlugin")); + FlutterTtsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterTtsPlugin")); +} diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..e9ee6df --- /dev/null +++ b/windows/flutter/generated_plugins.cmake @@ -0,0 +1,26 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + audioplayers_windows + flutter_tts +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST + jni +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + 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}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/windows/runner/CMakeLists.txt b/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +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} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# 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}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc new file mode 100644 index 0000000..ec9b7d4 --- /dev/null +++ b/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.settimer" "\0" + VALUE "FileDescription", "settimer" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "settimer" "\0" + VALUE "LegalCopyright", "Copyright (C) 2026 com.settimer. All rights reserved." "\0" + VALUE "OriginalFilename", "settimer.exe" "\0" + VALUE "ProductName", "settimer" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/windows/runner/flutter_window.cpp b/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/windows/runner/flutter_window.h b/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp new file mode 100644 index 0000000..f477dc3 --- /dev/null +++ b/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"settimer", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/windows/runner/resource.h b/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp new file mode 100644 index 0000000..3cb7146 --- /dev/null +++ b/windows/runner/utils.cpp @@ -0,0 +1,69 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + // First, find the length of the string with a safe upper bound (CWE-126). + // UNICODE_STRING_MAX_CHARS (32767) is the maximum length of a UNICODE_STRING. + int input_length = static_cast(wcsnlen(utf16_string, UNICODE_STRING_MAX_CHARS)); + // Now use that bounded length to determine the required buffer size. + // When an explicit length is passed, WideCharToMultiByte does not include + // the null terminator in its returned size. + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, nullptr, 0, nullptr, nullptr); + std::string utf8_string; + if (target_length == 0 || static_cast(target_length) > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/windows/runner/utils.h b/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/windows/runner/win32_window.cpp b/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/windows/runner/win32_window.h b/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_