Merge pull request #77 from fanzru/kae_dev

Styling and Null Safety Fix on Mobile
fanzru · Jun 15, 2022 · b955eb9 · b955eb9
2 parents 5bdd17f + c9af092
commit b955eb9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/mobile/lib/screen/home/components/tikum/my_tikum.dart b/mobile/lib/screen/home/components/tikum/my_tikum.dart
@@ -24,6 +24,7 @@ class _MyTikumState extends State<MyTikum> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      backgroundColor: Colors.white,
       body: FutureBuilder<SecureProfile>(
         future: futureProfile,
         builder: (context, snapshot) {

diff --git a/mobile/lib/screen/home/components/tikum/mytikum_card.dart b/mobile/lib/screen/home/components/tikum/mytikum_card.dart
@@ -152,7 +152,8 @@ class MyTikumCard extends StatelessWidget {
                   )
                 ],
               ),
-            if (tikum.linkGroup != null)
+            if (tikum.linkGroup != null &&
+                Uri.tryParse(tikum.linkGroup!)!.isAbsolute)
               ElevatedButton(
                   style: ButtonStyle(
                       backgroundColor: MaterialStateProperty.all(Colors.black)),

diff --git a/mobile/lib/screen/home/components/tikum/tikum_card.dart b/mobile/lib/screen/home/components/tikum/tikum_card.dart
@@ -101,7 +101,8 @@ class TikumCard extends StatelessWidget {
                   )
                 ],
               ),
-            if (tikum.linkGroup != null)
+            if (tikum.linkGroup != null &&
+                Uri.tryParse(tikum.linkGroup!)!.isAbsolute)
               ElevatedButton(
                   style: ButtonStyle(
                       backgroundColor: MaterialStateProperty.all(Colors.black)),