Navigation update

android/app/build.gradle

@@ -17,14 +17,14 @@ android {
     ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
 
         coreLibraryDesugaringEnabled true
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_11
     }
 
     defaultConfig {

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-all.zip

android/settings.gradle

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "8.6.0" apply false
+    id "com.android.application" version "8.9.1" apply false
     id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 

lib/main.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'dart:math';
 
 import 'package:flutter/foundation.dart';
@@ -7,6 +6,7 @@ import 'package:interstellar/src/controller/controller.dart';
 import 'package:interstellar/src/controller/database.dart';
 import 'package:interstellar/src/utils/http_client.dart';
 import 'package:interstellar/src/utils/globals.dart';
+import 'package:interstellar/src/utils/utils.dart';
 import 'package:interstellar/src/widgets/markdown/drafts_controller.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -25,15 +25,15 @@ void main() async {
 
   await initDatabase();
 
-  if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
+  if (PlatformUtils.isDesktop) {
     await windowManager.ensureInitialized();
 
     // Get smallest dimensions of available displays and set minimum window
     // size to be a 16th of those dimensions.
     final screenSize = PlatformDispatcher.instance.displays
         .map((display) => display.size)
         .reduce((a, b) => Size(min(a.width, b.width), min(a.height, b.height)));
-    final minWindowSize = screenSize / 4;
+    final minWindowSize = screenSize / 8;//4;
 
     WindowOptions windowOptions = WindowOptions(minimumSize: minWindowSize);
 
@@ -75,7 +75,7 @@ void main() async {
     return false;
   };
 
-  if (Platform.isAndroid) {
+  if (PlatformUtils.isAndroid) {
     await initPushNotifications(ac);
   }
 

lib/src/api/bookmark.dart

@@ -38,35 +38,35 @@ class APIBookmark {
 
   APIBookmark(this.client);
 
-  Future<(List<Object>, String?)> list({
-    String? list,
-    String? page,
-  }) async {
+  Future<(List<Object>, String?)> list({String? list, String? page}) async {
     switch (client.software) {
       case ServerSoftware.mbin:
         const path = '/bookmark-lists/show';
-        final query = {
-          'list': list,
-          'sort': 'newest',
-          'p': page,
-        };
+        final query = {'list': list, 'sort': 'newest', 'p': page};
 
         final response = await client.get(path, queryParams: query);
 
         final json = response.bodyJson;
         final itemList = json['items'] as List<dynamic>;
-        final items = itemList.map((item) {
-          var itemType = item['itemType'];
-          if (itemType == 'entry') {
-            return PostModel.fromMbinEntry(item as JsonMap);
-          } else if (itemType == 'post') {
-            return PostModel.fromMbinPost(item as JsonMap);
-          } else if (itemType == 'entry_comment' || itemType == 'post_comment') {
-            return CommentModel.fromMbin(item as JsonMap);
-          }
-        }).nonNulls.toList();
-
-        return (items, mbinCalcNextPaginationPage(json['pagination'] as JsonMap));
+        final items = itemList
+            .map((item) {
+              var itemType = item['itemType'];
+              if (itemType == 'entry') {
+                return PostModel.fromMbinEntry(item as JsonMap);
+              } else if (itemType == 'post') {
+                return PostModel.fromMbinPost(item as JsonMap);
+              } else if (itemType == 'entry_comment' ||
+                  itemType == 'post_comment') {
+                return CommentModel.fromMbin(item as JsonMap);
+              }
+            })
+            .nonNulls
+            .toList();
+
+        return (
+          items,
+          mbinCalcNextPaginationPage(json['pagination'] as JsonMap),
+        );
 
       case ServerSoftware.lemmy:
         const postsPath = '/post/list';
@@ -81,7 +81,7 @@ class APIBookmark {
 
         final [postResponse, commentResponse] = await Future.wait([
           client.get(postsPath, queryParams: query),
-          client.get(commentsPath, queryParams: query)
+          client.get(commentsPath, queryParams: query),
         ]);
 
         final postJson = postResponse.bodyJson;
@@ -98,15 +98,18 @@ class APIBookmark {
 
         final postLists = PostListModel.fromLemmy(
           postJson,
-          langCodeIdPairs: await client.languageCodeIdPairs()
+          langCodeIdPairs: await client.languageCodeIdPairs(),
         );
 
         final commentLists = CommentListModel.fromLemmyToFlat(
           commentJson,
-          langCodeIdPairs: await client.languageCodeIdPairs()
+          langCodeIdPairs: await client.languageCodeIdPairs(),
         );
 
-        return ([...postLists.items, ...commentLists.items], postLists.nextPage);
+        return (
+          [...postLists.items, ...commentLists.items],
+          postLists.nextPage,
+        );
 
       case ServerSoftware.piefed:
         throw UnimplementedError('Unimplemented');

lib/src/api/community_moderation.dart

@@ -116,8 +116,7 @@ class APICommunityModeration {
           'community_id': communityId,
           'user_id': userId,
           'reason': reason,
-          if (expiredAt != null)
-            'expires_at': expiredAt.toIso8601String(),
+          if (expiredAt != null) 'expires_at': expiredAt.toIso8601String(),
         };
 
         final response = await client.post(path, body: body);

lib/src/api/feed.dart

@@ -23,7 +23,7 @@ class APIFeed {
         final path = '/${topics ? 'topic' : 'feed'}/list';
         final query = {
           if (!topics) 'mine_only': mineOnly.toString(),
-          'include_communities': includeCommunities.toString()
+          'include_communities': includeCommunities.toString(),
         };
 
         final response = await client.get(path, queryParams: query);

lib/src/api/feed_source.dart

@@ -7,9 +7,18 @@ import 'package:interstellar/src/controller/server.dart';
 enum FeedView {
   threads(icon: Symbols.feed_rounded),
   microblog(software: ServerSoftware.mbinFlag, icon: Symbols.chat_rounded),
-  combined(software: ServerSoftware.mbinFlag, icon: Symbols.view_timeline_rounded);
+  combined(
+    software: ServerSoftware.mbinFlag,
+    icon: Symbols.view_timeline_rounded,
+  );
 
-  const FeedView({this.software = ServerSoftware.mbinFlag | ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, this.icon});
+  const FeedView({
+    this.software =
+        ServerSoftware.mbinFlag |
+        ServerSoftware.piefedFlag |
+        ServerSoftware.lemmyFlag,
+    this.icon,
+  });
 
   final int software;
   final IconData? icon;
@@ -24,8 +33,9 @@ enum FeedView {
     List<FeedView> values = FeedView.values,
     required int software,
   }) {
-    return values.where(
-          (item) => (item.software & software) == software,).toList();
+    return values
+        .where((item) => (item.software & software) == software)
+        .toList();
   }
 }
 
@@ -64,34 +74,142 @@ enum FeedSort {
   top(icon: Symbols.trending_up_rounded),
   newest(icon: Symbols.nest_eco_leaf_rounded),
   active(icon: Symbols.rocket_launch_rounded),
-  commented(software: ServerSoftware.mbinFlag | ServerSoftware.lemmyFlag, icon: Symbols.chat_rounded),
-  oldest(software: ServerSoftware.mbinFlag | ServerSoftware.lemmyFlag, icon: Symbols.access_time_rounded),
-  scaled(software: ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, icon: Symbols.scale_rounded),
-  newComments(software: ServerSoftware.lemmyFlag, icon: Symbols.mark_chat_unread_rounded),
-  controversial(software: ServerSoftware.lemmyFlag, icon: Symbols.thumbs_up_down_rounded),
-
-  topHour(software: ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-  topThreeHour(software: ServerSoftware.mbinFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-  topSixHour(software: ServerSoftware.mbinFlag | ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-  topTwelveHour(software: ServerSoftware.mbinFlag | ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-  topDay(software: ServerSoftware.mbinFlag | ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-  topWeek(software: ServerSoftware.mbinFlag | ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-  topMonth(software: ServerSoftware.mbinFlag | ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-  topThreeMonths(software: ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-  topSixMonths(software: ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-  topNineMonths(software: ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-  topYear(software: ServerSoftware.mbinFlag | ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag, parent: FeedSort.top, icon: Symbols.trending_up_rounded),
-
-  commentedThreeHour(software: ServerSoftware.mbinFlag, parent: FeedSort.commented, icon: Symbols.chat_rounded),
-  commentedSixHour(software: ServerSoftware.mbinFlag, parent: FeedSort.commented, icon: Symbols.chat_rounded),
-  commentedTwelveHour(software: ServerSoftware.mbinFlag, parent: FeedSort.commented, icon: Symbols.chat_rounded),
-  commentedDay(software: ServerSoftware.mbinFlag, parent: FeedSort.commented, icon: Symbols.chat_rounded),
-  commentedWeek(software: ServerSoftware.mbinFlag, parent: FeedSort.commented, icon: Symbols.chat_rounded),
-  commentedMonth(software: ServerSoftware.mbinFlag, parent: FeedSort.commented, icon: Symbols.chat_rounded),
-  commentedYear(software: ServerSoftware.mbinFlag, parent: FeedSort.commented, icon: Symbols.chat_rounded);
+  commented(
+    software: ServerSoftware.mbinFlag | ServerSoftware.lemmyFlag,
+    icon: Symbols.chat_rounded,
+  ),
+  oldest(
+    software: ServerSoftware.mbinFlag | ServerSoftware.lemmyFlag,
+    icon: Symbols.access_time_rounded,
+  ),
+  scaled(
+    software: ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag,
+    icon: Symbols.scale_rounded,
+  ),
+  newComments(
+    software: ServerSoftware.lemmyFlag,
+    icon: Symbols.mark_chat_unread_rounded,
+  ),
+  controversial(
+    software: ServerSoftware.lemmyFlag,
+    icon: Symbols.thumbs_up_down_rounded,
+  ),
+
+  topHour(
+    software: ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+  topThreeHour(
+    software: ServerSoftware.mbinFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+  topSixHour(
+    software:
+        ServerSoftware.mbinFlag |
+        ServerSoftware.piefedFlag |
+        ServerSoftware.lemmyFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+  topTwelveHour(
+    software:
+        ServerSoftware.mbinFlag |
+        ServerSoftware.piefedFlag |
+        ServerSoftware.lemmyFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+  topDay(
+    software:
+        ServerSoftware.mbinFlag |
+        ServerSoftware.piefedFlag |
+        ServerSoftware.lemmyFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+  topWeek(
+    software:
+        ServerSoftware.mbinFlag |
+        ServerSoftware.piefedFlag |
+        ServerSoftware.lemmyFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+  topMonth(
+    software:
+        ServerSoftware.mbinFlag |
+        ServerSoftware.piefedFlag |
+        ServerSoftware.lemmyFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+  topThreeMonths(
+    software: ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+  topSixMonths(
+    software: ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+  topNineMonths(
+    software: ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+  topYear(
+    software:
+        ServerSoftware.mbinFlag |
+        ServerSoftware.piefedFlag |
+        ServerSoftware.lemmyFlag,
+    parent: FeedSort.top,
+    icon: Symbols.trending_up_rounded,
+  ),
+
+  commentedThreeHour(
+    software: ServerSoftware.mbinFlag,
+    parent: FeedSort.commented,
+    icon: Symbols.chat_rounded,
+  ),
+  commentedSixHour(
+    software: ServerSoftware.mbinFlag,
+    parent: FeedSort.commented,
+    icon: Symbols.chat_rounded,
+  ),
+  commentedTwelveHour(
+    software: ServerSoftware.mbinFlag,
+    parent: FeedSort.commented,
+    icon: Symbols.chat_rounded,
+  ),
+  commentedDay(
+    software: ServerSoftware.mbinFlag,
+    parent: FeedSort.commented,
+    icon: Symbols.chat_rounded,
+  ),
+  commentedWeek(
+    software: ServerSoftware.mbinFlag,
+    parent: FeedSort.commented,
+    icon: Symbols.chat_rounded,
+  ),
+  commentedMonth(
+    software: ServerSoftware.mbinFlag,
+    parent: FeedSort.commented,
+    icon: Symbols.chat_rounded,
+  ),
+  commentedYear(
+    software: ServerSoftware.mbinFlag,
+    parent: FeedSort.commented,
+    icon: Symbols.chat_rounded,
+  );
 
   const FeedSort({
-    this.software = ServerSoftware.mbinFlag | ServerSoftware.piefedFlag | ServerSoftware.lemmyFlag,
+    this.software =
+        ServerSoftware.mbinFlag |
+        ServerSoftware.piefedFlag |
+        ServerSoftware.lemmyFlag,
     this.parent,
     this.icon,
   });