Skip to content

Commit 5ad755c

Browse files
Merge branch 'zulip:main' into main
2 parents af40234 + 3730c90 commit 5ad755c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1801
-691
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,10 @@ jobs:
1818
distribution: temurin
1919

2020
- name: Clone Flutter SDK
21-
# We can't do a depth-1 clone, because we need the most recent tag
22-
# so that Flutter knows its version and sees the constraint in our
23-
# pubspec is satisfied. It's uncommon for flutter/flutter to go
24-
# more than 100 commits between tags. Fetch 1000 for good measure.
25-
# TODO(upstream): Around 2025-05, Flutter upstream stopped making
26-
# tags within the main/master branch. Get that fixed:
27-
# https://github.com/zulip/zulip-flutter/issues/1710
28-
# Pending that, fetch more than 1000 commits.
21+
# Upstream's version calculation fails with a shallow clone,
22+
# so instead clone with `--filter=blob:none`.
2923
run: |
30-
git clone --depth=3000 -b main https://github.com/flutter/flutter ~/flutter
24+
git clone --filter=blob:none -b main https://github.com/flutter/flutter ~/flutter
3125
TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local
3226
echo ~/flutter/bin >> "$GITHUB_PATH"
3327

.github/workflows/update-translations.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,10 @@ jobs:
2525
git reset --hard weblate/main
2626
2727
- name: Clone Flutter SDK
28-
# We can't do a depth-1 clone, because we need the most recent tag
29-
# so that Flutter knows its version and sees the constraint in our
30-
# pubspec is satisfied. It's uncommon for flutter/flutter to go
31-
# more than 100 commits between tags. Fetch 1000 for good measure.
32-
# TODO(upstream): See ci.yml for why we fetch more than 1000.
28+
# Upstream's version calculation fails with a shallow clone,
29+
# so instead clone with `--filter=blob:none`.
3330
run: |
34-
git clone --depth=3000 -b main https://github.com/flutter/flutter ~/flutter
31+
git clone --filter=blob:none -b main https://github.com/flutter/flutter ~/flutter
3532
TZ=UTC git --git-dir ~/flutter/.git log -1 --format='%h | %ci | %s' --date=iso8601-local
3633
echo ~/flutter/bin >> "$GITHUB_PATH"
3734

android/app/src/main/kotlin/com/zulip/flutter/AndroidIntents.g.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Autogenerated from Pigeon (v26.0.0), do not edit directly.
1+
// Autogenerated from Pigeon (v26.0.1), do not edit directly.
22
// See also: https://pub.dev/packages/pigeon
33
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
44

android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Autogenerated from Pigeon (v26.0.0), do not edit directly.
1+
// Autogenerated from Pigeon (v26.0.1), do not edit directly.
22
// See also: https://pub.dev/packages/pigeon
33
@file:Suppress("UNCHECKED_CAST", "ArrayInDataClass")
44

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ agpVersion=8.12.0
1313
# https://kotlinlang.org/docs/releases.html#release-details
1414
# A helpful discussion is at:
1515
# https://stackoverflow.com/a/74425347
16-
kotlinVersion=2.2.0
16+
kotlinVersion=2.2.20

assets/icons/ZulipIcons.ttf

224 Bytes
Binary file not shown.

assets/icons/more_horizontal.svg

Lines changed: 5 additions & 0 deletions
Loading

assets/l10n/app_en.arb

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,18 @@
7272
"@chooseAccountButtonAddAnAccount": {
7373
"description": "Label for ChooseAccountPage button to add an account"
7474
},
75+
"navButtonAllChannels": "All channels",
76+
"@navButtonAllChannels": {
77+
"description": "Title for a nav button that opens the 'All channels' page."
78+
},
79+
"allChannelsPageTitle": "All channels",
80+
"@allChannelsPageTitle": {
81+
"description": "Title for the 'All channels' page."
82+
},
83+
"allChannelsEmptyPlaceholder": "There are no channels you can view in this organization.",
84+
"@allChannelsEmptyPlaceholder": {
85+
"description": "Centered text on the 'All channels' page saying that there is no content to show."
86+
},
7587
"profileButtonSendDirectMessage": "Send direct message",
7688
"@profileButtonSendDirectMessage": {
7789
"description": "Label for button in profile screen to navigate to DMs with the shown user."
@@ -1074,10 +1086,17 @@
10741086
"@channelsPageTitle": {
10751087
"description": "Title for the page with a list of subscribed channels."
10761088
},
1077-
"channelsEmptyPlaceholder": "You are not subscribed to any channels yet.",
1089+
"channelsEmptyPlaceholder": "You’re not subscribed to any channels yet.",
10781090
"@channelsEmptyPlaceholder": {
10791091
"description": "Centered text on the 'Channels' page saying that there is no content to show."
10801092
},
1093+
"channelsEmptyPlaceholderWithAllChannelsLink": "You’re not subscribed to any channels yet. Try going to <z-link>{allChannelsPageTitle}</z-link> and joining some of them.",
1094+
"@channelsEmptyPlaceholderWithAllChannelsLink": {
1095+
"description": "Centered text on the 'Channels' page saying that there is no content to show, with a link to 'All channels'.",
1096+
"placeholders": {
1097+
"allChannelsPageTitle": {"type": "String", "example": "All channels"}
1098+
}
1099+
},
10811100
"sharePageTitle": "Share",
10821101
"@sharePageTitle": {
10831102
"description": "Title for the page about sharing content received from other apps."

ios/Podfile.lock

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,32 @@ PODS:
3737
- file_picker (0.0.1):
3838
- DKImagePickerController/PhotoGallery
3939
- Flutter
40-
- Firebase/CoreOnly (12.0.0):
41-
- FirebaseCore (~> 12.0.0)
42-
- Firebase/Messaging (12.0.0):
40+
- Firebase/CoreOnly (12.2.0):
41+
- FirebaseCore (~> 12.2.0)
42+
- Firebase/Messaging (12.2.0):
4343
- Firebase/CoreOnly
44-
- FirebaseMessaging (~> 12.0.0)
45-
- firebase_core (4.0.0):
46-
- Firebase/CoreOnly (= 12.0.0)
44+
- FirebaseMessaging (~> 12.2.0)
45+
- firebase_core (4.1.0):
46+
- Firebase/CoreOnly (= 12.2.0)
4747
- Flutter
48-
- firebase_messaging (16.0.0):
49-
- Firebase/Messaging (= 12.0.0)
48+
- firebase_messaging (16.0.1):
49+
- Firebase/Messaging (= 12.2.0)
5050
- firebase_core
5151
- Flutter
52-
- FirebaseCore (12.0.0):
53-
- FirebaseCoreInternal (~> 12.0.0)
52+
- FirebaseCore (12.2.0):
53+
- FirebaseCoreInternal (~> 12.2.0)
5454
- GoogleUtilities/Environment (~> 8.1)
5555
- GoogleUtilities/Logger (~> 8.1)
56-
- FirebaseCoreInternal (12.0.0):
56+
- FirebaseCoreInternal (12.2.0):
5757
- "GoogleUtilities/NSData+zlib (~> 8.1)"
58-
- FirebaseInstallations (12.0.0):
59-
- FirebaseCore (~> 12.0.0)
58+
- FirebaseInstallations (12.2.0):
59+
- FirebaseCore (~> 12.2.0)
6060
- GoogleUtilities/Environment (~> 8.1)
6161
- GoogleUtilities/UserDefaults (~> 8.1)
6262
- PromisesObjC (~> 2.4)
63-
- FirebaseMessaging (12.0.0):
64-
- FirebaseCore (~> 12.0.0)
65-
- FirebaseInstallations (~> 12.0.0)
63+
- FirebaseMessaging (12.2.0):
64+
- FirebaseCore (~> 12.2.0)
65+
- FirebaseInstallations (~> 12.2.0)
6666
- GoogleDataTransport (~> 10.1)
6767
- GoogleUtilities/AppDelegateSwizzler (~> 8.1)
6868
- GoogleUtilities/Environment (~> 8.1)
@@ -112,9 +112,9 @@ PODS:
112112
- Flutter
113113
- FlutterMacOS
114114
- PromisesObjC (2.4.0)
115-
- SDWebImage (5.21.1):
116-
- SDWebImage/Core (= 5.21.1)
117-
- SDWebImage/Core (5.21.1)
115+
- SDWebImage (5.21.2):
116+
- SDWebImage/Core (= 5.21.2)
117+
- SDWebImage/Core (5.21.2)
118118
- share_plus (0.0.1):
119119
- Flutter
120120
- sqlite3 (3.50.4):
@@ -135,7 +135,7 @@ PODS:
135135
- sqlite3_flutter_libs (0.0.1):
136136
- Flutter
137137
- FlutterMacOS
138-
- sqlite3 (~> 3.50.3)
138+
- sqlite3 (~> 3.50.4)
139139
- sqlite3/dbstatvtab
140140
- sqlite3/fts5
141141
- sqlite3/math
@@ -223,13 +223,13 @@ SPEC CHECKSUMS:
223223
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
224224
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
225225
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
226-
Firebase: 800d487043c0557d9faed71477a38d9aafb08a41
227-
firebase_core: 633e1851ffe1b9ab875f6467a4f574c79cef02e4
228-
firebase_messaging: d17feef781edc84ebefe62624fb384358ad96361
229-
FirebaseCore: 055f4ab117d5964158c833f3d5e7ec6d91648d4a
230-
FirebaseCoreInternal: dedc28e569a4be85f38f3d6af1070a2e12018d55
231-
FirebaseInstallations: d4c7c958f99c8860d7fcece786314ae790e2f988
232-
FirebaseMessaging: af49f8d7c0a3d2a017d9302c80946f45a7777dde
226+
Firebase: 26f6f8d460603af3df970ad505b16b15f5e2e9a1
227+
firebase_core: 3ff52146406557dddd01d570e807e203ec7e1302
228+
firebase_messaging: 3dcc998dd98e1e54af75d0cccae8606eba43553c
229+
FirebaseCore: 311c48a147ad4a0ab7febbaed89e8025c67510cd
230+
FirebaseCoreInternal: 56ea29f3dad2894f81b060f706f9d53509b6ed3b
231+
FirebaseInstallations: 3e884b01feabdf67582a80f3250425a00979b4ed
232+
FirebaseMessaging: 43ec73bbfedd0c385a849bb91593ab4ad4b9e48e
233233
Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
234234
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
235235
GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
@@ -239,10 +239,10 @@ SPEC CHECKSUMS:
239239
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
240240
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
241241
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
242-
SDWebImage: f29024626962457f3470184232766516dee8dfea
242+
SDWebImage: 9f177d83116802728e122410fb25ad88f5c7608a
243243
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
244244
sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
245-
sqlite3_flutter_libs: 616267f2fca40e9c6af8c5d82324e05667040b6e
245+
sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
246246
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
247247
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
248248
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b

ios/Runner/Notifications.g.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Autogenerated from Pigeon (v26.0.0), do not edit directly.
1+
// Autogenerated from Pigeon (v26.0.1), do not edit directly.
22
// See also: https://pub.dev/packages/pigeon
33

44
import Foundation

0 commit comments

Comments
 (0)