Fixes for Fluter 22 on latest Master

gskinnerTeam · Sep 18, 2020 · 6ffc257 · 6ffc257
1 parent ef94181
commit 6ffc257
Show file tree

Hide file tree

Showing 9 changed files with 137 additions and 91 deletions.
diff --git a/flokk_src/lib/_internal/components/pinned_stack.dart b/flokk_src/lib/_internal/components/pinned_stack.dart
@@ -17,15 +17,15 @@ class PinnedStack extends StatelessWidget {
   final StackFit fit;
   final AlignmentGeometry alignment;
   final TextDirection textDirection;
-  final Overflow overflow;
+  final Clip clip;
 
   const PinnedStack(
       {Key key,
       this.children,
       this.fit = StackFit.expand,
       this.alignment = Alignment.topLeft,
       this.textDirection = TextDirection.ltr,
-      this.overflow = Overflow.visible})
+      this.clip = Clip.none})
       : super(key: key);
 
   @override
@@ -36,7 +36,7 @@ class PinnedStack extends StatelessWidget {
         child: Stack(
           fit: fit,
           alignment: alignment,
-          overflow: overflow,
+          clipBehavior: clip,
           textDirection: textDirection,
           children: children,
         ),

diff --git a/flokk_src/lib/commands/bootstrap_command.dart b/flokk_src/lib/commands/bootstrap_command.dart
@@ -65,7 +65,7 @@ class BootstrapCommand extends AbstractCommand {
     });
 
     /// Reset models if there are any errors, or if the app version has been updated
-    if (errorLoadingData || appModel.version != AppModel.kCurrentVersion) {
+    if (errorLoadingData) {
       authModel.reset();
       twitterModel.reset();
       githubModel.reset();

diff --git a/flokk_src/lib/styled_components/clickable_icon_row.dart b/flokk_src/lib/styled_components/clickable_icon_row.dart
@@ -62,7 +62,7 @@ class _ClickableIconRowState extends State<ClickableIconRow> {
         ),
         padding: EdgeInsets.symmetric(horizontal: Insets.l, vertical: Insets.m),
         child: Stack(
-          overflow: Overflow.visible,
+          clipBehavior: Clip.none,
           children: [
             Row(
               crossAxisAlignment: CrossAxisAlignment.start,

diff --git a/flokk_src/lib/styled_components/flokk_logo.dart b/flokk_src/lib/styled_components/flokk_logo.dart
@@ -23,7 +23,7 @@ class FlokkSidebarLogo extends StatelessWidget {
     return Container(
       width: skinny ? 140 : 240,
       child: Stack(
-        overflow: Overflow.visible,
+        clipBehavior: Clip.none,
         children: [
           Image.asset("assets/images/sidebar-logo.png", width: skinny ? 140 : 160, filterQuality: FilterQuality.high),
           if (!skinny) ...{

diff --git a/flokk_src/lib/views/contact_page/contacts_list_with_headers.dart b/flokk_src/lib/views/contact_page/contacts_list_with_headers.dart
@@ -122,7 +122,7 @@ class _ContactsListWithHeadersState extends State<ContactsListWithHeaders> {
               onCheckChanged: () => setState(() {}),
             )
                 .opacity(checked.isEmpty ? 0 : 1, animate: true)
-                .scale(checked.isEmpty ? .98 : 1, animate: true)
+                .scale(all: checked.isEmpty ? .98 : 1, animate: true)
                 .translate(offset: Offset(0, checked.isEmpty ? -4 : 0), animate: true)
                 .animate(.1.seconds, Curves.easeOut)
           ],

diff --git a/flokk_src/lib/views/dashboard_page/social/social_activities_section.dart b/flokk_src/lib/views/dashboard_page/social/social_activities_section.dart
@@ -36,15 +36,15 @@ class _SocialActivitySectionState extends State<SocialActivitySection> {
     GithubModel gitModel = context.watch();
     TwitterModel twitterModel = context.watch();
     return LayoutBuilder(
-      builder: (_, constraints) {
+      builder: (layoutContext, constraints) {
         /// Responsively size tab bars
         double tabWidth = constraints.maxWidth < PageBreaks.LargePhone ? 240 : 280;
         TextStyle headerStyle = TextStyles.T1;
 
         bool useTabView = constraints.maxWidth < PageBreaks.TabletPortrait - 100;
 
         /// Determine which tab should be selected
-        var sectionType = context.select<AppModel, DashboardSocialSectionType>((model) => model.dashSocialSection);
+        var sectionType = layoutContext.select<AppModel, DashboardSocialSectionType>((model) => model.dashSocialSection);
         int tabIndex = 0;
         if (sectionType == DashboardSocialSectionType.Twitter) tabIndex = 1;
         if (sectionType == DashboardSocialSectionType.Git) tabIndex = 2;

diff --git a/flokk_src/lib/views/empty_states/placeholder_widget_helpers.dart b/flokk_src/lib/views/empty_states/placeholder_widget_helpers.dart
@@ -85,7 +85,7 @@ class PlaceholderImageAndBgStack extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Stack(
-      overflow: Overflow.visible,
+      clipBehavior: Clip.none,
       children: [
         bgWidget ?? _BgCircle(),
         Image.asset("assets/images/empty-$path@2x.png", height: height).positioned(top: top, left: left),