Merge pull request #93 from fanzru/staging

Bump main release
fanzru · Jun 22, 2022 · e9b4510 · e9b4510
2 parents 11296dc + 4b6357c
commit e9b4510
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/mobile/lib/screen/form_register/register_screen.dart b/mobile/lib/screen/form_register/register_screen.dart
@@ -66,25 +66,27 @@ class RegisterScreenState extends State<RegisterScreen> {
   @override
   Widget build(BuildContext context) {
     void _handleSubmit() async {
-      try {
-        showDialog(
-            context: context,
-            builder: (context) => const Center(
-                  child: SizedBox(
-                    height: 100,
-                    width: 100,
-                    child: CircularProgressIndicator(),
-                  ),
-                ));
-        await registerUser(_namaController.text, _emailController.text,
-            _passwordController.text);
-        Navigator.pop(context);
-        Navigator.pushNamedAndRemoveUntil(
-            context, HomeScreen.routeName, (route) => false);
-        ShowSnackBar(context, "Akun ${_namaController.text} berhasil dibuat");
-      } catch (err) {
-        Navigator.pop(context);
-        ShowSnackBar(context, "$err");
+      if (_formKey.currentState!.validate()) {
+        try {
+          showDialog(
+              context: context,
+              builder: (context) => const Center(
+                    child: SizedBox(
+                      height: 100,
+                      width: 100,
+                      child: CircularProgressIndicator(),
+                    ),
+                  ));
+          await registerUser(_namaController.text, _emailController.text,
+              _passwordController.text);
+          Navigator.pop(context);
+          Navigator.pushNamedAndRemoveUntil(
+              context, HomeScreen.routeName, (route) => false);
+          ShowSnackBar(context, "Akun ${_namaController.text} berhasil dibuat");
+        } catch (err) {
+          Navigator.pop(context);
+          ShowSnackBar(context, "$err");
+        }
       }
     }
 

diff --git a/mobile/lib/screen/home/components/tikum/mytikum_card.dart b/mobile/lib/screen/home/components/tikum/mytikum_card.dart
@@ -129,7 +129,7 @@ class MyTikumCard extends StatelessWidget {
                     fontWeight: FontWeight.bold,
                   ),
                 ),
-                Text(tikum.tempatTujuan)
+                Text(tikum.tempatKumpul)
               ],
             ),
             const SizedBox(

diff --git a/mobile/lib/screen/home/components/tikum/tikum_card.dart b/mobile/lib/screen/home/components/tikum/tikum_card.dart
@@ -76,7 +76,7 @@ class TikumCard extends StatelessWidget {
                     fontWeight: FontWeight.bold,
                   ),
                 ),
-                Text(tikum.tempatTujuan)
+                Text(tikum.tempatKumpul)
               ],
             ),
             const SizedBox(