🚀 Launch 1.2.1+18

🐛 Fix local db old data cause crash
💄 Update styles
2024-08-19 09:43:25 +08:00 · 2024-08-19 09:19:29 +08:00 · 2024-08-19 01:54:32 +08:00 · 2024-08-19 01:35:57 +08:00 · 2024-08-19 01:35:38 +08:00
11 changed files with 113 additions and 16 deletions
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -51,6 +51,9 @@ PODS:
  - Firebase/Messaging (10.29.0):
    - Firebase/CoreOnly
    - FirebaseMessaging (~> 10.29.0)
+  - Firebase/Performance (10.29.0):
+    - Firebase/CoreOnly
+    - FirebasePerformance (~> 10.29.0)
  - firebase_analytics (11.2.1):
    - Firebase/Analytics (= 10.29.0)
    - firebase_core
@ -66,6 +69,12 @@ PODS:
    - Firebase/Messaging (= 10.29.0)
    - firebase_core
    - Flutter
+  - firebase_performance (0.10.0-4):
+    - Firebase/Performance (= 10.29.0)
+    - firebase_core
+    - Flutter
+  - FirebaseABTesting (10.29.0):
+    - FirebaseCore (~> 10.0)
  - FirebaseAnalytics (10.29.0):
    - FirebaseAnalytics/AdIdSupport (= 10.29.0)
    - FirebaseCore (~> 10.0)
@ -115,6 +124,25 @@ PODS:
    - GoogleUtilities/Reachability (~> 7.8)
    - GoogleUtilities/UserDefaults (~> 7.8)
    - nanopb (< 2.30911.0, >= 2.30908.0)
+  - FirebasePerformance (10.29.0):
+    - FirebaseCore (~> 10.5)
+    - FirebaseInstallations (~> 10.0)
+    - FirebaseRemoteConfig (~> 10.0)
+    - FirebaseSessions (~> 10.5)
+    - GoogleDataTransport (~> 9.2)
+    - GoogleUtilities/Environment (~> 7.13)
+    - GoogleUtilities/ISASwizzler (~> 7.13)
+    - GoogleUtilities/MethodSwizzler (~> 7.13)
+    - GoogleUtilities/UserDefaults (~> 7.13)
+    - nanopb (< 2.30911.0, >= 2.30908.0)
+  - FirebaseRemoteConfig (10.29.0):
+    - FirebaseABTesting (~> 10.0)
+    - FirebaseCore (~> 10.0)
+    - FirebaseInstallations (~> 10.0)
+    - FirebaseRemoteConfigInterop (~> 10.23)
+    - FirebaseSharedSwift (~> 10.0)
+    - GoogleUtilities/Environment (~> 7.8)
+    - "GoogleUtilities/NSData+zlib (~> 7.8)"
  - FirebaseRemoteConfigInterop (10.29.0)
  - FirebaseSessions (10.29.0):
    - FirebaseCore (~> 10.5)
@ -125,6 +153,7 @@ PODS:
    - GoogleUtilities/UserDefaults (~> 7.13)
    - nanopb (< 2.30911.0, >= 2.30908.0)
    - PromisesSwift (~> 2.1)
+  - FirebaseSharedSwift (10.29.0)
  - Flutter (1.0.0)
  - flutter_keyboard_visibility (0.0.1):
    - Flutter
@ -168,6 +197,8 @@ PODS:
  - GoogleUtilities/Environment (7.13.3):
    - GoogleUtilities/Privacy
    - PromisesObjC (< 3.0, >= 1.2)
+  - GoogleUtilities/ISASwizzler (7.13.3):
+    - GoogleUtilities/Privacy
  - GoogleUtilities/Logger (7.13.3):
    - GoogleUtilities/Environment
    - GoogleUtilities/Privacy
@ -247,6 +278,7 @@ DEPENDENCIES:
  - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
  - firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
  - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
+  - firebase_performance (from `.symlinks/plugins/firebase_performance/ios`)
  - Flutter (from `Flutter`)
  - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
@ -273,6 +305,7 @@ SPEC REPOS:
    - DKImagePickerController
    - DKPhotoGallery
    - Firebase
+    - FirebaseABTesting
    - FirebaseAnalytics
    - FirebaseCore
    - FirebaseCoreExtension
@ -280,8 +313,11 @@ SPEC REPOS:
    - FirebaseCrashlytics
    - FirebaseInstallations
    - FirebaseMessaging
+    - FirebasePerformance
+    - FirebaseRemoteConfig
    - FirebaseRemoteConfigInterop
    - FirebaseSessions
+    - FirebaseSharedSwift
    - GoogleAppMeasurement
    - GoogleDataTransport
    - GoogleUtilities
@ -308,6 +344,8 @@ EXTERNAL SOURCES:
    :path: ".symlinks/plugins/firebase_crashlytics/ios"
  firebase_messaging:
    :path: ".symlinks/plugins/firebase_messaging/ios"
+  firebase_performance:
+    :path: ".symlinks/plugins/firebase_performance/ios"
  Flutter:
    :path: Flutter
  flutter_keyboard_visibility:
@ -360,6 +398,8 @@ SPEC CHECKSUMS:
  firebase_core: 57aeb91680e5d5e6df6b888064be7c785f146efb
  firebase_crashlytics: e3d3e0c99bad5aaab5908385133dea8ec344693f
  firebase_messaging: c862b3d2b973ecc769194dc8de09bd22c77ae757
+  firebase_performance: 8643e815a354ee94da1192cd69335a48a7b625a4
+  FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe
  FirebaseAnalytics: 23717de130b779aa506e757edb9713d24b6ffeda
  FirebaseCore: 30e9c1cbe3d38f5f5e75f48bfcea87d7c358ec16
  FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
@ -367,8 +407,11 @@ SPEC CHECKSUMS:
  FirebaseCrashlytics: 34647b41e18de773717fdd348a22206f2f9bc774
  FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
  FirebaseMessaging: 7b5d8033e183ab59eb5b852a53201559e976d366
+  FirebasePerformance: d0ac4aa90f8c1aedeb8d0329a56e2d77d8d9e004
+  FirebaseRemoteConfig: 48ef3f243742a8d72422ccfc9f986e19d7de53fd
  FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
  FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
+  FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
  flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
  flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@ -254,6 +254,7 @@
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
 				B1CDA9DD5B638A2BB88053CB /* [CP] Check Pods Manifest.lock */,
+				7356FAC42C72724B0051A465 /* [Crashlytics] Clear dSYM */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
@ -263,7 +264,7 @@
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
 				287A33C298CA352A7E7F32A4 /* [CP] Embed Pods Frameworks */,
 				0818E8E4321C0D7433E07576 /* [CP] Copy Pods Resources */,
-				1A9FD6BE5DEE99CDA7399504 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */,
+				1A9FD6BE5DEE99CDA7399504 /* [Crashlytics] Upload dSYM */,
 			);
 			buildRules = (
 			);
@ -366,7 +367,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		1A9FD6BE5DEE99CDA7399504 /* FlutterFire: "flutterfire upload-crashlytics-symbols" */ = {
+		1A9FD6BE5DEE99CDA7399504 /* [Crashlytics] Upload dSYM */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@ -375,14 +376,14 @@
 			);
 			inputPaths = (
 			);
-			name = "FlutterFire: \"flutterfire upload-crashlytics-symbols\"";
+			name = "[Crashlytics] Upload dSYM";
 			outputFileListPaths = (
 			);
 			outputPaths = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\n#!/bin/bash\nPATH=${PATH}:$FLUTTER_ROOT/bin:$HOME/.pub-cache/bin\nflutterfire upload-crashlytics-symbols --upload-symbols-script-path=$PODS_ROOT/FirebaseCrashlytics/upload-symbols --platform=ios --apple-project-path=${SRCROOT} --env-platform-name=${PLATFORM_NAME} --env-configuration=${CONFIGURATION} --env-project-dir=${PROJECT_DIR} --env-built-products-dir=${BUILT_PRODUCTS_DIR} --env-dwarf-dsym-folder-path=${DWARF_DSYM_FOLDER_PATH} --env-dwarf-dsym-file-name=${DWARF_DSYM_FILE_NAME} --env-infoplist-path=${INFOPLIST_PATH} --default-config=default\n";
+			shellScript = "\n#!/bin/bash\nsleep 1 # Without this, there seems a chance that the script runs before dSYM generation is finished \n$PODS_ROOT/FirebaseCrashlytics/upload-symbols -gsp $PROJECT_DIR/Runner/GoogleService-Info.plist -p ios $DWARF_DSYM_FOLDER_PATH/$DWARF_DSYM_FILE_NAME\n";
 		};
 		259653AE41D478F4C6BAE9B2 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
@ -439,6 +440,24 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		7356FAC42C72724B0051A465 /* [Crashlytics] Clear dSYM */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "[Crashlytics] Clear dSYM";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\n#!/bin/bash\nrm -rf $DWARF_DSYM_FOLDER_PATH/$DWARF_DSYM_FILE_NAME\n";
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@ -452,7 +471,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
+			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
 		B1CDA9DD5B638A2BB88053CB /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
--- a/lib/models/event.dart
+++ b/lib/models/event.dart
@ -63,7 +63,7 @@ class Event {
 class EventMessageBody {
  String text;
  String algorithm;
-  List<int>? attachments;
+  List<String>? attachments;
  int? quoteEvent;
  int? relatedEvent;
  List<int>? relatedUsers;
@ -82,7 +82,7 @@ class EventMessageBody {
        text: json['text'] ?? '',
        algorithm: json['algorithm'] ?? 'plain',
        attachments: json['attachments'] != null
-            ? List<int>.from(json['attachments'].map((x) => x))
+            ? List<String>.from(json['attachments']?.whereType<String>())
            : null,
        quoteEvent: json['quote_event'],
        relatedEvent: json['related_event'],
--- a/lib/models/stickers.dart
+++ b/lib/models/stickers.dart
@ -36,7 +36,7 @@ class Sticker {

  String get imageUrl => ServiceFinder.buildUrl(
        'files',
-        '/attachments/$attachmentId',
+        '/attachments/${attachment.rid}',
      );

  factory Sticker.fromJson(Map<String, dynamic> json) => Sticker(
--- a/lib/screens/account/stickers.dart
+++ b/lib/screens/account/stickers.dart
@ -66,7 +66,7 @@ class _StickerScreenState extends State<StickerScreen> {
  Widget _buildEmoteEntry(Sticker item, String prefix) {
    final imageUrl = ServiceFinder.buildUrl(
      'files',
-      '/attachments/${item.attachmentId}',
+      '/attachments/${item.attachment.rid}',
    );
    return ListTile(
      title: Text(item.name),
--- a/lib/shells/root_shell.dart
+++ b/lib/shells/root_shell.dart
@ -1,3 +1,4 @@
+import 'package:firebase_analytics/firebase_analytics.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:solian/theme.dart';
@ -29,6 +30,15 @@ class RootShell extends StatelessWidget {
  Widget build(BuildContext context) {
    final routeName = state.topRoute?.name;

+    if (routeName != null) {
+      FirebaseAnalytics.instance.logEvent(
+        name: 'screen_view',
+        parameters: {
+          'firebase_screen': routeName,
+        },
+      );
+    }
+
    return Scaffold(
      key: rootScaffoldKey,
      drawer: SolianTheme.isLargeScreen(context)
--- a/lib/widgets/attachments/attachment_list.dart
+++ b/lib/widgets/attachments/attachment_list.dart
@ -72,6 +72,7 @@ class _AttachmentListState extends State<AttachmentList> {
    double? consistentValue;
    int portrait = 0, square = 0, landscape = 0;
    for (var entry in _attachmentsMeta) {
+      if (entry == null) continue;
      if (entry!.metadata?['ratio'] != null) {
        if (entry.metadata?['ratio'] is int) {
          consistentValue ??= entry.metadata?['ratio'].toDouble();
@ -372,7 +373,6 @@ class _AttachmentSelfContainedEntryState
          isDense: widget.isDense,
          parentId: widget.parentId,
          showMature: _showMature,
-          showBorder: true,
          onReveal: (value) {
            setState(() => _showMature = value);
          },
--- a/lib/widgets/chat/chat_event.dart
+++ b/lib/widgets/chat/chat_event.dart
@ -39,7 +39,7 @@ class ChatEvent extends StatelessWidget {

  Widget _buildAttachment(BuildContext context, {bool isMinimal = false}) {
    final attachments = item.body['attachments'] != null
-        ? List<String>.from(item.body['attachments'].map((x) => x))
+        ? List<String>.from(item.body['attachments']?.whereType<String>())
        : List<String>.empty();

    if (attachments.isEmpty) return const SizedBox();
--- a/lib/widgets/posts/post_item.dart
+++ b/lib/widgets/posts/post_item.dart
@ -293,7 +293,7 @@ class _PostItemState extends State<PostItem> {
  @override
  Widget build(BuildContext context) {
    final List<String> attachments = item.body['attachments'] is List
-        ? item.body['attachments']?.cast<String>()
+        ? List.from(item.body['attachments']?.whereType<String>())
        : List.empty();
    final hasAttachment = attachments.isNotEmpty;

@ -301,7 +301,7 @@ class _PostItemState extends State<PostItem> {
      return Column(
        crossAxisAlignment: CrossAxisAlignment.start,
        children: [
-          _buildThumbnail(),
+          _buildThumbnail().paddingOnly(bottom: 8),
          _buildHeader().paddingSymmetric(horizontal: 12),
          _buildHeaderDivider().paddingSymmetric(horizontal: 12),
          Stack(
--- a/pubspec.lock
+++ b/pubspec.lock
@ -550,6 +550,30 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "3.8.12"
+  firebase_performance:
+    dependency: "direct main"
+    description:
+      name: firebase_performance
+      sha256: "6d17133458b9627f15f278d6f71bebbbce885d393f3462b690e55deeb5c36b90"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.10.0+4"
+  firebase_performance_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_performance_platform_interface
+      sha256: "28dc0a70a3459fe51d1c1be5754803a9a0db0e210322ec7526f6ce42bf6ad83e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.4+40"
+  firebase_performance_web:
+    dependency: transitive
+    description:
+      name: firebase_performance_web
+      sha256: db91d86b34280f5253d2913945fdd51d7114486584a298a7bedf1c4b2ab08f79
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6+12"
  fixnum:
    dependency: transitive
    description:
@ -1630,10 +1654,10 @@ packages:
    dependency: transitive
    description:
      name: sqflite_common
-      sha256: c5e5b2a142a893a752cb36ae5888680248686725a54afceff31f9a3a76bc53c2
+      sha256: "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e"
      url: "https://pub.dev"
    source: hosted
-    version: "2.5.4+1"
+    version: "2.5.4+2"
  sqflite_common_ffi:
    dependency: "direct dev"
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -2,7 +2,7 @@ name: solian
 description: "The Solar Network App"
 publish_to: "none"

-version: 1.2.1+16
+version: 1.2.1+18

 environment:
  sdk: ">=3.3.4 <4.0.0"
@ -69,6 +69,7 @@ dependencies:
  firebase_analytics: ^11.2.1
  video_player: ^2.9.1
  chewie: ^1.8.3
+  firebase_performance: ^0.10.0+4

 dev_dependencies:
  flutter_test:
Author	SHA1	Message	Date
LittleSheep	95ea3e558f	🚀 Launch 1.2.1+18	2024-08-19 09:43:25 +08:00
LittleSheep	0006a94632	🐛 Fix local db old data cause crash	2024-08-19 09:19:29 +08:00
LittleSheep	7ea18dbe12	💄 Update styles	2024-08-19 01:54:32 +08:00
LittleSheep	6004b74724	🚀 Launch 1.2.1+17	2024-08-19 01:35:57 +08:00
LittleSheep	4d82ae8058	🐛 Bug fixes ⬆️ Add firebase performance	2024-08-19 01:35:38 +08:00