Release: v2026.01.001 - Focus Enhancements & Settings Refinement

Author: LeanBitLab

.gitignore

@@ -44,6 +44,7 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+/android/app/build
 /android/build
 
 android/app/google-services.json

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "java.configuration.updateBuildConfiguration": "automatic"
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "java.compile.nullAnalysis.mode": "automatic"
 }

README.md

@@ -19,9 +19,10 @@ This customized version introduces usability enhancements and some UX improvemen
 - **Easy WiFi Access** - Network indicator doubles as a shortcut to system WiFi settings.
 - **Quick Presets** - Select Time/Date formats and Category names from a list (No keyboard required).
 - **Pitch Black Wallpaper** - Added a true black gradient background option.
-- **Easier D-Pad Navigation** - High-contrast focus outlines for better visibility on TV.
+- **Enhanced Focus Indicator** - New double-border design ensures perfect visibility on any background.
+- **Smart Navigation** - Fixed "bounce back" issues and optimized focus traversal for a smoother experience.
+- **Refined Settings** - Reorganized menus with a new "Miscellaneous" section and unified focus styles.
 - **New Categories** - Added "All Apps" and "Favorites" with auto-population support.
-- **UI Refinement** - Polished interface with cleaner typography and unified terminology.
 - **Optimizations** - Improved performance with aggressive icon caching and code cleanups.
 
 

android/app/src/main/java/me/efesser/flauncher/MainActivity.java

@@ -590,7 +590,14 @@ private boolean openScreensaverSettings() {
             return true;
         }
 
-        // 3. Final fallback - open main settings
+        // 3. FALLBACK: Try Display Settings (often contains screensaver on newer
+        // Android TV/Google TV)
+        Intent displayIntent = new Intent(Settings.ACTION_DISPLAY_SETTINGS);
+        if (tryStartActivity(displayIntent)) {
+            return true;
+        }
+
+        // 4. Final fallback - open main settings
         return launchActivityFromAction(Settings.ACTION_SETTINGS);
     }
 

android/settings.gradle

@@ -37,6 +37,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
     id "com.android.application" version '8.2.1' apply false
+    id "org.jetbrains.kotlin.android" version "1.9.22" apply false
 }
 
 include ":app"

lib/actions.dart

@@ -65,6 +65,10 @@ class BackAction extends Action<BackIntent> {
   }
 }
 
+class MoveFocusToSettingsIntent extends Intent {
+  const MoveFocusToSettingsIntent();
+}
+
 class BackIntent extends Intent {
   const BackIntent();
 }

lib/flauncher.dart

@@ -17,6 +17,7 @@
  */
 
 
+import 'package:flauncher/actions.dart';
 import 'package:flauncher/custom_traversal_policy.dart';
 import 'package:flauncher/providers/apps_service.dart';
 import 'package:flauncher/providers/launcher_state.dart';
@@ -31,78 +32,107 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
 import 'models/category.dart';
 
-class FLauncher extends StatelessWidget {
-  const FLauncher();
+class FLauncher extends StatefulWidget {
+  const FLauncher({super.key});
 
   @override
-  Widget build(BuildContext context) => FocusTraversalGroup(
-    policy: RowByRowTraversalPolicy(),
-    child: Stack(
-      children: [
-        Consumer<WallpaperService>(
-          builder: (_, wallpaperService, __) => _wallpaper(context, wallpaperService)
-        ),
-        Consumer<LauncherState>(
-          builder: (_, state, child) => Visibility(
-            child: child!,
-            replacement: const Center(
-              child: AlternativeLauncherView()
-            ),
-            visible: state.launcherVisible
+  State<FLauncher> createState() => _FLauncherState();
+}
+
+class _FLauncherState extends State<FLauncher> {
+  final GlobalKey<FocusAwareAppBarState> _appBarKey = GlobalKey();
+
+  @override
+  Widget build(BuildContext context) => Actions(
+    actions: <Type, Action<Intent>>{
+      MoveFocusToSettingsIntent: CallbackAction<MoveFocusToSettingsIntent>(
+        onInvoke: (_) => _appBarKey.currentState?.focusSettings(),
+      ),
+    },
+    child: FocusTraversalGroup(
+      policy: RowByRowTraversalPolicy(),
+      child: Stack(
+        children: [
+          Consumer<WallpaperService>(
+            builder: (_, wallpaperService, __) => _wallpaper(context, wallpaperService)
           ),
-          child: Scaffold(
-            backgroundColor: Colors.transparent,
-            appBar: FocusAwareAppBar(),
-            body: Padding(
-              padding: const EdgeInsets.fromLTRB(16, 16, 16, 0),
-              child: Consumer<AppsService>(
-                builder: (context, appsService, _) {
-                  if (appsService.initialized) {
-                    return SingleChildScrollView(child: _sections(appsService.launcherSections));
-                  }
-                  else {
-                    return _emptyState(context);
+          Consumer<LauncherState>(
+            builder: (_, state, child) => Visibility(
+              child: child!,
+              replacement: const Center(
+                child: AlternativeLauncherView()
+              ),
+              visible: state.launcherVisible
+            ),
+            child: Scaffold(
+              backgroundColor: Colors.transparent,
+              appBar: FocusAwareAppBar(key: _appBarKey),
+              body: Padding(
+                padding: const EdgeInsets.fromLTRB(16, 16, 16, 0),
+                child: Consumer<AppsService>(
+                  builder: (context, appsService, _) {
+                    if (appsService.initialized) {
+                      return SingleChildScrollView(child: _sections(appsService.launcherSections));
+                    }
+                    else {
+                      return _emptyState(context);
+                    }
                   }
-                }
+                )
               )
             )
           )
-        )
-      ]
-    )
+        ]
+      )
+    ),
   );
 
-  Widget _sections(List<LauncherSection> sections) => Column(
-    children: sections.map((section) {
+  Widget _sections(List<LauncherSection> sections) {
+    List<Widget> children = [];
+    bool firstCategoryFound = false;
+
+    for (var section in sections) {
       final Key sectionKey = Key(section.id.toString());
-      final Widget categoryWidget;
 
       if (section is LauncherSpacer) {
-        return SizedBox(key: sectionKey, height: section.height.toDouble());
+        children.add(SizedBox(key: sectionKey, height: section.height.toDouble()));
+        continue;
       }
 
       Category category = section as Category;
+      Widget categoryWidget;
+
+      // Pass isFirstSection only to the first category found
+      bool isFirstSection = !firstCategoryFound;
+      if (isFirstSection) firstCategoryFound = true;
+
       switch (category.type) {
         case CategoryType.row:
           categoryWidget = CategoryRow(
               key: sectionKey,
               category: category,
-              applications: category.applications
+              applications: category.applications,
+              isFirstSection: isFirstSection
           );
+          break; // Added break
         case CategoryType.grid:
           categoryWidget = AppsGrid(
               key: sectionKey,
               category: category,
-              applications: category.applications
+              applications: category.applications,
+              isFirstSection: isFirstSection
           );
+          break; // Added break
       }
 
-      return Padding(
-        padding: const EdgeInsets.symmetric(vertical: 8),
-        child: categoryWidget
-      );
-    }).toList(),
-  );
+      children.add(Padding(
+          padding: const EdgeInsets.symmetric(vertical: 8),
+          child: categoryWidget
+      ));
+    }
+
+    return Column(children: children);
+  }
 
   Widget _wallpaper(BuildContext context, WallpaperService wallpaperService) {
     if (wallpaperService.wallpaper != null) {

lib/flauncher_app.dart

@@ -79,11 +79,22 @@ class FLauncherApp extends StatelessWidget
         useMaterial3: true,
         brightness: Brightness.dark,
         primarySwatch: _swatch,
-        cardColor: _swatch[300],
-        canvasColor: _swatch[300],
-        dialogBackgroundColor: _swatch[400],
-        scaffoldBackgroundColor: _swatch[400],
-        textButtonTheme: TextButtonThemeData(style: TextButton.styleFrom(foregroundColor: Colors.white)),
+        cardColor: const Color(0xFF1E1E1E), // Dark surface color
+        canvasColor: const Color(0xFF121212), // Dark background
+        dialogBackgroundColor: const Color(0xFF1E1E1E),
+        scaffoldBackgroundColor: const Color(0xFF121212), // Dark background
+        textButtonTheme: TextButtonThemeData(
+            style: TextButton.styleFrom(
+              foregroundColor: Colors.white, // Revert to white for settings list
+              padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+            )
+        ),
+        dialogTheme: DialogTheme(
+          shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(20)),
+          backgroundColor: const Color(0xFF1E1E1E),
+          titleTextStyle: Typography.material2018().white.titleLarge,
+          contentTextStyle: Typography.material2018().white.bodyMedium,
+        ),
         appBarTheme: const AppBarTheme(elevation: 0, backgroundColor: Colors.transparent),
         typography: Typography.material2018(),
         inputDecorationTheme: InputDecorationTheme(

lib/l10n/app_en.arb

@@ -83,7 +83,7 @@
     "showCategoryTitles": "Show category titles",
     "sort": "Sort",
     "systemSettings": "System settings",
-    "textAboutDialog": "FlauncherL is a customized fork of FLauncher, developed by LeanBitLab.\n\nFLauncher is an open-source alternative launcher for Android TV.\nSource code available at {repoUrl}.\n\nLogo by Katie (@fureturoe), design by @FXCostanzo.",
+    "textAboutDialog": "FlauncherL is a customized open-source launcher for Android TV, based on FLauncher.\n\nDeveloped by LeanBitLab.\nSource code available at {repoUrl}.\n\nLogo by Katie (@fureturoe), design by @FXCostanzo.",
     "@textAboutDialog": {
         "placeholders": {
             "repoUrl": {

lib/l10n/app_es.arb

@@ -86,7 +86,7 @@
     "showCategoryTitles": "Mostrar títulos de categorías",
     "sort": "Orden",
     "systemSettings": "Ajustes del sistema",
-    "textAboutDialog": "FLauncher es un lanzador de aplicaciones alternativo de código abierto para Android TV.\nCódigo fuente disponible en {repoUrl}.\n\nLogo creado por Katie (@fureturoe) y diseño por @FXCostanzo.",
+    "textAboutDialog": "FlauncherL es un lanzador de código abierto personalizado para Android TV, basado en FLauncher.\n\nDesarrollado por LeanBitLab.\nCódigo fuente disponible en {repoUrl}.\n\nLogo creado por Katie (@fureturoe) y diseño por @FXCostanzo.",
     "@textAboutDialog": {
         "placeholders": {
             "repoUrl": {