Fix #87: Changing Stack position and types of button

fanzru · Jun 20, 2022 · cea9282 · cea9282
1 parent c3d2fe8
commit cea9282
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 49 deletions.
diff --git a/mobile/lib/screen/form_login/login_screen.dart b/mobile/lib/screen/form_login/login_screen.dart
@@ -81,17 +81,6 @@ class _LoginScreenState extends State<LoginScreen> {
           padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 30),
           child: Stack(
             children: [
-              TextButton(
-                  style: ButtonStyle(
-                      overlayColor: MaterialStateProperty.all(Colors.black12)),
-                  onPressed: _handleKembaliButton,
-                  child: const Text(
-                    "Kembali",
-                    style: TextStyle(
-                        color: Colors.black,
-                        fontWeight: FontWeight.bold,
-                        fontSize: 15),
-                  )),
               Center(
                 child: SingleChildScrollView(
                   reverse: true,
@@ -217,6 +206,20 @@ class _LoginScreenState extends State<LoginScreen> {
                   ),
                 ),
               ),
+              ElevatedButton(
+                style: ButtonStyle(
+                  overlayColor: MaterialStateProperty.all(Colors.black12),
+                  backgroundColor: MaterialStateProperty.all(Colors.white),
+                ),
+                onPressed: _handleKembaliButton,
+                child: const Text(
+                  "Kembali",
+                  style: TextStyle(
+                      color: Colors.black,
+                      fontWeight: FontWeight.bold,
+                      fontSize: 15),
+                ),
+              ),
             ],
           ),
         )));

diff --git a/mobile/lib/screen/form_register/register_screen.dart b/mobile/lib/screen/form_register/register_screen.dart
@@ -95,18 +95,6 @@ class RegisterScreenState extends State<RegisterScreen> {
             padding: const EdgeInsets.symmetric(vertical: 15, horizontal: 30),
             child: Stack(
               children: [
-                TextButton(
-                    style: ButtonStyle(
-                        overlayColor:
-                            MaterialStateProperty.all(Colors.black12)),
-                    onPressed: _handleKembaliButton,
-                    child: const Text(
-                      "Kembali",
-                      style: TextStyle(
-                          color: Colors.black,
-                          fontWeight: FontWeight.bold,
-                          fontSize: 15),
-                    )),
                 Center(
                   child: SingleChildScrollView(
                     reverse: true,
@@ -266,7 +254,21 @@ class RegisterScreenState extends State<RegisterScreen> {
                       ),
                     ),
                   ),
-                )
+                ),
+                ElevatedButton(
+                  style: ButtonStyle(
+                    overlayColor: MaterialStateProperty.all(Colors.black12),
+                    backgroundColor: MaterialStateProperty.all(Colors.white),
+                  ),
+                  onPressed: _handleKembaliButton,
+                  child: const Text(
+                    "Kembali",
+                    style: TextStyle(
+                        color: Colors.black,
+                        fontWeight: FontWeight.bold,
+                        fontSize: 15),
+                  ),
+                ),
               ],
             )),
       ),

diff --git a/mobile/lib/screen/form_review/form_review_screen.dart b/mobile/lib/screen/form_review/form_review_screen.dart
@@ -144,17 +144,6 @@ class _FormReviewScreenState extends State<FormReviewScreen> {
           padding: const EdgeInsets.all(12.0),
           child: Stack(
             children: [
-              TextButton(
-                  style: ButtonStyle(
-                      overlayColor: MaterialStateProperty.all(Colors.black12)),
-                  onPressed: _handleKembaliButton,
-                  child: const Text(
-                    "Kembali",
-                    style: TextStyle(
-                        color: Colors.black,
-                        fontWeight: FontWeight.bold,
-                        fontSize: 15),
-                  )),
               Center(
                 child: SingleChildScrollView(
                   reverse: true,
@@ -349,7 +338,21 @@ class _FormReviewScreenState extends State<FormReviewScreen> {
                     ),
                   ),
                 ),
-              )
+              ),
+              ElevatedButton(
+                style: ButtonStyle(
+                  overlayColor: MaterialStateProperty.all(Colors.black12),
+                  backgroundColor: MaterialStateProperty.all(Colors.white),
+                ),
+                onPressed: _handleKembaliButton,
+                child: const Text(
+                  "Kembali",
+                  style: TextStyle(
+                      color: Colors.black,
+                      fontWeight: FontWeight.bold,
+                      fontSize: 15),
+                ),
+              ),
             ],
           ),
         ),

diff --git a/mobile/lib/screen/form_tikum/form_tikum_screen.dart b/mobile/lib/screen/form_tikum/form_tikum_screen.dart
@@ -87,18 +87,6 @@ class _FormTikumScreenState extends State<FormTikumScreen> {
             padding: const EdgeInsets.all(12.0),
             child: Stack(
               children: [
-                TextButton(
-                  style: ButtonStyle(
-                      overlayColor: MaterialStateProperty.all(Colors.black12)),
-                  onPressed: _handleKembaliButton,
-                  child: const Text(
-                    "Kembali",
-                    style: TextStyle(
-                        color: Colors.black,
-                        fontWeight: FontWeight.bold,
-                        fontSize: 15),
-                  ),
-                ),
                 Center(
                   child: SingleChildScrollView(
                     reverse: true,
@@ -347,7 +335,21 @@ class _FormTikumScreenState extends State<FormTikumScreen> {
                       ),
                     ),
                   ),
-                )
+                ),
+                ElevatedButton(
+                  style: ButtonStyle(
+                    overlayColor: MaterialStateProperty.all(Colors.black12),
+                    backgroundColor: MaterialStateProperty.all(Colors.white),
+                  ),
+                  onPressed: _handleKembaliButton,
+                  child: const Text(
+                    "Kembali",
+                    style: TextStyle(
+                        color: Colors.black,
+                        fontWeight: FontWeight.bold,
+                        fontSize: 15),
+                  ),
+                ),
               ],
             ),
           ),