diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 65e5c203..7763544b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,26 +63,25 @@ jobs: flutter build apk --release \ --build-name=$VERSION_NAME \ --build-number=$GITHUB_RUN_NUMBER \ - --dart-define=FLAVOR=release + --flavor production # Build AAB flutter build appbundle --release \ --build-name=$VERSION_NAME \ --build-number=$GITHUB_RUN_NUMBER \ - --dart-define=FLAVOR=release + --flavor production - name: Rename APK and AAB run: | - mv build/app/outputs/flutter-apk/app-release.apk "build/app/outputs/flutter-apk/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.apk" - mv build/app/outputs/bundle/release/app-release.aab "build/app/outputs/bundle/release/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.aab" + mkdir -p build/app/outputs/android_artifacts + mv build/app/outputs/flutter-apk/app-production-release.apk "build/app/outputs/android_artifacts/${{ env.APP_NAME }}-Android-${{ env.VERSION_NAME }}.apk" + mv build/app/outputs/bundle/productionRelease/app-production-release.aab "build/app/outputs/android_artifacts/${{ env.APP_NAME }}-Android-${{ env.VERSION_NAME }}.aab" - name: Archive Android artifacts uses: actions/upload-artifact@v4.0.0 with: name: ${{ env.APP_NAME }}-Android-${{ env.VERSION_NAME }} - path: | - build/app/outputs/flutter-apk/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.apk - build/app/outputs/bundle/release/${{ env.APP_NAME }}-${{ env.VERSION_NAME }}-signed.aab + path: build/app/outputs/android_artifacts/ build-windows: #Use windows-2019, latest(2022) causes MSVCP140.dll related crashes @@ -274,6 +273,7 @@ jobs: path: build/web - name: Deploy to ghcr.io + if: startsWith(github.ref, 'refs/tags/v') uses: mr-smithers-excellent/docker-build-push@v6 with: image: fladder @@ -283,9 +283,11 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build Github pages web + if: startsWith(github.ref, 'refs/tags/v') run: flutter build web --base-href /${{ github.event.repository.name }}/ --release --build-number=$GITHUB_RUN_NUMBER - name: Deploy to GitHub Pages + if: startsWith(github.ref, 'refs/tags/v') uses: peaceiris/actions-gh-pages@v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} # Automatically provided by GitHub Actions diff --git a/.vscode/launch.json b/.vscode/launch.json index ee0f98d7..641207a2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,51 +5,62 @@ "version": "0.2.0", "configurations": [ { - "name": "fladder", + "name": "Fladder Development (debug)", "request": "launch", "type": "dart", "args": [ - "--web-port", - "8096" - ], + "--flavor", + "development" + ] }, { - "name": "fladder (profile mode)", + "name": "Fladder Production (debug)", "request": "launch", "type": "dart", - "flutterMode": "profile", "args": [ - "--web-port", - "9090" - ], + "--flavor", + "production" + ] }, { - "name": "fladder (release mode)", + "name": "Fladder Development (profile mode)", "request": "launch", "type": "dart", - "flutterMode": "release", + "flutterMode": "profile", "args": [ - "--web-port", - "9090" - ], + "--flavor", + "development" + ] }, { - "name": "Android", + "name": "Fladder Production (profile mode)", "request": "launch", "type": "dart", + "flutterMode": "profile", + "args": [ + "--flavor", + "production" + ] }, { - "name": "iPhone", + "name": "Fladder Development (release mode)", "request": "launch", "type": "dart", - "deviceId": "iphone" + "flutterMode": "release", + "args": [ + "--flavor", + "development" + ] }, { - "name": "Windows", + "name": "Fladder Production (release mode)", "request": "launch", "type": "dart", - "flutterMode": "debug", - "deviceId": "windows" + "flutterMode": "release", + "args": [ + "--flavor", + "production" + ] }, { "name": "Web", @@ -72,20 +83,5 @@ "9090" ], }, - { - "name": "AndroidTV", - "request": "launch", - "program": "lib/android_tv/main.dart", - "type": "dart", - }, ], - "compounds": [ - { - "name": "All Devices", - "configurations": [ - "Windows", - "Android" - ], - } - ] } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 9618668e..b0f327fe 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -75,10 +75,15 @@ "command": "dart", "args": [ "run", - "icons_launcher:create" + "icons_launcher:create", + "--flavors", + "development,production" ], - "label": "dart: generate launcher icons", - "detail": "" + "label": "dart: generate icons_launcher", + "detail": "", + "options": { + "cwd": "${workspaceFolder}" + } } ], } \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 4c2b8bcf..7f5929c5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -68,12 +68,24 @@ android { buildTypes { release { + minifyEnabled true + shrinkResources true + proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro" signingConfig signingConfigs.release } - debug{ - applicationIdSuffix = ".debug" - } } + + flavorDimensions "default" + productFlavors { + development { + dimension "default" + applicationIdSuffix ".dev" + } + production { + dimension "default" + applicationIdSuffix "" + } + } } flutter { diff --git a/android/app/src/development/ic_launcher-playstore.png b/android/app/src/development/ic_launcher-playstore.png new file mode 100644 index 00000000..c7184f7b Binary files /dev/null and b/android/app/src/development/ic_launcher-playstore.png differ diff --git a/android/app/src/development/res/drawable-hdpi/ic_notification.png b/android/app/src/development/res/drawable-hdpi/ic_notification.png new file mode 100644 index 00000000..59bd9b46 Binary files /dev/null and b/android/app/src/development/res/drawable-hdpi/ic_notification.png differ diff --git a/android/app/src/development/res/drawable-mdpi/ic_notification.png b/android/app/src/development/res/drawable-mdpi/ic_notification.png new file mode 100644 index 00000000..6f91752d Binary files /dev/null and b/android/app/src/development/res/drawable-mdpi/ic_notification.png differ diff --git a/android/app/src/development/res/drawable-xhdpi/ic_notification.png b/android/app/src/development/res/drawable-xhdpi/ic_notification.png new file mode 100644 index 00000000..1d0a437b Binary files /dev/null and b/android/app/src/development/res/drawable-xhdpi/ic_notification.png differ diff --git a/android/app/src/development/res/drawable-xxhdpi/ic_notification.png b/android/app/src/development/res/drawable-xxhdpi/ic_notification.png new file mode 100644 index 00000000..41785386 Binary files /dev/null and b/android/app/src/development/res/drawable-xxhdpi/ic_notification.png differ diff --git a/android/app/src/development/res/drawable-xxxhdpi/ic_notification.png b/android/app/src/development/res/drawable-xxxhdpi/ic_notification.png new file mode 100644 index 00000000..fc1aa37b Binary files /dev/null and b/android/app/src/development/res/drawable-xxxhdpi/ic_notification.png differ diff --git a/android/app/src/development/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/development/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..71547337 --- /dev/null +++ b/android/app/src/development/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/android/app/src/development/res/mipmap-hdpi/ic_launcher.png b/android/app/src/development/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..438ef9b6 Binary files /dev/null and b/android/app/src/development/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/development/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/development/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..6c0cdcfb Binary files /dev/null and b/android/app/src/development/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/development/res/mipmap-hdpi/ic_launcher_monochrome.png b/android/app/src/development/res/mipmap-hdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..8d51a509 Binary files /dev/null and b/android/app/src/development/res/mipmap-hdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/development/res/mipmap-mdpi/ic_launcher.png b/android/app/src/development/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..641b1b47 Binary files /dev/null and b/android/app/src/development/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/development/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/development/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..22c4cc82 Binary files /dev/null and b/android/app/src/development/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/development/res/mipmap-mdpi/ic_launcher_monochrome.png b/android/app/src/development/res/mipmap-mdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..a4c2fa35 Binary files /dev/null and b/android/app/src/development/res/mipmap-mdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/development/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/development/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..c69b9e01 Binary files /dev/null and b/android/app/src/development/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/development/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/development/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..6b97c327 Binary files /dev/null and b/android/app/src/development/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/development/res/mipmap-xhdpi/ic_launcher_monochrome.png b/android/app/src/development/res/mipmap-xhdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..131c0810 Binary files /dev/null and b/android/app/src/development/res/mipmap-xhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/development/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/development/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..96663172 Binary files /dev/null and b/android/app/src/development/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/development/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/development/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..833d9b7f Binary files /dev/null and b/android/app/src/development/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/development/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/android/app/src/development/res/mipmap-xxhdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..30bc5117 Binary files /dev/null and b/android/app/src/development/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..88a838ba Binary files /dev/null and b/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..435d7eeb Binary files /dev/null and b/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..169df6bd Binary files /dev/null and b/android/app/src/development/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/development/res/values/colors.xml b/android/app/src/development/res/values/colors.xml new file mode 100644 index 00000000..0234c1d9 --- /dev/null +++ b/android/app/src/development/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #FF21013A + diff --git a/android/app/src/production/ic_launcher-playstore.png b/android/app/src/production/ic_launcher-playstore.png new file mode 100644 index 00000000..8c9490fb Binary files /dev/null and b/android/app/src/production/ic_launcher-playstore.png differ diff --git a/android/app/src/production/res/drawable-hdpi/ic_notification.png b/android/app/src/production/res/drawable-hdpi/ic_notification.png new file mode 100644 index 00000000..59bd9b46 Binary files /dev/null and b/android/app/src/production/res/drawable-hdpi/ic_notification.png differ diff --git a/android/app/src/production/res/drawable-mdpi/ic_notification.png b/android/app/src/production/res/drawable-mdpi/ic_notification.png new file mode 100644 index 00000000..6f91752d Binary files /dev/null and b/android/app/src/production/res/drawable-mdpi/ic_notification.png differ diff --git a/android/app/src/production/res/drawable-xhdpi/ic_notification.png b/android/app/src/production/res/drawable-xhdpi/ic_notification.png new file mode 100644 index 00000000..1d0a437b Binary files /dev/null and b/android/app/src/production/res/drawable-xhdpi/ic_notification.png differ diff --git a/android/app/src/production/res/drawable-xxhdpi/ic_notification.png b/android/app/src/production/res/drawable-xxhdpi/ic_notification.png new file mode 100644 index 00000000..41785386 Binary files /dev/null and b/android/app/src/production/res/drawable-xxhdpi/ic_notification.png differ diff --git a/android/app/src/production/res/drawable-xxxhdpi/ic_notification.png b/android/app/src/production/res/drawable-xxxhdpi/ic_notification.png new file mode 100644 index 00000000..fc1aa37b Binary files /dev/null and b/android/app/src/production/res/drawable-xxxhdpi/ic_notification.png differ diff --git a/android/app/src/production/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/production/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..71547337 --- /dev/null +++ b/android/app/src/production/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/android/app/src/production/res/mipmap-hdpi/ic_launcher.png b/android/app/src/production/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..7d20580e Binary files /dev/null and b/android/app/src/production/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/production/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/production/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..27f9d10c Binary files /dev/null and b/android/app/src/production/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/production/res/mipmap-hdpi/ic_launcher_monochrome.png b/android/app/src/production/res/mipmap-hdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..0f00592b Binary files /dev/null and b/android/app/src/production/res/mipmap-hdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/production/res/mipmap-mdpi/ic_launcher.png b/android/app/src/production/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..04ef3080 Binary files /dev/null and b/android/app/src/production/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/production/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/production/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..e8c69391 Binary files /dev/null and b/android/app/src/production/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/production/res/mipmap-mdpi/ic_launcher_monochrome.png b/android/app/src/production/res/mipmap-mdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..a5598665 Binary files /dev/null and b/android/app/src/production/res/mipmap-mdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/production/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/production/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..03e68cd4 Binary files /dev/null and b/android/app/src/production/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/production/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/production/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..4c67c8b5 Binary files /dev/null and b/android/app/src/production/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/production/res/mipmap-xhdpi/ic_launcher_monochrome.png b/android/app/src/production/res/mipmap-xhdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..271201c4 Binary files /dev/null and b/android/app/src/production/res/mipmap-xhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/production/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/production/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..438a6cd5 Binary files /dev/null and b/android/app/src/production/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/production/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/production/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..1e555af2 Binary files /dev/null and b/android/app/src/production/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/production/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/android/app/src/production/res/mipmap-xxhdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..e9bc336f Binary files /dev/null and b/android/app/src/production/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/production/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/production/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..fa7e110b Binary files /dev/null and b/android/app/src/production/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/production/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/production/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..5134d01f Binary files /dev/null and b/android/app/src/production/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/production/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/production/res/mipmap-xxxhdpi/ic_launcher_monochrome.png new file mode 100644 index 00000000..45cbe4a9 Binary files /dev/null and b/android/app/src/production/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/production/res/values/colors.xml b/android/app/src/production/res/values/colors.xml new file mode 100644 index 00000000..6a5ebae6 --- /dev/null +++ b/android/app/src/production/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #FF3A2101 + diff --git a/android/build.gradle b/android/build.gradle index 7240bb65..18bbb21e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,6 +7,10 @@ allprojects { rootProject.buildDir = '../build' +buildscript { + ext.kotlin_version = '1.8.0' +} + //[Fixes AAPT: error: resource android:attr/lStar not found] subprojects { afterEvaluate { project -> diff --git a/icons/development/fladder_adaptive_icon.png b/icons/development/fladder_adaptive_icon.png new file mode 100644 index 00000000..f6d29eb2 Binary files /dev/null and b/icons/development/fladder_adaptive_icon.png differ diff --git a/icons/development/fladder_icon.png b/icons/development/fladder_icon.png new file mode 100644 index 00000000..770b30e8 Binary files /dev/null and b/icons/development/fladder_icon.png differ diff --git a/icons/development/fladder_icon_desktop.png b/icons/development/fladder_icon_desktop.png new file mode 100644 index 00000000..491824e0 Binary files /dev/null and b/icons/development/fladder_icon_desktop.png differ diff --git a/icons/development/fladder_macos_icon.png b/icons/development/fladder_macos_icon.png new file mode 100644 index 00000000..68d9dc0c Binary files /dev/null and b/icons/development/fladder_macos_icon.png differ diff --git a/icons/development/fladder_store_icon.jpg b/icons/development/fladder_store_icon.jpg new file mode 100644 index 00000000..34f221d4 Binary files /dev/null and b/icons/development/fladder_store_icon.jpg differ diff --git a/icons/fladder_icon.afphoto b/icons/fladder_icon.afphoto new file mode 100644 index 00000000..05a86d32 Binary files /dev/null and b/icons/fladder_icon.afphoto differ diff --git a/icons/macos_icon.afphoto b/icons/macos_icon.afphoto deleted file mode 100644 index d10d05eb..00000000 Binary files a/icons/macos_icon.afphoto and /dev/null differ diff --git a/icons/fladder_adaptive_icon.png b/icons/production/fladder_adaptive_icon.png similarity index 100% rename from icons/fladder_adaptive_icon.png rename to icons/production/fladder_adaptive_icon.png diff --git a/icons/fladder_icon.png b/icons/production/fladder_icon.png similarity index 100% rename from icons/fladder_icon.png rename to icons/production/fladder_icon.png diff --git a/icons/fladder_icon_desktop.png b/icons/production/fladder_icon_desktop.png similarity index 100% rename from icons/fladder_icon_desktop.png rename to icons/production/fladder_icon_desktop.png diff --git a/icons/fladder_macos_icon.png b/icons/production/fladder_macos_icon.png similarity index 100% rename from icons/fladder_macos_icon.png rename to icons/production/fladder_macos_icon.png diff --git a/icons/fladder_store_icon.jpg b/icons/production/fladder_store_icon.jpg similarity index 100% rename from icons/fladder_store_icon.jpg rename to icons/production/fladder_store_icon.jpg diff --git a/icons_launcher-development.yaml b/icons_launcher-development.yaml new file mode 100644 index 00000000..51b43a32 --- /dev/null +++ b/icons_launcher-development.yaml @@ -0,0 +1,24 @@ +icons_launcher: + image_path: "icons/development/fladder_icon.png" + platforms: + android: + adaptive_foreground_image: "icons/development/fladder_icon.png" + adaptive_background_color: "#21013a" + adaptive_monochrome_image: "icons/development/fladder_adaptive_icon.png" + notification_image: icons/fladder_notification_icon.png + enable: true + ios: + image_path: "icons/development/fladder_store_icon.jpg" + enable: true + windows: + image_path: "icons/development/fladder_icon_desktop.png" + enable: true + macos: + image_path: "icons/development/fladder_macos_icon.png" + enable: true + linux: + image_path: "icons/development/fladder_icon_desktop.png" + enable: true + web: + favicon_path: "icons/development/fladder_icon_desktop.png" + enable: true diff --git a/icons_launcher-production.yaml b/icons_launcher-production.yaml new file mode 100644 index 00000000..ebe5b099 --- /dev/null +++ b/icons_launcher-production.yaml @@ -0,0 +1,24 @@ +icons_launcher: + image_path: "icons/production/fladder_icon.png" + platforms: + android: + adaptive_foreground_image: "icons/production/fladder_icon.png" + adaptive_background_color: "#3a2101" + adaptive_monochrome_image: "icons/production/fladder_adaptive_icon.png" + notification_image: icons/fladder_notification_icon.png + enable: true + ios: + image_path: "icons/production/fladder_store_icon.jpg" + enable: true + windows: + image_path: "icons/production/fladder_icon_desktop.png" + enable: true + macos: + image_path: "icons/production/fladder_macos_icon.png" + enable: true + linux: + image_path: "icons/production/fladder_icon_desktop.png" + enable: true + web: + favicon_path: "icons/production/fladder_icon_desktop.png" + enable: true diff --git a/icons_launcher.yaml b/icons_launcher.yaml deleted file mode 100644 index ccf210a1..00000000 --- a/icons_launcher.yaml +++ /dev/null @@ -1,24 +0,0 @@ -icons_launcher: - image_path: "icons/fladder_icon.png" - platforms: - android: - adaptive_foreground_image: "icons/fladder_icon.png" - adaptive_background_color: "#3a2101" - adaptive_monochrome_image: "icons/fladder_adaptive_icon.png" - notification_image: icons/fladder_notification_icon.png - enable: true - ios: - image_path: "icons/fladder_store_icon.jpg" - enable: true - windows: - image_path: "icons/fladder_icon_desktop.png" - enable: true - macos: - image_path: "icons/fladder_macos_icon.png" - enable: true - linux: - image_path: "icons/fladder_icon_desktop.png" - enable: true - web: - favicon_path: "icons/fladder_icon_desktop.png" - enable: true diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Contents.json new file mode 100644 index 00000000..d8073053 --- /dev/null +++ b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Contents.json @@ -0,0 +1,120 @@ +{ + "images": [ + { + "filename": "Icon-App-20x20@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "20x20", + "platform": "ios" + }, + { + "filename": "Icon-App-20x20@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "20x20", + "platform": "ios" + }, + { + "filename": "Icon-App-29x29@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "29x29", + "platform": "ios" + }, + { + "filename": "Icon-App-29x29@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "29x29", + "platform": "ios" + }, + { + "filename": "Icon-App-38x38@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "38x38", + "platform": "ios" + }, + { + "filename": "Icon-App-38x38@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "38x38", + "platform": "ios" + }, + { + "filename": "Icon-App-40x40@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "40x40", + "platform": "ios" + }, + { + "filename": "Icon-App-40x40@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "40x40", + "platform": "ios" + }, + { + "filename": "Icon-App-60x60@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "60x60", + "platform": "ios" + }, + { + "filename": "Icon-App-60x60@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "60x60", + "platform": "ios" + }, + { + "filename": "Icon-App-64x64@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "64x64", + "platform": "ios" + }, + { + "filename": "Icon-App-64x64@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "64x64", + "platform": "ios" + }, + { + "filename": "Icon-App-68x68@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "68x68", + "platform": "ios" + }, + { + "filename": "Icon-App-76x76@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "76x76", + "platform": "ios" + }, + { + "filename": "Icon-App-83.5x83.5@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "83.5x83.5", + "platform": "ios" + }, + { + "filename": "Icon-App-1024x1024@1x.png", + "idiom": "universal", + "scale": "1x", + "size": "1024x1024", + "platform": "ios" + } + ], + "info": { + "author": "icons_launcher", + "version": 1 + } +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 00000000..bebe0fe0 Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 00000000..26072e3e Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 00000000..17a02d8f Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 00000000..61829c8d Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 00000000..7d58ccfb Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-38x38@2x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-38x38@2x.png new file mode 100644 index 00000000..97563580 Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-38x38@2x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-38x38@3x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-38x38@3x.png new file mode 100644 index 00000000..b5cd02dc Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-38x38@3x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 00000000..78733e87 Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 00000000..b9080c70 Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 00000000..b9080c70 Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 00000000..bd673d55 Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-64x64@2x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-64x64@2x.png new file mode 100644 index 00000000..2f544dc1 Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-64x64@2x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-64x64@3x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-64x64@3x.png new file mode 100644 index 00000000..8fe7c8aa Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-64x64@3x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-68x68@2x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-68x68@2x.png new file mode 100644 index 00000000..c929611f Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-68x68@2x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 00000000..24954eb2 Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 00000000..97a083c2 Binary files /dev/null and b/ios/Runner/Assets.xcassets/developmentAppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Contents.json new file mode 100644 index 00000000..d8073053 --- /dev/null +++ b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Contents.json @@ -0,0 +1,120 @@ +{ + "images": [ + { + "filename": "Icon-App-20x20@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "20x20", + "platform": "ios" + }, + { + "filename": "Icon-App-20x20@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "20x20", + "platform": "ios" + }, + { + "filename": "Icon-App-29x29@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "29x29", + "platform": "ios" + }, + { + "filename": "Icon-App-29x29@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "29x29", + "platform": "ios" + }, + { + "filename": "Icon-App-38x38@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "38x38", + "platform": "ios" + }, + { + "filename": "Icon-App-38x38@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "38x38", + "platform": "ios" + }, + { + "filename": "Icon-App-40x40@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "40x40", + "platform": "ios" + }, + { + "filename": "Icon-App-40x40@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "40x40", + "platform": "ios" + }, + { + "filename": "Icon-App-60x60@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "60x60", + "platform": "ios" + }, + { + "filename": "Icon-App-60x60@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "60x60", + "platform": "ios" + }, + { + "filename": "Icon-App-64x64@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "64x64", + "platform": "ios" + }, + { + "filename": "Icon-App-64x64@3x.png", + "idiom": "universal", + "scale": "3x", + "size": "64x64", + "platform": "ios" + }, + { + "filename": "Icon-App-68x68@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "68x68", + "platform": "ios" + }, + { + "filename": "Icon-App-76x76@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "76x76", + "platform": "ios" + }, + { + "filename": "Icon-App-83.5x83.5@2x.png", + "idiom": "universal", + "scale": "2x", + "size": "83.5x83.5", + "platform": "ios" + }, + { + "filename": "Icon-App-1024x1024@1x.png", + "idiom": "universal", + "scale": "1x", + "size": "1024x1024", + "platform": "ios" + } + ], + "info": { + "author": "icons_launcher", + "version": 1 + } +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 00000000..c7f594cb Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 00000000..9357ee97 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 00000000..844df5a2 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 00000000..0b57ede1 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 00000000..8663b7fe Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-38x38@2x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-38x38@2x.png new file mode 100644 index 00000000..774da540 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-38x38@2x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-38x38@3x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-38x38@3x.png new file mode 100644 index 00000000..03f0bd0d Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-38x38@3x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 00000000..25fe4888 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 00000000..356a2ec6 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 00000000..356a2ec6 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 00000000..8cbba147 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-64x64@2x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-64x64@2x.png new file mode 100644 index 00000000..0dbdd223 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-64x64@2x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-64x64@3x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-64x64@3x.png new file mode 100644 index 00000000..499f1693 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-64x64@3x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-68x68@2x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-68x68@2x.png new file mode 100644 index 00000000..c022900e Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-68x68@2x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 00000000..94508fa4 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 00000000..38aa6058 Binary files /dev/null and b/ios/Runner/Assets.xcassets/productionAppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/lib/util/custom_color_themes.dart b/lib/util/custom_color_themes.dart index 9672bd1a..3c3fbad8 100644 --- a/lib/util/custom_color_themes.dart +++ b/lib/util/custom_color_themes.dart @@ -1,9 +1,10 @@ +import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; enum ColorThemes { fladder( name: 'Fladder', - color: Colors.orange, + color: kDebugMode ? Colors.purpleAccent : Colors.orange, ), deepOrange( name: 'Deep Orange',