From 65d5fd48d3357849508222b64ab2c92c216e2cfb Mon Sep 17 00:00:00 2001
From: Shawn <shawn@gskinner.com>
Date: Wed, 7 Sep 2022 13:28:41 -0600
Subject: [PATCH] Rename to LocaleSwitcher, tweak HomeMenu layout

---
 ...ocale_button.dart => locale_switcher.dart} |  4 +--
 lib/ui/screens/home_menu/home_menu.dart       | 34 ++++++++++---------
 lib/ui/screens/intro/intro_screen.dart        |  4 +--
 3 files changed, 22 insertions(+), 20 deletions(-)
 rename lib/ui/common/controls/{locale_button.dart => locale_switcher.dart} (82%)

diff --git a/lib/ui/common/controls/locale_button.dart b/lib/ui/common/controls/locale_switcher.dart
similarity index 82%
rename from lib/ui/common/controls/locale_button.dart
rename to lib/ui/common/controls/locale_switcher.dart
index 3f9b3914..9150b9c2 100644
--- a/lib/ui/common/controls/locale_button.dart
+++ b/lib/ui/common/controls/locale_switcher.dart
@@ -1,7 +1,7 @@
 import 'package:wonders/common_libs.dart';
 
-class LocaleButton extends StatelessWidget with GetItMixin {
-  LocaleButton({Key? key}) : super(key: key);
+class LocaleSwitcher extends StatelessWidget with GetItMixin {
+  LocaleSwitcher({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/ui/screens/home_menu/home_menu.dart b/lib/ui/screens/home_menu/home_menu.dart
index fbdf1d9a..138e0694 100644
--- a/lib/ui/screens/home_menu/home_menu.dart
+++ b/lib/ui/screens/home_menu/home_menu.dart
@@ -4,7 +4,7 @@ import 'package:wonders/common_libs.dart';
 import 'package:wonders/logic/data/wonder_data.dart';
 import 'package:wonders/ui/common/app_backdrop.dart';
 import 'package:wonders/ui/common/app_icons.dart';
-import 'package:wonders/ui/common/controls/locale_button.dart';
+import 'package:wonders/ui/common/controls/locale_switcher.dart';
 import 'package:wonders/ui/screens/home_menu/about_dialog_content.dart';
 
 class HomeMenu extends StatelessWidget {
@@ -50,11 +50,23 @@ class HomeMenu extends StatelessWidget {
           ),
         ),
 
-        /// Back btn
-        BackBtn.close(
-          bgColor: Colors.transparent,
-          iconColor: $styles.colors.offWhite,
-        ).safe(),
+        SafeArea(
+          child: PaddedRow(
+            padding: EdgeInsets.symmetric(
+              horizontal: $styles.insets.md,
+              vertical: $styles.insets.sm,
+            ),
+            children: [
+              /// Back btn
+              BackBtn.close(
+                bgColor: Colors.transparent,
+                iconColor: $styles.colors.offWhite,
+              ),
+              Spacer(),
+              LocaleSwitcher()
+            ],
+          ),
+        ),
 
         /// Content
         Positioned.fill(
@@ -77,16 +89,6 @@ class HomeMenu extends StatelessWidget {
             ),
           ),
         ),
-        Positioned(
-          right: -$styles.insets.xs,
-          top: $styles.insets.xs,
-          child: SafeArea(
-            child: Padding(
-              padding: EdgeInsets.symmetric(horizontal: $styles.insets.lg),
-              child: LocaleButton(),
-            ),
-          ),
-        ),
       ],
     );
   }
diff --git a/lib/ui/screens/intro/intro_screen.dart b/lib/ui/screens/intro/intro_screen.dart
index 0e7bf99a..1ec5fa70 100644
--- a/lib/ui/screens/intro/intro_screen.dart
+++ b/lib/ui/screens/intro/intro_screen.dart
@@ -2,7 +2,7 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:wonders/common_libs.dart';
 import 'package:wonders/ui/common/app_icons.dart';
 import 'package:wonders/ui/common/controls/app_page_indicator.dart';
-import 'package:wonders/ui/common/controls/locale_button.dart';
+import 'package:wonders/ui/common/controls/locale_switcher.dart';
 import 'package:wonders/ui/common/static_text_scale.dart';
 import 'package:wonders/ui/common/themed_text.dart';
 import 'package:wonders/ui/common/utils/app_haptics.dart';
@@ -142,7 +142,7 @@ class _IntroScreenState extends State<IntroScreen> {
       Positioned(
         right: 0,
         top: 0,
-        child: LocaleButton(),
+        child: LocaleSwitcher(),
       ),
     ]);