From a2e8a72109e1a23d4c1ae9a6feb3859b961e99b4 Mon Sep 17 00:00:00 2001 From: Erfan Jazeb Nikoo <erfan.jazebnikoo@gmail.com> Date: Fri, 10 Nov 2023 15:48:48 +0100 Subject: [PATCH 1/2] erfan/feed remove prints --- lib/ui/screens/settings/data_streams_screen.dart | 4 ---- pubspec.yaml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/ui/screens/settings/data_streams_screen.dart b/lib/ui/screens/settings/data_streams_screen.dart index 2d427ee..90edbe3 100644 --- a/lib/ui/screens/settings/data_streams_screen.dart +++ b/lib/ui/screens/settings/data_streams_screen.dart @@ -166,10 +166,6 @@ class _DataStreamsScreenState extends State<DataStreamsScreen> { physics: NeverScrollableScrollPhysics(), itemCount: plugin.rss.sortedNewsSources.length, itemBuilder: (context, index) { - print( - '1++++ ${plugin.rss.sortedNewsSources.elementAt(index).id}'); - print( - '3++++ ${provider.selectedNewsSources.contains(plugin.rss.sortedNewsSources.elementAt(index).id)}'); return Container( padding: EdgeInsets.symmetric(vertical: 8), margin: diff --git a/pubspec.yaml b/pubspec.yaml index e3fa80a..541d1f6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: consumer_app description: Memri Consumer Application publish_to: 'none' -version: 1.4.4+79 +version: 1.4.4+81 environment: sdk: '>=2.18.5 <3.0.0' -- GitLab From f34b07d151d27d9ac5fbc3912249fac0def26190 Mon Sep 17 00:00:00 2001 From: Erfan Jazeb Nikoo <erfan.jazebnikoo@gmail.com> Date: Mon, 27 Nov 2023 13:41:57 +0100 Subject: [PATCH 2/2] erfan/feed Fixed tab alignment issue caused by the recent update enabling Material design in Flutter --- lib/ui/screens/home_screen.dart | 1 + lib/ui/screens/settings/data_streams_screen.dart | 1 + pubspec.yaml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ui/screens/home_screen.dart b/lib/ui/screens/home_screen.dart index bea19a0..af319d4 100644 --- a/lib/ui/screens/home_screen.dart +++ b/lib/ui/screens/home_screen.dart @@ -159,6 +159,7 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin { labelPadding: EdgeInsets.symmetric(horizontal: 12), dividerColor: app.colors.lineDivider, indicatorSize: TabBarIndicatorSize.tab, + tabAlignment: TabAlignment.start, indicatorWeight: 2, indicator: UnderlineTabIndicator( borderSide: BorderSide( diff --git a/lib/ui/screens/settings/data_streams_screen.dart b/lib/ui/screens/settings/data_streams_screen.dart index 90edbe3..ac9a781 100644 --- a/lib/ui/screens/settings/data_streams_screen.dart +++ b/lib/ui/screens/settings/data_streams_screen.dart @@ -69,6 +69,7 @@ class _DataStreamsScreenState extends State<DataStreamsScreen> { delegate: SliverAppBarDelegate( TabBar( labelStyle: app.styles.body, + tabAlignment: TabAlignment.start, unselectedLabelStyle: app.styles.body, labelColor: app.colors.brandOrange, unselectedLabelColor: app.colors.textGrey, diff --git a/pubspec.yaml b/pubspec.yaml index 541d1f6..496a590 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: consumer_app description: Memri Consumer Application publish_to: 'none' -version: 1.4.4+81 +version: 1.4.4+83 environment: sdk: '>=2.18.5 <3.0.0' -- GitLab