factorize open avatar to function. Open avatar viewer set to contain

odrevet · May 31, 2019 · acb7d1f · acb7d1f
1 parent d550a5c
commit acb7d1f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 48 deletions.
diff --git a/lib/account.dart b/lib/account.dart
@@ -29,6 +29,21 @@ class Account {
   String avatar;
 }
 
+openAvatarViewerDialog(context, image){
+  Navigator.of(context).push(MaterialPageRoute<Null>(
+      builder: (BuildContext context) {
+        return Container(
+          decoration: BoxDecoration(
+            image: DecorationImage(
+              image: image,
+              fit: BoxFit.contain,
+            ),
+          ),
+        );
+      },
+      fullscreenDialog: true));
+}
+
 String extractAccountId(str) {
   final idRegex = RegExp(r'/account/(\d+).html');
   var match = idRegex.firstMatch(str);
@@ -142,21 +157,6 @@ class AccountPageWidget extends StatelessWidget {
     );
   }
 
-  _openAvatarViewerDialog(context, image){
-    Navigator.of(context).push(MaterialPageRoute<Null>(
-        builder: (BuildContext context) {
-          return Container(
-            decoration: BoxDecoration(
-              image: DecorationImage(
-                image: image,
-                fit: BoxFit.cover,
-              ),
-            ),
-          );
-        },
-        fullscreenDialog: true));
-  }
-
   Widget _buildView(BuildContext context, Account account) {
     final url = baseUri + account.avatar;
     final image = NetworkImage(url);
@@ -179,7 +179,7 @@ class AccountPageWidget extends StatelessWidget {
                       Expanded(
                           child: InkWell(
                               onTap: () {
-                                _openAvatarViewerDialog(context, image);
+                                openAvatarViewerDialog(context, image);
                               },
                               child: Image.network(url))),
                       Expanded(

diff --git a/lib/manageAccount.dart b/lib/manageAccount.dart
@@ -33,21 +33,6 @@ class ManageAccountPageWidget extends StatelessWidget {
     );
   }
 
-  _openAvatarViewerDialog(context, image){
-    Navigator.of(context).push(MaterialPageRoute<Null>(
-        builder: (BuildContext context) {
-          return Container(
-            decoration: BoxDecoration(
-              image: DecorationImage(
-                image: image,
-                fit: BoxFit.cover,
-              ),
-            ),
-          );
-        },
-        fullscreenDialog: true));
-  }
-
   Widget _buildView(BuildContext context, Account account) {
     final url = baseUri + account.avatar;
     final image = NetworkImage(url);
@@ -65,7 +50,7 @@ class ManageAccountPageWidget extends StatelessWidget {
                   Expanded(
                       child: InkWell(
                           onTap: () {
-                            _openAvatarViewerDialog(context, image);
+                            openAvatarViewerDialog(context, image);
                           },
                           child: Image.network(url))),
                   Expanded(

diff --git a/lib/trombidoscope.dart b/lib/trombidoscope.dart
@@ -83,21 +83,6 @@ class _TrombidoscopeWidgetState extends State<TrombidoscopeWidget> {
     );
   }
 
-  _openAvatarViewerDialog(context, image){
-    Navigator.of(context).push(MaterialPageRoute<Null>(
-        builder: (BuildContext context) {
-          return Container(
-            decoration: BoxDecoration(
-              image: DecorationImage(
-                image: image,
-                fit: BoxFit.cover,
-              ),
-            ),
-          );
-        },
-        fullscreenDialog: true));
-  }
-
   Widget _buildView(
       BuildContext context, Map<String, AccountLink> accountLinks) {
     var rows = <GestureDetector>[];
@@ -114,7 +99,7 @@ class _TrombidoscopeWidgetState extends State<TrombidoscopeWidget> {
                       account: fetchAccount(accountLink.id))));
         },
         onLongPress: () {
-          _openAvatarViewerDialog(context, NetworkImage(url));
+          openAvatarViewerDialog(context, NetworkImage(url));
         },
         child: Container(
           child: Text(accountLink.name, style: _font),