fix: Fixed templates for tab and navigation.

mathrunet · Dec 15, 2023 · 3b0c2bb · 3b0c2bb
1 parent f3de01f
commit 3b0c2bb
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/packages/katana_cli/lib/command/code/tmp/navigation.dart b/packages/katana_cli/lib/command/code/tmp/navigation.dart
@@ -90,7 +90,7 @@ enum ${className}PageNavigation {
 
   /// The first navigation to display.
   // TODO: Specify the initial navigation.
-  static final ${className}PageTab initialNavigation = ${className}PageNavigation.navigation1;
+  static const ${className}PageNavigation initialNavigation = ${className}PageNavigation.navigation1;
 
   /// Get the label of ${className}PageNavigation.
   // TODO: Specify a label for each navigation.
@@ -173,9 +173,11 @@ class ${className}Page extends PageScopedWidget {
         currentIndex: nestedRouter.currentQuery?.key<${className}PageNavigation>()?.index ??
             ${className}PageNavigation.initialNavigation.index,
         onTap: (index) {
-          nestedRouter.push(
-            ${className}PageNavigation.values[index].routeQuery,
-          );
+          final routeQuery = TestPageNavigation.values[index].routeQuery;
+          if (routeQuery == null) {
+            return;
+          }
+          nestedRouter.push(routeQuery);
         },
         items: [
           ...${className}PageNavigation.values.map((e) {
@@ -187,7 +189,6 @@ class ${className}Page extends PageScopedWidget {
         ],
       ),
     );
-    );
   }
 }
 """;

diff --git a/packages/katana_cli/lib/command/code/tmp/tab.dart b/packages/katana_cli/lib/command/code/tmp/tab.dart
@@ -90,7 +90,7 @@ enum ${className}PageTab {
 
   /// The first tab to display.
   // TODO: Specify the initial tab.
-  static final ${className}PageTab initialTab = ${className}PageTab.tab1;
+  static const ${className}PageTab initialTab = ${className}PageTab.tab1;
 
   /// Get the label of ${className}PageTab.
   // TODO: Specify a label for each tab.
@@ -164,7 +164,12 @@ class ${className}Page extends PageScopedWidget {
     return DefaultTabController(
       initialIndex: ${className}PageTab.initialTab.index,
       length: ${className}PageTab.values.length,
-      child: UniversalScaffold(),
+      child: UniversalScaffold(
+        appBar: UniversalAppBar(
+          bottom: tabBar,
+        ),
+        body: tabView,
+      ),
     );
   }
 }