project wide code formatting

lamarios · Aug 4, 2023 · 2a30137 · 2a30137
1 parent 69c0d9d
commit 2a30137
Show file tree

Hide file tree

Showing 68 changed files with 213 additions and 189 deletions.
diff --git a/README.md b/README.md
@@ -58,21 +58,27 @@ Or download the latest APK from the [Releases Section](https://github.com/lamari
 
 ## Screenshots
 ### Phone
-[![Video list](./screenshots/video-list_small.png)](./screenshots/video-list.png)
-[![Video details](./screenshots/video-details_small.png)](./screenshots/video-details.png)
-[![Channel](./screenshots/channel_small.png)](./screenshots/channel.png)
+[![Home](./screenshots/mobile-home_small.png)](./screenshots/mobile-home.png)
+[![Video](./screenshots/mobile-video_small.png)](./screenshots/mobile-video.png)
+[![Channel](./screenshots/mobile-channel_small.png)](./screenshots/mobile-channel_small.png)
+[![Playlist](./screenshots/mobile-playlist_small.png)](./screenshots/mobile-playlist_small.png)
 
 ### Tablet
 
-[![Video list](./screenshots/video-list-tablet_small.png)](./screenshots/video-list-tablet.png)
-[![Video details](./screenshots/video-detail-tablet_small.png)](./screenshots/video-detail-tablet.png)
-[![Channel](./screenshots/channel-tablet_small.png)](./screenshots/channel-tablet.png)
+[![Home](./screenshots/tablet-home_small.png)](./screenshots/tablet-home.png)
+[![Video](./screenshots/tablet-video_small.png)](./screenshots/tablet-video.png)
+[![Channel](./screenshots/tablet-channel_small.png)](./screenshots/tablet-channel_small.png)
+[![Playlist](./screenshots/tablet-playlist_small.png)](./screenshots/tablet-playlist_small.png)
 
 ### TV
 
 [![Home](./screenshots/tv-home_small.png)](./screenshots/tv-home.png)
+[![Home](./screenshots/tv-home-2_small.png)](./screenshots/tv-home-2.png)
 [![Video](./screenshots/tv-video_small.png)](./screenshots/tv-video.png)
+[![Video](./screenshots/tv-video-2_small.png)](./screenshots/tv-video-2.png)
 [![Channel](./screenshots/tv-channel_small.png)](./screenshots/tv-channel_small.png)
+[![Playlist](./screenshots/tv-playlist_small.png)](./screenshots/tv-playlist_small.png)
+[![Playlist](./screenshots/tv-playlist-2_small.png)](./screenshots/tv-playlist_small-2.png)
 
 ## Facing an issue ? 
 

diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
@@ -1 +1 @@
-<p><i>Clipious</i>is an Android client for Invidious, the privacy focused YouTube front end.</p><p><b>Features:</b></p><ul><li>Use own or public server</li><li>Subscription management</li><li>SponsorBlock</li><li>Video view/progress tracking</li><li>User playlists</li><li>Background playback</li><li>Live stream support</li></ul>
+<p><i>Clipious</i>is an Android client for Invidious, the privacy focused YouTube front end.</p><p><b>Features:</b></p><ul><li>Use own or public server</li><li>Subscription management</li><li>SponsorBlock</li><li>Video view/progress tracking</li><li>User playlists</li><li>Background playback</li><li>Live stream support</li><li>Android TV UI</li><li>Audio playback</li><li>Video / audio download</li><li>Video filtering</li><li>Return Youtube Dislikes</li></ul>
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png
diff --git a/fastlane/metadata/android/en-US/images/tvScreenshots/1.png b/fastlane/metadata/android/en-US/images/tvScreenshots/1.png
diff --git a/fastlane/metadata/android/en-US/images/tvScreenshots/2.png b/fastlane/metadata/android/en-US/images/tvScreenshots/2.png
diff --git a/fastlane/metadata/android/en-US/images/tvScreenshots/3.png b/fastlane/metadata/android/en-US/images/tvScreenshots/3.png
diff --git a/fastlane/metadata/android/en-US/images/tvScreenshots/4.png b/fastlane/metadata/android/en-US/images/tvScreenshots/4.png
diff --git a/fastlane/metadata/android/en-US/images/tvScreenshots/5.png b/fastlane/metadata/android/en-US/images/tvScreenshots/5.png
diff --git a/fastlane/metadata/android/en-US/images/tvScreenshots/6.png b/fastlane/metadata/android/en-US/images/tvScreenshots/6.png
diff --git a/fastlane/metadata/android/en-US/images/tvScreenshots/7.png b/fastlane/metadata/android/en-US/images/tvScreenshots/7.png
diff --git a/lib/controllers/tvPlaylistController.dart b/lib/controllers/tvPlaylistController.dart
@@ -12,6 +12,7 @@ class TvPlaylistController extends PlaylistController {
 
   void setShowImage(bool bool) {
     showImage = bool;
+    scrollController.jumpTo(0);
     update();
   }
 }
diff --git a/lib/views/tv/tvChannelView.dart b/lib/views/tv/tvChannelView.dart
@@ -38,7 +38,7 @@ class TvChannelView extends StatelessWidget {
           builder: (_) {
             return _.loading
                 ? const Center(
-                    child: CircularProgressIndicator(),
+                    child: SizedBox(width: 50, height: 50, child: CircularProgressIndicator()),
                   )
                 : DefaultTextStyle(
                     style: textTheme.bodyLarge!,
@@ -64,8 +64,10 @@ class TvChannelView extends StatelessWidget {
                                         padding: const EdgeInsets.only(top: 100.0),
                                         child: Align(
                                           alignment: Alignment.centerLeft,
-                                          child: Container(
-                                            decoration: BoxDecoration(color: colors.background.withOpacity(1), borderRadius: BorderRadius.circular(35)),
+                                          child: AnimatedContainer(
+                                            decoration:
+                                                BoxDecoration(color: _.showBackground ? colors.background.withOpacity(0) : colors.background.withOpacity(1), borderRadius: BorderRadius.circular(35)),
+                                            duration: animationDuration,
                                             child: Row(mainAxisSize: MainAxisSize.min, children: [
                                               Thumbnail(
                                                 thumbnailUrl: ImageObject.getBestThumbnail(_.channel?.authorThumbnails)?.url ?? '',

diff --git a/lib/views/tv/tvExpandableText.dart b/lib/views/tv/tvExpandableText.dart
@@ -32,7 +32,7 @@ class TvExpandableText extends StatelessWidget {
             return AnimatedContainer(
               duration: animationDuration,
               decoration: BoxDecoration(
-                color: hasFocus ? colors.secondaryContainer : colors.background.withOpacity(0),
+                color: hasFocus ? colors.primaryContainer : colors.background.withOpacity(0),
                 borderRadius: BorderRadius.circular(10),
               ),
               child: Padding(

diff --git a/lib/views/tv/tvHome.dart b/lib/views/tv/tvHome.dart
@@ -16,7 +16,7 @@ import 'package:invidious/views/tv/tvVideoGridView.dart';
 
 import '../popular.dart';
 
-const overlayBackgroundOpacity = 0.9;
+const overlayBackgroundOpacity = 0.8;
 const double overlayBlur = 25.0;
 
 class TvHome extends StatelessWidget {

diff --git a/lib/views/tv/tvPlaylistView.dart b/lib/views/tv/tvPlaylistView.dart
@@ -42,8 +42,13 @@ class TvPlaylistView extends PlaylistView {
               child: SizedBox(
                 width: 50,
                 height: 50,
-                child: CircularProgressIndicator(
-                  value: _.loadingProgress,
+                child: TweenAnimationBuilder(
+                  tween: Tween<double>(begin: 0, end: _.loadingProgress),
+                  duration: animationDuration,
+                  curve: Curves.easeInOutQuad,
+                  builder: (context, value, child) => CircularProgressIndicator(
+                    value: value > 0 && value < 1 ? value : null,
+                  ),
                 ),
               ),
             ),
@@ -69,7 +74,7 @@ class TvPlaylistView extends PlaylistView {
                       AnimatedPositioned(
                         duration: animationDuration,
                         curve: Curves.easeInOutQuad,
-                        top: _.showImage ? 350 : 0,
+                        top: _.showImage ? 335 : 0,
                         left: 0,
                         bottom: 0,
                         right: 0,
@@ -83,60 +88,66 @@ class TvPlaylistView extends PlaylistView {
                                   sigmaX: value,
                                   sigmaY: value,
                                 ),
-                                child: Container(
-                                  color: colors.background.withOpacity(overlayBackgroundOpacity),
-                                  child: TvOverscan(
-                                    child: Column(
-                                      mainAxisAlignment: MainAxisAlignment.start,
-                                      crossAxisAlignment: CrossAxisAlignment.start,
-                                      children: [
-                                        Row(
-                                          crossAxisAlignment: CrossAxisAlignment.center,
-                                          children: [
-                                            Padding(
-                                              padding: const EdgeInsets.only(right: 16.0),
-                                              child: TvButton(
-                                                autofocus: true,
-                                                onFocusChanged: (focus) {
-                                                  _.setShowImage(focus);
-                                                },
-                                                onPressed: (context) => playPlaylist(context, _),
-                                                child: const Padding(
-                                                  padding: EdgeInsets.all(15.0),
-                                                  child: Icon(
-                                                    Icons.play_arrow,
-                                                    size: 50,
+                                child: TvOverscan(
+                                  child: Container(
+                                    decoration: BoxDecoration(
+                                      borderRadius: BorderRadius.circular(20),
+                                      color: colors.background.withOpacity(overlayBackgroundOpacity),
+                                    ),
+                                    child: Padding(
+                                      padding: const EdgeInsets.all(16.0),
+                                      child: Column(
+                                        mainAxisAlignment: MainAxisAlignment.start,
+                                        crossAxisAlignment: CrossAxisAlignment.start,
+                                        children: [
+                                          Row(
+                                            crossAxisAlignment: CrossAxisAlignment.center,
+                                            children: [
+                                              Padding(
+                                                padding: const EdgeInsets.only(right: 16.0),
+                                                child: TvButton(
+                                                  autofocus: true,
+                                                  onFocusChanged: (focus) {
+                                                    _.setShowImage(focus);
+                                                  },
+                                                  onPressed: (context) => playPlaylist(context, _),
+                                                  child: const Padding(
+                                                    padding: EdgeInsets.all(15.0),
+                                                    child: Icon(
+                                                      Icons.play_arrow,
+                                                      size: 50,
+                                                    ),
                                                   ),
                                                 ),
                                               ),
-                                            ),
-                                            Column(
-                                              crossAxisAlignment: CrossAxisAlignment.start,
-                                              children: [
-                                                Text(
-                                                  _.playlist.title,
-                                                  style: textTheme.headlineLarge,
-                                                ),
-                                                Text(
-                                                  locals.nVideos(_.playlist.videos.length),
-                                                  style: textTheme.bodyLarge,
-                                                ),
-                                              ],
-                                            ),
-                                          ],
-                                        ),
-                                        Expanded(
-                                          child: Padding(
-                                            padding: const EdgeInsets.only(top: 16.0),
-                                            child: GridView.count(
-                                              controller: _.scrollController,
-                                              childAspectRatio: 16 / 13,
-                                              crossAxisCount: 3,
-                                              children: _.playlist.videos.map((e) => TvVideoItem(video: e, autoFocus: false)).toList(),
+                                              Column(
+                                                crossAxisAlignment: CrossAxisAlignment.start,
+                                                children: [
+                                                  Text(
+                                                    _.playlist.title,
+                                                    style: textTheme.headlineLarge,
+                                                  ),
+                                                  Text(
+                                                    locals.nVideos(_.playlist.videos.length),
+                                                    style: textTheme.bodyLarge,
+                                                  ),
+                                                ],
+                                              ),
+                                            ],
+                                          ),
+                                          Expanded(
+                                            child: Padding(
+                                              padding: const EdgeInsets.only(top: 16.0),
+                                              child: GridView.count(
+                                                controller: _.scrollController,
+                                                childAspectRatio: 16 / 13,
+                                                crossAxisCount: 3,
+                                                children: _.playlist.videos.map((e) => TvVideoItem(video: e, autoFocus: false)).toList(),
+                                              ),
                                             ),
                                           ),
-                                        ),
-                                      ],
+                                        ],
+                                      ),
                                     ),
                                   ),
                                 ),

diff --git a/lib/views/tv/tvSubscribeButton.dart b/lib/views/tv/tvSubscribeButton.dart
@@ -26,7 +26,6 @@ class TvSubscribeButton extends StatelessWidget {
             child: TvButton(
               autofocus: autoFocus,
               onFocusChanged: onFocusChanged,
-              focusedColor: colors.secondaryContainer,
               unfocusedColor: colors.background.withOpacity(0.0),
               onPressed: (context) => _.isLoggedIn ? _.toggleSubscription() : null,
               child: Padding(
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<p><i>Clipious</i>is an Android client for Invidious, the privacy focused YouTube front end.</p><p><b>Features:</b></p><ul><li>Use own or public server</li><li>Subscription management</li><li>SponsorBlock</li><li>Video view/progress tracking</li><li>User playlists</li><li>Background playback</li><li>Live stream support</li></ul>
		<p><i>Clipious</i>is an Android client for Invidious, the privacy focused YouTube front end.</p><p><b>Features:</b></p><ul><li>Use own or public server</li><li>Subscription management</li><li>SponsorBlock</li><li>Video view/progress tracking</li><li>User playlists</li><li>Background playback</li><li>Live stream support</li><li>Android TV UI</li><li>Audio playback</li><li>Video / audio download</li><li>Video filtering</li><li>Return Youtube Dislikes</li></ul>