Fix inconsistent prefix icon color for text edit field

arianneorpilla · Jul 11, 2021 · 070348e · 070348e
1 parent 2224e5e
commit 070348e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 48 deletions.
diff --git a/chewie/lib/src/material_controls.dart b/chewie/lib/src/material_controls.dart
@@ -385,7 +385,7 @@ class _MaterialControlsState extends State<MaterialControls>
               Icons.mobile_screen_share_rounded,
             ],
             highlights: highlightedIndexes,
-            invisibles: gIsTapToSelectSupported ? [1] : [3, 1],
+            invisibles: gIsTapToSelectSupported ? [1] : [1, 3],
           ),
         );
 

diff --git a/lib/main.dart b/lib/main.dart
@@ -3140,18 +3140,17 @@ class _HistoryResultState extends State<HistoryResult>
                     Navigator.pop(context);
                   },
                 ),
-                (isNetwork())
-                    ? TextButton(
-                        child: Text('CHANNEL',
-                            style: TextStyle(color: Colors.white)),
-                        onPressed: () async {
-                          channelCallback(
-                              history.channelId, history.subheading, false);
-                          Navigator.pop(context);
-                          print(history.channelId);
-                        },
-                      )
-                    : Container(),
+                if (isNetwork())
+                  TextButton(
+                    child:
+                        Text('CHANNEL', style: TextStyle(color: Colors.white)),
+                    onPressed: () async {
+                      channelCallback(
+                          history.channelId, history.subheading, false);
+                      Navigator.pop(context);
+                      print(history.channelId);
+                    },
+                  ),
                 TextButton(
                   child: Text(
                     'PLAY',
@@ -4789,7 +4788,7 @@ class _CreatorState extends State<Creator> {
         });
       },
       decoration: InputDecoration(
-        prefixIcon: Icon(Icons.image, color: Colors.white),
+        prefixIcon: Icon(Icons.image),
         suffixIcon: Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           mainAxisSize: MainAxisSize.min,
@@ -4877,8 +4876,7 @@ class _CreatorState extends State<Creator> {
           }
         },
         decoration: InputDecoration(
-          prefixIcon:
-              Icon(Icons.format_align_center_rounded, color: Colors.white),
+          prefixIcon: Icon(Icons.format_align_center_rounded),
           suffixIcon: Row(
             mainAxisAlignment: MainAxisAlignment.spaceBetween,
             mainAxisSize: MainAxisSize.min,
@@ -4891,7 +4889,7 @@ class _CreatorState extends State<Creator> {
                       showSentenceDialog(_sentenceController.text);
                     }
                   },
-                  icon: Icon(Icons.account_tree_outlined, color: Colors.white),
+                  icon: Icon(Icons.account_tree_outlined),
                 ),
               IconButton(
                 iconSize: 18,

diff --git a/lib/player.dart b/lib/player.dart
@@ -1105,22 +1105,6 @@ class _VideoPlayerState extends State<VideoPlayer>
   }
 
   void playEmbeddedSubtitles(int index) async {
-    _currentSubtitle.value = Subtitle(
-      startTime: Duration.zero,
-      endTime: Duration.zero,
-      text: "",
-    );
-    _shadowingSubtitle.value = Subtitle(
-      startTime: Duration.zero,
-      endTime: Duration.zero,
-      text: "",
-    );
-    _comprehensionSubtitle.value = Subtitle(
-      startTime: Duration.zero,
-      endTime: Duration.zero,
-      text: "",
-    );
-
     _subTitleController.subtitleType = SubtitleType.srt;
     if (index == 99999) {
       _subTitleController.updateSubtitleContent(content: "");
@@ -1133,21 +1117,6 @@ class _VideoPlayerState extends State<VideoPlayer>
   }
 
   void playExternalSubtitles() async {
-    _currentSubtitle.value = Subtitle(
-      startTime: Duration.zero,
-      endTime: Duration.zero,
-      text: "",
-    );
-    _shadowingSubtitle.value = Subtitle(
-      startTime: Duration.zero,
-      endTime: Duration.zero,
-      text: "",
-    );
-    _comprehensionSubtitle.value = Subtitle(
-      startTime: Duration.zero,
-      endTime: Duration.zero,
-      text: "",
-    );
     _subTitleController.subtitleType = SubtitleType.srt;
 
     File result = await FilePicker.getFile(