diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index e3e7e7a31..d4753596d 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -58,9 +58,7 @@ jobs: with: flutter-version-file: .tool_versions.yaml cache: true - - uses: moonrepo/setup-rust@v1 - with: - cache: true + - uses: dtolnay/rust-toolchain@stable - name: Cache Gradle uses: actions/cache@v5 with: @@ -86,7 +84,7 @@ jobs: with: flutter-version-file: .tool_versions.yaml cache: true - - uses: moonrepo/setup-rust@v1 + - uses: dtolnay/rust-toolchain@stable - run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - run: flutter pub get - name: Prepare web @@ -113,7 +111,7 @@ jobs: run: | git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git ./flutter/bin/flutter doctor - - uses: moonrepo/setup-rust@v1 + - uses: dtolnay/rust-toolchain@stable - run: ./flutter/bin/flutter pub get - run: ./flutter/bin/flutter build linux --target-platform linux-${{ matrix.arch }} @@ -129,7 +127,7 @@ jobs: - name: Use specific XCode version run: sudo xcode-select --switch /Applications/Xcode_26.3.app - run: brew install sqlcipher - - uses: moonrepo/setup-rust@v1 + - uses: dtolnay/rust-toolchain@stable - run: ./scripts/add-firebase-messaging.sh - run: flutter pub get - run: flutter build ios --no-codesign @@ -193,9 +191,7 @@ jobs: with: flutter-version-file: .tool_versions.yaml cache: true - - uses: moonrepo/setup-rust@v1 - with: - cache: true + - uses: dtolnay/rust-toolchain@stable - name: Cache Gradle uses: actions/cache@v5 with: diff --git a/.github/workflows/main_deploy.yaml b/.github/workflows/main_deploy.yaml index a6ccda28d..8d6482b66 100644 --- a/.github/workflows/main_deploy.yaml +++ b/.github/workflows/main_deploy.yaml @@ -18,7 +18,7 @@ jobs: - uses: subosito/flutter-action@v2 with: flutter-version-file: .tool_versions.yaml - - uses: moonrepo/setup-rust@v1 + - uses: dtolnay/rust-toolchain@stable - run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - name: Prepare web run: ./scripts/prepare-web.sh @@ -48,7 +48,7 @@ jobs: with: ruby-version: '3.3' - uses: ./.github/actions/free_up_space - - uses: moonrepo/setup-rust@v1 + - uses: dtolnay/rust-toolchain@stable - name: Install Fastlane run: gem install fastlane -NV - name: Add Firebase Messaging diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 133f099c1..2cc3338b3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: with: flutter-version-file: .tool_versions.yaml cache: true - - uses: moonrepo/setup-rust@v1 + - uses: dtolnay/rust-toolchain@stable - run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - run: flutter pub get - name: Prepare web @@ -87,7 +87,10 @@ jobs: echo '${{secrets.GOOGLE_SERVICES_JSON}}' | base64 -d > android/app/google-services.json ./scripts/add-firebase-messaging.sh - uses: ./.github/actions/free_up_space - - uses: moonrepo/setup-rust@v1 + - uses: dtolnay/rust-toolchain@stable + - name: Install Fastlane + working-directory: android + run: gem install fastlane -NV - run: flutter pub get - name: Prepare Android Release Build env: @@ -120,7 +123,7 @@ jobs: run: | git clone --branch ${{ env.FLUTTER_VERSION }} https://github.com/flutter/flutter.git ./flutter/bin/flutter doctor - - uses: moonrepo/setup-rust@v1 + - uses: dtolnay/rust-toolchain@stable - run: ./flutter/bin/flutter pub get - run: ./flutter/bin/flutter build linux --target-platform linux-${{ matrix.arch }} - name: Create archive @@ -148,7 +151,7 @@ jobs: with: ruby-version: '3.3' - uses: ./.github/actions/free_up_space - - uses: moonrepo/setup-rust@v1 + - uses: dtolnay/rust-toolchain@stable - name: Install Fastlane working-directory: android run: gem install fastlane -NV diff --git a/LICENSES/LicenseRef-AllRightsReserved.txt b/LICENSES/LicenseRef-AllRightsReserved.txt new file mode 100644 index 000000000..e69ee3560 --- /dev/null +++ b/LICENSES/LicenseRef-AllRightsReserved.txt @@ -0,0 +1,3 @@ +All rights reserved. + +This file/artwork is proprietary and confidential. No part of this media may be reproduced, distributed, or transmitted in any form or by any means, including photocopying, recording, or other electronic or mechanical methods, without the prior written permission of the copyright holder, except in the case of brief quotations embodied in critical reviews and certain other noncommercial uses permitted by copyright law. \ No newline at end of file diff --git a/REUSE.toml b/REUSE.toml index 9f795e8ff..2a5033587 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -49,18 +49,15 @@ SPDX-License-Identifier = "Apache-2.0" # App Logo [[annotations]] path = [ - "assets/*.png", - "assets/*.svg", + "assets/logo/**", "android/app/src/main/res/mipmap**/**", "ios/Runner/Assets.xcassets/AppIcon.appiconset/**", "macos/Runner/Assets.xcassets/AppIcon.appiconset/**", "web/icons/**", "web/splash/**", - "web/favicon.png", - "linux/flutter/assets/**", - "snap/gui/fluffychat.png", - "windows/runner/resources/**" + "snap/gui/*.png", + "windows/runner/resources/app_icon.ico" ] precedence = "aggregate" -SPDX-FileCopyrightText = "2019-Present Fabimayada" -SPDX-License-Identifier = "CC-BY-4.0" \ No newline at end of file +SPDX-FileCopyrightText = "2019-Present Christian Kußowski" +SPDX-License-Identifier = "LicenseRef-AllRightsReserved" \ No newline at end of file diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png new file mode 100644 index 000000000..12a3a36de Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..8f8ea3340 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_monochrome.png new file mode 100644 index 000000000..8f8ea3340 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/drawable-hdpi/notifications_icon.png b/android/app/src/main/res/drawable-hdpi/notifications_icon.png index 3ff16e6d2..8390615d2 100644 Binary files a/android/app/src/main/res/drawable-hdpi/notifications_icon.png and b/android/app/src/main/res/drawable-hdpi/notifications_icon.png differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png new file mode 100644 index 000000000..a4095eb8b Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..c2d88839f Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_monochrome.png new file mode 100644 index 000000000..c2d88839f Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/drawable-mdpi/notifications_icon.png b/android/app/src/main/res/drawable-mdpi/notifications_icon.png index eb0c4a031..d4c0de5fd 100644 Binary files a/android/app/src/main/res/drawable-mdpi/notifications_icon.png and b/android/app/src/main/res/drawable-mdpi/notifications_icon.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png new file mode 100644 index 000000000..87a6df475 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..c5117e9ae Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_monochrome.png new file mode 100644 index 000000000..c5117e9ae Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/notifications_icon.png b/android/app/src/main/res/drawable-xhdpi/notifications_icon.png index 723304216..5839ba7c3 100644 Binary files a/android/app/src/main/res/drawable-xhdpi/notifications_icon.png and b/android/app/src/main/res/drawable-xhdpi/notifications_icon.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png new file mode 100644 index 000000000..8e226b329 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..6bfdc7e99 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_monochrome.png new file mode 100644 index 000000000..6bfdc7e99 Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/notifications_icon.png b/android/app/src/main/res/drawable-xxhdpi/notifications_icon.png index 489b245d9..482c2c8b0 100644 Binary files a/android/app/src/main/res/drawable-xxhdpi/notifications_icon.png and b/android/app/src/main/res/drawable-xxhdpi/notifications_icon.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png new file mode 100644 index 000000000..e317e4b6a Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..9da83b8cf Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_monochrome.png new file mode 100644 index 000000000..9da83b8cf Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/notifications_icon.png b/android/app/src/main/res/drawable-xxxhdpi/notifications_icon.png index fcd0f6e4a..b73d5f6f6 100644 Binary files a/android/app/src/main/res/drawable-xxxhdpi/notifications_icon.png and b/android/app/src/main/res/drawable-xxxhdpi/notifications_icon.png differ diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 1084c2408..01213857f 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,14 @@ - - - - \ No newline at end of file + + + + + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 54dd74b56..7e9752bce 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 6fc0dcbfb..5caf30fd8 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index dd6dcadac..e481598db 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index ea5d85515..e51843a13 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 8d4f59224..c3d82b4ac 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/assets/banner.png b/assets/banner.png deleted file mode 100644 index d85c89728..000000000 Binary files a/assets/banner.png and /dev/null differ diff --git a/assets/banner_transparent.png b/assets/banner_transparent.png deleted file mode 100644 index 7e576c6f4..000000000 Binary files a/assets/banner_transparent.png and /dev/null differ diff --git a/assets/favicon.png b/assets/favicon.png deleted file mode 100644 index d55415b19..000000000 Binary files a/assets/favicon.png and /dev/null differ diff --git a/assets/info-logo.png b/assets/info-logo.png deleted file mode 100644 index ceb42f09b..000000000 Binary files a/assets/info-logo.png and /dev/null differ diff --git a/assets/logo.png b/assets/logo.png deleted file mode 100644 index 7a46e62c3..000000000 Binary files a/assets/logo.png and /dev/null differ diff --git a/assets/logo.svg b/assets/logo.svg deleted file mode 100644 index a3a951645..000000000 --- a/assets/logo.svg +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/assets/logo/img/logo.png b/assets/logo/img/logo.png new file mode 100644 index 000000000..54c978f4e Binary files /dev/null and b/assets/logo/img/logo.png differ diff --git a/assets/logo/img/logo_background.png b/assets/logo/img/logo_background.png new file mode 100644 index 000000000..47d3aa4fa Binary files /dev/null and b/assets/logo/img/logo_background.png differ diff --git a/assets/logo/img/logo_favicon.png b/assets/logo/img/logo_favicon.png new file mode 100644 index 000000000..5172b2aec Binary files /dev/null and b/assets/logo/img/logo_favicon.png differ diff --git a/assets/logo/img/logo_font.png b/assets/logo/img/logo_font.png new file mode 100644 index 000000000..0daf28a74 Binary files /dev/null and b/assets/logo/img/logo_font.png differ diff --git a/assets/logo/img/logo_mono.png b/assets/logo/img/logo_mono.png new file mode 100644 index 000000000..f3b6a15df Binary files /dev/null and b/assets/logo/img/logo_mono.png differ diff --git a/assets/logo/img/logo_standalone.png b/assets/logo/img/logo_standalone.png new file mode 100644 index 000000000..ff6622a0a Binary files /dev/null and b/assets/logo/img/logo_standalone.png differ diff --git a/assets/logo/vector/logo.svg b/assets/logo/vector/logo.svg new file mode 100644 index 000000000..87fef5f89 --- /dev/null +++ b/assets/logo/vector/logo.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/assets/logo/vector/logo_background.svg b/assets/logo/vector/logo_background.svg new file mode 100644 index 000000000..57e072824 --- /dev/null +++ b/assets/logo/vector/logo_background.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/assets/logo/vector/logo_favicon.svg b/assets/logo/vector/logo_favicon.svg new file mode 100644 index 000000000..f40114463 --- /dev/null +++ b/assets/logo/vector/logo_favicon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/assets/logo/vector/logo_mono.svg b/assets/logo/vector/logo_mono.svg new file mode 100644 index 000000000..e7b4a0827 --- /dev/null +++ b/assets/logo/vector/logo_mono.svg @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/assets/logo/vector/logo_standalone.svg b/assets/logo/vector/logo_standalone.svg new file mode 100644 index 000000000..d27126d0e --- /dev/null +++ b/assets/logo/vector/logo_standalone.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/assets/logo_transparent.png b/assets/logo_transparent.png deleted file mode 100644 index 5c0b08391..000000000 Binary files a/assets/logo_transparent.png and /dev/null differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 53408ef6a..8ad34b547 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -919,7 +919,7 @@ C146955A2E642D400075F2F7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_OBJC_WEAK = YES; @@ -961,7 +961,7 @@ C146955B2E642D400075F2F7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_OBJC_WEAK = YES; @@ -1000,7 +1000,7 @@ C146955C2E642D400075F2F7 /* Profile */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_OBJC_WEAK = YES; diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index d36b1fab2..d0d98aa17 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,122 +1 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} +{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index fb1434bfe..51e91be93 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index c1316a046..9be8607dc 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index 614e86e70..32136fea8 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index 6470c4af2..48e0987d0 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index 67e871887..ae238201f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index 82f590cb4..ad5b0817c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 82e64450f..feb3325ec 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index 614e86e70..32136fea8 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 4cea61db8..356c3a7f7 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index a526a33e4..3d74dd2b0 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png index bbf764529..81d1b3fd8 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png index cd6906568..e83e9108f 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png index f3dd408e3..ed852b48b 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png index 37766e74a..e5154bca4 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index a526a33e4..3d74dd2b0 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index a21531ac0..61079d08c 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png index 477aa9700..7e9752bce 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png index 9d3aaf7db..e51843a13 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index f02c1af0d..45a3c41d9 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index ba0bc949a..a9cb56d68 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index 93bc65236..99ba0562d 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json deleted file mode 100644 index fa3132785..000000000 --- a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "images" : [ - { - "filename" : "background.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "darkbackground.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - }, - { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png deleted file mode 100644 index e29b3b59f..000000000 Binary files a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/background.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png b/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png deleted file mode 100644 index 1b5df34e7..000000000 Binary files a/ios/Runner/Assets.xcassets/LaunchBackground.imageset/darkbackground.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json index 00cabce83..0bedcf2fd 100644 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -1,23 +1,23 @@ { "images" : [ { - "filename" : "LaunchImage.png", "idiom" : "universal", + "filename" : "LaunchImage.png", "scale" : "1x" }, { - "filename" : "LaunchImage@2x.png", "idiom" : "universal", + "filename" : "LaunchImage@2x.png", "scale" : "2x" }, { - "filename" : "LaunchImage@3x.png", "idiom" : "universal", + "filename" : "LaunchImage@3x.png", "scale" : "3x" } ], "info" : { - "author" : "xcode", - "version" : 1 + "version" : 1, + "author" : "xcode" } } diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png index f4c0bdb92..9da19eaca 100644 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png index dafa3b707..9da19eaca 100644 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png index b627f5280..9da19eaca 100644 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard index fdc5a5e56..f2e259c7c 100644 --- a/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -16,19 +16,13 @@ - - + + - - - - - - - - + + @@ -38,7 +32,6 @@ - - + - \ No newline at end of file + diff --git a/lib/config/app_config.dart b/lib/config/app_config.dart index 72ce40219..f8a9be8dc 100644 --- a/lib/config/app_config.dart +++ b/lib/config/app_config.dart @@ -6,10 +6,7 @@ import 'dart:ui'; abstract class AppConfig { - // Const and final configuration values (immutable) - static const Color primaryColor = Color(0xFF5625BA); - static const Color primaryColorLight = Color(0xFFCCBDEA); - static const Color secondaryColor = Color(0xFF41a2bc); + static const Color primaryColor = Color(0xFF41a2bc); static const Color chatColor = primaryColor; static const double messageFontSize = 16.0; diff --git a/lib/config/themes.dart b/lib/config/themes.dart index dfdedec7e..6193a47a3 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -48,6 +48,7 @@ abstract class FluffyThemes { final colorScheme = ColorScheme.fromSeed( brightness: brightness, seedColor: seed ?? Color(AppSettings.colorSchemeSeedInt.value), + dynamicSchemeVariant: DynamicSchemeVariant.rainbow, ); final isColumnMode = FluffyThemes.isColumnMode(context); return ThemeData( diff --git a/lib/l10n/intl_be.arb b/lib/l10n/intl_be.arb index 7e2321ee6..6f559d147 100644 --- a/lib/l10n/intl_be.arb +++ b/lib/l10n/intl_be.arb @@ -2716,7 +2716,6 @@ "createNewAccount": "Стварыць новы ўліковы запіс", "signUpGreeting": "FluffyChat дэцэнтралізаваны! Выберыце свой сервер, дзе вы хаціце стварыць уліковы запіс і прайягвайце!", "signInGreeting": "Вы ўжо маеце ўліковы запіс у Matrix? З вяртаннем! Выберыце свой хатні сервер і аўтарызуйцеся.", - "appIntro": "З дапамогай FluffyChat вы можаце размаўляць з вашымі сябрамі. Гэта бяспечны дэцэнтралізаваны [matrix] мэнэджэр! Даведайцеся больш на https://matrix.org, калі хаціце ці проста ўвайдзіце.", "theProcessWasCanceled": "Працэс быў скасаваны.", "join": "Далучыцца", "searchOrEnterHomeserverAddress": "Пашукайце ці ўвядзіце адрас хатняга сервера", diff --git a/lib/l10n/intl_ca.arb b/lib/l10n/intl_ca.arb index a68ae02dd..4f41f2670 100644 --- a/lib/l10n/intl_ca.arb +++ b/lib/l10n/intl_ca.arb @@ -2728,7 +2728,6 @@ "createNewAccount": "Crea un compte nou", "signUpGreeting": "El FluffyChat és descentralitzat! Tria un servidor on vulguis crear-t'hi un compte, i som-hi!", "signInGreeting": "Si ja tens un compte a Matrix, benvingudi! Tria el teu servidor i inicia-hi sessió.", - "appIntro": "Pots xatejar amb lis tevis amiguis amb Fluffychat. És una app de missatgeria [matrix] descentralitzada! Llegeix-ne més a https://matrix.org si vols, o inicia sessió.", "theProcessWasCanceled": "S'ha canceŀlat el procés.", "join": "Entra", "searchOrEnterHomeserverAddress": "Cerca o introdueix l'adreça del teu servidor", diff --git a/lib/l10n/intl_cs.arb b/lib/l10n/intl_cs.arb index e089c495b..c034f7f51 100644 --- a/lib/l10n/intl_cs.arb +++ b/lib/l10n/intl_cs.arb @@ -2576,7 +2576,6 @@ "createNewAccount": "Vytvořit nový účet", "signUpGreeting": "FluffyChat je decentralizovaný! Vyberte server, kde si chcete vytvořit účet, a jdeme na věc!", "signInGreeting": "Již máte účet na Matrixu? Vítejte zpět! Vyberte svůj domácí server a přihlaste se.", - "appIntro": "S FluffyChatem můžeme chatovat s přáteli. Je to decentralizovaná chatovací aplikace pro [matrix]! Zjistěte více na https://matrix.org nebo se zaregistrujte.", "theProcessWasCanceled": "Proces byl zrušen.", "sendImages": "Poslat {count} obrazků", "@sendImages": { diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb index 765d27d4e..540986acb 100644 --- a/lib/l10n/intl_de.arb +++ b/lib/l10n/intl_de.arb @@ -2735,7 +2735,6 @@ "createNewAccount": "Neues Konto erstellen", "signUpGreeting": "FluffyChat ist dezentral! Wähle einen Server, auf dem du dein Konto erstellen möchtest, und los geht's!", "signInGreeting": "Du hast bereits ein Konto bei Matrix? Willkommen zurück! Wähle deinen Homeserver aus und melde dich an.", - "appIntro": "Mit FluffyChat kannst du mit deinen Freunden chatten. Es ist ein sicherer, dezentralisierter [Matrix]-Messenger! Erfahre mehr auf https://matrix.org wenn du möchtest, oder melde dich einfach an.", "theProcessWasCanceled": "Der Vorgang wurde abgebrochen.", "federationBaseUrl": "Basis-URL der Föderation", "clientWellKnownInformation": "Bekannte Informationen zum Client:", diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 495d17286..85c59f068 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -2723,7 +2723,6 @@ "createNewAccount": "Create new account", "signUpGreeting": "FluffyChat is decentralized! Select a server where you want to create your account and let's go!", "signInGreeting": "You already have an account in Matrix? Welcome back! Select your homeserver and sign in.", - "appIntro": "With FluffyChat you can chat with your friends. It's a secure decentralized [matrix] messenger! Learn more on https://matrix.org if you like or just sign up.", "theProcessWasCanceled": "The process was canceled.", "join": "Join", "searchOrEnterHomeserverAddress": "Search or enter homeserver address", @@ -2761,5 +2760,7 @@ "createNewTag": "Create new tag", "hideRoomsInSpaces": "Hide rooms that are in a space", "possibleByYou": "This release was only possible thanks to your support. FluffyChat remains free, open-source, and entirely community-driven.", - "showThumbnailsInTimeline": "Show thumbnails of images and videos" + "showThumbnailsInTimeline": "Show thumbnails of images and videos", + "appSubtitle": "Secure [matrix] Communication", + "appDescription": "Communicate encrypted over the decentralized [matrix] network in an easy and accessible way for everyone." } \ No newline at end of file diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb index 7cf665cf2..1217d5bd9 100644 --- a/lib/l10n/intl_es.arb +++ b/lib/l10n/intl_es.arb @@ -2737,7 +2737,6 @@ "createNewAccount": "Crear nueva cuenta", "signUpGreeting": "¡FluffyChat está descentralizado! ¡Selecciona un servidor donde quieres crear tu cuenta y sigamos!", "signInGreeting": "¿Ya tienes una cuenta en Matrix? ¡Bienvenido de nuevo! Selecciona tu servidor e inicia sesión.", - "appIntro": "Con FluffyChat puedes hablar con tus amigos ¡Es un sistema de mensajería de [matrix] seguro y descentralizado! Aprende más en https://matrix.org si quieres o simplemente inicia sesión.", "theProcessWasCanceled": "El proceso se ha cancelado.", "join": "Unirse", "searchOrEnterHomeserverAddress": "Buscar o pon la dirección de tu servidor local", diff --git a/lib/l10n/intl_et.arb b/lib/l10n/intl_et.arb index dbf2cedb5..a39d7c801 100644 --- a/lib/l10n/intl_et.arb +++ b/lib/l10n/intl_et.arb @@ -2729,7 +2729,6 @@ "createNewAccount": "Loo uus kasutajakonto", "signUpGreeting": "FluffyChat kasutab hajutatud võrku! Vali server, kuhu tahad oma kasutajakonto lisada ning alustame!", "signInGreeting": "Sul juba on Matrixi kasutajakonto olemas? Tere tulemast tagasi! Vali oma koduserver ja logi sisse.", - "appIntro": "FluffyChati abil saad suhelda oma sõpradega. See on turvaline ja hajutatud sõnumiklient [matrix]-i võrgus! Lisateavet leiad https://matrix.org saidist või lihtsalt liitu.", "theProcessWasCanceled": "Protsess on katkestatud.", "join": "Liitu", "searchOrEnterHomeserverAddress": "Otsi koduserveri aadressi või sisesta see", diff --git a/lib/l10n/intl_eu.arb b/lib/l10n/intl_eu.arb index 9337a66f8..753d6d6db 100644 --- a/lib/l10n/intl_eu.arb +++ b/lib/l10n/intl_eu.arb @@ -2729,7 +2729,6 @@ "createNewAccount": "Sortu kontu berria", "signUpGreeting": "FluffyChat deszentralizatua da! Hautatu zure kontua zein zerbitzaritan sortu nahi duzun, eta hasi erabiltzen!", "signInGreeting": "Baduzu dagoeneko Matrix kontu bat? Ongi etorri berriro ere! Hautatu zure zerbitzaria eta hasi saioa.", - "appIntro": "FluffyChat-i esker lagunekin txateatu dezakezu. [matrix]-erako mezularitza programa seguru eta deszentralizatua da! Nahi baduzu, irakurri gehiago https://matrix.org gunean, edo hasi saioa.", "theProcessWasCanceled": "Eragiketa bertan behera utzi da.", "join": "Batu", "searchOrEnterHomeserverAddress": "Bilatu edo sartu zerbitzariaren helbidea", diff --git a/lib/l10n/intl_fa.arb b/lib/l10n/intl_fa.arb index cd640503f..59557e544 100644 --- a/lib/l10n/intl_fa.arb +++ b/lib/l10n/intl_fa.arb @@ -2719,7 +2719,6 @@ "createNewAccount": "ساخت حساب جدید", "signUpGreeting": "فلافی چت غیرمتمرکز است! یک سرور که میخواهید در آن حسابتان را بسازید را انتخاب کنید و شروع کنید!", "signInGreeting": "از قبل در ماتریکس حساب کاربری دارید؟ خوش برگشتید! سرور خانه خود را انتخاب و لاگین کنید.", - "appIntro": "فلافی چت یک پیامرسان امن غیرمتمرکز ماتریکس است که با آن میتوانید با دوستانتان چت کنید! برای اطلاعات بیشتر میتوانید به https://matrix.org مراجعه کنید یا اینکه صرفا ثبت نام کنید.", "theProcessWasCanceled": "فرآیند لغو شد.", "join": "عضویت", "searchOrEnterHomeserverAddress": "جستجو یا وارد کردن آدرس سرور خانه", diff --git a/lib/l10n/intl_ga.arb b/lib/l10n/intl_ga.arb index 11b3fc526..6691b57b5 100644 --- a/lib/l10n/intl_ga.arb +++ b/lib/l10n/intl_ga.arb @@ -2735,7 +2735,6 @@ "createNewAccount": "Cruthaigh cuntas nua", "signUpGreeting": "Tá FluffyChat díláraithe! Roghnaigh freastalaí inar mian leat do chuntas a chruthú agus déanaimis é!", "signInGreeting": "An bhfuil cuntas agat i Matrix cheana féin? Fáilte ar ais! Roghnaigh do fhreastalaí baile agus sínigh isteach.", - "appIntro": "Le FluffyChat is féidir leat comhrá a dhéanamh le do chairde. Is teachtaire [maitrís] díláraithe slán é! Foghlaim tuilleadh ar https://matrix.org más maith leat nó cláraigh.", "theProcessWasCanceled": "Cuireadh an próiseas ar ceal.", "join": "Téigh i", "searchOrEnterHomeserverAddress": "Cuardaigh nó cuir isteach seoladh an fhreastalaí baile", diff --git a/lib/l10n/intl_gl.arb b/lib/l10n/intl_gl.arb index 32cae0628..ad739ca15 100644 --- a/lib/l10n/intl_gl.arb +++ b/lib/l10n/intl_gl.arb @@ -2729,7 +2729,6 @@ "createNewAccount": "Crear nova conta", "signUpGreeting": "FluffyChat é descentralizada! Elixe un servidor para crear a conta e xa podes utilizar a app!", "signInGreeting": "Xa tes unha conta en Matrix? Benvida! Selecciona o teu servidor de orixe e accede.", - "appIntro": "Con FluffyChat podes conversar coas amizades. É mensaxería segura e descentralizada en [matrix]! Coñece máis en https://matrix.org ou crea unha conta.", "theProcessWasCanceled": "Desbotouse o proceso.", "join": "Unirse", "searchOrEnterHomeserverAddress": "Busca ou escribe o enderezo do servidor de inicio", diff --git a/lib/l10n/intl_id.arb b/lib/l10n/intl_id.arb index 3be296152..c3e2830fd 100644 --- a/lib/l10n/intl_id.arb +++ b/lib/l10n/intl_id.arb @@ -2728,7 +2728,6 @@ "createNewAccount": "Buat akun baru", "signUpGreeting": "FluffyChat terdesentralisasi! Pilih server tempat Anda ingin membuat akun dan mari kita mulai!", "signInGreeting": "Anda sudah memiliki akun di Matrix? Selamat datang kembali! Pilih homeserver Anda dan masuk.", - "appIntro": "Dengan FluffyChat Anda dapat mengobrol dengan teman-teman Anda. Ini adalah messenger [matrix] terdesentralisasi yang aman! Pelajari lebih lanjut di https://matrix.org jika Anda suka atau cukup daftar.", "theProcessWasCanceled": "Proses dibatalkan.", "join": "Bergabung", "searchOrEnterHomeserverAddress": "Cari atau masukkan alamat homeserver", diff --git a/lib/l10n/intl_lv.arb b/lib/l10n/intl_lv.arb index cae1c044e..101192ad4 100644 --- a/lib/l10n/intl_lv.arb +++ b/lib/l10n/intl_lv.arb @@ -2712,6 +2712,5 @@ "signIn": "Pieteikties", "createNewAccount": "Izveidot jaunu kontu", "signUpGreeting": "FluffyChat ir decentralizēta. Jāatlasa serveris, kurā ir vēlēšanās izveidot savu kontu, un aiziet!", - "signInGreeting": "Jau ir Matrix konts? Laipni lūdzam atpakaļ! Jāatlasa savs mājasserveris un jāpiesakās.", - "appIntro": "Ar FluffyChat vari tērzēt ar saviem draugiem. Tā ir droša un decentralizēta [matrix] ziņapmaiņas lietotne. Vairāk var uzzināt https://matrix.org, ja ir vēlēšanās, vai vienkārši jāpiesakās." + "signInGreeting": "Jau ir Matrix konts? Laipni lūdzam atpakaļ! Jāatlasa savs mājasserveris un jāpiesakās." } \ No newline at end of file diff --git a/lib/l10n/intl_nb.arb b/lib/l10n/intl_nb.arb index f5c50cdd9..b38692e20 100644 --- a/lib/l10n/intl_nb.arb +++ b/lib/l10n/intl_nb.arb @@ -2736,7 +2736,6 @@ "createNewAccount": "Opprett ny konto", "signUpGreeting": "FluffyChat er desentralisert! Velg en server der du vil opprette kontoen din, så kjører vi på!", "signInGreeting": "Har du allerede en Matrix-konto? Velkommen tilbake! Velg hjemmeserveren din og logg inn.", - "appIntro": "Med FluffyChat kan du chatte med vennene dine. Det er en sikker, desentralisert [matrix]-meldingsapp! Les mer på https://matrix.org hvis du vil, eller bare registrer deg.", "theProcessWasCanceled": "Prosessen ble avbrutt.", "join": "Bli med", "searchOrEnterHomeserverAddress": "Søk eller angi adresse til hjemmeserver", diff --git a/lib/l10n/intl_nl.arb b/lib/l10n/intl_nl.arb index 9d90b0bb7..4c7b72df1 100644 --- a/lib/l10n/intl_nl.arb +++ b/lib/l10n/intl_nl.arb @@ -2728,7 +2728,6 @@ "createNewAccount": "Registreer nieuw account", "signUpGreeting": "FluffyChat is decentraal! Kies een server waar je wil voor jouw account en laten we gaan!", "signInGreeting": "Heb je al een Matrix account? Welkom terug! Kies jouw server en log in.", - "appIntro": "Met FluffyChat kan je chatten met je vrienden. Het is een veilige en decentrale [matrix] app! Lees meer op https://matrix.org als je wilt of kies registreren.", "theProcessWasCanceled": "Het proces is geannuleerd.", "join": "Deelnemen", "searchOrEnterHomeserverAddress": "Zoek of voer serveradres in", diff --git a/lib/l10n/intl_pl.arb b/lib/l10n/intl_pl.arb index 74d386e4d..e34cc6601 100644 --- a/lib/l10n/intl_pl.arb +++ b/lib/l10n/intl_pl.arb @@ -2683,7 +2683,6 @@ "createNewAccount": "Utwórz nowe konto", "signUpGreeting": "FluffyChat jest zdecentralizowany! Wybierz serwer, na którym chcesz utworzyć konto i zaczynamy!", "signInGreeting": "Masz już konto w sieci Matrix? Witaj z powrotem! Wybierz swój serwer macierzysty i zaloguj się.", - "appIntro": "Dzięki FluffyChat możesz rozmawiać ze znajomymi. To bezpieczny, zdecentralizowany komunikator oparty na sieci [matrix]! Dowiedz się więcej na https://matrix.org lub po prostu się zarejestruj.", "theProcessWasCanceled": "Proces został anulowany.", "join": "Dołącz", "searchOrEnterHomeserverAddress": "Wyszukaj lub wprowadź adres serwera macierzystego", diff --git a/lib/l10n/intl_ru.arb b/lib/l10n/intl_ru.arb index 71894d450..2a47c9606 100644 --- a/lib/l10n/intl_ru.arb +++ b/lib/l10n/intl_ru.arb @@ -2673,7 +2673,6 @@ "advancedConfigurations": "Расширенные конфигурации", "signUpGreeting": "FluffyChat децентрализорован! Выберите сервер, где вы хотите сделать свой аккаунт и заходите!", "signInGreeting": "У вас есть уже аккаунт в Matrix? Добро пожаловать! Выберите свой сервер и войдите.", - "appIntro": "С FluffyChat'ом вы можете говорить со своими друзьями. Это защищённый децентрализорованный [matrix] мессенджер! Узнайте больше на https://matrix.org, если вам нравится или просто зарегистрироваться.", "join": "Присоединиться", "countFiles": "{count} файлов", "@countFiles": { diff --git a/lib/l10n/intl_ta.arb b/lib/l10n/intl_ta.arb index e1f537be2..739e216c6 100644 --- a/lib/l10n/intl_ta.arb +++ b/lib/l10n/intl_ta.arb @@ -2721,7 +2721,6 @@ "createNewAccount": "புதிய கணக்கை உருவாக்கவும்", "signUpGreeting": "FluffyChat பரவலாக்கப்பட்டது! உங்கள் கணக்கை உருவாக்க விரும்பும் சேவையகத்தைத் தேர்ந்தெடுத்து, செல்லலாம்!", "signInGreeting": "உங்களிடம் ஏற்கனவே அணி இல் கணக்கு உள்ளதா? மீண்டும் வருக! உங்கள் ஓம் சர்வரைத் தேர்ந்தெடுத்து உள்நுழையவும்.", - "appIntro": "FluffyChat மூலம் நீங்கள் உங்கள் நண்பர்களுடன் அரட்டையடிக்கலாம். இது ஒரு பாதுகாப்பான பரவலாக்கப்பட்ட [மேட்ரிக்ச்] தூதுவர்! நீங்கள் விரும்பினால் https://matrix.org இல் மேலும் அறியவும் அல்லது பதிவு செய்யவும்.", "theProcessWasCanceled": "செயல்முறை ரத்து செய்யப்பட்டது.", "join": "சேருங்கள்", "searchOrEnterHomeserverAddress": "ஓம்சர்வர் முகவரியைத் தேடவும் அல்லது உள்ளிடவும்", diff --git a/lib/l10n/intl_uk.arb b/lib/l10n/intl_uk.arb index 19e6c97c0..50458772c 100644 --- a/lib/l10n/intl_uk.arb +++ b/lib/l10n/intl_uk.arb @@ -2729,7 +2729,6 @@ "createNewAccount": "Створити новий обліковий запис", "signUpGreeting": "FluffyChat децентралізований! Виберіть сервер, на якому ви хочете створити свій обліковий запис, і почнімо!", "signInGreeting": "Ви вже маєте обліковий запис у Matrix? Ласкаво просимо! Виберіть свій домашній сервер і ввійдіть.", - "appIntro": "За допомогою FluffyChat ви можете спілкуватися зі своїми друзями. Це безпечний децентралізований месенджер [matrix]! Дізнайтеся більше на сайті https://matrix.org або просто зареєструйтеся.", "theProcessWasCanceled": "Процес скасовано.", "join": "Приєднатись", "searchOrEnterHomeserverAddress": "Знайдіть або введіть адресу домашнього сервера", diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb index 9809e73e3..3e80c0fe4 100644 --- a/lib/l10n/intl_zh.arb +++ b/lib/l10n/intl_zh.arb @@ -2729,7 +2729,6 @@ "createNewAccount": "创建新账户", "signUpGreeting": "FluffyChat 是去中心化的！选择您希望创建账户的服务器！", "signInGreeting": "已经有 Matrix 账户了？欢迎回来！选择 homeserver 登录。", - "appIntro": "借助 FluffyChat，您可以和好友聊天。它是安全的去中心化 [matrix] 消息收发应用！如果愿意，可以在 https://matrix.org 了解更多信息，也可直接注册账户。", "theProcessWasCanceled": "过程被取消。", "join": "加入", "searchOrEnterHomeserverAddress": "搜索或输入 homeserver 地址", diff --git a/lib/pages/intro/intro_page.dart b/lib/pages/intro/intro_page.dart index 8a7ba119d..f0cd61943 100644 --- a/lib/pages/intro/intro_page.dart +++ b/lib/pages/intro/intro_page.dart @@ -10,7 +10,6 @@ import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/widgets/layouts/login_scaffold.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_linkify/flutter_linkify.dart'; import 'package:go_router/go_router.dart'; import 'package:url_launcher/url_launcher_string.dart'; @@ -39,11 +38,7 @@ class IntroPage extends StatelessWidget { return LoginScaffold( appBar: AppBar( centerTitle: true, - title: Text( - addMultiAccount - ? L10n.of(context).addAccount - : L10n.of(context).login, - ), + title: addMultiAccount ? Text(L10n.of(context).addAccount) : null, actions: [ PopupMenuButton( useRootNavigator: true, @@ -114,32 +109,36 @@ class IntroPage extends StatelessWidget { child: Hero( tag: 'info-logo', child: Image.asset( - './assets/banner_transparent.png', - fit: BoxFit.fitWidth, + './assets/logo/img/logo_favicon.png', + width: 156, + height: 156, ), ), ), - const SizedBox(height: 32), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 32.0, + Center( + child: Image.asset( + './assets/logo/img/logo_font.png', + width: 156, ), - child: SelectableLinkify( - text: welcomeText ?? L10n.of(context).appIntro, - textScaleFactor: MediaQuery.textScalerOf( - context, - ).scale(1), + ), + const SizedBox(height: 8), + Text( + L10n.of(context).appSubtitle, + textAlign: TextAlign.center, + style: TextStyle(fontSize: 18), + ), + const SizedBox(height: 8), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 32), + child: Text( + L10n.of(context).appDescription, textAlign: TextAlign.center, - linkStyle: TextStyle( - color: theme.colorScheme.secondary, - decorationColor: theme.colorScheme.secondary, - ), - onOpen: (link) => launchUrlString(link.url), + style: TextStyle(fontSize: 12), ), ), const Spacer(), Padding( - padding: const EdgeInsets.all(32.0), + padding: const EdgeInsets.symmetric(horizontal: 32), child: Column( mainAxisSize: .min, crossAxisAlignment: .stretch, @@ -184,6 +183,7 @@ class IntroPage extends StatelessWidget { ], ), ), + const SizedBox(height: 36), ], ), ), diff --git a/lib/pages/login/login_view.dart b/lib/pages/login/login_view.dart index ada07e6b0..d2b6aea00 100644 --- a/lib/pages/login/login_view.dart +++ b/lib/pages/login/login_view.dart @@ -38,9 +38,15 @@ class LoginView extends StatelessWidget { child: ListView( padding: const EdgeInsets.symmetric(horizontal: 8), children: [ - Hero( - tag: 'info-logo', - child: Image.asset('assets/banner_transparent.png'), + Center( + child: Hero( + tag: 'info-logo', + child: Image.asset( + './assets/logo/img/logo_favicon.png', + width: 192, + height: 192, + ), + ), ), const SizedBox(height: 16), Padding( diff --git a/lib/utils/platform_infos.dart b/lib/utils/platform_infos.dart index 706f5e7fa..23771282c 100644 --- a/lib/utils/platform_infos.dart +++ b/lib/utils/platform_infos.dart @@ -93,7 +93,7 @@ abstract class PlatformInfos { ), ], applicationIcon: Image.asset( - 'assets/logo.png', + 'assets/logo/img/logo_standalone.png', width: 64, height: 64, filterQuality: FilterQuality.medium, diff --git a/lib/widgets/fluffy_chat_app.dart b/lib/widgets/fluffy_chat_app.dart index a1ed244f1..333217db7 100644 --- a/lib/widgets/fluffy_chat_app.dart +++ b/lib/widgets/fluffy_chat_app.dart @@ -60,11 +60,15 @@ class FluffyChatApp extends StatelessWidget { builder: (context, themeMode, primaryColor) => MaterialApp.router( title: AppSettings.applicationName.value, themeMode: themeMode, - theme: FluffyThemes.buildTheme(context, Brightness.light, primaryColor), + theme: FluffyThemes.buildTheme( + context, + Brightness.light, + AppConfig.primaryColor, + ), darkTheme: FluffyThemes.buildTheme( context, Brightness.dark, - primaryColor, + AppConfig.primaryColor, ), scrollBehavior: CustomScrollBehavior(), localizationsDelegates: L10n.localizationsDelegates, diff --git a/lib/widgets/layouts/empty_page.dart b/lib/widgets/layouts/empty_page.dart index 59cda4919..c33bfb51a 100644 --- a/lib/widgets/layouts/empty_page.dart +++ b/lib/widgets/layouts/empty_page.dart @@ -25,7 +25,7 @@ class EmptyPage extends StatelessWidget { body: Container( alignment: Alignment.center, child: Image.asset( - 'assets/logo_transparent.png', + 'assets/logo/img/logo_mono.png', color: theme.colorScheme.surfaceContainerHigh, width: width, height: width, diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index eba1335b9..ac5afcb2f 100644 --- a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1 +1,64 @@ -{"images":[{"size":"1024x1024","filename":"1024-mac.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024-mac.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]} \ No newline at end of file +{ + "images": [ + { + "size": "16x16", + "idiom": "mac", + "filename": "app_icon_16.png", + "scale": "1x" + }, + { + "size": "16x16", + "idiom": "mac", + "filename": "app_icon_32.png", + "scale": "2x" + }, + { + "size": "32x32", + "idiom": "mac", + "filename": "app_icon_32.png", + "scale": "1x" + }, + { + "size": "32x32", + "idiom": "mac", + "filename": "app_icon_64.png", + "scale": "2x" + }, + { + "size": "128x128", + "idiom": "mac", + "filename": "app_icon_128.png", + "scale": "1x" + }, + { + "size": "128x128", + "idiom": "mac", + "filename": "app_icon_256.png", + "scale": "2x" + }, + { + "size": "256x256", + "idiom": "mac", + "filename": "app_icon_256.png", + "scale": "1x" + }, + { + "size": "256x256", + "idiom": "mac", + "filename": "app_icon_512.png", + "scale": "2x" + }, + { + "size": "512x512", + "idiom": "mac", + "filename": "app_icon_512.png", + "scale": "1x" + }, + { + "size": "512x512", + "idiom": "mac", + "filename": "app_icon_1024.png", + "scale": "2x" + } + ] +} \ No newline at end of file diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 000000000..51e91be93 Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 000000000..a91195f13 Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 000000000..c3b826510 Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 000000000..5254d68bc Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png new file mode 100644 index 000000000..e3d3fbaec Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 000000000..2e08b98bf Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 000000000..034319609 Binary files /dev/null and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/pubspec.lock b/pubspec.lock index 6fba6b7a4..ceb59cda3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -475,6 +475,14 @@ packages: url: "https://pub.dev" source: hosted version: "9.2.2" + flutter_launcher_icons: + dependency: "direct dev" + description: + name: flutter_launcher_icons + sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7" + url: "https://pub.dev" + source: hosted + version: "0.14.4" flutter_linkify: dependency: "direct main" description: @@ -536,14 +544,6 @@ packages: url: "https://pub.dev" source: hosted version: "8.3.0" - flutter_native_splash: - dependency: "direct dev" - description: - name: flutter_native_splash - sha256: "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002" - url: "https://pub.dev" - source: hosted - version: "2.4.7" flutter_new_badger: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index e6053811e..c4eac44e8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -87,8 +87,8 @@ dependencies: dev_dependencies: dart_code_linter: ^4.0.3 + flutter_launcher_icons: ^0.14.4 flutter_lints: ^6.0.0 - flutter_native_splash: ^2.4.7 flutter_test: sdk: flutter integration_test: @@ -96,19 +96,33 @@ dev_dependencies: license_checker: ^1.6.2 translations_cleaner: ^0.1.1 -flutter_native_splash: - color: "#ffffff" - color_dark: "#000000" - image: "assets/info-logo.png" - flutter: generate: true uses-material-design: true assets: - assets/ + - assets/logo/img/ - assets/sounds/ - assets/vodozemac/ +flutter_launcher_icons: + image_path: assets/logo/img/logo.png + android: true + adaptive_icon_foreground: assets/logo/img/logo_mono.png + adaptive_icon_background: assets/logo/img/logo_background.png + adaptive_icon_monochrome: assets/logo/img/logo_mono.png + adaptive_icon_foreground_inset: 24 + ios: true + macos: + generate: true + windows: + generate: true + web: + generate: true + image_path: assets/logo/img/logo_standalone.png + background_color: "#FFFFFF" + theme_color: "#41a2bc" + # Guidelines for adding a dependency override: # 1. Don't do it if you can avoid it or fix it upstream in a manageable time # 2. Always link an (upstream?) issue diff --git a/snap/gui/fluffychat.png b/snap/gui/fluffychat.png index e00764939..9429b4ba2 100644 Binary files a/snap/gui/fluffychat.png and b/snap/gui/fluffychat.png differ diff --git a/web/favicon.png b/web/favicon.png index e062b83e7..523dabd61 100644 Binary files a/web/favicon.png and b/web/favicon.png differ diff --git a/web/icons/Icon-192.png b/web/icons/Icon-192.png index 6003f5cf7..75c60ac9c 100644 Binary files a/web/icons/Icon-192.png and b/web/icons/Icon-192.png differ diff --git a/web/icons/Icon-512.png b/web/icons/Icon-512.png index f652f244a..e575a89df 100644 Binary files a/web/icons/Icon-512.png and b/web/icons/Icon-512.png differ diff --git a/web/icons/Icon-maskable-192.png b/web/icons/Icon-maskable-192.png new file mode 100644 index 000000000..75c60ac9c Binary files /dev/null and b/web/icons/Icon-maskable-192.png differ diff --git a/web/icons/Icon-maskable-512.png b/web/icons/Icon-maskable-512.png new file mode 100644 index 000000000..e575a89df Binary files /dev/null and b/web/icons/Icon-maskable-512.png differ diff --git a/web/index.html b/web/index.html index c593cc057..016ff91f4 100644 --- a/web/index.html +++ b/web/index.html @@ -28,11 +28,10 @@ - + FluffyChat - @@ -57,15 +56,6 @@ }); }); - - - - - - + \ No newline at end of file diff --git a/web/manifest.json b/web/manifest.json index e4f6c31cf..117b277fc 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -3,8 +3,8 @@ "short_name": "FluffyChat", "start_url": ".", "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", + "background_color": "#FFFFFF", + "theme_color": "#41a2bc", "description": "The cutest messenger in the Matrix network", "orientation": "portrait-primary", "prefer_related_applications": false, @@ -18,6 +18,18 @@ "src": "icons/Icon-512.png", "sizes": "512x512", "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" } ] } \ No newline at end of file diff --git a/web/splash/img/dark-1x.png b/web/splash/img/dark-1x.png deleted file mode 100644 index f4c0bdb92..000000000 Binary files a/web/splash/img/dark-1x.png and /dev/null differ diff --git a/web/splash/img/dark-2x.png b/web/splash/img/dark-2x.png deleted file mode 100644 index dafa3b707..000000000 Binary files a/web/splash/img/dark-2x.png and /dev/null differ diff --git a/web/splash/img/dark-3x.png b/web/splash/img/dark-3x.png deleted file mode 100644 index b627f5280..000000000 Binary files a/web/splash/img/dark-3x.png and /dev/null differ diff --git a/web/splash/img/dark-4x.png b/web/splash/img/dark-4x.png deleted file mode 100644 index 0d1d2a74d..000000000 Binary files a/web/splash/img/dark-4x.png and /dev/null differ diff --git a/web/splash/img/light-1x.png b/web/splash/img/light-1x.png deleted file mode 100644 index f4c0bdb92..000000000 Binary files a/web/splash/img/light-1x.png and /dev/null differ diff --git a/web/splash/img/light-2x.png b/web/splash/img/light-2x.png deleted file mode 100644 index dafa3b707..000000000 Binary files a/web/splash/img/light-2x.png and /dev/null differ diff --git a/web/splash/img/light-3x.png b/web/splash/img/light-3x.png deleted file mode 100644 index b627f5280..000000000 Binary files a/web/splash/img/light-3x.png and /dev/null differ diff --git a/web/splash/img/light-4x.png b/web/splash/img/light-4x.png deleted file mode 100644 index 0d1d2a74d..000000000 Binary files a/web/splash/img/light-4x.png and /dev/null differ diff --git a/web/splash/style.css b/web/splash/style.css deleted file mode 100644 index 6654d94e6..000000000 --- a/web/splash/style.css +++ /dev/null @@ -1,45 +0,0 @@ -body, -html { - margin: 0; - height: 100%; - background: #ffffff; - background-size: 100% 100%; -} - -.center { - margin: 0; - position: absolute; - top: 50%; - left: 50%; - -ms-transform: translate(-50%, -50%); - transform: translate(-50%, -50%); -} - -.contain { - display: block; - width: 100%; - height: 100%; - object-fit: contain; -} - -.stretch { - display: block; - width: 100%; - height: 100%; -} - -.cover { - display: block; - width: 100%; - height: 100%; - object-fit: cover; -} - -@media (prefers-color-scheme: dark) { - body { - margin: 0; - height: 100%; - background: #000000; - background-size: 100% 100%; - } -} \ No newline at end of file diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico index f53c6c005..ac0b62588 100644 Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ