bump flutter to 3.7.2 (#134)

.github/workflows/commit_check.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     env:
-      FLUTTER_VERSION: "3.7.0"
+      FLUTTER_VERSION: "3.7.2"
     steps:
       - uses: actions/checkout@v2
       - uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.7.0'
+          flutter-version: '3.7.2'
           channel: 'stable'
       - run: flutter pub get
       - run: flutter format --set-exit-if-changed .

.github/workflows/publish_ios.yml

@@ -31,7 +31,7 @@ jobs:
         uses: subosito/flutter-action@v2
         with:
           cache: true
-          flutter-version: 3.7.0
+          flutter-version: 3.7.2
       - run: flutter pub get
       - run: flutter format --set-exit-if-changed .
       - run: flutter analyze

fastlane/metadata/android/en-US/changelogs/84.txt

@@ -0,0 +1,3 @@
+- Customization of tab bar.
+- Option to enable swipe gesture for switching between tabs.
+- Access to action menu from home screen.

lib/extensions/state_extension.dart

@@ -119,11 +119,45 @@ extension StateExtension on State {
     }
   }
 
-  void onShareTapped(Item item, Rect? rect) {
-    Share.share(
-      'https://news.ycombinator.com/item?id=${item.id}',
-      sharePositionOrigin: rect,
-    );
+  Future<void> onShareTapped(Item item, Rect? rect) async {
+    late final String? linkToShare;
+    if (item.url.isNotEmpty) {
+      linkToShare = await showModalBottomSheet<String>(
+        context: context,
+        builder: (BuildContext context) {
+          return Container(
+            height: 140,
+            color: Theme.of(context).canvasColor,
+            child: Material(
+              child: Column(
+                children: <Widget>[
+                  ListTile(
+                    onTap: () => Navigator.pop(context, item.url),
+                    title: const Text('Link to article'),
+                  ),
+                  ListTile(
+                    onTap: () => Navigator.pop(
+                      context,
+                      'https://news.ycombinator.com/item?id=${item.id}',
+                    ),
+                    title: const Text('Link to HN'),
+                  ),
+                ],
+              ),
+            ),
+          );
+        },
+      );
+    } else {
+      linkToShare = 'https://news.ycombinator.com/item?id=${item.id}';
+    }
+
+    if (linkToShare != null) {
+      await Share.share(
+        linkToShare,
+        sharePositionOrigin: rect,
+      );
+    }
   }
 
   void onFlagTapped(Item item) {

lib/models/models.dart

@@ -9,4 +9,5 @@ export 'post_data.dart';
 export 'preference.dart';
 export 'search_params.dart';
 export 'story.dart';
+export 'story_type.dart';
 export 'user.dart';

lib/models/poll_option.dart

@@ -24,22 +24,7 @@ class PollOption extends Item {
 
   PollOption.empty()
       : ratio = 0,
-        super(
-          id: 0,
-          score: 0,
-          descendants: 0,
-          time: 0,
-          by: '',
-          title: '',
-          url: '',
-          kids: <int>[],
-          dead: false,
-          parts: <int>[],
-          deleted: false,
-          parent: 0,
-          text: '',
-          type: '',
-        );
+        super.empty();
 
   PollOption.fromJson(super.json)
       : ratio = 0,

lib/models/preference.dart

@@ -1,3 +1,4 @@
+import 'dart:collection';
 import 'dart:io';
 
 import 'package:equatable/equatable.dart';
@@ -13,26 +14,29 @@ abstract class Preference<T> extends Equatable with SettingsDisplayable {
 
   Preference<T> copyWith({required T? val});
 
-  static List<Preference<dynamic>> allPreferences = <Preference<dynamic>>[
-    // Order of these first three preferences does not matter.
-    FetchModePreference(),
-    CommentsOrderPreference(),
-    FontSizePreference(),
-    TabOrderPreference(),
-    // Order of items below matters and
-    // reflects the order on settings screen.
-    const DisplayModePreference(),
-    const MetadataModePreference(),
-    const StoryUrlModePreference(),
-    const NotificationModePreference(),
-    const SwipeGesturePreference(),
-    const CollapseModePreference(),
-    NavigationModePreference(),
-    const ReaderModePreference(),
-    const MarkReadStoriesModePreference(),
-    const EyeCandyModePreference(),
-    const TrueDarkModePreference(),
-  ];
+  static final List<Preference<dynamic>> allPreferences =
+      UnmodifiableListView<Preference<dynamic>>(
+    <Preference<dynamic>>[
+      // Order of these first four preferences does not matter.
+      FetchModePreference(),
+      CommentsOrderPreference(),
+      FontSizePreference(),
+      TabOrderPreference(),
+      // Order of items below matters and
+      // reflects the order on settings screen.
+      const DisplayModePreference(),
+      const MetadataModePreference(),
+      const StoryUrlModePreference(),
+      const NotificationModePreference(),
+      const SwipeGesturePreference(),
+      const CollapseModePreference(),
+      NavigationModePreference(),
+      const ReaderModePreference(),
+      const MarkReadStoriesModePreference(),
+      const EyeCandyModePreference(),
+      const TrueDarkModePreference(),
+    ],
+  );
 
   @override
   List<Object?> get props => <Object?>[key];
@@ -81,7 +85,7 @@ class SwipeGesturePreference extends BooleanPreference {
 
   @override
   String get subtitle =>
-      '''Enable swipe gesture for switching between tabs. If enabled, long press on Story tile to trigger the action menu.''';
+      '''enable swipe gesture for switching between tabs. If enabled, long press on Story tile to trigger the action menu.''';
 }
 
 class NotificationModePreference extends BooleanPreference {
@@ -118,6 +122,10 @@ class CollapseModePreference extends BooleanPreference {
 
   @override
   String get title => 'Tap Anywhere to Collapse';
+
+  @override
+  String get subtitle =>
+      '''if disabled, tap on the top of comment tile to collapse.''';
 }
 
 /// The value deciding whether or not the story

lib/models/story.dart

@@ -1,41 +1,6 @@
 import 'package:hacki/config/constants.dart';
 import 'package:hacki/models/item.dart';
 
-enum StoryType {
-  top('topstories'),
-  best('beststories'),
-  latest('newstories'),
-  ask('askstories'),
-  show('showstories');
-
-  const StoryType(this.path);
-
-  final String path;
-
-  String get label {
-    switch (this) {
-      case StoryType.top:
-        return 'TOP';
-      case StoryType.best:
-        return 'BEST';
-      case StoryType.latest:
-        return 'NEW';
-      case StoryType.ask:
-        return 'ASK';
-      case StoryType.show:
-        return 'SHOW';
-    }
-  }
-
-  static int convertToSettingsValue(List<StoryType> tabs) {
-    return int.parse(
-      tabs
-          .map((StoryType e) => e.index.toString())
-          .reduce((String value, String element) => '$value$element'),
-    );
-  }
-}
-
 class Story extends Item {
   const Story({
     required super.descendants,
@@ -55,23 +20,7 @@ class Story extends Item {
           parent: 0,
         );
 
-  Story.empty()
-      : super(
-          id: 0,
-          score: 0,
-          descendants: 0,
-          time: 0,
-          by: '',
-          title: '',
-          url: '',
-          kids: <int>[],
-          dead: false,
-          parts: <int>[],
-          deleted: false,
-          parent: 0,
-          text: '',
-          type: '',
-        );
+  Story.empty() : super.empty();
 
   Story.placeholder()
       : super(

lib/models/story_type.dart

@@ -0,0 +1,34 @@
+enum StoryType {
+  top('topstories'),
+  best('beststories'),
+  latest('newstories'),
+  ask('askstories'),
+  show('showstories');
+
+  const StoryType(this.path);
+
+  final String path;
+
+  String get label {
+    switch (this) {
+      case StoryType.top:
+        return 'TOP';
+      case StoryType.best:
+        return 'BEST';
+      case StoryType.latest:
+        return 'NEW';
+      case StoryType.ask:
+        return 'ASK';
+      case StoryType.show:
+        return 'SHOW';
+    }
+  }
+
+  static int convertToSettingsValue(List<StoryType> tabs) {
+    return int.parse(
+      tabs
+          .map((StoryType e) => e.index.toString())
+          .reduce((String value, String element) => '$value$element'),
+    );
+  }
+}

pubspec.lock

@@ -1358,5 +1358,5 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.18.0 <4.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=2.18.0 <3.0.0"
+  flutter: ">=3.7.1"

pubspec.yaml

@@ -1,11 +1,11 @@
 name: hacki
 description: A Hacker News reader.
-version: 1.0.5+83
+version: 1.0.8+86
 publish_to: none
 
 environment:
   sdk: ">=2.17.0 <3.0.0"
-  flutter: "3.7.0"
+  flutter: "3.7.2"
 
 dependencies:
   adaptive_theme: ^3.0.0