Merge pull request 'updated app icons and splash screen assets, updated sort logic' (#100) from develop-logo into develop

Reviewed-on: #100
2026-05-17 09:54:59 +00:00
parent 582eff8750 215911cf29
commit 831ea56869
87 changed files with 160 additions and 289 deletions
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
  <background android:drawable="@drawable/ic_launcher_background"/>
-  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+  <foreground>
+      <inset
+          android:drawable="@drawable/ic_launcher_foreground"
+          android:inset="16%" />
+  </foreground>
 </adaptive-icon>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="69.999985mm"
+   height="82.227501mm"
+   viewBox="0 0 69.999985 82.227501"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs1" /><g
+     id="g1"
+     transform="matrix(0.26458333,0,0,0.26458334,120.1078,-90.601937)"><g
+       id="group-R5"
+       transform="translate(-749.41293,290.52252)"><path
+         id="path2"
+         d="m 418.75901,57.817748 c -2.19013,14.15999 -3.96053,26.66133 -5.83906,39.13333 11.5776,2.532 18.4688,3.680002 29.7848,5.841332 8.50666,1.62133 23.36533,2.71733 23.952,11.096 0.86133,12.35866 -16.62534,7.388 -25.11734,5.84133 -11.244,-2.04667 -21.21693,-3.844 -30.9596,-5.84133 -1.82346,8.09866 -3.57813,15.82533 -5.25733,23.948 -4.90253,23.77866 -9.824,49.08933 -14.01666,73.59866 2.4136,-3.42133 4.11413,-5.69733 5.84226,-8.76267 8.89267,-15.76799 18.71867,-32.67066 30.37027,-47.31066 4.46106,-5.60667 10.24506,-12.64133 15.77306,-15.188 13.12267,-6.048 22.224,2.96133 22.78,15.77067 0.49334,11.372 -3.07733,24.15733 -4.676,36.80133 -1.65333,13.08933 -3.05066,25.98933 -4.66933,36.796 9.65733,-13.69067 19.72267,-35.95334 32.12533,-50.81733 3.668,-4.4 9.80667,-10.748 15.76934,-11.68134 29.16799,-4.57866 16.87733,41.62267 16.94133,63.084 0.0547,19.32001 5.86667,34.04934 23.36133,36.21068 5.73333,0.70933 14.10933,-1.48667 15.02533,3.51466 1.15467,6.31467 -10.42133,8.068 -16.77866,8.168 -38.84667,0.60267 -42.94133,-34.97734 -41.46933,-76.51601 -2.64534,2.476 -4.76134,6.336 -7.00934,9.93067 -13.00933,20.78267 -27.192,43.62801 -39.72133,67.17068 -3.45467,6.504 -7.15867,15.29333 -18.10667,11.09733 -2.30133,-0.88267 -6.43466,-5.92 -7.008,-7.59467 -2.60786,-7.62666 0.20667,-18.32533 1.168,-27.45333 2.87334,-27.16134 7.70934,-51.87868 10.516,-78.26534 -3.50533,-0.0707 -5.85733,4.008 -7.59333,6.42667 -6.2548,8.70266 -11.47147,18.76666 -16.94133,28.61866 -7.04214,12.684 -14.42814,25.71067 -21.02867,39.13201 -10.03173,20.41333 -25.14373,66.92133 -32.28013,90.50933 -1.15573,3.82133 -2.35933,7.744 -3.5052,11.68667 -0.998,3.428 -1.38693,7.69066 -4.67347,9.928 -13.33853,-2.52534 -11.962,-13.98534 -9.3464,-27.45467 6.31414,-32.45733 22.78547,-94.19334 28.19587,-126.13867 -9.72813,9.464 -20.53067,27.65466 -38.552,31.54133 -18.1928,3.92667 -29.05788,-6.35733 -36.2136,-16.35333 -2.28489,-3.19467 -5.52188,-6.60534 -3.50417,-10.51467 11.19375,-4.73333 15.11457,8.69467 26.28537,9.93067 3.0204,0.33199 7.2756,-0.32001 9.93027,-1.17067 17.65253,-5.64667 31.67346,-29.168 39.71506,-46.14133 9.88747,-20.86267 16.70987,-44.06667 19.86094,-65.42133 -8.76254,-1.51867 -19.064,-2.95467 -29.2344,-4.86933 -14.64054,-2.76134 -21.17334,-1.432 -26.83947,-7.980002 1.2228,-5.592 5.5228,-8.108 9.34627,-11.09867 16.83653,2.24533 33.6584,4.504 49.64946,7.59333 2.72454,-11.9 6.92973,-29.13199 9.92813,-41.47199 5.40267,-3.468 11.84947,1.12533 14.0204,4.676"
+         style="fill:#941a1f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.133333" /></g></g></svg>
@@ -647,7 +647,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BB0001010000000011111111 /* ShareExtension-Debug.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_OBJC_WEAK = YES;
@@ -691,7 +691,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BB0001020000000011111111 /* ShareExtension-Release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_OBJC_WEAK = YES;
@@ -732,7 +732,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BB0001030000000011111111 /* ShareExtension-Profile.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CLANG_ENABLE_OBJC_WEAK = YES;
@@ -941,7 +941,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BB0001040000000011111111 /* TimetableWidget-Debug.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -983,7 +983,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BB0001050000000011111111 /* TimetableWidget-Release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -1023,7 +1023,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = BB0001060000000011111111 /* TimetableWidget-Profile.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
@@ -38,7 +38,7 @@
        </scene>
    </scenes>
    <resources>
-        <image name="LaunchImage" width="800" height="1131"/>
+        <image name="LaunchImage" width="512" height="512"/>
        <image name="LaunchBackground" width="1" height="1"/>
    </resources>
 </document>
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
+	<dict>
 		<key>AppGroupId</key>
 		<string>$(CUSTOM_GROUP_ID)</string>
 		<key>CADisableMinimumFrameDurationOnPhone</key>
@@ -86,5 +86,5 @@
 		</array>
 		<key>UIViewControllerBasedStatusBarAppearance</key>
 		<false/>
-</dict>
+	</dict>
 </plist>
@@ -16,26 +16,20 @@ class GetRoomResponse extends ApiResponse {
  Map<String, dynamic> toJson() => _$GetRoomResponseToJson(this);

  List<GetRoomResponseObject> sortBy({
-    bool lastActivity = true,
    required bool favoritesToTop,
    required bool unreadToTop,
  }) {
-    for (var chat in data) {
-      final buffer = StringBuffer();
-
-      if (favoritesToTop) {
-        buffer.write(chat.isFavorite ? 'b' : 'a');
+    return data.toList()..sort((a, b) {
+      if (favoritesToTop && a.isFavorite != b.isFavorite) {
+        return a.isFavorite ? -1 : 1;
      }
      if (unreadToTop) {
-        buffer.write(chat.unreadMessages > 0 ? 'b' : 'a');
+        final aUnread = a.unreadMessages > 0;
+        final bUnread = b.unreadMessages > 0;
+        if (aUnread != bUnread) return aUnread ? -1 : 1;
      }
-
-      buffer.write(chat.lastActivity);
-
-      chat.sort = buffer.toString();
-    }
-
-    return data.toList()..sort((a, b) => b.sort!.compareTo(a.sort!));
+      return b.lastActivity.compareTo(a.lastActivity);
+    });
  }
 }

@@ -71,7 +65,6 @@ class GetRoomResponseObject {
  String? status;
  String? statusIcon;
  String? statusMessage;
-  String? sort;

  GetRoomResponseObject(
    this.id,
@@ -60,7 +60,7 @@ GetRoomResponseObject _$GetRoomResponseObjectFromJson(
  json['status'] as String?,
  json['statusIcon'] as String?,
  json['statusMessage'] as String?,
-)..sort = json['sort'] as String?;
+);

 Map<String, dynamic> _$GetRoomResponseObjectToJson(
  GetRoomResponseObject instance,
@@ -97,7 +97,6 @@ Map<String, dynamic> _$GetRoomResponseObjectToJson(
  'status': instance.status,
  'statusIcon': instance.statusIcon,
  'statusMessage': instance.statusMessage,
-  'sort': instance.sort,
 };

 const _$GetRoomResponseObjectConversationTypeEnumMap = {
@@ -13,7 +13,6 @@ class CacheableFile {
  String? eTag;
  DateTime? createdAt;
  DateTime? modifiedAt;
-  String? sort;

  /// Nextcloud's instance-local file id (`oc:fileid`). Used to address the
  /// preview API by id, which is more reliable than the path-based variant
@@ -22,7 +22,7 @@ CacheableFile _$CacheableFileFromJson(Map<String, dynamic> json) =>
          : DateTime.parse(json['modifiedAt'] as String),
      fileId: (json['fileId'] as num?)?.toInt(),
      hasPreview: json['hasPreview'] as bool?,
-    )..sort = json['sort'] as String?;
+    );

 Map<String, dynamic> _$CacheableFileToJson(CacheableFile instance) =>
    <String, dynamic>{
@@ -34,7 +34,6 @@ Map<String, dynamic> _$CacheableFileToJson(CacheableFile instance) =>
      'eTag': instance.eTag,
      'createdAt': instance.createdAt?.toIso8601String(),
      'modifiedAt': instance.modifiedAt?.toIso8601String(),
-      'sort': instance.sort,
      'fileId': instance.fileId,
      'hasPreview': instance.hasPreview,
    };
@@ -1,4 +1,3 @@
-import 'package:jiffy/jiffy.dart';
 import 'package:json_annotation/json_annotation.dart';

 import '../../../../../view/pages/files/data/sort_options.dart';
@@ -22,60 +21,19 @@ class ListFilesResponse extends ApiResponse {
    SortOption sortOption = SortOption.name,
    bool reversed = false,
  }) {
-    var list = List<CacheableFile>.empty(growable: true);
+    final ascending = SortOptions.getOption(sortOption).compare;
+    // `reversed=true` means user picked "Aufsteigend" (a→z, oldest→newest,
+    // smallest→largest); default is descending.
+    final compare = reversed
+        ? ascending
+        : (CacheableFile a, CacheableFile b) => ascending(b, a);

-    if (foldersToTop) {
-      list.addAll(
-        _sort(
-          files.where((element) => element.isDirectory).toSet(),
-          reversed: reversed,
-          sortOption: sortOption,
-        ),
-      );
-      list.addAll(
-        _sort(
-          files.where((element) => !element.isDirectory).toSet(),
-          reversed: reversed,
-          sortOption: sortOption,
-        ),
-      );
-    } else {
-      list.addAll(_sort(files, reversed: reversed, sortOption: sortOption));
+    if (!foldersToTop) {
+      return files.toList()..sort(compare);
    }

-    return list;
-  }
-
-  List<CacheableFile> _sort(
-    Set<CacheableFile> files, {
-    SortOption sortOption = SortOption.name,
-    bool reversed = false,
-  }) {
-    for (var file in files) {
-      final buffer = StringBuffer();
-
-      switch (sortOption) {
-        case SortOption.date:
-          buffer.write(
-            Jiffy.parseFromMillisecondsSinceEpoch(
-              file.modifiedAt?.millisecondsSinceEpoch ?? 0,
-            ).format(pattern: 'yyyyMMddhhmmss'),
-          );
-          break;
-
-        case SortOption.name:
-          buffer.write(file.name.toLowerCase());
-          break;
-
-        case SortOption.size:
-          buffer.write(file.size);
-          break;
-      }
-
-      file.sort = buffer.toString();
-    }
-
-    var list = files.toList()..sort((a, b) => b.sort!.compareTo(a.sort!));
-    return reversed ? list.reversed.toList() : list;
+    final folders = files.where((f) => f.isDirectory).toList()..sort(compare);
+    final regular = files.where((f) => !f.isDirectory).toList()..sort(compare);
+    return [...folders, ...regular];
  }
 }
@@ -21,12 +21,16 @@ class SortOptions {
    SortOption.name: BetterSortOption(
      displayName: 'Name',
      icon: Icons.sort_by_alpha_outlined,
-      compare: (a, b) => a.name.compareTo(b.name),
+      compare: (a, b) => a.name.toLowerCase().compareTo(b.name.toLowerCase()),
    ),
    SortOption.date: BetterSortOption(
      displayName: 'Datum',
      icon: Icons.history_outlined,
-      compare: (a, b) => a.modifiedAt!.compareTo(b.modifiedAt!),
+      compare: (a, b) {
+        final aMs = a.modifiedAt?.millisecondsSinceEpoch ?? 0;
+        final bMs = b.modifiedAt?.millisecondsSinceEpoch ?? 0;
+        return aMs.compareTo(bMs);
+      },
    ),
    SortOption.size: BetterSortOption(
      displayName: 'Größe',
@@ -100,7 +100,6 @@ class ShareChatPicker extends StatelessWidget {
          if (rooms == null) return const SizedBox.shrink();
          final sorted = rooms
              .sortBy(
-                lastActivity: true,
                favoritesToTop: talkSettings.sortFavoritesToTop,
                unreadToTop: talkSettings.sortUnreadToTop,
              )
@@ -162,7 +162,6 @@ class _ChatListViewState extends State<_ChatListView> {
                  .val()
                  .talkSettings;
              final sorted = rooms.sortBy(
-                lastActivity: true,
                favoritesToTop: talkSettings.sortFavoritesToTop,
                unreadToTop: talkSettings.sortUnreadToTop,
              );
@@ -44,6 +44,18 @@
  
  
  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
  
  
  
@@ -132,6 +144,12 @@
  
  
  
+  
+  
+  
+  
+  
+    
  <script>
    window.addEventListener('load', function(ev) {
      // Download main.dart.js