Merge remote-tracking branch 'origin/main' into rust_integration

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.1.8
+
+- Improved: Typos and grammar issues thanks to @AlbertUnruh
+- Fix: App becomes unresponsive when clicking notifications.
+
 ## 0.1.7
 
 - Improved: Show input indicator in the chat overview as well 

lib/src/localization/generated/app_localizations.dart

@@ -445,7 +445,7 @@ abstract class AppLocalizations {
   /// No description provided for @userDeletedAccount.
   ///
   /// In en, this message translates to:
-  /// **'The user has deleted its account.'**
+  /// **'The user has deleted their account.'**
   String get userDeletedAccount;
 
   /// No description provided for @contextMenuUserProfile.
@@ -1003,7 +1003,7 @@ abstract class AppLocalizations {
   /// No description provided for @deleteAllContactMessagesBody.
   ///
   /// In en, this message translates to:
-  /// **'This will remove all messages, except stored media files, in your chat with {username}. This will NOT delete the messages stored at {username}s device!'**
+  /// **'This will remove all messages, except stored media files, in your chat with {username}. This will NOT delete the messages stored at {username}\'s device!'**
   String deleteAllContactMessagesBody(Object username);
 
   /// No description provided for @contactBlock.
@@ -1657,7 +1657,7 @@ abstract class AppLocalizations {
   /// No description provided for @autoRenewalLongDesc.
   ///
   /// In en, this message translates to:
-  /// **'When your subscription expires, you will automatically be downgraded to the Preview plan. If you activate the automatic renewal, please make sure that you have enough credit for the automatic renewal.  We will notify you in good time before the automatic renewal.'**
+  /// **'When your subscription expires, you will automatically be downgraded to the Preview plan. If you activate the automatic renewal, please make sure that you have enough credit for the automatic renewal. We will notify you in good time before the automatic renewal.'**
   String get autoRenewalLongDesc;
 
   /// No description provided for @planSuccessUpgraded.
@@ -1681,13 +1681,13 @@ abstract class AppLocalizations {
   /// No description provided for @additionalUsersPlusTokens.
   ///
   /// In en, this message translates to:
-  /// **'twonly-Codes für \"Plus\" user'**
+  /// **'twonly-codes for \"Plus\" user'**
   String get additionalUsersPlusTokens;
 
   /// No description provided for @additionalUsersFreeTokens.
   ///
   /// In en, this message translates to:
-  /// **'twonly-Codes für \"Free\" user'**
+  /// **'twonly-codes for \"Free\" user'**
   String get additionalUsersFreeTokens;
 
   /// No description provided for @planLimitReached.
@@ -1699,7 +1699,7 @@ abstract class AppLocalizations {
   /// No description provided for @planNotAllowed.
   ///
   /// In en, this message translates to:
-  /// **'You cannot send media files with your current tariff.  Upgrade your plan now to send the media file.'**
+  /// **'You cannot send media files with your current tariff. Upgrade your plan now to send the media file.'**
   String get planNotAllowed;
 
   /// No description provided for @galleryDelete.
@@ -2455,13 +2455,13 @@ abstract class AppLocalizations {
   /// No description provided for @youRevokedAdminRights.
   ///
   /// In en, this message translates to:
-  /// **'You revoked {affectedR} admin rights.'**
+  /// **'You revoked {affectedR}\'s admin rights.'**
   String youRevokedAdminRights(Object affectedR);
 
   /// No description provided for @makerRevokedAdminRights.
   ///
   /// In en, this message translates to:
-  /// **'{maker} revoked {affectedR} admin rights.'**
+  /// **'{maker} revoked {affectedR}\'s admin rights.'**
   String makerRevokedAdminRights(Object affectedR, Object maker);
 
   /// No description provided for @youLeftGroup.

lib/src/localization/generated/app_localizations_de.dart

@@ -153,7 +153,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get shareImageUserNotVerifiedDesc =>
-      'twonlies können nur an verifizierte Nutzer gesendet werden. Um einen Nutzer zu verifizieren, gehe auf sein Profil und auf „Sicherheitsnummer verifizieren“.';
+      'twonlies können nur an verifizierte Nutzer gesendet werden. Um einen Nutzer zu verifizieren, gehe auf deren Profil und auf „Sicherheitsnummer verifizieren“.';
 
   @override
   String get shareImageShowArchived => 'Archivierte Benutzer anzeigen';
@@ -199,7 +199,7 @@ class AppLocalizationsDe extends AppLocalizations {
   String get chatListDetailInput => 'Nachricht eingeben';
 
   @override
-  String get userDeletedAccount => 'Der Nutzer hat sein Konto gelöscht.';
+  String get userDeletedAccount => 'Der Nutzer hat deren Konto gelöscht.';
 
   @override
   String get contextMenuUserProfile => 'Userprofil';
@@ -484,7 +484,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String contactVerifyNumberLongDesc(Object username) {
-    return 'Um die Ende-zu-Ende-Verschlüsselung mit $username zu verifizieren, vergleiche die Zahlen mit ihrem Gerät. Die Person kann auch deinen Code mit ihrem Gerät scannen.';
+    return 'Um die Ende-zu-Ende-Verschlüsselung mit $username zu verifizieren, vergleiche die Zahlen mit deren Gerät. Die Person kann auch deinen Code mit deren Gerät scannen.';
   }
 
   @override
@@ -514,7 +514,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get contactBlockBody =>
-      'Ein blockierter Benutzer kann dir keine Nachrichten mehr senden, und sein Profil ist nicht mehr sichtbar. Um die Blockierung eines Benutzers aufzuheben, navigiere einfach zu Einstellungen > Datenschutz > Blockierte Benutzer.';
+      'Ein blockierter Benutzer kann dir keine Nachrichten mehr senden, und deren Profil ist nicht mehr sichtbar. Um die Blockierung eines Benutzers aufzuheben, navigiere einfach zu Einstellungen > Datenschutz > Blockierte Benutzer.';
 
   @override
   String get contactRemove => 'Benutzer löschen';
@@ -865,7 +865,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get autoRenewalLongDesc =>
-      'Wenn dein Abonnement ausläuft, wirst du automatisch auf den Preview-Plan zurückgestuft. Wenn du die automatische Verlängerung aktivierst, vergewissere dich bitte, dass du über genügend Guthaben für die automatische Erneuerung verfügst.  Wir werden dich rechtzeitig vor der automatischen Erneuerung benachrichtigen.';
+      'Wenn dein Abonnement ausläuft, wirst du automatisch auf den Preview-Plan zurückgestuft. Wenn du die automatische Verlängerung aktivierst, vergewissere dich bitte, dass du über genügend Guthaben für die automatische Erneuerung verfügst. Wir werden dich rechtzeitig vor der automatischen Erneuerung benachrichtigen.';
 
   @override
   String get planSuccessUpgraded => 'Dein Plan wurde erfolgreich aktualisiert.';
@@ -1264,7 +1264,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String makeAdminRightsBody(Object username) {
-    return '$username  wird diese Gruppe und ihre Mitglieder bearbeiten können.';
+    return '$username wird diese Gruppe und ihre Mitglieder bearbeiten können.';
   }
 
   @override
@@ -1695,7 +1695,7 @@ class AppLocalizationsDe extends AppLocalizations {
 
   @override
   String get verificationBadgeGreenDesc =>
-      'Kontakt, den du durch den QR-Code persönlich verifiziert hast. Dadurch wurde auch sein öffentlicher Schlüssel überprüft.';
+      'Kontakt, den du durch den QR-Code persönlich verifiziert hast. Dadurch wurde auch deren öffentlicher Schlüssel überprüft.';
 
   @override
   String get verificationBadgeYellowDesc =>

lib/src/localization/generated/app_localizations_en.dart

@@ -197,7 +197,7 @@ class AppLocalizationsEn extends AppLocalizations {
   String get chatListDetailInput => 'Type a message';
 
   @override
-  String get userDeletedAccount => 'The user has deleted its account.';
+  String get userDeletedAccount => 'The user has deleted their account.';
 
   @override
   String get contextMenuUserProfile => 'User profile';
@@ -496,7 +496,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String deleteAllContactMessagesBody(Object username) {
-    return 'This will remove all messages, except stored media files, in your chat with $username. This will NOT delete the messages stored at ${username}s device!';
+    return 'This will remove all messages, except stored media files, in your chat with $username. This will NOT delete the messages stored at $username\'s device!';
   }
 
   @override
@@ -859,7 +859,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get autoRenewalLongDesc =>
-      'When your subscription expires, you will automatically be downgraded to the Preview plan. If you activate the automatic renewal, please make sure that you have enough credit for the automatic renewal.  We will notify you in good time before the automatic renewal.';
+      'When your subscription expires, you will automatically be downgraded to the Preview plan. If you activate the automatic renewal, please make sure that you have enough credit for the automatic renewal. We will notify you in good time before the automatic renewal.';
 
   @override
   String get planSuccessUpgraded => 'Successfully upgraded your plan.';
@@ -871,10 +871,10 @@ class AppLocalizationsEn extends AppLocalizations {
   String get additionalUsersList => 'Your additional users';
 
   @override
-  String get additionalUsersPlusTokens => 'twonly-Codes für \"Plus\" user';
+  String get additionalUsersPlusTokens => 'twonly-codes for \"Plus\" user';
 
   @override
-  String get additionalUsersFreeTokens => 'twonly-Codes für \"Free\" user';
+  String get additionalUsersFreeTokens => 'twonly-codes for \"Free\" user';
 
   @override
   String get planLimitReached =>
@@ -882,7 +882,7 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String get planNotAllowed =>
-      'You cannot send media files with your current tariff.  Upgrade your plan now to send the media file.';
+      'You cannot send media files with your current tariff. Upgrade your plan now to send the media file.';
 
   @override
   String get galleryDelete => 'Delete file';
@@ -1323,12 +1323,12 @@ class AppLocalizationsEn extends AppLocalizations {
 
   @override
   String youRevokedAdminRights(Object affectedR) {
-    return 'You revoked $affectedR admin rights.';
+    return 'You revoked $affectedR\'s admin rights.';
   }
 
   @override
   String makerRevokedAdminRights(Object affectedR, Object maker) {
-    return '$maker revoked $affectedR admin rights.';
+    return '$maker revoked $affectedR\'s admin rights.';
   }
 
   @override

lib/src/localization/generated/app_localizations_sv.dart

@@ -197,7 +197,7 @@ class AppLocalizationsSv extends AppLocalizations {
   String get chatListDetailInput => 'Type a message';
 
   @override
-  String get userDeletedAccount => 'The user has deleted its account.';
+  String get userDeletedAccount => 'The user has deleted their account.';
 
   @override
   String get contextMenuUserProfile => 'User profile';
@@ -496,7 +496,7 @@ class AppLocalizationsSv extends AppLocalizations {
 
   @override
   String deleteAllContactMessagesBody(Object username) {
-    return 'This will remove all messages, except stored media files, in your chat with $username. This will NOT delete the messages stored at ${username}s device!';
+    return 'This will remove all messages, except stored media files, in your chat with $username. This will NOT delete the messages stored at $username\'s device!';
   }
 
   @override
@@ -859,7 +859,7 @@ class AppLocalizationsSv extends AppLocalizations {
 
   @override
   String get autoRenewalLongDesc =>
-      'When your subscription expires, you will automatically be downgraded to the Preview plan. If you activate the automatic renewal, please make sure that you have enough credit for the automatic renewal.  We will notify you in good time before the automatic renewal.';
+      'When your subscription expires, you will automatically be downgraded to the Preview plan. If you activate the automatic renewal, please make sure that you have enough credit for the automatic renewal. We will notify you in good time before the automatic renewal.';
 
   @override
   String get planSuccessUpgraded => 'Successfully upgraded your plan.';
@@ -871,10 +871,10 @@ class AppLocalizationsSv extends AppLocalizations {
   String get additionalUsersList => 'Your additional users';
 
   @override
-  String get additionalUsersPlusTokens => 'twonly-Codes für \"Plus\" user';
+  String get additionalUsersPlusTokens => 'twonly-codes for \"Plus\" user';
 
   @override
-  String get additionalUsersFreeTokens => 'twonly-Codes für \"Free\" user';
+  String get additionalUsersFreeTokens => 'twonly-codes for \"Free\" user';
 
   @override
   String get planLimitReached =>
@@ -882,7 +882,7 @@ class AppLocalizationsSv extends AppLocalizations {
 
   @override
   String get planNotAllowed =>
-      'You cannot send media files with your current tariff.  Upgrade your plan now to send the media file.';
+      'You cannot send media files with your current tariff. Upgrade your plan now to send the media file.';
 
   @override
   String get galleryDelete => 'Delete file';
@@ -1323,12 +1323,12 @@ class AppLocalizationsSv extends AppLocalizations {
 
   @override
   String youRevokedAdminRights(Object affectedR) {
-    return 'You revoked $affectedR admin rights.';
+    return 'You revoked $affectedR\'s admin rights.';
   }
 
   @override
   String makerRevokedAdminRights(Object affectedR, Object maker) {
-    return '$maker revoked $affectedR admin rights.';
+    return '$maker revoked $affectedR\'s admin rights.';
   }
 
   @override

lib/src/localization/translations

@@ -1 +1 @@
-Subproject commit e1ac9e6c476f82819063a8087af4d42acc1167d4
+Subproject commit 57ec512977e514fca6413622bb4a7e03701f09a0

lib/src/views/home.view.dart

@@ -135,7 +135,8 @@ class HomeViewState extends State<HomeView> {
       _mainCameraController.setSharedLinkForPreview,
     );
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      if (widget.initialPage == 1 && !AppSession.currentUser.startWithCameraOpen ||
+      if (widget.initialPage == 1 &&
+              !AppSession.currentUser.startWithCameraOpen ||
           widget.initialPage == 0) {
         globalUpdateOfHomeViewPageIndex(0);
       }

pubspec.yaml

@@ -3,7 +3,7 @@ description: "twonly, a privacy-friendly way to connect with friends through sec
 
 publish_to: 'none'
 
-version: 0.1.7+107
+version: 0.1.8+108
 
 environment:
   sdk: ^3.11.0