diff --git a/assets/design/branding.sketch b/assets/design/branding.sketch index 4ec9141f3..8ffc97d30 100644 Binary files a/assets/design/branding.sketch and b/assets/design/branding.sketch differ diff --git a/assets/icons/current/app-icon-desktop.png b/assets/icons/current/app-icon-desktop.png deleted file mode 100644 index 3a80cac49..000000000 Binary files a/assets/icons/current/app-icon-desktop.png and /dev/null differ diff --git a/assets/icons/current/app_favicon.png b/assets/icons/current/app_favicon.png deleted file mode 100644 index c75539899..000000000 Binary files a/assets/icons/current/app_favicon.png and /dev/null differ diff --git a/assets/icons/current/app_icon_android.png b/assets/icons/current/app_icon_android.png index bff390b15..898bd31b1 100644 Binary files a/assets/icons/current/app_icon_android.png and b/assets/icons/current/app_icon_android.png differ diff --git a/assets/icons/current/app_icon_desktop.png b/assets/icons/current/app_icon_desktop.png new file mode 100644 index 000000000..86a0f4b2d Binary files /dev/null and b/assets/icons/current/app_icon_desktop.png differ diff --git a/assets/icons/current/app_icon_foreground_full.png b/assets/icons/current/app_icon_foreground_full.png deleted file mode 100644 index df0145384..000000000 Binary files a/assets/icons/current/app_icon_foreground_full.png and /dev/null differ diff --git a/assets/icons/current/app_icon_ios.png b/assets/icons/current/app_icon_ios.png index aa97b77b9..ab2b7bed1 100644 Binary files a/assets/icons/current/app_icon_ios.png and b/assets/icons/current/app_icon_ios.png differ diff --git a/assets/icons/current/ios-splash/Icon-1024.png b/assets/icons/current/ios-splash/Icon-1024.png new file mode 100644 index 000000000..baf2d21bc Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-1024.png differ diff --git a/assets/icons/current/ios-splash/Icon-108@2x.png b/assets/icons/current/ios-splash/Icon-108@2x.png new file mode 100644 index 000000000..499dfd576 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-108@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-128.png b/assets/icons/current/ios-splash/Icon-128.png new file mode 100644 index 000000000..4968ae80e Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-128.png differ diff --git a/assets/icons/current/ios-splash/Icon-128@2x.png b/assets/icons/current/ios-splash/Icon-128@2x.png new file mode 100644 index 000000000..d718e9cf2 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-128@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-16.png b/assets/icons/current/ios-splash/Icon-16.png new file mode 100644 index 000000000..0ec36d697 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-16.png differ diff --git a/assets/icons/current/ios-splash/Icon-16@2x.png b/assets/icons/current/ios-splash/Icon-16@2x.png new file mode 100644 index 000000000..0b6997f73 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-16@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-20.png b/assets/icons/current/ios-splash/Icon-20.png new file mode 100644 index 000000000..845f4fa2a Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-20.png differ diff --git a/assets/icons/current/ios-splash/Icon-20@2x.png b/assets/icons/current/ios-splash/Icon-20@2x.png new file mode 100644 index 000000000..e01de100f Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-20@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-20@3x.png b/assets/icons/current/ios-splash/Icon-20@3x.png new file mode 100644 index 000000000..c060aa378 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-20@3x.png differ diff --git a/assets/icons/current/ios-splash/Icon-24@2x.png b/assets/icons/current/ios-splash/Icon-24@2x.png new file mode 100644 index 000000000..681c9d9ce Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-24@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-256.png b/assets/icons/current/ios-splash/Icon-256.png new file mode 100644 index 000000000..d718e9cf2 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-256.png differ diff --git a/assets/icons/current/ios-splash/Icon-256@2x.png b/assets/icons/current/ios-splash/Icon-256@2x.png new file mode 100644 index 000000000..d718e9cf2 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-256@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-27.5@2x.png b/assets/icons/current/ios-splash/Icon-27.5@2x.png new file mode 100644 index 000000000..c346e53a5 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-27.5@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-29.png b/assets/icons/current/ios-splash/Icon-29.png new file mode 100644 index 000000000..0c4f8bd9d Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-29.png differ diff --git a/assets/icons/current/ios-splash/Icon-29@2x.png b/assets/icons/current/ios-splash/Icon-29@2x.png new file mode 100644 index 000000000..84e9d118e Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-29@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-29@3x.png b/assets/icons/current/ios-splash/Icon-29@3x.png new file mode 100644 index 000000000..6cdbcace7 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-29@3x.png differ diff --git a/assets/icons/current/ios-splash/Icon-32.png b/assets/icons/current/ios-splash/Icon-32.png new file mode 100644 index 000000000..0b6997f73 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-32.png differ diff --git a/assets/icons/current/ios-splash/Icon-32@2x.png b/assets/icons/current/ios-splash/Icon-32@2x.png new file mode 100644 index 000000000..2626d7b99 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-32@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-40.png b/assets/icons/current/ios-splash/Icon-40.png new file mode 100644 index 000000000..e01de100f Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-40.png differ diff --git a/assets/icons/current/ios-splash/Icon-40@2x.png b/assets/icons/current/ios-splash/Icon-40@2x.png new file mode 100644 index 000000000..9e0591656 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-40@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-40@3x.png b/assets/icons/current/ios-splash/Icon-40@3x.png new file mode 100644 index 000000000..b3f99f3d0 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-40@3x.png differ diff --git a/assets/icons/current/ios-splash/Icon-44@2x.png b/assets/icons/current/ios-splash/Icon-44@2x.png new file mode 100644 index 000000000..fcdfc7469 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-44@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-50@2x.png b/assets/icons/current/ios-splash/Icon-50@2x.png new file mode 100644 index 000000000..72f1163df Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-50@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-512.png b/assets/icons/current/ios-splash/Icon-512.png new file mode 100644 index 000000000..18e217df4 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-512.png differ diff --git a/assets/icons/current/ios-splash/Icon-512@2x.png b/assets/icons/current/ios-splash/Icon-512@2x.png new file mode 100644 index 000000000..baf2d21bc Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-512@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-60@2x.png b/assets/icons/current/ios-splash/Icon-60@2x.png new file mode 100644 index 000000000..b3f99f3d0 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-60@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-60@3x.png b/assets/icons/current/ios-splash/Icon-60@3x.png new file mode 100644 index 000000000..798bbbd77 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-60@3x.png differ diff --git a/assets/icons/current/ios-splash/Icon-76.png b/assets/icons/current/ios-splash/Icon-76.png new file mode 100644 index 000000000..fdfc8c234 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-76.png differ diff --git a/assets/icons/current/ios-splash/Icon-76@2x.png b/assets/icons/current/ios-splash/Icon-76@2x.png new file mode 100644 index 000000000..a60b31423 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-76@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-83.5@2x.png b/assets/icons/current/ios-splash/Icon-83.5@2x.png new file mode 100644 index 000000000..6cae210f6 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-83.5@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-86@2x.png b/assets/icons/current/ios-splash/Icon-86@2x.png new file mode 100644 index 000000000..37f36981d Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-86@2x.png differ diff --git a/assets/icons/current/ios-splash/Icon-98@2x.png b/assets/icons/current/ios-splash/Icon-98@2x.png new file mode 100644 index 000000000..264578571 Binary files /dev/null and b/assets/icons/current/ios-splash/Icon-98@2x.png differ diff --git a/assets/icons/current/ios/Icon-1024.png b/assets/icons/current/ios/Icon-1024.png index dbf32cbe3..e0905f5ae 100644 Binary files a/assets/icons/current/ios/Icon-1024.png and b/assets/icons/current/ios/Icon-1024.png differ diff --git a/assets/icons/current/ios/Icon-108@2x.png b/assets/icons/current/ios/Icon-108@2x.png index 27cb4bbfd..265d6b5d9 100644 Binary files a/assets/icons/current/ios/Icon-108@2x.png and b/assets/icons/current/ios/Icon-108@2x.png differ diff --git a/assets/icons/current/ios/Icon-128.png b/assets/icons/current/ios/Icon-128.png index 0f016e20a..c176fbdcf 100644 Binary files a/assets/icons/current/ios/Icon-128.png and b/assets/icons/current/ios/Icon-128.png differ diff --git a/assets/icons/current/ios/Icon-128@2x.png b/assets/icons/current/ios/Icon-128@2x.png index 9b2120087..51e13f4bd 100644 Binary files a/assets/icons/current/ios/Icon-128@2x.png and b/assets/icons/current/ios/Icon-128@2x.png differ diff --git a/assets/icons/current/ios/Icon-16.png b/assets/icons/current/ios/Icon-16.png index f324490e9..41b3a0d0c 100644 Binary files a/assets/icons/current/ios/Icon-16.png and b/assets/icons/current/ios/Icon-16.png differ diff --git a/assets/icons/current/ios/Icon-16@2x.png b/assets/icons/current/ios/Icon-16@2x.png index 4858ffe4c..808d35321 100644 Binary files a/assets/icons/current/ios/Icon-16@2x.png and b/assets/icons/current/ios/Icon-16@2x.png differ diff --git a/assets/icons/current/ios/Icon-20.png b/assets/icons/current/ios/Icon-20.png index 8186ab924..8e407b39c 100644 Binary files a/assets/icons/current/ios/Icon-20.png and b/assets/icons/current/ios/Icon-20.png differ diff --git a/assets/icons/current/ios/Icon-20@2x.png b/assets/icons/current/ios/Icon-20@2x.png index 232ff1569..6550c7032 100644 Binary files a/assets/icons/current/ios/Icon-20@2x.png and b/assets/icons/current/ios/Icon-20@2x.png differ diff --git a/assets/icons/current/ios/Icon-20@3x.png b/assets/icons/current/ios/Icon-20@3x.png index b0515a043..ce29c3290 100644 Binary files a/assets/icons/current/ios/Icon-20@3x.png and b/assets/icons/current/ios/Icon-20@3x.png differ diff --git a/assets/icons/current/ios/Icon-24@2x.png b/assets/icons/current/ios/Icon-24@2x.png index 0fcea9df9..996982c83 100644 Binary files a/assets/icons/current/ios/Icon-24@2x.png and b/assets/icons/current/ios/Icon-24@2x.png differ diff --git a/assets/icons/current/ios/Icon-256.png b/assets/icons/current/ios/Icon-256.png index 9b2120087..51e13f4bd 100644 Binary files a/assets/icons/current/ios/Icon-256.png and b/assets/icons/current/ios/Icon-256.png differ diff --git a/assets/icons/current/ios/Icon-256@2x.png b/assets/icons/current/ios/Icon-256@2x.png index 9b2120087..51e13f4bd 100644 Binary files a/assets/icons/current/ios/Icon-256@2x.png and b/assets/icons/current/ios/Icon-256@2x.png differ diff --git a/assets/icons/current/ios/Icon-27.5@2x.png b/assets/icons/current/ios/Icon-27.5@2x.png index 0f6298603..b77062e57 100644 Binary files a/assets/icons/current/ios/Icon-27.5@2x.png and b/assets/icons/current/ios/Icon-27.5@2x.png differ diff --git a/assets/icons/current/ios/Icon-29.png b/assets/icons/current/ios/Icon-29.png index d92696dc8..de8373e7d 100644 Binary files a/assets/icons/current/ios/Icon-29.png and b/assets/icons/current/ios/Icon-29.png differ diff --git a/assets/icons/current/ios/Icon-29@2x.png b/assets/icons/current/ios/Icon-29@2x.png index da71eca91..ae9f12f5a 100644 Binary files a/assets/icons/current/ios/Icon-29@2x.png and b/assets/icons/current/ios/Icon-29@2x.png differ diff --git a/assets/icons/current/ios/Icon-29@3x.png b/assets/icons/current/ios/Icon-29@3x.png index 51b0a1c26..5125d9e7d 100644 Binary files a/assets/icons/current/ios/Icon-29@3x.png and b/assets/icons/current/ios/Icon-29@3x.png differ diff --git a/assets/icons/current/ios/Icon-32.png b/assets/icons/current/ios/Icon-32.png index 4858ffe4c..808d35321 100644 Binary files a/assets/icons/current/ios/Icon-32.png and b/assets/icons/current/ios/Icon-32.png differ diff --git a/assets/icons/current/ios/Icon-32@2x.png b/assets/icons/current/ios/Icon-32@2x.png index 2f329b9e4..7c3332cf6 100644 Binary files a/assets/icons/current/ios/Icon-32@2x.png and b/assets/icons/current/ios/Icon-32@2x.png differ diff --git a/assets/icons/current/ios/Icon-40.png b/assets/icons/current/ios/Icon-40.png index 232ff1569..6550c7032 100644 Binary files a/assets/icons/current/ios/Icon-40.png and b/assets/icons/current/ios/Icon-40.png differ diff --git a/assets/icons/current/ios/Icon-40@2x.png b/assets/icons/current/ios/Icon-40@2x.png index 70b427703..bc68f0e6e 100644 Binary files a/assets/icons/current/ios/Icon-40@2x.png and b/assets/icons/current/ios/Icon-40@2x.png differ diff --git a/assets/icons/current/ios/Icon-40@3x.png b/assets/icons/current/ios/Icon-40@3x.png index fe90f82e8..fec9d5cc6 100644 Binary files a/assets/icons/current/ios/Icon-40@3x.png and b/assets/icons/current/ios/Icon-40@3x.png differ diff --git a/assets/icons/current/ios/Icon-44@2x.png b/assets/icons/current/ios/Icon-44@2x.png index 2815c8a10..27d3cd72a 100644 Binary files a/assets/icons/current/ios/Icon-44@2x.png and b/assets/icons/current/ios/Icon-44@2x.png differ diff --git a/assets/icons/current/ios/Icon-50@2x.png b/assets/icons/current/ios/Icon-50@2x.png index 6bc5c75b1..b6aef8921 100644 Binary files a/assets/icons/current/ios/Icon-50@2x.png and b/assets/icons/current/ios/Icon-50@2x.png differ diff --git a/assets/icons/current/ios/Icon-512.png b/assets/icons/current/ios/Icon-512.png index 3f7dbf2f8..fca710b38 100644 Binary files a/assets/icons/current/ios/Icon-512.png and b/assets/icons/current/ios/Icon-512.png differ diff --git a/assets/icons/current/ios/Icon-512@2x.png b/assets/icons/current/ios/Icon-512@2x.png index dbf32cbe3..e0905f5ae 100644 Binary files a/assets/icons/current/ios/Icon-512@2x.png and b/assets/icons/current/ios/Icon-512@2x.png differ diff --git a/assets/icons/current/ios/Icon-60@2x.png b/assets/icons/current/ios/Icon-60@2x.png index fe90f82e8..fec9d5cc6 100644 Binary files a/assets/icons/current/ios/Icon-60@2x.png and b/assets/icons/current/ios/Icon-60@2x.png differ diff --git a/assets/icons/current/ios/Icon-60@3x.png b/assets/icons/current/ios/Icon-60@3x.png index 8c94c5d2c..c122de44c 100644 Binary files a/assets/icons/current/ios/Icon-60@3x.png and b/assets/icons/current/ios/Icon-60@3x.png differ diff --git a/assets/icons/current/ios/Icon-76.png b/assets/icons/current/ios/Icon-76.png index a23a75f90..9c4162f52 100644 Binary files a/assets/icons/current/ios/Icon-76.png and b/assets/icons/current/ios/Icon-76.png differ diff --git a/assets/icons/current/ios/Icon-76@2x.png b/assets/icons/current/ios/Icon-76@2x.png index 5e157c362..54f199487 100644 Binary files a/assets/icons/current/ios/Icon-76@2x.png and b/assets/icons/current/ios/Icon-76@2x.png differ diff --git a/assets/icons/current/ios/Icon-83.5@2x.png b/assets/icons/current/ios/Icon-83.5@2x.png index dd9754679..067745058 100644 Binary files a/assets/icons/current/ios/Icon-83.5@2x.png and b/assets/icons/current/ios/Icon-83.5@2x.png differ diff --git a/assets/icons/current/ios/Icon-86@2x.png b/assets/icons/current/ios/Icon-86@2x.png index 8995f83f9..be698118d 100644 Binary files a/assets/icons/current/ios/Icon-86@2x.png and b/assets/icons/current/ios/Icon-86@2x.png differ diff --git a/assets/icons/current/ios/Icon-98@2x.png b/assets/icons/current/ios/Icon-98@2x.png index 7bd63fd33..d52f3bde9 100644 Binary files a/assets/icons/current/ios/Icon-98@2x.png and b/assets/icons/current/ios/Icon-98@2x.png differ diff --git a/assets/logo/current/app_logo_banner_cyan.png b/assets/logo/current/app_logo_banner_cyan.png new file mode 100644 index 000000000..a8def4077 Binary files /dev/null and b/assets/logo/current/app_logo_banner_cyan.png differ diff --git a/assets/logo/current/app_logo_banner_cyan_large.png b/assets/logo/current/app_logo_banner_cyan_large.png new file mode 100644 index 000000000..141148204 Binary files /dev/null and b/assets/logo/current/app_logo_banner_cyan_large.png differ diff --git a/assets/logo/current/app_logo_banner_white.png b/assets/logo/current/app_logo_banner_white.png new file mode 100644 index 000000000..396de54ec Binary files /dev/null and b/assets/logo/current/app_logo_banner_white.png differ diff --git a/assets/logo/current/app_logo_cyan.png b/assets/logo/current/app_logo_cyan.png new file mode 100644 index 000000000..285a4e93b Binary files /dev/null and b/assets/logo/current/app_logo_cyan.png differ diff --git a/assets/logo/current/app_logo_cyan.svg b/assets/logo/current/app_logo_cyan.svg new file mode 100644 index 000000000..0d3bf90c9 --- /dev/null +++ b/assets/logo/current/app_logo_cyan.svg @@ -0,0 +1,14 @@ + + + app_logo_cyan + + + + + + + + + \ No newline at end of file diff --git a/assets/logo/current/app_logo_white.png b/assets/logo/current/app_logo_white.png new file mode 100644 index 000000000..0a9afb9b9 Binary files /dev/null and b/assets/logo/current/app_logo_white.png differ diff --git a/assets/logo/current/app_logo_white.svg b/assets/logo/current/app_logo_white.svg new file mode 100644 index 000000000..9bf897c57 --- /dev/null +++ b/assets/logo/current/app_logo_white.svg @@ -0,0 +1,14 @@ + + + app_logo_white + + + + + + + + + \ No newline at end of file diff --git a/assets/logo/app_logo.svg b/assets/logo/v1/app_logo.svg similarity index 100% rename from assets/logo/app_logo.svg rename to assets/logo/v1/app_logo.svg diff --git a/assets/logo/app_logo_banner.png b/assets/logo/v1/app_logo_banner.png similarity index 100% rename from assets/logo/app_logo_banner.png rename to assets/logo/v1/app_logo_banner.png diff --git a/assets/logo/app_logo_banner_new.png b/assets/logo/v1/app_logo_banner_new.png similarity index 100% rename from assets/logo/app_logo_banner_new.png rename to assets/logo/v1/app_logo_banner_new.png diff --git a/assets/logo/app_logo_filled.svg b/assets/logo/v1/app_logo_filled.svg similarity index 100% rename from assets/logo/app_logo_filled.svg rename to assets/logo/v1/app_logo_filled.svg diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index 097823051..11ce5e75a 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,118 +1,178 @@ { "images" : [ { - "filename" : "Icon-20@2x-2.png", + "filename" : "Icon-20@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { - "filename" : "Icon-App-20x20@3x.png", + "filename" : "Icon-20@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { - "filename" : "Icon-App-29x29@1x.png", + "filename" : "Icon-29.png", "idiom" : "iphone", "scale" : "1x", "size" : "29x29" }, { - "filename" : "Icon-App-29x29@2x.png", + "filename" : "Icon-29@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { - "filename" : "Icon-App-29x29@3x.png", + "filename" : "Icon-29@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { - "filename" : "Icon-App-40x40@2x.png", + "filename" : "Icon-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { - "filename" : "Icon-App-40x40@3x.png", + "filename" : "Icon-40@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { - "filename" : "Icon-App-60x60@2x.png", + "filename" : "Icon-60@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { - "filename" : "Icon-App-60x60@3x.png", + "filename" : "Icon-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "filename" : "Icon-App-20x20@1x.png", + "filename" : "Icon-20.png", "idiom" : "ipad", "scale" : "1x", "size" : "20x20" }, { - "filename" : "Icon-App-20x20@2x.png", + "filename" : "Icon-20@2x-1.png", "idiom" : "ipad", "scale" : "2x", "size" : "20x20" }, { - "filename" : "Icon-App-29x29@1x.png", + "filename" : "Icon-30.png", "idiom" : "ipad", "scale" : "1x", "size" : "29x29" }, { - "filename" : "Icon-App-29x29@2x.png", + "filename" : "Icon-29@2x-1.png", "idiom" : "ipad", "scale" : "2x", "size" : "29x29" }, { - "filename" : "Icon-App-40x40@1x.png", + "filename" : "Icon-40.png", "idiom" : "ipad", "scale" : "1x", "size" : "40x40" }, { - "filename" : "Icon-App-40x40@2x.png", + "filename" : "Icon-40@2x-1.png", "idiom" : "ipad", "scale" : "2x", "size" : "40x40" }, { - "filename" : "Icon-App-76x76@1x.png", + "filename" : "Icon-76.png", "idiom" : "ipad", "scale" : "1x", "size" : "76x76" }, { - "filename" : "Icon-App-76x76@2x.png", + "filename" : "Icon-76@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "76x76" }, { - "filename" : "Icon-App-83.5x83.5@2x.png", + "filename" : "Icon-83.5@2x.png", "idiom" : "ipad", "scale" : "2x", "size" : "83.5x83.5" }, { - "filename" : "Icon-App-1024x1024@1x.png", + "filename" : "Icon-1024.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" + }, + { + "filename" : "Icon-16.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "filename" : "Icon-16@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "filename" : "Icon-32.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "filename" : "Icon-32@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "filename" : "Icon-128.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "filename" : "Icon-128@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "filename" : "Icon-256.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "Icon-513.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "Icon-512.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "Icon-512@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" } ], "info" : { diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-1024.png new file mode 100644 index 000000000..e0905f5ae Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-1024.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-128.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-128.png new file mode 100644 index 000000000..c176fbdcf Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-128.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-128@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-128@2x.png new file mode 100644 index 000000000..51e13f4bd Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-128@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-16.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-16.png new file mode 100644 index 000000000..41b3a0d0c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-16.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-16@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-16@2x.png new file mode 100644 index 000000000..808d35321 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-16@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20.png new file mode 100644 index 000000000..8e407b39c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png new file mode 100644 index 000000000..6550c7032 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-2.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-2.png deleted file mode 100644 index 3d25ad676..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-2.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png new file mode 100644 index 000000000..6550c7032 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png new file mode 100644 index 000000000..ce29c3290 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-256.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-256.png new file mode 100644 index 000000000..51e13f4bd Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-256.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29.png new file mode 100644 index 000000000..de8373e7d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png new file mode 100644 index 000000000..ae9f12f5a Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png new file mode 100644 index 000000000..ae9f12f5a Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png new file mode 100644 index 000000000..5125d9e7d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-30.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-30.png new file mode 100644 index 000000000..de8373e7d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-30.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-32.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-32.png new file mode 100644 index 000000000..808d35321 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-32.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-32@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-32@2x.png new file mode 100644 index 000000000..7c3332cf6 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-32@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40.png new file mode 100644 index 000000000..6550c7032 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png new file mode 100644 index 000000000..bc68f0e6e Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png new file mode 100644 index 000000000..bc68f0e6e Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png new file mode 100644 index 000000000..fec9d5cc6 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-512.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-512.png new file mode 100644 index 000000000..fca710b38 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-512.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-512@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-512@2x.png new file mode 100644 index 000000000..e0905f5ae Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-512@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-513.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-513.png new file mode 100644 index 000000000..fca710b38 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-513.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png new file mode 100644 index 000000000..fec9d5cc6 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png new file mode 100644 index 000000000..c122de44c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png new file mode 100644 index 000000000..9c4162f52 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png new file mode 100644 index 000000000..54f199487 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png new file mode 100644 index 000000000..067745058 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.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 deleted file mode 100644 index 0dbfd56ca..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null 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 deleted file mode 100644 index 95f631598..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null 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 deleted file mode 100644 index 0d224a930..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null 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 deleted file mode 100644 index e5faaadaf..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null 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 deleted file mode 100644 index 9e1bf00a3..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null 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 deleted file mode 100644 index f0a22e516..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null 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 deleted file mode 100644 index 823f32fe4..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null 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 deleted file mode 100644 index 0d224a930..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null 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 deleted file mode 100644 index f5fa38a7d..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null 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 deleted file mode 100644 index 8bcceb7d8..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null 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 deleted file mode 100644 index 232b54ac2..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png and /dev/null 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 deleted file mode 100644 index c40f47f04..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png and /dev/null 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 deleted file mode 100644 index d315ff0f9..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png and /dev/null 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 deleted file mode 100644 index f75f95dde..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png and /dev/null 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 deleted file mode 100644 index 8bcceb7d8..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null 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 deleted file mode 100644 index 0dd59536b..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null 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 deleted file mode 100644 index 21f904b5e..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png and /dev/null 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 deleted file mode 100644 index 87ac33f83..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png and /dev/null 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 deleted file mode 100644 index 12a5c7ccd..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null 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 deleted file mode 100644 index c6a2061c7..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null 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 deleted file mode 100644 index 2c5c52253..000000000 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/Contents.json b/ios/Runner/Assets.xcassets/Contents.json new file mode 100644 index 000000000..73c00596a --- /dev/null +++ b/ios/Runner/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json index b7ec78497..cf7bceeba 100644 --- a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -6,7 +6,7 @@ "scale" : "1x" }, { - "filename" : "Icon-257.png", + "filename" : "Icon-256.png", "idiom" : "universal", "scale" : "2x" }, diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-128.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-128.png index 30afe1ddb..4968ae80e 100644 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-128.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-128.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-256.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-256.png new file mode 100644 index 000000000..d718e9cf2 Binary files /dev/null and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-256.png differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-257.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-257.png deleted file mode 100644 index 52b890b33..000000000 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-257.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-512.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-512.png index 255dba42f..18e217df4 100644 Binary files a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-512.png and b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Icon-512.png differ diff --git a/lib/store/rooms/actions.dart b/lib/store/rooms/actions.dart index 07a54d84b..4e02e1072 100644 --- a/lib/store/rooms/actions.dart +++ b/lib/store/rooms/actions.dart @@ -174,7 +174,8 @@ ThunkAction syncRooms( // the end would be room.prevHash == room.lastHash final roomUpdated = store.state.roomStore.rooms[room.id]; - if (roomUpdated.limited && + if (roomUpdated != null && + room.limited && room.prevHash != null && room.prevHash != room.lastHash) { store.dispatch( diff --git a/lib/store/rooms/room/model.dart b/lib/store/rooms/room/model.dart index b3e189b45..22e1496b5 100644 --- a/lib/store/rooms/room/model.dart +++ b/lib/store/rooms/room/model.dart @@ -571,12 +571,15 @@ class Room { // Filter to find startTime and endTime final messagesAll = List.from(messagesMap.values); - print('[fromMessageEvents] ${this.name}'); - print('[limited] ${limited}'); - print('[limited - cached] ${this.limited}'); - print('[lastHash] ${lastHash}'); - print('[lastHash - Cached] ${this.lastHash}'); - print('[prevHash] ${prevHash}'); + // TODO: after message catchup works, remove this + if (true) { + // print('[fromMessageEvents] ${this.name}'); + // print('[limited] ${limited}'); + // print('[limited - cached] ${this.limited}'); + // print('[lastHash] ${lastHash}'); + // print('[lastHash - Cached] ${this.lastHash}'); + // print('[prevHash] ${prevHash}'); + } return this.copyWith( outbox: outbox, diff --git a/lib/views/home/index.dart b/lib/views/home/index.dart index a78c659aa..a9a8508c1 100644 --- a/lib/views/home/index.dart +++ b/lib/views/home/index.dart @@ -395,10 +395,11 @@ class HomeViewState extends State { child: Container( width: Dimensions.badgeAvatarSize, height: Dimensions.badgeAvatarSize, - color: Colors.green, + color: + Theme.of(context).scaffoldBackgroundColor, child: Icon( Icons.lock, - color: Colors.white, + color: Colors.green[700], size: Dimensions.iconSizeMini, ), )), diff --git a/lib/views/widgets/appbars/appbar-chat.dart b/lib/views/widgets/appbars/appbar-chat.dart index 959c60cee..ca15df82d 100644 --- a/lib/views/widgets/appbars/appbar-chat.dart +++ b/lib/views/widgets/appbars/appbar-chat.dart @@ -151,7 +151,7 @@ class AppBarChatState extends State { child: Container( width: Dimensions.badgeAvatarSize, height: Dimensions.badgeAvatarSize, - color: Colors.green, + color: Colors.green[700], child: Icon( Icons.lock, color: Colors.white, diff --git a/readme.md b/readme.md index 98ba3ddb5..0a41a2f3b 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@

- +