keyboard test

Desync-o-tron · Oct 9, 2024 · 9e78f54 · 9e78f54
1 parent 15c8e39
commit 9e78f54
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 49 deletions.
diff --git a/lib/exercises/ex_search_page.dart b/lib/exercises/ex_search_page.dart
@@ -89,37 +89,39 @@ class _ExerciseSearchPageState extends State<ExerciseSearchPage> {
           } else {
             pageChildren.add(
                 Text('Exercise Match', style: Theme.of(context).textTheme.headlineSmall));
-            // pageChildren.add(ExerciseTile(
-            //   exercise: widget.foreignEx!,
-            //   isSelectable: false,
-            //   colorDecoration: true,
-            // ));
+            pageChildren.add(ExerciseTile(
+              exercise: widget.foreignEx!,
+              isSelectable: false,
+              colorDecoration: true,
+            ));
             pageChildren.add(Text('To', style: Theme.of(context).textTheme.bodyMedium));
           }
-          pageChildren.addAll([
-            _exListView(scrollController, filteredExercises),
-            SearchBar(
-              onKeywordChanged: (value) {
-                setState(() {
-                  keyword = value;
-                });
-              },
-            ),
-            _muscleAndCategoryFilterButtons(context, exercisesState),
-          ]);
-
-          if (widget.useForAddingToTraining) {
-            pageChildren.add(_addSelectedButton(context));
-          }
-          if (widget.useForMappingForeignExercise) {
+          final isKeyboardOpen = MediaQuery.of(context).viewInsets.bottom > 0;
+          if (!isKeyboardOpen) {
             pageChildren.addAll([
-              _thisIsMyExButton(widget.setForeignExerciseCallback!),
-              _noExerciseMatchButton(widget.setForeignExerciseCallback!),
+              _exListView(scrollController, filteredExercises),
+              SearchBar(
+                onKeywordChanged: (value) {
+                  setState(() {
+                    keyword = value;
+                  });
+                },
+              ),
+              _muscleAndCategoryFilterButtons(context, exercisesState),
             ]);
-          } else {
-            pageChildren.add(_createNewExButton(context));
-          }
 
+            if (widget.useForAddingToTraining) {
+              pageChildren.add(_addSelectedButton(context));
+            }
+            if (widget.useForMappingForeignExercise) {
+              pageChildren.addAll([
+                _thisIsMyExButton(widget.setForeignExerciseCallback!),
+                _noExerciseMatchButton(widget.setForeignExerciseCallback!),
+              ]);
+            } else {
+              pageChildren.add(_createNewExButton(context));
+            }
+          }
           return SafeArea(
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,

diff --git a/lib/history/history_page.dart b/lib/history/history_page.dart
@@ -72,16 +72,6 @@ class HistoryPage extends StatelessWidget {
   Widget _hamburgerMenuActions(BuildContext context) {
     return PopupMenuButton<String>(
       icon: const Icon(Icons.more_horiz_outlined, size: 30),
-      onSelected: (String result) {
-        final cubit = context.read<TrainingHistoryCubit>();
-        if (result == 'import') {
-          appRouter.push(routeNames.ImportExternalAppHistory.text);
-        } else if (result == 'refresh training history') {
-          cubit.loadUserTrainingHistory(useCache: false);
-        } else if (result == 'rm all') {
-          cubit.deleteEntireTrainingHistory();
-        }
-      },
       itemBuilder: (BuildContext context) => <PopupMenuEntry<String>>[
         const PopupMenuItem<String>(
           value: 'import',
@@ -96,6 +86,16 @@ class HistoryPage extends StatelessWidget {
           child: Text('Refresh training history cache'),
         ),
       ],
+      onSelected: (String result) {
+        final cubit = context.read<TrainingHistoryCubit>();
+        if (result == 'import') {
+          appRouter.push(routeNames.ImportExternalAppHistory.text);
+        } else if (result == 'refresh training history') {
+          cubit.loadUserTrainingHistory(useCache: false);
+        } else if (result == 'rm all') {
+          cubit.deleteEntireTrainingHistory();
+        }
+      },
     );
   }
 }

diff --git a/lib/importing/ex_match_listview.dart b/lib/importing/ex_match_listview.dart
@@ -41,11 +41,13 @@ class _MatchExercisesScrollViewState extends State<MatchExercisesScrollView> {
         Expanded(
           child: Container(
             decoration: BoxDecoration(border: Border.all()),
-            child: ListView.builder(
-              itemCount: widget.exerciseMatches.length,
-              itemBuilder: (context, index) {
-                return _buildExerciseMatchTile(index);
-              },
+            child: Scrollbar(
+              child: ListView.builder(
+                itemCount: widget.exerciseMatches.length,
+                itemBuilder: (context, index) {
+                  return _buildExerciseMatchTile(index);
+                },
+              ),
             ),
           ),
         ),

diff --git a/lib/importing/import_training_first_page.dart b/lib/importing/import_training_first_page.dart
@@ -64,14 +64,6 @@ class _ImportTrainingDataPageState extends State<ImportTrainingDataPage> {
         ),
       ),
     );
-
-    /*
-
-    for (var session in sessions) {
-      myStorage.addTrainingSessionToHistory(session);
-    }
-    
-    */
   }
 
   Row setAsDefaultUnitsSwitch() {
-Original file line number
+Diff line change
@@ Expand Up @@
             ),
           ),
         );
-        /*
-        for (var session in sessions) {
-          myStorage.addTrainingSessionToHistory(session);
-        }
-        */
       }
       Row setAsDefaultUnitsSwitch() {
@@ Expand Down @@