From a91fb279558bbf09303fff0b8128eb4ed3d6f4a5 Mon Sep 17 00:00:00 2001 From: lambiengcode Date: Thu, 12 Oct 2023 13:22:41 +0700 Subject: [PATCH] config(workflows): build apk --- .github/workflows/release.yaml | 59 ++++++++ .metadata | 2 +- android/.gitignore | 2 + android/app/build.gradle | 42 +++--- android/app/src/debug/AndroidManifest.xml | 6 +- android/app/src/main/AndroidManifest.xml | 20 +-- .../res/drawable-v21/launch_background.xml | 12 ++ .../app/src/main/res/values-night/styles.xml | 18 +++ android/app/src/main/res/values/styles.xml | 12 +- android/app/src/profile/AndroidManifest.xml | 6 +- android/build.gradle | 10 +- android/gradle.properties | 1 - .../gradle/wrapper/gradle-wrapper.properties | 3 +- android/settings.gradle | 25 +++- ios/Podfile.lock | 23 +++ ios/Runner.xcodeproj/project.pbxproj | 140 ++++++++++++++++-- .../contents.xcworkspacedata | 3 + lib/main.dart | 11 +- lib/src/app.dart | 4 +- lib/src/models/my_theme_provider.dart | 1 + lib/src/pages/alarm/alarm_page.dart | 15 +- .../alarm/controllers/alarm_controller.dart | 7 +- lib/src/pages/alarm/widgets/list_alarm.dart | 9 +- lib/src/pages/bedtime/bed_time_page.dart | 30 ++-- lib/src/pages/bedtime/widgets/pick_day.dart | 5 +- .../controllers/count_down_controller.dart | 3 + lib/src/pages/countdown/count_down_page.dart | 53 +++---- .../countdown/widgets/count_controll.dart | 7 +- .../pages/countdown/widgets/pick_time.dart | 9 +- .../global/controllers/clock_controller.dart | 5 + lib/src/pages/global/global_page.dart | 9 +- lib/src/pages/global/widgets/body.dart | 7 +- lib/src/pages/global/widgets/clock.dart | 13 +- .../pages/global/widgets/clock_painter.dart | 2 + .../pages/global/widgets/country_card.dart | 7 +- .../widgets/time_in_hour_and_minute.dart | 9 +- .../controllers/stop_watch_controller.dart | 7 +- lib/src/pages/stopwatch/stop_watch_page.dart | 71 +++++---- .../stopwatch/widgets/list_stop_watch.dart | 9 +- .../widgets/stop_watch_controll.dart | 7 +- lib/src/pages/tab/tab_bar_layout.dart | 5 +- lib/src/public/constants.dart | 3 + lib/src/public/size_config.dart | 1 + lib/src/routes/app_pages.dart | 6 +- lib/src/shared/logger/logger_utils.dart | 1 + lib/src/theme/theme_service.dart | 5 +- lib/src/theme/themes.dart | 7 +- pubspec.lock | 24 +++ pubspec.yaml | 1 + test/widget_test.dart | 7 +- 50 files changed, 553 insertions(+), 191 deletions(-) create mode 100644 .github/workflows/release.yaml create mode 100644 android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 android/app/src/main/res/values-night/styles.xml create mode 100644 ios/Podfile.lock diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml new file mode 100644 index 0000000..9644538 --- /dev/null +++ b/.github/workflows/release.yaml @@ -0,0 +1,59 @@ +name: Analyze, Build, Release APK + +on: + push: + tags: + - "v*" + +jobs: + test: + name: Analyze project + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-java@v3 + with: + distribution: "temurin" + java-version: "17" + cache: "gradle" + - uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH }} + name: id_rsa + known_hosts: ${{ secrets.KNOWN_HOSTS }} + - uses: subosito/flutter-action@v2 + with: + flutter-version: "3.13.7" + cache: true + - run: flutter pub get + - run: flutter analyze + # - run: flutter test + + build_apk: + needs: [test] + name: Build & Release APK + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-java@v3 + with: + distribution: "temurin" + java-version: "17" + cache: "gradle" + - uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH }} + name: id_rsa + known_hosts: ${{ secrets.KNOWN_HOSTS }} + - uses: subosito/flutter-action@v2 + with: + flutter-version: "3.13.7" + cache: true + - run: flutter pub get + - run: flutter build apk --release + - name: Create a Release APK + uses: ncipollo/release-action@v1 + with: + name: "Analog Clock ${{ github.ref_name }}" + artifacts: "build/app/outputs/apk/release/*.apk" + token: ${{ secrets.TOKEN }} diff --git a/.metadata b/.metadata index 5d71d6a..fce676f 100644 --- a/.metadata +++ b/.metadata @@ -15,7 +15,7 @@ migration: - platform: root create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c - - platform: ios + - platform: android create_revision: 2f708eb8396e362e280fac22cf171c2cb467343c base_revision: 2f708eb8396e362e280fac22cf171c2cb467343c diff --git a/android/.gitignore b/android/.gitignore index 0a741cb..6f56801 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app key.properties +**/*.keystore +**/*.jks diff --git a/android/app/build.gradle b/android/app/build.gradle index 4ea6649..5e131da 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,26 +22,31 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { - compileSdkVersion 28 + namespace "com.example.analog_clock" + compileSdkVersion flutter.compileSdkVersion + ndkVersion flutter.ndkVersion - sourceSets { - main.java.srcDirs += 'src/main/kotlin' + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' } - lintOptions { - disable 'InvalidPackage' + sourceSets { + main.java.srcDirs += 'src/main/kotlin' } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.analog_clock" - minSdkVersion 16 - targetSdkVersion 28 + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + minSdkVersion flutter.minSdkVersion + targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName } @@ -58,6 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} +dependencies {} diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml index afd19e3..399f698 100644 --- a/android/app/src/debug/AndroidManifest.xml +++ b/android/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 73f223c..bbcd72f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,16 +1,11 @@ - - + - - diff --git a/android/app/src/main/res/drawable-v21/launch_background.xml b/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/android/app/src/main/res/values-night/styles.xml b/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 1f83a33..cb1ef88 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,18 +1,18 @@ - - - diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml index afd19e3..399f698 100644 --- a/android/app/src/profile/AndroidManifest.xml +++ b/android/app/src/profile/AndroidManifest.xml @@ -1,6 +1,6 @@ - - diff --git a/android/build.gradle b/android/build.gradle index 3100ad2..f7eb7f6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.3.50' + ext.kotlin_version = '1.7.10' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.3.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -14,7 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/android/gradle.properties b/android/gradle.properties index 38c8d45..94adc3a 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx1536M -android.enableR8=true android.useAndroidX=true android.enableJetifier=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 296b146..3c472b9 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jun 23 08:50:38 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 44e62bc..55c4ca8 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,11 +1,20 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + } + settings.ext.flutterSdkPath = flutterSdkPath() -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() + includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle") -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + plugins { + id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false + } +} -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" +include ":app" + +apply from: "${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/ios/Podfile.lock b/ios/Podfile.lock new file mode 100644 index 0000000..bc942ac --- /dev/null +++ b/ios/Podfile.lock @@ -0,0 +1,23 @@ +PODS: + - Flutter (1.0.0) + - path_provider_foundation (0.0.1): + - Flutter + - FlutterMacOS + +DEPENDENCIES: + - Flutter (from `Flutter`) + - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`) + +EXTERNAL SOURCES: + Flutter: + :path: Flutter + path_provider_foundation: + :path: ".symlinks/plugins/path_provider_foundation/darwin" + +SPEC CHECKSUMS: + Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 + path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943 + +PODFILE CHECKSUM: 70d9d25280d0dd177a5f637cdb0f0b0b12c6a189 + +COCOAPODS: 1.12.1 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 3ba28b4..0140ddb 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -7,13 +7,15 @@ objects = { /* Begin PBXBuildFile section */ + 0E2FDB644281EA66F52D94AD /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3796299EA5F583A8BAA6E3D5 /* Pods_Runner.framework */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + DDBBA11C0FC7CD88B8C37AFF /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 458F19BED79A42E95F37E8D8 /* Pods_RunnerTests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -42,7 +44,14 @@ /* Begin PBXFileReference section */ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 21862CCB2C4F4E44C19A580A /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3796299EA5F583A8BAA6E3D5 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 3B7D332A691F774F0FB47AB4 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 458F19BED79A42E95F37E8D8 /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6537882332C6A3DDE7C0FE8C /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -53,21 +62,61 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; - 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + C2F24EAC6C30279775115D47 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + E6B3897CFCD640E411C0E489 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + FAF8C55CE2F7376C726A30C7 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 447038A40A9EEBF2378A9587 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + DDBBA11C0FC7CD88B8C37AFF /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 0E2FDB644281EA66F52D94AD /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 586869C0425B45CE08DE0B82 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 3796299EA5F583A8BAA6E3D5 /* Pods_Runner.framework */, + 458F19BED79A42E95F37E8D8 /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 7327F4B6BB9043F90DBE9B0D /* Pods */ = { + isa = PBXGroup; + children = ( + C2F24EAC6C30279775115D47 /* Pods-Runner.debug.xcconfig */, + 3B7D332A691F774F0FB47AB4 /* Pods-Runner.release.xcconfig */, + E6B3897CFCD640E411C0E489 /* Pods-Runner.profile.xcconfig */, + 21862CCB2C4F4E44C19A580A /* Pods-RunnerTests.debug.xcconfig */, + FAF8C55CE2F7376C726A30C7 /* Pods-RunnerTests.release.xcconfig */, + 6537882332C6A3DDE7C0FE8C /* Pods-RunnerTests.profile.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -79,14 +128,6 @@ name = Flutter; sourceTree = ""; }; - 331C8082294A63A400263BE5 /* RunnerTests */ = { - isa = PBXGroup; - children = ( - 331C807B294A618700263BE5 /* RunnerTests.swift */, - ); - path = RunnerTests; - sourceTree = ""; - }; 97C146E51CF9000F007C117D = { isa = PBXGroup; children = ( @@ -94,6 +135,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, + 7327F4B6BB9043F90DBE9B0D /* Pods */, + 586869C0425B45CE08DE0B82 /* Frameworks */, ); sourceTree = ""; }; @@ -128,9 +171,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( + 09D05721F5BC2F5156A43E83 /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, - 331C807E294A63A400263BE5 /* Frameworks */, 331C807F294A63A400263BE5 /* Resources */, + 447038A40A9EEBF2378A9587 /* Frameworks */, ); buildRules = ( ); @@ -146,12 +190,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + 83CE0977031BB1063E40DA97 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + D522F3ECF7B10E9911B17268 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -223,6 +269,28 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 09D05721F5BC2F5156A43E83 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -239,6 +307,28 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; + 83CE0977031BB1063E40DA97 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -254,6 +344,23 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + D522F3ECF7B10E9911B17268 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -361,6 +468,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = 3SHAJNAYM4; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -377,7 +485,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AE0B7B92F70575B8D7E0D07E /* Pods-RunnerTests.debug.xcconfig */; + baseConfigurationReference = 21862CCB2C4F4E44C19A580A /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -395,7 +503,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 89B67EB44CE7B6631473024E /* Pods-RunnerTests.release.xcconfig */; + baseConfigurationReference = FAF8C55CE2F7376C726A30C7 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -411,7 +519,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 640959BDD8F10B91D80A66BE /* Pods-RunnerTests.profile.xcconfig */; + baseConfigurationReference = 6537882332C6A3DDE7C0FE8C /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -539,6 +647,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = 3SHAJNAYM4; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -561,6 +670,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = 3SHAJNAYM4; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata index 1d526a1..21a3cc1 100644 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/lib/main.dart b/lib/main.dart index 8079892..8dda778 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:get/get.dart'; +import 'package:get_storage/get_storage.dart'; + +// Project imports: import 'package:analog_clock/src/routes/app_pages.dart'; import 'package:analog_clock/src/shared/logger/logger_utils.dart'; import 'package:analog_clock/src/theme/theme_service.dart'; import 'package:analog_clock/src/theme/themes.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; -import 'package:get_storage/get_storage.dart'; void main() async { await GetStorage.init(); diff --git a/lib/src/app.dart b/lib/src/app.dart index 4956dab..5a70bf2 100644 --- a/lib/src/app.dart +++ b/lib/src/app.dart @@ -1,7 +1,9 @@ -import 'package:analog_clock/src/pages/tab/tab_bar_layout.dart'; +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +// Project imports: +import 'package:analog_clock/src/pages/tab/tab_bar_layout.dart'; import 'package:analog_clock/src/theme/theme_service.dart'; class App extends StatefulWidget { diff --git a/lib/src/models/my_theme_provider.dart b/lib/src/models/my_theme_provider.dart index 89c99bc..1d770e2 100644 --- a/lib/src/models/my_theme_provider.dart +++ b/lib/src/models/my_theme_provider.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class MyThemeModel extends ChangeNotifier { diff --git a/lib/src/pages/alarm/alarm_page.dart b/lib/src/pages/alarm/alarm_page.dart index 521dc12..f137114 100644 --- a/lib/src/pages/alarm/alarm_page.dart +++ b/lib/src/pages/alarm/alarm_page.dart @@ -1,8 +1,11 @@ -import 'package:analog_clock/src/pages/alarm/controllers/alarm_controller.dart'; -import 'package:analog_clock/src/pages/alarm/widgets/list_alarm.dart'; +// Package imports: import 'package:flutter_neumorphic_plus/flutter_neumorphic.dart'; import 'package:get/get.dart'; import 'package:percent_indicator/percent_indicator.dart'; + +// Project imports: +import 'package:analog_clock/src/pages/alarm/controllers/alarm_controller.dart'; +import 'package:analog_clock/src/pages/alarm/widgets/list_alarm.dart'; import 'package:analog_clock/src/public/constants.dart'; class AlarmPage extends StatefulWidget { @@ -34,11 +37,10 @@ class _AlarmPageState extends State { width: width, child: Stack( children: [ - SizedBox( - width: double.infinity, + SizedBox.expand( child: Column( children: [ - const SizedBox(height: 24.0), + const SizedBox(height: 16.0), StreamBuilder( stream: alarmController.currentTime.stream, builder: (context, snapshot) { @@ -49,7 +51,6 @@ class _AlarmPageState extends State { return _buildClock(snapshot.data!); }, ), - const SizedBox(height: 25.0), const Expanded( child: ListAlarm(), ), @@ -94,7 +95,7 @@ class _AlarmPageState extends State { Widget _buildClock(DateTime dateTime) { return CircularPercentIndicator( - radius: width * .825, + radius: width * .45, lineWidth: 60.0, percent: alarmController.percent, circularStrokeCap: CircularStrokeCap.round, diff --git a/lib/src/pages/alarm/controllers/alarm_controller.dart b/lib/src/pages/alarm/controllers/alarm_controller.dart index 5dd2a70..bb91253 100644 --- a/lib/src/pages/alarm/controllers/alarm_controller.dart +++ b/lib/src/pages/alarm/controllers/alarm_controller.dart @@ -1,6 +1,11 @@ +// Dart imports: +import 'dart:async'; + +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; -import 'dart:async'; class AlarmController extends GetxController { StreamController currentTime = diff --git a/lib/src/pages/alarm/widgets/list_alarm.dart b/lib/src/pages/alarm/widgets/list_alarm.dart index f1c0612..ac756f0 100644 --- a/lib/src/pages/alarm/widgets/list_alarm.dart +++ b/lib/src/pages/alarm/widgets/list_alarm.dart @@ -1,9 +1,14 @@ -import 'package:analog_clock/src/pages/alarm/controllers/alarm_controller.dart'; -import 'package:analog_clock/src/public/constants.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; import 'package:intl/intl.dart'; +// Project imports: +import 'package:analog_clock/src/pages/alarm/controllers/alarm_controller.dart'; +import 'package:analog_clock/src/public/constants.dart'; + class ListAlarm extends StatefulWidget { const ListAlarm({super.key}); diff --git a/lib/src/pages/bedtime/bed_time_page.dart b/lib/src/pages/bedtime/bed_time_page.dart index ad59b0d..5d306fd 100644 --- a/lib/src/pages/bedtime/bed_time_page.dart +++ b/lib/src/pages/bedtime/bed_time_page.dart @@ -1,14 +1,21 @@ +// Dart imports: import 'dart:math'; + +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_phosphor_icons/flutter_phosphor_icons.dart'; +import 'package:get/get.dart'; +import 'package:percent_indicator/circular_percent_indicator.dart'; + +// Project imports: import 'package:analog_clock/src/pages/bedtime/widgets/pick_day.dart'; import 'package:analog_clock/src/pages/global/controllers/clock_controller.dart'; import 'package:analog_clock/src/pages/global/widgets/clock_painter.dart'; import 'package:analog_clock/src/public/constants.dart'; import 'package:analog_clock/src/public/size_config.dart'; import 'package:analog_clock/src/theme/theme_service.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter_phosphor_icons/flutter_phosphor_icons.dart'; -import 'package:get/get.dart'; -import 'package:percent_indicator/circular_percent_indicator.dart'; class BedTimePage extends StatefulWidget { const BedTimePage({super.key}); @@ -48,9 +55,10 @@ class _BedTimePageState extends State { const PickDay(), const Spacer(flex: 2), Stack( + alignment: Alignment.center, children: [ CircularPercentIndicator( - radius: width * .92, + radius: width * .45, lineWidth: 35.0, percent: .5, circularStrokeCap: CircularStrokeCap.round, @@ -79,7 +87,7 @@ class _BedTimePageState extends State { ), ), Positioned( - top: height * .186, + top: width * .45 - 5, left: 0, right: 0, child: IconButton( @@ -94,7 +102,7 @@ class _BedTimePageState extends State { ), ), Positioned( - top: 4, + top: 35 / 2 + 8, left: 0, right: 0, child: Icon( @@ -104,11 +112,11 @@ class _BedTimePageState extends State { ), ), Positioned( - bottom: 4, + bottom: 35 / 2 + 6, left: 0, right: 0, child: Icon( - Icons.notifications_active, + Icons.notifications_active_outlined, color: Colors.white, size: width / 16.0, ), @@ -167,8 +175,8 @@ class _BedTimePageState extends State { Widget _buildClock(context, dateTime) { return Padding( - padding: const EdgeInsets.symmetric( - horizontal: 36.0, + padding: EdgeInsets.symmetric( + horizontal: 35 + width * .05, ), child: AspectRatio( aspectRatio: 1, diff --git a/lib/src/pages/bedtime/widgets/pick_day.dart b/lib/src/pages/bedtime/widgets/pick_day.dart index a46247c..c3d48e6 100644 --- a/lib/src/pages/bedtime/widgets/pick_day.dart +++ b/lib/src/pages/bedtime/widgets/pick_day.dart @@ -1,6 +1,9 @@ -import 'package:analog_clock/src/public/constants.dart'; +// Package imports: import 'package:flutter_neumorphic_plus/flutter_neumorphic.dart'; +// Project imports: +import 'package:analog_clock/src/public/constants.dart'; + class PickDay extends StatefulWidget { const PickDay({super.key}); diff --git a/lib/src/pages/countdown/controllers/count_down_controller.dart b/lib/src/pages/countdown/controllers/count_down_controller.dart index f96e01b..f4a873a 100644 --- a/lib/src/pages/countdown/controllers/count_down_controller.dart +++ b/lib/src/pages/countdown/controllers/count_down_controller.dart @@ -1,4 +1,7 @@ +// Dart imports: import 'dart:async'; + +// Package imports: import 'package:get/get.dart'; class CountDownController extends GetxController { diff --git a/lib/src/pages/countdown/count_down_page.dart b/lib/src/pages/countdown/count_down_page.dart index 0a6456b..6903f55 100644 --- a/lib/src/pages/countdown/count_down_page.dart +++ b/lib/src/pages/countdown/count_down_page.dart @@ -1,9 +1,14 @@ -import 'package:analog_clock/src/pages/countdown/controllers/count_down_controller.dart'; -import 'package:analog_clock/src/pages/countdown/widgets/count_controll.dart'; -import 'package:analog_clock/src/pages/countdown/widgets/pick_time.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; import 'package:percent_indicator/circular_percent_indicator.dart'; + +// Project imports: +import 'package:analog_clock/src/pages/countdown/controllers/count_down_controller.dart'; +import 'package:analog_clock/src/pages/countdown/widgets/count_controll.dart'; +import 'package:analog_clock/src/pages/countdown/widgets/pick_time.dart'; import 'package:analog_clock/src/public/constants.dart'; class CountDownPage extends StatefulWidget { @@ -32,29 +37,25 @@ class _CountDownPageState extends State { Widget build(BuildContext context) { return Scaffold( body: SizedBox( - width: width, - child: SizedBox( - width: double.infinity, - child: Column( - children: [ - const Spacer(flex: 4), - StreamBuilder( - stream: countDownController.currentTime.stream, - builder: (context, snapshot) { - if (!snapshot.hasData) { - return _buildClock(DateTime(0, 0, 0)); - } + child: Column( + children: [ + const Spacer(flex: 4), + StreamBuilder( + stream: countDownController.currentTime.stream, + builder: (context, snapshot) { + if (!snapshot.hasData) { + return _buildClock(DateTime(0, 0, 0)); + } - return _buildClock(snapshot.data); - }, - ), - const Spacer(flex: 3), - const PickTime(), - const Spacer(flex: 2), - const CountControll(), - const Spacer(flex: 8), - ], - ), + return _buildClock(snapshot.data); + }, + ), + const Spacer(flex: 3), + const PickTime(), + const Spacer(flex: 2), + const CountControll(), + const Spacer(flex: 8), + ], ), ), ); @@ -62,7 +63,7 @@ class _CountDownPageState extends State { Widget _buildClock(dateTime) { return CircularPercentIndicator( - radius: width * .825, + radius: width * .45, lineWidth: 60.0, percent: countDownController.percent, circularStrokeCap: CircularStrokeCap.round, diff --git a/lib/src/pages/countdown/widgets/count_controll.dart b/lib/src/pages/countdown/widgets/count_controll.dart index 2b4e10a..9f59da5 100644 --- a/lib/src/pages/countdown/widgets/count_controll.dart +++ b/lib/src/pages/countdown/widgets/count_controll.dart @@ -1,8 +1,11 @@ -import 'package:analog_clock/src/pages/countdown/controllers/count_down_controller.dart'; -import 'package:analog_clock/src/public/constants.dart'; +// Package imports: import 'package:flutter_neumorphic_plus/flutter_neumorphic.dart'; import 'package:get/get.dart'; +// Project imports: +import 'package:analog_clock/src/pages/countdown/controllers/count_down_controller.dart'; +import 'package:analog_clock/src/public/constants.dart'; + class CountControll extends StatefulWidget { const CountControll({super.key}); diff --git a/lib/src/pages/countdown/widgets/pick_time.dart b/lib/src/pages/countdown/widgets/pick_time.dart index 52acaee..fd4f147 100644 --- a/lib/src/pages/countdown/widgets/pick_time.dart +++ b/lib/src/pages/countdown/widgets/pick_time.dart @@ -1,8 +1,13 @@ -import 'package:analog_clock/src/pages/countdown/controllers/count_down_controller.dart'; +// Flutter imports: import 'package:flutter/material.dart'; -import 'package:analog_clock/src/public/constants.dart'; + +// Package imports: import 'package:get/get.dart'; +// Project imports: +import 'package:analog_clock/src/pages/countdown/controllers/count_down_controller.dart'; +import 'package:analog_clock/src/public/constants.dart'; + class PickTime extends StatefulWidget { const PickTime({super.key}); diff --git a/lib/src/pages/global/controllers/clock_controller.dart b/lib/src/pages/global/controllers/clock_controller.dart index 16da52a..7a3f000 100644 --- a/lib/src/pages/global/controllers/clock_controller.dart +++ b/lib/src/pages/global/controllers/clock_controller.dart @@ -1,5 +1,10 @@ +// Dart imports: import 'dart:async'; + +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; class ClockController extends GetxController { diff --git a/lib/src/pages/global/global_page.dart b/lib/src/pages/global/global_page.dart index 1c062fa..0833b7f 100644 --- a/lib/src/pages/global/global_page.dart +++ b/lib/src/pages/global/global_page.dart @@ -1,8 +1,13 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:get/get.dart'; + +// Project imports: import 'package:analog_clock/src/pages/global/controllers/clock_controller.dart'; import 'package:analog_clock/src/pages/global/widgets/body.dart'; import 'package:analog_clock/src/public/size_config.dart'; -import 'package:flutter/material.dart'; -import 'package:get/get.dart'; class GlobalPage extends StatefulWidget { const GlobalPage({super.key}); diff --git a/lib/src/pages/global/widgets/body.dart b/lib/src/pages/global/widgets/body.dart index 65a6e13..c2b8089 100644 --- a/lib/src/pages/global/widgets/body.dart +++ b/lib/src/pages/global/widgets/body.dart @@ -1,9 +1,14 @@ -import 'package:analog_clock/src/public/constants.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:intl/intl.dart'; + +// Project imports: import 'package:analog_clock/src/pages/global/widgets/clock.dart'; import 'package:analog_clock/src/pages/global/widgets/country_card.dart'; import 'package:analog_clock/src/pages/global/widgets/time_in_hour_and_minute.dart'; +import 'package:analog_clock/src/public/constants.dart'; class Body extends StatelessWidget { final DateTime dateTime; diff --git a/lib/src/pages/global/widgets/clock.dart b/lib/src/pages/global/widgets/clock.dart index 85cbb2c..d05a1d5 100644 --- a/lib/src/pages/global/widgets/clock.dart +++ b/lib/src/pages/global/widgets/clock.dart @@ -1,10 +1,17 @@ +// Dart imports: import 'dart:math'; + +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:flutter_phosphor_icons/flutter_phosphor_icons.dart'; + +// Project imports: +import 'package:analog_clock/src/pages/global/widgets/clock_painter.dart'; import 'package:analog_clock/src/public/constants.dart'; import 'package:analog_clock/src/public/size_config.dart'; import 'package:analog_clock/src/theme/theme_service.dart'; -import 'package:flutter/material.dart'; -import 'package:analog_clock/src/pages/global/widgets/clock_painter.dart'; -import 'package:flutter_phosphor_icons/flutter_phosphor_icons.dart'; class Clock extends StatelessWidget { final DateTime dateTime; diff --git a/lib/src/pages/global/widgets/clock_painter.dart b/lib/src/pages/global/widgets/clock_painter.dart index 227b8b9..cb9f34b 100644 --- a/lib/src/pages/global/widgets/clock_painter.dart +++ b/lib/src/pages/global/widgets/clock_painter.dart @@ -1,5 +1,7 @@ +// Dart imports: import 'dart:math'; +// Flutter imports: import 'package:flutter/material.dart'; class ClockPainter extends CustomPainter { diff --git a/lib/src/pages/global/widgets/country_card.dart b/lib/src/pages/global/widgets/country_card.dart index 5cfb878..b6fd074 100644 --- a/lib/src/pages/global/widgets/country_card.dart +++ b/lib/src/pages/global/widgets/country_card.dart @@ -1,7 +1,12 @@ -import 'package:analog_clock/src/public/size_config.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_svg/flutter_svg.dart'; +// Project imports: +import 'package:analog_clock/src/public/size_config.dart'; + class CountryCard extends StatelessWidget { final String country, timeZone, iconSrc, time, period; diff --git a/lib/src/pages/global/widgets/time_in_hour_and_minute.dart b/lib/src/pages/global/widgets/time_in_hour_and_minute.dart index 8aaac6b..ec421b8 100644 --- a/lib/src/pages/global/widgets/time_in_hour_and_minute.dart +++ b/lib/src/pages/global/widgets/time_in_hour_and_minute.dart @@ -1,8 +1,13 @@ -import 'package:analog_clock/src/pages/global/controllers/clock_controller.dart'; -import 'package:analog_clock/src/public/size_config.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; +// Project imports: +import 'package:analog_clock/src/pages/global/controllers/clock_controller.dart'; +import 'package:analog_clock/src/public/size_config.dart'; + class TimeInHourAndMinute extends StatelessWidget { final TimeOfDay timeOfDay; final bool showPeriod; diff --git a/lib/src/pages/stopwatch/controllers/stop_watch_controller.dart b/lib/src/pages/stopwatch/controllers/stop_watch_controller.dart index 9113f7e..a76a023 100644 --- a/lib/src/pages/stopwatch/controllers/stop_watch_controller.dart +++ b/lib/src/pages/stopwatch/controllers/stop_watch_controller.dart @@ -1,6 +1,11 @@ +// Dart imports: +import 'dart:async'; + +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; -import 'dart:async'; class StopWatchController extends GetxController { StreamController currentTime = diff --git a/lib/src/pages/stopwatch/stop_watch_page.dart b/lib/src/pages/stopwatch/stop_watch_page.dart index ada38fa..811636e 100644 --- a/lib/src/pages/stopwatch/stop_watch_page.dart +++ b/lib/src/pages/stopwatch/stop_watch_page.dart @@ -1,10 +1,15 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Package imports: +import 'package:get/get.dart'; +import 'package:percent_indicator/circular_percent_indicator.dart'; + +// Project imports: import 'package:analog_clock/src/pages/stopwatch/controllers/stop_watch_controller.dart'; import 'package:analog_clock/src/pages/stopwatch/widgets/list_stop_watch.dart'; import 'package:analog_clock/src/pages/stopwatch/widgets/stop_watch_controll.dart'; -import 'package:flutter/material.dart'; -import 'package:percent_indicator/circular_percent_indicator.dart'; import 'package:analog_clock/src/public/constants.dart'; -import 'package:get/get.dart'; class StopWatchPage extends StatefulWidget { const StopWatchPage({super.key}); @@ -32,47 +37,41 @@ class _StopWatchPageState extends State { @override Widget build(BuildContext context) { return Scaffold( - body: SizedBox( - width: width, - child: SizedBox( - width: double.infinity, - child: Column( - children: [ - const Spacer(), - StreamBuilder( - stream: stopWatchController.currentTime.stream, - builder: (context, snapshot) { - if (!snapshot.hasData) { - return _buildClock( - DateTime(0, 0, 0), - DateTime(0, 0, 0), - ); - } + body: Column( + children: [ + const Spacer(), + StreamBuilder( + stream: stopWatchController.currentTime.stream, + builder: (context, snapshot) { + if (!snapshot.hasData) { + return _buildClock( + DateTime(0, 0, 0), + DateTime(0, 0, 0), + ); + } - return _buildClock( - snapshot.data!, - stopWatchController.dateTimes[0], - ); - }, - ), - const Spacer(), - SizedBox( - height: height * .3, - child: const ListStopWatch(), - ), - const Spacer(), - const StopWatchControll(), - const Spacer(flex: 3), - ], + return _buildClock( + snapshot.data!, + stopWatchController.dateTimes[0], + ); + }, ), - ), + const Spacer(), + SizedBox( + height: height * .3, + child: const ListStopWatch(), + ), + const Spacer(), + const StopWatchControll(), + const Spacer(flex: 3), + ], ), ); } Widget _buildClock(DateTime dateTime, DateTime dateTimePrevious) { return CircularPercentIndicator( - radius: width * .825, + radius: width * .45, lineWidth: 60.0, percent: stopWatchController.percent, circularStrokeCap: CircularStrokeCap.round, diff --git a/lib/src/pages/stopwatch/widgets/list_stop_watch.dart b/lib/src/pages/stopwatch/widgets/list_stop_watch.dart index bcd66cf..34e455e 100644 --- a/lib/src/pages/stopwatch/widgets/list_stop_watch.dart +++ b/lib/src/pages/stopwatch/widgets/list_stop_watch.dart @@ -1,9 +1,14 @@ -import 'package:analog_clock/src/pages/stopwatch/controllers/stop_watch_controller.dart'; -import 'package:analog_clock/src/public/constants.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; import 'package:intl/intl.dart'; +// Project imports: +import 'package:analog_clock/src/pages/stopwatch/controllers/stop_watch_controller.dart'; +import 'package:analog_clock/src/public/constants.dart'; + class ListStopWatch extends StatefulWidget { const ListStopWatch({super.key}); diff --git a/lib/src/pages/stopwatch/widgets/stop_watch_controll.dart b/lib/src/pages/stopwatch/widgets/stop_watch_controll.dart index ef514ec..85b80a0 100644 --- a/lib/src/pages/stopwatch/widgets/stop_watch_controll.dart +++ b/lib/src/pages/stopwatch/widgets/stop_watch_controll.dart @@ -1,8 +1,11 @@ -import 'package:analog_clock/src/pages/stopwatch/controllers/stop_watch_controller.dart'; -import 'package:analog_clock/src/public/constants.dart'; +// Package imports: import 'package:flutter_neumorphic_plus/flutter_neumorphic.dart'; import 'package:get/get.dart'; +// Project imports: +import 'package:analog_clock/src/pages/stopwatch/controllers/stop_watch_controller.dart'; +import 'package:analog_clock/src/public/constants.dart'; + class StopWatchControll extends StatefulWidget { const StopWatchControll({super.key}); diff --git a/lib/src/pages/tab/tab_bar_layout.dart b/lib/src/pages/tab/tab_bar_layout.dart index dd1b491..5738efc 100644 --- a/lib/src/pages/tab/tab_bar_layout.dart +++ b/lib/src/pages/tab/tab_bar_layout.dart @@ -1,10 +1,13 @@ +// Flutter imports: +import 'package:flutter/material.dart'; + +// Project imports: import 'package:analog_clock/src/pages/alarm/alarm_page.dart'; import 'package:analog_clock/src/pages/bedtime/bed_time_page.dart'; import 'package:analog_clock/src/pages/countdown/count_down_page.dart'; import 'package:analog_clock/src/pages/global/global_page.dart'; import 'package:analog_clock/src/pages/stopwatch/stop_watch_page.dart'; import 'package:analog_clock/src/public/constants.dart'; -import 'package:flutter/material.dart'; import 'package:analog_clock/src/public/size_config.dart'; class TabBarLayout extends StatefulWidget { diff --git a/lib/src/public/constants.dart b/lib/src/public/constants.dart index bda0a59..0f0de5d 100644 --- a/lib/src/public/constants.dart +++ b/lib/src/public/constants.dart @@ -1,4 +1,7 @@ +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:get/get.dart'; // Colors diff --git a/lib/src/public/size_config.dart b/lib/src/public/size_config.dart index b8c9cc7..9c750cc 100644 --- a/lib/src/public/size_config.dart +++ b/lib/src/public/size_config.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class SizeConfig { diff --git a/lib/src/routes/app_pages.dart b/lib/src/routes/app_pages.dart index 0d6cfa5..5bc6167 100644 --- a/lib/src/routes/app_pages.dart +++ b/lib/src/routes/app_pages.dart @@ -1,5 +1,9 @@ -import 'package:analog_clock/src/app.dart'; +// Package imports: import 'package:get/get.dart'; + +// Project imports: +import 'package:analog_clock/src/app.dart'; + part 'app_routes.dart'; // ignore: avoid_classes_with_only_static_members diff --git a/lib/src/shared/logger/logger_utils.dart b/lib/src/shared/logger/logger_utils.dart index 53c513b..cc1802c 100644 --- a/lib/src/shared/logger/logger_utils.dart +++ b/lib/src/shared/logger/logger_utils.dart @@ -1,3 +1,4 @@ +// Flutter imports: import 'package:flutter/material.dart'; class Logger { diff --git a/lib/src/theme/theme_service.dart b/lib/src/theme/theme_service.dart index 90d4a1a..6b3b99b 100644 --- a/lib/src/theme/theme_service.dart +++ b/lib/src/theme/theme_service.dart @@ -1,7 +1,10 @@ +// Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:get_storage/get_storage.dart'; + +// Package imports: import 'package:get/get.dart'; +import 'package:get_storage/get_storage.dart'; class ThemeService { final _getStorage = GetStorage(); diff --git a/lib/src/theme/themes.dart b/lib/src/theme/themes.dart index f0a6d22..0c979b7 100644 --- a/lib/src/theme/themes.dart +++ b/lib/src/theme/themes.dart @@ -1,7 +1,12 @@ -import 'package:analog_clock/src/public/constants.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:google_fonts/google_fonts.dart'; +// Project imports: +import 'package:analog_clock/src/public/constants.dart'; + class Themes { final lightTheme = ThemeData.light().copyWith( appBarTheme: appBarTheme, diff --git a/pubspec.lock b/pubspec.lock index 1eafdf4..62930cc 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -163,6 +163,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + import_sorter: + dependency: "direct dev" + description: + name: import_sorter + sha256: eb15738ccead84e62c31e0208ea4e3104415efcd4972b86906ca64a1187d0836 + url: "https://pub.dev" + source: hosted + version: "4.6.0" intl: dependency: "direct main" description: @@ -368,6 +376,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.0" + tint: + dependency: transitive + description: + name: tint + sha256: "9652d9a589f4536d5e392cf790263d120474f15da3cf1bee7f1fdb31b4de5f46" + url: "https://pub.dev" + source: hosted + version: "2.0.1" typed_data: dependency: transitive description: @@ -440,6 +456,14 @@ packages: url: "https://pub.dev" source: hosted version: "6.3.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" sdks: dart: ">=3.1.2 <4.0.0" flutter: ">=3.13.5" diff --git a/pubspec.yaml b/pubspec.yaml index c448f70..2031b13 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -42,6 +42,7 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^2.0.3 + import_sorter: ^4.6.0 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/test/widget_test.dart b/test/widget_test.dart index 5cc90f6..9297651 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -5,10 +5,15 @@ // gestures. You can also use WidgetTester to find child widgets in the widget // tree, read text, and verify that the values of widget properties are correct. -import 'package:analog_clock/src/app.dart'; +// Flutter imports: import 'package:flutter/material.dart'; + +// Package imports: import 'package:flutter_test/flutter_test.dart'; +// Project imports: +import 'package:analog_clock/src/app.dart'; + void main() { testWidgets('Counter increments smoke test', (tester) async { // Build our app and trigger a frame.