Merge branch 'zulip:main' into add-language-setting

Author: AshutoshKhadse23

assets/icons/ZulipIcons.ttf

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>12.0</string>
+  <string>14.0</string>
 </dict>
 </plist>

assets/icons/edit.svg

@@ -1,5 +1,6 @@
 # This should match the iOS Deployment Target
 # (in Xcode, that's in project > Runner > Info)
+# and MinimumOSVersion in ios/Flutter/AppFrameworkInfo.plist.
 platform :ios, '14.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.

ios/Flutter/AppFrameworkInfo.plist

@@ -363,6 +363,24 @@ class ZulipStream {
     required this.streamWeeklyTraffic,
   });
 
+  /// Construct a plain [ZulipStream] from [subscription].
+  factory ZulipStream.fromSubscription(Subscription subscription) {
+    return ZulipStream(
+      streamId: subscription.streamId,
+      name: subscription.name,
+      description: subscription.description,
+      renderedDescription: subscription.renderedDescription,
+      dateCreated: subscription.dateCreated,
+      firstMessageId: subscription.firstMessageId,
+      inviteOnly: subscription.inviteOnly,
+      isWebPublic: subscription.isWebPublic,
+      historyPublicToSubscribers: subscription.historyPublicToSubscribers,
+      messageRetentionDays: subscription.messageRetentionDays,
+      channelPostPolicy: subscription.channelPostPolicy,
+      streamWeeklyTraffic: subscription.streamWeeklyTraffic,
+    );
+  }
+
   factory ZulipStream.fromJson(Map<String, dynamic> json) =>
     _$ZulipStreamFromJson(json);
 

ios/Podfile

@@ -275,6 +275,7 @@ Future<UpdateMessageResult> updateMessage(
   bool? sendNotificationToOldThread,
   bool? sendNotificationToNewThread,
   String? content,
+  String? prevContentSha256,
   int? streamId,
 }) {
   return connection.patch('updateMessage', UpdateMessageResult.fromJson, 'messages/$messageId', {
@@ -283,6 +284,7 @@ Future<UpdateMessageResult> updateMessage(
     if (sendNotificationToOldThread != null) 'send_notification_to_old_thread': sendNotificationToOldThread,
     if (sendNotificationToNewThread != null) 'send_notification_to_new_thread': sendNotificationToNewThread,
     if (content != null) 'content': RawParameter(content),
+    if (prevContentSha256 != null) 'prev_content_sha256': RawParameter(prevContentSha256),
     if (streamId != null) 'stream_id': streamId,
   });
 }

lib/api/model/model.dart

@@ -17,10 +17,8 @@
 /// so as to set the app ID differently.
 library;
 
-// ignore: undefined_hidden_name // anticipates https://github.com/flutter/flutter/pull/164818
-import 'package:flutter/material.dart' hide SliverPaintOrder;
+import 'package:flutter/material.dart';
 
-import '../widgets/scrolling.dart';
 import '../widgets/sticky_header.dart';
 
 /// Example page using [StickyHeaderListView] and [StickyHeaderItem] in a
@@ -153,7 +151,7 @@ class ExampleVerticalDouble extends StatelessWidget {
 
     return Scaffold(
       appBar: AppBar(title: Text(title)),
-      body: CustomPaintOrderScrollView(
+      body: CustomScrollView(
         semanticChildCount: numSections,
         center: centerKey,
         paintOrder: headerAtBottom ?

lib/api/route/messages.dart

@@ -68,15 +68,17 @@ import 'zulip_localizations_uk.dart';
 /// be consistent with the languages listed in the ZulipLocalizations.supportedLocales
 /// property.
 abstract class ZulipLocalizations {
-  ZulipLocalizations(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
+  ZulipLocalizations(String locale)
+    : localeName = intl.Intl.canonicalizedLocale(locale.toString());
 
   final String localeName;
 
   static ZulipLocalizations of(BuildContext context) {
     return Localizations.of<ZulipLocalizations>(context, ZulipLocalizations)!;
   }
 
-  static const LocalizationsDelegate<ZulipLocalizations> delegate = _ZulipLocalizationsDelegate();
+  static const LocalizationsDelegate<ZulipLocalizations> delegate =
+      _ZulipLocalizationsDelegate();
 
   /// A list of this localizations delegate along with the default localizations
   /// delegates.
@@ -88,12 +90,13 @@ abstract class ZulipLocalizations {
   /// Additional delegates can be added by appending to this list in
   /// MaterialApp. This list does not have to be used at all if a custom list
   /// of delegates is preferred or required.
-  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
-    delegate,
-    GlobalMaterialLocalizations.delegate,
-    GlobalCupertinoLocalizations.delegate,
-    GlobalWidgetsLocalizations.delegate,
-  ];
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates =
+      <LocalizationsDelegate<dynamic>>[
+        delegate,
+        GlobalMaterialLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate,
+        GlobalWidgetsLocalizations.delegate,
+      ];
 
   /// A list of this localizations delegate's supported locales.
   static const List<Locale> supportedLocales = <Locale>[
@@ -104,7 +107,7 @@ abstract class ZulipLocalizations {
     Locale('pl'),
     Locale('ru'),
     Locale('sk'),
-    Locale('uk')
+    Locale('uk'),
   ];
 
   /// Title for About Zulip page.
@@ -381,7 +384,11 @@ abstract class ZulipLocalizations {
   ///
   /// In en, this message translates to:
   /// **'{num, plural, =1{File is} other{{num} files are}} larger than the server\'s limit of {maxFileUploadSizeMib} MiB and will not be uploaded:\n\n{listMessage}'**
-  String errorFilesTooLarge(int num, int maxFileUploadSizeMib, String listMessage);
+  String errorFilesTooLarge(
+    int num,
+    int maxFileUploadSizeMib,
+    String listMessage,
+  );
 
   /// Error title when attached files are too large in size.
   ///
@@ -459,7 +466,11 @@ abstract class ZulipLocalizations {
   ///
   /// In en, this message translates to:
   /// **'Error handling a Zulip event from {serverUrl}; will retry.\n\nError: {error}\n\nEvent: {event}'**
-  String errorHandlingEventDetails(String serverUrl, String error, String event);
+  String errorHandlingEventDetails(
+    String serverUrl,
+    String error,
+    String event,
+  );
 
   /// Error title when opening a link failed.
   ///
@@ -831,7 +842,11 @@ abstract class ZulipLocalizations {
   ///
   /// In en, this message translates to:
   /// **'{url} is running Zulip Server {zulipVersion}, which is unsupported. The minimum supported version is Zulip Server {minSupportedZulipVersion}.'**
-  String errorServerVersionUnsupportedMessage(String url, String zulipVersion, String minSupportedZulipVersion);
+  String errorServerVersionUnsupportedMessage(
+    String url,
+    String zulipVersion,
+    String minSupportedZulipVersion,
+  );
 
   /// Error message in the dialog for invalid API key.
   ///
@@ -1302,40 +1317,58 @@ abstract class ZulipLocalizations {
   String get systemDefaultLanguage;
 }
 
-class _ZulipLocalizationsDelegate extends LocalizationsDelegate<ZulipLocalizations> {
+class _ZulipLocalizationsDelegate
+    extends LocalizationsDelegate<ZulipLocalizations> {
   const _ZulipLocalizationsDelegate();
 
   @override
   Future<ZulipLocalizations> load(Locale locale) {
-    return SynchronousFuture<ZulipLocalizations>(lookupZulipLocalizations(locale));
+    return SynchronousFuture<ZulipLocalizations>(
+      lookupZulipLocalizations(locale),
+    );
   }
 
   @override
-  bool isSupported(Locale locale) => <String>['ar', 'en', 'ja', 'nb', 'pl', 'ru', 'sk', 'uk'].contains(locale.languageCode);
+  bool isSupported(Locale locale) => <String>[
+    'ar',
+    'en',
+    'ja',
+    'nb',
+    'pl',
+    'ru',
+    'sk',
+    'uk',
+  ].contains(locale.languageCode);
 
   @override
   bool shouldReload(_ZulipLocalizationsDelegate old) => false;
 }
 
 ZulipLocalizations lookupZulipLocalizations(Locale locale) {
-
-
   // Lookup logic when only language code is specified.
   switch (locale.languageCode) {
-    case 'ar': return ZulipLocalizationsAr();
-    case 'en': return ZulipLocalizationsEn();
-    case 'ja': return ZulipLocalizationsJa();
-    case 'nb': return ZulipLocalizationsNb();
-    case 'pl': return ZulipLocalizationsPl();
-    case 'ru': return ZulipLocalizationsRu();
-    case 'sk': return ZulipLocalizationsSk();
-    case 'uk': return ZulipLocalizationsUk();
+    case 'ar':
+      return ZulipLocalizationsAr();
+    case 'en':
+      return ZulipLocalizationsEn();
+    case 'ja':
+      return ZulipLocalizationsJa();
+    case 'nb':
+      return ZulipLocalizationsNb();
+    case 'pl':
+      return ZulipLocalizationsPl();
+    case 'ru':
+      return ZulipLocalizationsRu();
+    case 'sk':
+      return ZulipLocalizationsSk();
+    case 'uk':
+      return ZulipLocalizationsUk();
   }
 
   throw FlutterError(
     'ZulipLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
     'an issue with the localizations generation tool. Please file an issue '
     'on GitHub with a reproducible sample app and the gen-l10n configuration '
-    'that was used.'
+    'that was used.',
   );
 }