Merge pull request #1520 from GetStream/develop

vanGalilea · web-flow · commit a69cbba54267 · 2022-06-29T14:23:28.000+02:00
Next release
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -66,8 +66,9 @@
 
 - [ ] I have signed the [Stream CLA](https://docs.google.com/forms/d/e/1FAIpQLScFKsKkAJI7mhCr7K9rEIOpqIDThrWxuvxnwUq2XkHyG154vQ/viewform) (required)
 - [ ] PR targets the `develop` branch
-- [ ] Commits follow the [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) spec
-- [ ] New code is covered by tests
-- [ ] Screenshots added for visual changes
 - [ ] Documentation is updated
+- [ ] New code is tested in main example apps, including all possible scenarios
+  - [ ] SampleApp iOS and Android
+  - [ ] Expo iOS and Android
+
 
diff --git a/docusaurus/docs/reactnative/basics/troubleshooting.mdx b/docusaurus/docs/reactnative/basics/troubleshooting.mdx
@@ -214,13 +214,18 @@ android {
 Opening an external link doesn't work without permissions on `targetSdkVersion` >= 30. So, the following permission must be included in the `AndroidManifest.xml` file.
 
 ```xml
-<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+<queries>
+  <intent>
+    <action android:name="android.intent.action.VIEW" />
+    <data android:scheme="http" android:host="*" />
+  </intent>
+  <intent>
+    <action android:name="android.intent.action.VIEW" />
+    <data android:scheme="https" android:host="*" />
+  </intent>
+</queries>
 ```
 
-:::caution
-**Note:** Make sure you are aware of [upcoming policies](https://support.google.com/googleplay/android-developer/answer/10158779) that this change will be subjected to.
-:::
-
 ## GIF and WebP not displaying
 
 ### Android
diff --git a/examples/ExpoMessaging/package.json b/examples/ExpoMessaging/package.json
@@ -7,7 +7,7 @@
     "eject": "expo eject"
   },
   "dependencies": {
-    "@react-native-community/masked-view": "0.1.10",
+    "@react-native-masked-view/masked-view": "0.2.6",
     "@react-native-community/netinfo": "7.1.3",
     "@react-navigation/native": "5.8.10",
     "@react-navigation/stack": "5.12.8",
diff --git a/examples/SampleApp/android/app/src/main/AndroidManifest.xml b/examples/SampleApp/android/app/src/main/AndroidManifest.xml
@@ -4,9 +4,19 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
+    <queries>
+      <intent>
+        <action android:name="android.intent.action.VIEW" />
+        <data android:scheme="http" android:host="*" />
+      </intent>
+      <intent>
+        <action android:name="android.intent.action.VIEW" />
+        <data android:scheme="https" android:host="*" />
+      </intent>
+    </queries>
+
     <application
       android:usesCleartextTraffic="true"
       android:name=".MainApplication"
diff --git a/examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj b/examples/SampleApp/ios/SampleApp.xcodeproj/project.pbxproj
@@ -514,7 +514,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppDebug.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 123;
+				CURRENT_PROJECT_VERSION = 128;
 				DEVELOPMENT_TEAM = EHV7XZLAHA;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = SampleApp/Info.plist;
@@ -545,7 +545,7 @@
 				CODE_SIGN_ENTITLEMENTS = SampleApp/SampleAppRelease.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 123;
+				CURRENT_PROJECT_VERSION = 128;
 				DEVELOPMENT_TEAM = EHV7XZLAHA;
 				INFOPLIST_FILE = SampleApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
diff --git a/examples/SampleApp/ios/SampleApp/Info.plist b/examples/SampleApp/ios/SampleApp/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.2</string>
+	<string>1.7.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>123</string>
+	<string>128</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>
diff --git a/examples/SampleApp/ios/SampleAppTests/Info.plist b/examples/SampleApp/ios/SampleAppTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.2</string>
+	<string>1.7.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>123</string>
+	<string>128</string>
 </dict>
 </plist>
diff --git a/examples/TypeScriptMessaging/android/app/src/main/AndroidManifest.xml b/examples/TypeScriptMessaging/android/app/src/main/AndroidManifest.xml
@@ -4,9 +4,19 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
+    <queries>
+      <intent>
+        <action android:name="android.intent.action.VIEW" />
+        <data android:scheme="http" android:host="*" />
+      </intent>
+      <intent>
+        <action android:name="android.intent.action.VIEW" />
+        <data android:scheme="https" android:host="*" />
+      </intent>
+    </queries>
+
     <application
       android:name=".MainApplication"
       android:label="@string/app_name"
diff --git a/package/expo-package/package.json b/package/expo-package/package.json
@@ -14,7 +14,7 @@
   },
   "peerDependencies": {
     "@react-native-community/netinfo": "^6.0.0",
-    "expo": "^41.0.1",
+    "expo": ">=44.0.0",
     "expo-document-picker": "^9.1.2",
     "expo-file-system": "^11.0.2",
     "expo-haptics": "^10.0.0",
diff --git a/package/src/i18n/he.json b/package/src/i18n/he.json
@@ -0,0 +1,67 @@
+{
+  "1 Reply": "תגובה אחת",
+  "1 Thread Reply": "תגובה אחת לשרשור",
+  "Allow access to your Gallery": "אפשר גישה לגלריה שלך",
+  "Also send to channel": "שלח/י הודעה לשיחה",
+  "Are you sure you want to permanently delete this message?": "האם את/ה בטוח/ה שאת/ה רוצה למחוק את ההודעה הזו לצמיתות?",
+  "Block User": "חסום משתמש",
+  "Cancel": "ביטול",
+  "Cannot Flag Message": "סימון הודעה לא אפשרי",
+  "Copy Message": "העתק/י הודעה",
+  "Delete": "מחק",
+  "Delete Message": "מחק/י הודעה",
+  "Do you want to send a copy of this message to a moderator for further investigation?": "האם את/ה רוצה לשלוח עותק של הודעה זו למנחה להמשך חקירה?",
+  "Edit Message": "ערוך הודעה",
+  "Editing Message": "הודעה בעריכה",
+  "Emoji matching": "התאמת אמוג'י",
+  "Empty message...": "הודעה ריקה...",
+  "Error loading": "שגיאה ארעה בעת הטעינה",
+  "Error loading channel list...": "שגיאה ארעה בטעינת השיחות...",
+  "Error loading messages for this channel...": "שגיאה ארעה בטעינת הודעות עבור שיחה זאת...",
+  "Error while loading, please reload/refresh": "שגיאה ארעה בזמן הטעינה, אנא טען מחדש/רענן",
+  "File type not supported": "סוג הקובץ אינו נתמך",
+  "Flag": "סמן",
+  "Flag Message": "סמן הודעה",
+  "Flag action failed either due to a network issue or the message is already flagged": "פעולת הסימון נכשלה בגלל בעיית רשת או שההודעה כבר סומנה.",
+  "Instant Commands": "פעולות מיידיות",
+  "Links are disabled": "הקישורים מבוטלים",
+  "Loading channels...": "השיחות בטעינה...",
+  "Loading messages...": "ההודעות בטעינה..",
+  "Loading...": "טוען...",
+  "Message Reactions": "תגובות להודעה",
+  "Message deleted": "ההודעה נמחקה",
+  "Message flagged": "ההודעה סומנה",
+  "Mute User": "השתק/י משתמש",
+  "Not supported": "לא נתמך",
+  "Nothing yet...": "אינפורמציה תתקבל בהמשך...",
+  "Ok": "אוקיי",
+  "Only visible to you": "גלוי רק לך",
+  "Photo": "תמונה",
+  "Photos": "תמונות",
+  "Pin to Conversation": "הצמד/י לשיחה",
+  "Please enable access to your photos and videos so you can share them.": "אפשר/י גישה לתמונות ולסרטונים שלך כדי שתוכל/י לשתף אותם.",
+  "Please select a channel first": "אנא בחר/י שיחה תחילה",
+  "Reconnecting...": "מתחבר מחדש...",
+  "Reply": "השב/י",
+  "Reply to Message": "השב/י להודעה",
+  "Resend": "שלח/י שוב",
+  "Search GIFs": "חפש/י GIFs",
+  "Send a message": "שלח/י הודעה",
+  "Sending links is not allowed in this conversation": "שליחת קישורים אינה מותרת בשיחה זו",
+  "Slow mode ON": "מצב איטי מופעל",
+  "The message has been reported to a moderator.": "ההודעה דווחה למנהל",
+  "Thread Reply": "הגב/י בשרשור",
+  "Unblock User": "בטל/י חסימת משתמש",
+  "Unknown User": "משתמש לא ידוע",
+  "Unmute User": "בטל/י השתקת משתמש",
+  "Unpin from Conversation": "בטל/י הצמדה לשיחה",
+  "Unread Messages": "הודעות שטרם נקרו",
+  "You": "את/ה",
+  "You can't send messages in this channel": "את/ב לא יכול/ה לשלוח הודעות בשיחה זו",
+  "{{ firstUser }} and {{ nonSelfUserLength }} more are typing": "{{ firstUser }} ו-{{ nonSelfUserLength }} משתמש/ים אחר/ים מקלידים",
+  "{{ index }} of {{ photoLength }}": "{{ index }} מתוך {{ photoLength }}",
+  "{{ replyCount }} Replies": "{{ replyCount }} תגובות",
+  "{{ replyCount }} Thread Replies": "{{ replyCount }} תגובות שרשור",
+  "{{ user }} is typing": "{{ user }} מקליד/ה",
+  "🏙 Attachment...": "🏙 קובץ מצורף..."
+}
diff --git a/package/src/index.ts b/package/src/index.ts
@@ -18,5 +18,6 @@ export { default as itTranslations } from './i18n/it.json';
 export { default as nlTranslations } from './i18n/nl.json';
 export { default as ruTranslations } from './i18n/ru.json';
 export { default as trTranslations } from './i18n/tr.json';
+export { default as heTranslations } from './i18n/he.json';
 
 export { version } from './version.json';
diff --git a/package/src/utils/Streami18n.ts b/package/src/utils/Streami18n.ts
@@ -11,6 +11,7 @@ import type moment from 'moment';
 import type { TDateTimeParser } from '../contexts/translationContext/TranslationContext';
 import enTranslations from '../i18n/en.json';
 import frTranslations from '../i18n/fr.json';
+import heTranslations from '../i18n/he.json';
 import hiTranslations from '../i18n/hi.json';
 import itTranslations from '../i18n/it.json';
 import jaTranslations from '../i18n/ja.json';
@@ -19,9 +20,6 @@ import nlTranslations from '../i18n/nl.json';
 import ruTranslations from '../i18n/ru.json';
 import trTranslations from '../i18n/tr.json';
 
-const defaultNS = 'translation';
-const defaultLng = 'en';
-
 import 'dayjs/locale/fr';
 import 'dayjs/locale/hi';
 import 'dayjs/locale/it';
@@ -30,6 +28,7 @@ import 'dayjs/locale/ko';
 import 'dayjs/locale/nl';
 import 'dayjs/locale/ru';
 import 'dayjs/locale/tr';
+import 'dayjs/locale/he';
 
 /**
  * These locale imports also set these locales globally.
@@ -40,6 +39,9 @@ import 'dayjs/locale/en';
 
 import type { DefaultStreamChatGenerics } from '../types/types';
 
+const defaultNS = 'translation';
+const defaultLng = 'en';
+
 Dayjs.extend(updateLocale);
 
 Dayjs.updateLocale('en', {
@@ -357,6 +359,7 @@ export class Streami18n {
   } = {
     en: { [defaultNS]: enTranslations },
     fr: { [defaultNS]: frTranslations },
+    he: { [defaultNS]: heTranslations },
     hi: { [defaultNS]: hiTranslations },
     it: { [defaultNS]: itTranslations },
     ja: { [defaultNS]: jaTranslations },
