diff --git a/analysis_options.yaml b/analysis_options.yaml index f82bda6..7b39530 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -7,6 +7,9 @@ # The following line activates a set of recommended lints for Flutter apps, # packages, and plugins designed to encourage good coding practices. +analyzer: + errors: + use_build_context_synchronously: ignore include: package:flutter_lints/flutter.yaml linter: diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png index 762a2e6..0867c5e 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-hdpi/launcher_icon.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png index 7ed0d47..85e1e70 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-mdpi/launcher_icon.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png index 82ebcec..4fb3f7f 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xhdpi/launcher_icon.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png index 9bbf8ac..30eb930 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png index cd90778..d84d6fa 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png and b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon.png differ diff --git a/assets/icon-padded.png b/assets/icon-padded.png deleted file mode 100644 index 708faa5..0000000 Binary files a/assets/icon-padded.png and /dev/null differ diff --git a/assets/icon-w-shadow.png b/assets/icon-w-shadow.png new file mode 100644 index 0000000..61d168d Binary files /dev/null and b/assets/icon-w-shadow.png differ diff --git a/assets/icon.png b/assets/icon.png index 18e9966..0b9a3dd 100755 Binary files a/assets/icon.png and b/assets/icon.png differ diff --git a/assets/logo.png b/assets/logo.png index 3cc65cb..ad534e2 100755 Binary files a/assets/logo.png and b/assets/logo.png differ diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index b65edb4..c5c6900 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -654,7 +654,7 @@ 730D64942C4AC4D0005A1975 /* 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; @@ -694,7 +694,7 @@ 730D64952C4AC4D0005A1975 /* 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; @@ -731,7 +731,7 @@ 730D64962C4AC4D0005A1975 /* 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/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index d31c3dd..438b4ab 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 6fc5a27..37fc45a 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 7c38ace..086342c 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 e16808e..cfa92cd 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 649b323..dfd325a 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 3a799b6..f10e523 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 cc48d65..de2e89f 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 7c38ace..086342c 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 35d9f96..2944ff5 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 51827e5..05119a4 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 74a9653..058d0b4 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 a374ea7..38c6f82 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 3b300f0..56199eb 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 e816755..583d4f9 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 51827e5..05119a4 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 b826c72..2e8c91d 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 762a2e6..0867c5e 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 9bbf8ac..30eb930 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 475b4a7..7457c24 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 4537deb..95a4a13 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 522e7e5..c7b413d 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/lib/providers/content/attachment.dart b/lib/providers/content/attachment.dart index cf0acf6..ab7b8d1 100644 --- a/lib/providers/content/attachment.dart +++ b/lib/providers/content/attachment.dart @@ -83,7 +83,6 @@ class AttachmentProvider extends GetConnect { int id, String alt, String usage, { - double? ratio, bool isMature = false, }) async { final AuthProvider auth = Get.find(); @@ -92,9 +91,6 @@ class AttachmentProvider extends GetConnect { final client = auth.configureClient('files'); var resp = await client.put('/attachments/$id', { - 'metadata': { - if (ratio != null) 'ratio': ratio, - }, 'alt': alt, 'usage': usage, 'is_mature': isMature, diff --git a/lib/screens/home.dart b/lib/screens/home.dart index 25c61e7..3f4d95a 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -137,7 +137,7 @@ class PostCreatePopup extends StatelessWidget { final List actionList = [ ( icon: const Icon(Icons.edit_square), - label: 'postEditor'.tr, + label: 'postEditorModeStory'.tr, onTap: () { Navigator.pop(context); AppRouter.instance.pushNamed('postEditor').then((val) { diff --git a/lib/screens/posts/post_editor.dart b/lib/screens/posts/post_editor.dart index 42536df..cc816d2 100644 --- a/lib/screens/posts/post_editor.dart +++ b/lib/screens/posts/post_editor.dart @@ -134,7 +134,7 @@ class _PostPublishScreenState extends State { child: Scaffold( appBar: AppBar( leading: AppBarLeadingButton.adaptive(context), - title: AppBarTitle('postPublish'.tr), + title: AppBarTitle('postEditorModeStory'.tr), centerTitle: false, toolbarHeight: SolianTheme.toolbarHeight(context), actions: [ diff --git a/lib/theme.dart b/lib/theme.dart index ee22260..ccf149b 100644 --- a/lib/theme.dart +++ b/lib/theme.dart @@ -32,7 +32,9 @@ abstract class SolianTheme { brightness: brightness, useMaterial3: true, colorScheme: ColorScheme.fromSeed( - brightness: brightness, seedColor: Colors.indigo), + brightness: brightness, + seedColor: const Color.fromRGBO(103, 96, 193, 1), + ), ); } } diff --git a/lib/translations.dart b/lib/translations.dart index 7491135..2c5db3d 100644 --- a/lib/translations.dart +++ b/lib/translations.dart @@ -5,7 +5,7 @@ import 'package:solian/translations/zh_cn.dart'; class SolianMessages extends Translations { @override Map> get keys => { - 'en_US': messagesEnglish, - 'zh_CN': simplifiedChineseMessages, + 'en_US': i18nEnglish, + 'zh_CN': i18nSimplifiedChinese, }; } diff --git a/lib/translations/en_us.dart b/lib/translations/en_us.dart index 3acbb8f..d1a1319 100644 --- a/lib/translations/en_us.dart +++ b/lib/translations/en_us.dart @@ -1,4 +1,4 @@ -const messagesEnglish = { +const i18nEnglish = { 'done': 'Done', 'hide': 'Hide', 'okay': 'Okay', @@ -97,7 +97,9 @@ const messagesEnglish = { 'postPinned': 'Pinned', 'postListNews': 'News', 'postListShuffle': 'Random', - 'postEditor': 'Create new post', + 'postEditorModeStory': 'Post a post', + 'postEditorModeArticle': 'Post an article', + 'postEditor': 'Post editor', 'articleEditor': 'Create new article', 'articleDetail': 'Article details', 'draftBoxOpen': 'Open draft box', diff --git a/lib/translations/zh_cn.dart b/lib/translations/zh_cn.dart index fe722e4..567a1d9 100644 --- a/lib/translations/zh_cn.dart +++ b/lib/translations/zh_cn.dart @@ -1,4 +1,4 @@ -const simplifiedChineseMessages = { +const i18nSimplifiedChinese = { 'done': '完成', 'hide': '隐藏', 'okay': '确认', @@ -89,7 +89,9 @@ const simplifiedChineseMessages = { 'pinPost': '置顶本帖', 'unpinPost': '取消置顶本帖', 'postPinned': '已置顶', - 'postEditor': '发个帖子', + 'postEditorModeStory': '发个帖子', + 'postEditorModeArticle': '撰写文章', + 'postEditor': '帖子编辑器', 'articleEditor': '撰写文章', 'articleDetail': '文章详情', 'draftBoxOpen': '打开草稿箱', diff --git a/lib/widgets/attachments/attachment_item.dart b/lib/widgets/attachments/attachment_item.dart index ac8ea02..2fab1b1 100644 --- a/lib/widgets/attachments/attachment_item.dart +++ b/lib/widgets/attachments/attachment_item.dart @@ -108,7 +108,6 @@ class _AttachmentItemImage extends StatelessWidget { final Function? onHide; const _AttachmentItemImage({ - super.key, required this.parentId, required this.item, required this.showBadge, @@ -215,7 +214,7 @@ class _AttachmentItemImage extends StatelessWidget { class _AttachmentItemVideo extends StatefulWidget { final Attachment item; - const _AttachmentItemVideo({super.key, required this.item}); + const _AttachmentItemVideo({required this.item}); @override State<_AttachmentItemVideo> createState() => _AttachmentItemVideoState(); diff --git a/lib/widgets/attachments/attachment_publish.dart b/lib/widgets/attachments/attachment_publish.dart index bc3b3b8..bfeecc7 100644 --- a/lib/widgets/attachments/attachment_publish.dart +++ b/lib/widgets/attachments/attachment_publish.dart @@ -361,7 +361,7 @@ class _AttachmentPublishPopupState extends State { alignment: WrapAlignment.center, runAlignment: WrapAlignment.center, children: [ - if (PlatformInfo.isDesktop) + if (PlatformInfo.isDesktop || PlatformInfo.isIOS || PlatformInfo.isWeb) ElevatedButton.icon( icon: const Icon(Icons.paste), label: Text('attachmentAddClipboard'.tr), @@ -426,12 +426,10 @@ class AttachmentEditorDialog extends StatefulWidget { } class _AttachmentEditorDialogState extends State { - final _ratioController = TextEditingController(); final _altController = TextEditingController(); bool _isBusy = false; bool _isMature = false; - bool _hasAspectRatio = false; Future updateAttachment() async { final AttachmentProvider provider = Get.find(); @@ -442,9 +440,6 @@ class _AttachmentEditorDialogState extends State { widget.item.id, _altController.value.text, widget.item.usage, - ratio: _hasAspectRatio - ? (double.tryParse(_ratioController.value.text) ?? 1) - : null, isMature: _isMature, ); @@ -476,13 +471,6 @@ class _AttachmentEditorDialogState extends State { void syncWidget() { _isMature = widget.item.isMature; _altController.text = widget.item.alt; - - if (['image', 'video'] - .contains(widget.item.mimetype.split('/').firstOrNull)) { - _ratioController.text = - widget.item.metadata?['ratio']?.toString() ?? 1.toString(); - _hasAspectRatio = true; - } } @override @@ -517,61 +505,6 @@ class _AttachmentEditorDialogState extends State { onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(), ), - const SizedBox(height: 16), - TextField( - readOnly: !_hasAspectRatio, - controller: _ratioController, - decoration: InputDecoration( - isDense: true, - prefixIcon: const Icon(Icons.aspect_ratio), - border: const OutlineInputBorder(), - labelText: 'aspectRatio'.tr, - ), - onTapOutside: (_) => - FocusManager.instance.primaryFocus?.unfocus(), - ), - const SizedBox(height: 5), - SingleChildScrollView( - scrollDirection: Axis.horizontal, - child: Wrap( - spacing: 6, - runSpacing: 0, - children: [ - ActionChip( - avatar: Icon(Icons.square_rounded, - color: Theme.of(context).colorScheme.onSurfaceVariant), - label: Text('aspectRatioSquare'.tr), - onPressed: () { - if (_hasAspectRatio) { - setState(() => _ratioController.text = '1'); - } - }, - ), - ActionChip( - avatar: Icon(Icons.portrait, - color: Theme.of(context).colorScheme.onSurfaceVariant), - label: Text('aspectRatioPortrait'.tr), - onPressed: () { - if (_hasAspectRatio) { - setState( - () => _ratioController.text = (9 / 16).toString()); - } - }, - ), - ActionChip( - avatar: Icon(Icons.landscape, - color: Theme.of(context).colorScheme.onSurfaceVariant), - label: Text('aspectRatioLandscape'.tr), - onPressed: () { - if (_hasAspectRatio) { - setState( - () => _ratioController.text = (16 / 9).toString()); - } - }, - ), - ], - ), - ), Card( child: CheckboxListTile( shape: const RoundedRectangleBorder( diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 761eb83..314227d 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png 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 index db736b7..0829762 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png 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 index aff12b7..490f6ac 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png 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 index b5047af..8630063 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png 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 index 618d07e..3adaf65 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png 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 index 96afd96..cf664a7 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png 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 index 75b47dc..f7a9dae 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/pubspec.yaml b/pubspec.yaml index 7ecf9ad..7d98b44 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,7 +2,7 @@ name: solian description: "The Solar Network App" publish_to: "none" -version: 1.2.0 +version: 1.2.0+1 environment: sdk: ">=3.3.4 <4.0.0" @@ -83,16 +83,16 @@ flutter_launcher_icons: min_sdk_android: 21 web: generate: true - image_path: "assets/icon-padded.png" + image_path: "assets/icon-w-shadow.png" background_color: "#ffffff" theme_color: "#4b5094" windows: generate: true - image_path: "assets/icon-padded.png" + image_path: "assets/icon-w-shadow.png" icon_size: 256 macos: generate: true - image_path: "assets/icon-padded.png" + image_path: "assets/icon-w-shadow.png" msix_config: protocol_activation: solink diff --git a/web/favicon.png b/web/favicon.png index aff12b7..490f6ac 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 f3e7119..e4a2af9 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 96afd96..cf664a7 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 index f3e7119..e4a2af9 100644 Binary files a/web/icons/Icon-maskable-192.png 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 index 96afd96..cf664a7 100644 Binary files a/web/icons/Icon-maskable-512.png and b/web/icons/Icon-maskable-512.png differ diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico index 10a94e1..baeef27 100644 Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ