Fix styles icon placement

jb3rndt · Mar 4, 2024 · a7d0f9b · a7d0f9b
1 parent 8749271
commit a7d0f9b
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/example/CHANGELOG.md b/example/CHANGELOG.md
@@ -0,0 +1,3 @@
+## Unreleased
+### Fixed
+- Icon widget in prebuilt styles placed wronlgy
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -36,7 +36,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.example"
-        minSdkVersion 16
+        minSdkVersion flutter.minSdkVersion
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

diff --git a/lib/styles/style_1_bottom_navbar.dart b/lib/styles/style_1_bottom_navbar.dart
@@ -25,7 +25,7 @@ class Style1BottomNavBar extends StatelessWidget {
           ),
           if (item.title != null)
             Padding(
-              padding: const EdgeInsets.only(top: 15),
+              padding: const EdgeInsets.only(top: 4),
               child: Material(
                 type: MaterialType.transparency,
                 child: FittedBox(

diff --git a/lib/styles/style_3_bottom_navbar.dart b/lib/styles/style_3_bottom_navbar.dart
@@ -13,14 +13,16 @@ class Style3BottomNavBar extends StatelessWidget {
   Widget _buildItem(ItemConfig item, bool isSelected) => Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: <Widget>[
-          IconTheme(
-            data: IconThemeData(
-              size: item.iconSize,
-              color: isSelected
-                  ? item.activeColorPrimary
-                  : item.inactiveColorPrimary,
+          Flexible(
+            child: IconTheme(
+              data: IconThemeData(
+                size: item.iconSize,
+                color: isSelected
+                    ? item.activeColorPrimary
+                    : item.inactiveColorPrimary,
+              ),
+              child: isSelected ? item.icon : item.inactiveIcon,
             ),
-            child: isSelected ? item.icon : item.inactiveIcon,
           ),
           if (item.title != null)
             FittedBox(

diff --git a/lib/styles/style_6_bottom_navbar.dart b/lib/styles/style_6_bottom_navbar.dart
@@ -59,14 +59,16 @@ class _Style6BottomNavBarState extends State<Style6BottomNavBar>
           child: Column(
             mainAxisAlignment: MainAxisAlignment.center,
             children: <Widget>[
-              IconTheme(
-                data: IconThemeData(
-                  size: item.iconSize,
-                  color: isSelected
-                      ? item.activeColorPrimary
-                      : item.inactiveColorPrimary,
+              Flexible(
+                child: IconTheme(
+                  data: IconThemeData(
+                    size: item.iconSize,
+                    color: isSelected
+                        ? item.activeColorPrimary
+                        : item.inactiveColorPrimary,
+                  ),
+                  child: isSelected ? item.icon : item.inactiveIcon,
                 ),
-                child: isSelected ? item.icon : item.inactiveIcon,
               ),
               if (item.title != null)
                 FittedBox(