diff --git a/.firebase/hosting.YnVpbGQvd2Vi.cache b/.firebase/hosting.YnVpbGQvd2Vi.cache index bdeb89a..818ccc6 100644 --- a/.firebase/hosting.YnVpbGQvd2Vi.cache +++ b/.firebase/hosting.YnVpbGQvd2Vi.cache @@ -1,35 +1,35 @@ -favicon.png,1689321969758,bc61d7b6fb147376de227725039076a3b96af9b4ab6445e645dc61fad99d22d9 -manifest.json,1689321969762,75ba472c5d0757110e14f875a4449745578123f014d2d5ab883a8f9657d43cc1 -index.html,1689321969758,d24d558d7456eb3154dad4541d185abd22c4030b0a043608101b4790f2db6075 -flutter_service_worker.js,1689321970690,394325d8e16e05b51fa4b874cdc4c48748be97c3e0a7c2fe6438d9bf1d5435b0 -version.json,1689321966034,14343d48e326db3488725f65544bb1d0f9a82b78bdd65f6224b18b25116b9900 -assets/AssetManifest.bin,1689321966270,f5d033794dd60a582c452dfe952e1074eef5468e4195d8d9a0b72c07d6fa4e74 -assets/AssetManifest.json,1689321966270,f1483d5dab670b707bc4ff1b7152b54e48c53ce619b4210556952f6c172ab056 -flutter.js,1689321881861,88f1dfd84d67e64038721e3d7dbe9bb9a716eb26a3da8b3f28d7f1717548779e -assets/FontManifest.json,1689321966270,d802c5900d0fe04223c6d000a5d108ffb0d39938a55b188dfd3ecc879f04cd2a -assets/packages/cupertino_icons/assets/CupertinoIcons.ttf,1689321969718,2c84e82a04f55fff57c170a51e1e904458ca6ddfba978cf5b6019c28e7331706 -assets/fonts/MaterialIcons-Regular.otf,1689321969742,5a5a85923c5df731c843761acd17b6482750c6f549c8c37f70e2c979269126dc -assets/shaders/ink_sparkle.frag,1689321966682,60cfcda20789be21ae74e3105d1d37b0ab3b72e207b3a0a7f9c8f1fea11bdcbd -canvaskit/skwasm.worker.js,1689321881733,18bd90dafcdaa5c18107698b25d8694992d097b86dffae49ba3c394fcc555eab -icons/Icon-192.png,1689321969762,0966c457950641eb1185ae6829206e371c35e4e9c081f515fa055f65726139e4 -icons/Icon-512.png,1689321969762,15ba6f76fbf68941784b974bb22328be9f3a7121861307c4d0c83ade6da3cb8a -icons/Icon-maskable-192.png,1689321969762,c2bc2780f66d9dc189e78b84594329d913ea6bf76620cdf91c9087b85b9dffb5 -assets/packages/font_awesome_flutter/lib/fonts/fa-regular-400.ttf,1689321969730,61b9f8e2d9e8a04384913d200a83a3a65b7e2fca424605268ce549120f2b47c3 -canvaskit/skwasm.js,1689321881749,36b2fe3a55da6aab92e7b6ebbbbe557aab800b6b1712fa33e2e2c6e7f82d31a7 -icons/Icon-maskable-512.png,1689321969762,6afa714bf4222cc8f6d18df0e09ed4431535f50a755f606f6ae1361507ec1048 -assets/assets/images/monthly_qr.png,1689321966250,36e958da0cc1df33b132fd5c3b2094fea486163ff22f9755a3b1450395e5ca9b -assets/assets/images/plotsklapps_straight.png,1689321966250,49d982df59713b9be311bfb772d6af7eede8f5f41eb8f1d2c3c014c2bb9a9361 -assets/assets/images/onetime_qr.png,1689321966250,eb64c0d8c8b8d7803bedbc5bdbc32f065c9698b0683df82c1b4daf99a3b519ac -assets/assets/images/plotsklapps_icon.png,1689321966250,23e59b3015324a0d43accc643e3e3da92919d047777b8cc24b056aabc4b0ddcb -canvaskit/canvaskit.js,1689321881857,d8568f5004414a6b1bf53a3bf5b6694fc7405f5f6a74dc3c3d46f78e035628c1 -canvaskit/chromium/canvaskit.js,1689321881801,26126fa2807abcac0c369c0fbada366e6d2b24ef368bf291c5e0503ca909ba5f -assets/assets/images/plotsklapps_stacked.png,1689321966250,26375062dcc148c152d76f5ce241992710d9b38829aaa863d5d47d0123084f31 -assets/assets/images/loading_fireworks.gif,1689321966250,b159a842a58f16b132fd311fcffb1e6113462fe5dbf99941154491bb85df4507 -assets/packages/font_awesome_flutter/lib/fonts/fa-brands-400.ttf,1689321969726,824e6afe73b4b064ebc17f1f93483daafa3ba30b8e2d089864fc31987652ad2f -assets/assets/images/spinner.png,1689321966250,b4f5af21b14a0fd41ae4f2a530eb99bef4e5f5ba549594fca4577d5d6fabeb6e -assets/packages/font_awesome_flutter/lib/fonts/fa-solid-900.ttf,1689321969742,e795d9a10a3adb623d6d6fc37ad30a0ee7ada62e44110b58845b9e94085faecd -assets/NOTICES,1689321966274,42a70a11ac4b4ace6ab2c82236c9af8f5923b80a28b1b26b1f51404d83934dce -main.dart.js,1689321966026,fe81401c0c20cebf7990a7b5dada81efddb3a71e27b9429d97924c8b20935b64 -canvaskit/skwasm.wasm,1689321881809,fb14708cb145dd849853879843940b5fcf6d6e429bc1e0711e04b27e08480558 -canvaskit/chromium/canvaskit.wasm,1689321881761,40b4c6e9594205edd7839205c07196b7f936230ddd3685a4e77ab0c1719e0122 -canvaskit/canvaskit.wasm,1689321881749,47205a04ff8a28597cc6cd660166166987597cf79eb0da43883d3949e2ec3d03 +favicon.png,1689326548060,bc61d7b6fb147376de227725039076a3b96af9b4ab6445e645dc61fad99d22d9 +flutter_service_worker.js,1689326549644,51586d4a8147aba622aca9f2c8ec4e5a4b8b8dbc8d4c459833be9327b64bbd3c +manifest.json,1689326548068,75ba472c5d0757110e14f875a4449745578123f014d2d5ab883a8f9657d43cc1 +index.html,1689326548060,8328872a1bf4c8f08a54e785e69e2c96eca4f5ede8e62f139476ee6ef04883d0 +version.json,1689326544300,14343d48e326db3488725f65544bb1d0f9a82b78bdd65f6224b18b25116b9900 +assets/AssetManifest.bin,1689326544556,f5d033794dd60a582c452dfe952e1074eef5468e4195d8d9a0b72c07d6fa4e74 +assets/AssetManifest.json,1689326544556,f1483d5dab670b707bc4ff1b7152b54e48c53ce619b4210556952f6c172ab056 +assets/FontManifest.json,1689326544556,d802c5900d0fe04223c6d000a5d108ffb0d39938a55b188dfd3ecc879f04cd2a +flutter.js,1689326455815,88f1dfd84d67e64038721e3d7dbe9bb9a716eb26a3da8b3f28d7f1717548779e +assets/packages/cupertino_icons/assets/CupertinoIcons.ttf,1689326548016,2c84e82a04f55fff57c170a51e1e904458ca6ddfba978cf5b6019c28e7331706 +assets/fonts/MaterialIcons-Regular.otf,1689326548036,5a5a85923c5df731c843761acd17b6482750c6f549c8c37f70e2c979269126dc +assets/shaders/ink_sparkle.frag,1689326544948,60cfcda20789be21ae74e3105d1d37b0ab3b72e207b3a0a7f9c8f1fea11bdcbd +canvaskit/skwasm.worker.js,1689326455643,18bd90dafcdaa5c18107698b25d8694992d097b86dffae49ba3c394fcc555eab +icons/Icon-192.png,1689326548064,0966c457950641eb1185ae6829206e371c35e4e9c081f515fa055f65726139e4 +icons/Icon-maskable-192.png,1689326548068,c2bc2780f66d9dc189e78b84594329d913ea6bf76620cdf91c9087b85b9dffb5 +icons/Icon-512.png,1689326548064,15ba6f76fbf68941784b974bb22328be9f3a7121861307c4d0c83ade6da3cb8a +assets/packages/font_awesome_flutter/lib/fonts/fa-regular-400.ttf,1689326548024,61b9f8e2d9e8a04384913d200a83a3a65b7e2fca424605268ce549120f2b47c3 +canvaskit/skwasm.js,1689326455699,36b2fe3a55da6aab92e7b6ebbbbe557aab800b6b1712fa33e2e2c6e7f82d31a7 +icons/Icon-maskable-512.png,1689326548064,6afa714bf4222cc8f6d18df0e09ed4431535f50a755f606f6ae1361507ec1048 +assets/assets/images/monthly_qr.png,1689326544532,36e958da0cc1df33b132fd5c3b2094fea486163ff22f9755a3b1450395e5ca9b +assets/assets/images/plotsklapps_icon.png,1689326544532,23e59b3015324a0d43accc643e3e3da92919d047777b8cc24b056aabc4b0ddcb +assets/assets/images/onetime_qr.png,1689326544532,eb64c0d8c8b8d7803bedbc5bdbc32f065c9698b0683df82c1b4daf99a3b519ac +assets/assets/images/plotsklapps_straight.png,1689326544532,49d982df59713b9be311bfb772d6af7eede8f5f41eb8f1d2c3c014c2bb9a9361 +canvaskit/canvaskit.js,1689326455807,d8568f5004414a6b1bf53a3bf5b6694fc7405f5f6a74dc3c3d46f78e035628c1 +canvaskit/chromium/canvaskit.js,1689326455759,26126fa2807abcac0c369c0fbada366e6d2b24ef368bf291c5e0503ca909ba5f +assets/assets/images/plotsklapps_stacked.png,1689326544532,26375062dcc148c152d76f5ce241992710d9b38829aaa863d5d47d0123084f31 +assets/assets/images/loading_fireworks.gif,1689326544532,b159a842a58f16b132fd311fcffb1e6113462fe5dbf99941154491bb85df4507 +assets/packages/font_awesome_flutter/lib/fonts/fa-brands-400.ttf,1689326548024,824e6afe73b4b064ebc17f1f93483daafa3ba30b8e2d089864fc31987652ad2f +assets/assets/images/spinner.png,1689326544532,b4f5af21b14a0fd41ae4f2a530eb99bef4e5f5ba549594fca4577d5d6fabeb6e +assets/packages/font_awesome_flutter/lib/fonts/fa-solid-900.ttf,1689326548036,e795d9a10a3adb623d6d6fc37ad30a0ee7ada62e44110b58845b9e94085faecd +assets/NOTICES,1689326544560,42a70a11ac4b4ace6ab2c82236c9af8f5923b80a28b1b26b1f51404d83934dce +main.dart.js,1689326544296,d13255f491df57534aae45788c3f6af02b07521f6ffe7ff5e25ca88014761e7d +canvaskit/skwasm.wasm,1689326455771,fb14708cb145dd849853879843940b5fcf6d6e429bc1e0711e04b27e08480558 +canvaskit/chromium/canvaskit.wasm,1689326455719,40b4c6e9594205edd7839205c07196b7f936230ddd3685a4e77ab0c1719e0122 +canvaskit/canvaskit.wasm,1689326455659,47205a04ff8a28597cc6cd660166166987597cf79eb0da43883d3949e2ec3d03 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 db77bb4..38dd79e 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 17987b7..19b0b14 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 09d4391..e962543 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 d5f1c8d..f20f12a 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 4d6372e..569e3c5 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/images/cosanostr_icon.png b/assets/images/cosanostr_icon.png new file mode 100644 index 0000000..e1be323 Binary files /dev/null and b/assets/images/cosanostr_icon.png differ 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 dc9ada4..59dd076 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 7353c41..b426294 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 797d452..6331b25 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 6ed2d93..17cea07 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 4cd7b00..e9650c6 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 fe73094..e5cee0c 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 321773c..83d165c 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 797d452..6331b25 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 502f463..4b6a274 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 0ec3034..cafc134 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 new file mode 100644 index 0000000..be3906b Binary files /dev/null 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 new file mode 100644 index 0000000..b62c39c Binary files /dev/null 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 new file mode 100644 index 0000000..2787e68 Binary files /dev/null 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 new file mode 100644 index 0000000..2c617e2 Binary files /dev/null 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 0ec3034..cafc134 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 e9f5fea..2418cad 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 new file mode 100644 index 0000000..a74ccb5 Binary files /dev/null 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 new file mode 100644 index 0000000..b3f6ba3 Binary files /dev/null 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 84ac32a..50736b2 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 8953cba..89d991c 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 0467bf1..300bcf4 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/all_imports.dart b/lib/all_imports.dart index 3e6c337..d9975ec 100644 --- a/lib/all_imports.dart +++ b/lib/all_imports.dart @@ -2,6 +2,7 @@ export 'dart:convert'; export 'package:cosanostr/components/feedscreen_card.dart'; export 'package:cosanostr/components/feedscreen_fab.dart'; +export 'package:cosanostr/components/joincosanostr_fab.dart'; export 'package:cosanostr/components/phone_container.dart'; export 'package:cosanostr/components/scaffold_appbar.dart'; export 'package:cosanostr/components/scaffold_drawer.dart'; diff --git a/lib/components/joincosanostr_fab.dart b/lib/components/joincosanostr_fab.dart new file mode 100644 index 0000000..200e195 --- /dev/null +++ b/lib/components/joincosanostr_fab.dart @@ -0,0 +1,23 @@ +import 'package:cosanostr/all_imports.dart'; + +class JoinCosaNostrFAB extends ConsumerWidget { + const JoinCosaNostrFAB({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + return FloatingActionButton.extended( + tooltip: 'Create new Keys', + label: const Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Text('JOIN COSANOSTR'), + SizedBox(width: 8.0), + Icon(FontAwesomeIcons.circlePlus), + ], + ), + onPressed: () async { + await Dialogs().keysOptionDialog(context, ref); + }, + ); + } +} diff --git a/lib/components/scaffold_drawer.dart b/lib/components/scaffold_drawer.dart index 257cd36..64a6a48 100644 --- a/lib/components/scaffold_drawer.dart +++ b/lib/components/scaffold_drawer.dart @@ -16,14 +16,27 @@ class ScaffoldDrawer extends StatelessWidget { return Drawer( child: Column( children: [ - const DrawerHeader( + DrawerHeader( child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - Text('CosaNostr'), + Flexible( + fit: FlexFit.tight, + child: Image.asset( + 'assets/images/cosanostr_icon.png', + ), + ), + const SizedBox(height: 8.0), + const Text( + 'CosaNostr', + style: TextStyle( + fontWeight: FontWeight.bold, + ), + ), + const SizedBox(height: 8.0), // Bump this version every time something insanely cool is // added. - Text('Version: 0.0.1'), + const Text('Version: 0.0.1'), ], ), ), diff --git a/lib/screens/feed_screen.dart b/lib/screens/feed_screen.dart index 29c53dc..7c50bfe 100644 --- a/lib/screens/feed_screen.dart +++ b/lib/screens/feed_screen.dart @@ -242,7 +242,7 @@ class FeedScreenState extends ConsumerState { }, isNotePublishing: ref.watch(isNotePublishingProvider), ) - : Container(), + : const JoinCosaNostrFAB(), ); } } diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index a2ec33f..96d3fee 100644 --- a/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,68 +1,68 @@ { - "images" : [ - { - "size" : "16x16", - "idiom" : "mac", - "filename" : "app_icon_16.png", - "scale" : "1x" + "info": { + "version": 1, + "author": "xcode" }, - { - "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" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} + "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 index 82b6f9d..4662a9a 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 13b35eb..752d69a 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 0a3f5fa..68171ce 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 bdb5722..e90edae 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 f083318..61854f9 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 326c0e7..d78f0b8 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 2f1632c..36c9fb4 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.lock b/pubspec.lock index ef4fdba..9688081 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -9,6 +9,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.3" + archive: + dependency: transitive + description: + name: archive + sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" + url: "https://pub.dev" + source: hosted + version: "3.3.7" + args: + dependency: transitive + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" async: dependency: transitive description: @@ -81,6 +97,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: b8db3080e59b2503ca9e7922c3df2072cf13992354d5e944074ffa836fba43b7 + url: "https://pub.dev" + source: hosted + version: "0.4.0" clock: dependency: transitive description: @@ -214,6 +246,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.2.0" + flutter_launcher_icons: + dependency: "direct main" + description: + name: flutter_launcher_icons + sha256: "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea" + url: "https://pub.dev" + source: hosted + version: "0.13.1" flutter_riverpod: dependency: "direct main" description: @@ -320,6 +360,14 @@ packages: url: "https://pub.dev" source: hosted version: "4.0.2" + image: + dependency: transitive + description: + name: image + sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf + url: "https://pub.dev" + source: hosted + version: "4.0.17" js: dependency: transitive description: @@ -328,6 +376,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.7" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + url: "https://pub.dev" + source: hosted + version: "4.8.1" kepler: dependency: transitive description: @@ -424,6 +480,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.7" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" + source: hosted + version: "5.4.0" platform: dependency: transitive description: @@ -621,6 +685,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" + xml: + dependency: transitive + description: + name: xml + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" + source: hosted + version: "6.3.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" sdks: dart: ">=3.0.0 <4.0.0" flutter: ">=3.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index 1d8c2ac..9184c22 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,6 +16,7 @@ dependencies: flutter: sdk: flutter flutter_animate: ^4.2.0 + flutter_launcher_icons: ^0.13.1 flutter_riverpod: ^2.3.6 flutter_secure_storage: ^8.0.0 font_awesome_flutter: ^10.5.0 @@ -32,3 +33,22 @@ flutter: uses-material-design: true assets: - assets/images/ + +flutter_launcher_icons: + android: true + ios: true + remove_alpha_ios: true + image_path: "assets/images/cosanostr_icon.png" + min_sdk_android: 21 # android min sdk min:16, default 21 + web: + generate: true + image_path: "assets/images/cosanostr_icon.png" + background_color: "#ffffff" + theme_color: "#ffffff" + windows: + generate: true + image_path: "assets/images/cosanostr_icon.png" + icon_size: 48 # min:48, max:256, default: 48 + macos: + generate: true + image_path: "assets/images/cosanostr_icon.png" diff --git a/web/favicon.png b/web/favicon.png index 8aaa46a..68171ce 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 b749bfe..569e3c5 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 88cfd48..d78f0b8 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 eb9b4d7..569e3c5 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 d69c566..d78f0b8 100644 Binary files a/web/icons/Icon-maskable-512.png and b/web/icons/Icon-maskable-512.png differ diff --git a/web/manifest.json b/web/manifest.json index 1f7b57e..481659c 100644 --- a/web/manifest.json +++ b/web/manifest.json @@ -3,8 +3,8 @@ "short_name": "cosanostr", "start_url": ".", "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", + "background_color": "#ffffff", + "theme_color": "#ffffff", "description": "PWA Nostr Client", "orientation": "portrait-primary", "prefer_related_applications": false, @@ -32,4 +32,4 @@ "purpose": "maskable" } ] -} +} \ No newline at end of file diff --git a/windows/runner/resources/app_icon.ico b/windows/runner/resources/app_icon.ico index c04e20c..b9fff15 100644 Binary files a/windows/runner/resources/app_icon.ico and b/windows/runner/resources/app_icon.ico differ