Merge remote-tracking branch 'origin/feature/nfe/invites_empty_state' into app-layout-testing-06-09

Merge remote-tracking branch 'origin/feature/nfe/app_layout_release_experience' into app-layout-testing-06-09
Merge remote-tracking branch 'origin/feature/nfe/app_layout_all_screens_test' into app-layout-testing-06-09
2025-10-06 00:02:48 +02:00 · 2022-09-06 11:15:25 +02:00 · 2022-09-06 11:15:02 +02:00 · 2022-09-06 11:14:51 +02:00 · 2022-09-06 11:14:40 +02:00 · 2022-09-06 11:14:30 +02:00
772 changed files with 8672 additions and 3531 deletions
--- a/.github/ISSUE_TEMPLATE/release.yml
+++ b/.github/ISSUE_TEMPLATE/release.yml
@@ -21,6 +21,8 @@ body:
        - [ ] While Weblate is locked, and after the PR from Weblate has been merged, handle all the TODOs in the main `strings.xml` file
        - [ ] Run the script `./tools/release/pushPlayStoreMetaData.sh`. You can check in the GooglePlay console the Activity log to check the effect.

+        - [ ] Ensure all [the required PRs](https://github.com/vector-im/element-android/pulls?q=is%3Aopen+is%3Apr+label%3AZ-NextRelease) have been merged
+
        ### Do the release

        - [ ] Make sure `develop` and `main` are up to date (git pull)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
        with:
          name: vector-${{ matrix.target }}-debug
          path: |
-            vector/build/outputs/apk/*/debug/*.apk
+            vector-app/build/outputs/apk/*/debug/*.apk

  release:
    name: Build unsigned GPlay APKs
@@ -65,7 +65,7 @@ jobs:
        with:
          name: vector-gplay-release-unsigned
          path: |
-            vector/build/outputs/apk/*/release/*.apk
+            vector-app/build/outputs/apk/*/release/*.apk

  exodus:
    runs-on: ubuntu-latest
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -11,7 +11,7 @@ jobs:
      - run: |
          npm install --save-dev @babel/plugin-transform-flow-strip-types
      - name: Danger
-        uses: danger/danger-js@11.1.1
+        uses: danger/danger-js@11.1.2
        with:
          args: "--dangerfile tools/danger/dangerfile.js"
        env:
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -7,7 +7,7 @@ on:

 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
+  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxPermSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon

 jobs:
@@ -27,7 +27,7 @@ jobs:
      - uses: actions/checkout@v3
      - name: Run knit
        run: |
-          ./gradlew knitCheck
+          ./gradlew knitCheck $CI_GRADLE_ARG_PROPERTIES

  # Check the project: ktlint, detekt, lint
  lint:
@@ -41,7 +41,7 @@ jobs:
      - uses: actions/checkout@v3
      - name: Run ktlint
        run: |
-          ./gradlew ktlintCheck --continue
+          ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES --continue
      - name: Run detekt
        if: always()
        run: |
@@ -49,8 +49,8 @@ jobs:
      - name: Run lint
        # Not always, if ktlint or detekt fail, avoid running the long lint check.
        run: |
-          ./gradlew lintGplayRelease $CI_GRADLE_ARG_PROPERTIES
-          ./gradlew lintFdroidRelease $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew vector-app:lintGplayRelease $CI_GRADLE_ARG_PROPERTIES
+          ./gradlew vector-app:lintFdroidRelease $CI_GRADLE_ARG_PROPERTIES
      - name: Upload reports
        if: always()
        uses: actions/upload-artifact@v3
@@ -66,7 +66,7 @@ jobs:
          yarn add danger-plugin-lint-report --dev
      - name: Danger lint
        if: always()
-        uses: danger/danger-js@11.1.1
+        uses: danger/danger-js@11.1.2
        with:
          args: "--dangerfile tools/danger/dangerfile-lint.js"
        env:
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -49,6 +49,7 @@ jobs:
          disable-animations: true
          emulator-build: 7425822
          script: | 
+            ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
            ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
            ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
            ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
@@ -65,6 +66,7 @@ jobs:
          disable-animations: true
          emulator-build: 7425822
          script: |
+            ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES
            ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
            ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES
            ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES
--- a/.github/workflows/triage-labelled.yml
+++ b/.github/workflows/triage-labelled.yml
@@ -142,32 +142,6 @@ jobs:
        env:
          PROJECT_ID: "PN_kwDOAM0swc2KCw"
          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
-  move_threads_issues:
-    name: A-Threads to Thread board
-    runs-on: ubuntu-latest
-    # Skip in forks
-    if: >
-      github.repository == 'vector-im/element-android' &&
-      contains(github.event.issue.labels.*.name, 'A-Threads')
-    steps:
-      - uses: octokit/graphql-action@v2.x
-        with:
-          headers: '{"GraphQL-Features": "projects_next_graphql"}'
-          query: |
-            mutation add_to_project($projectid:ID!,$contentid:ID!) {
-              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }
-          projectid: ${{ env.PROJECT_ID }}
-          contentid: ${{ github.event.issue.node_id }}
-        env:
-          PROJECT_ID: "PN_kwDOAM0swc0rRA"
-          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
-
  move_message_bubbles_issues:
    name: A-Message-Bubbles to Message bubbles board
    runs-on: ubuntu-latest
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,51 @@
+Changes in Element v1.4.34 (2022-08-23)
+=======================================
+
+Features ✨
+----------
+ - [Notification] - Handle creation of notification for live location and poll start ([#6746](https://github.com/vector-im/element-android/issues/6746))
+
+Bugfixes 🐛
+----------
+ - Fixes onboarding requiring matrix.org to be accessible on the first step, the server can now be manually changed ([#6718](https://github.com/vector-im/element-android/issues/6718))
+ - Fixing sign in/up for homeservers that rely on the SSO fallback url ([#6827](https://github.com/vector-im/element-android/issues/6827))
+ - Fixes uncaught exceptions in the SyncWorker to cause the worker to become stuck in the failure state ([#6836](https://github.com/vector-im/element-android/issues/6836))
+ - Fixes onboarding captcha crashing when no WebView is available by showing an error with information instead ([#6855](https://github.com/vector-im/element-android/issues/6855))
+ - Removes ability to continue registration after the app has been destroyed, fixes the next steps crashing due to missing information from the previous steps ([#6860](https://github.com/vector-im/element-android/issues/6860))
+ - Fixes crash when exiting the login or registration entry screens whilst they're loading ([#6861](https://github.com/vector-im/element-android/issues/6861))
+ - Fixes server selection being unable to trust certificates ([#6864](https://github.com/vector-im/element-android/issues/6864))
+ - Ensure SyncThread is started when the app is launched after a Push has been received. ([#6884](https://github.com/vector-im/element-android/issues/6884))
+ - Fixes missing firebase notifications after logging in when UnifiedPush distributor is installed ([#6891](https://github.com/vector-im/element-android/issues/6891))
+
+In development 🚧
+----------------
+ - Create DM room only on first message - Trigger the flow when the "Direct Message" action is selected from the room member details screen ([#5525](https://github.com/vector-im/element-android/issues/5525))
+ - added filter tabs for new App layout's Home screen ([#6505](https://github.com/vector-im/element-android/issues/6505))
+ - [App Layout] added dialog to configure app layout ([#6506](https://github.com/vector-im/element-android/issues/6506))
+ - Adds space list bottom sheet for new app layout ([#6749](https://github.com/vector-im/element-android/issues/6749))
+ - [App Layout] Dialpad moved from bottom navigation tab to a separate activity accessed via home screen context menu ([#6787](https://github.com/vector-im/element-android/issues/6787))
+ - Makes toolbar switch title based on space in New App Layout ([#6795](https://github.com/vector-im/element-android/issues/6795))
+ - [Devices management] Add a feature flag and empty screen for future new layout ([#6798](https://github.com/vector-im/element-android/issues/6798))
+ - Adds new chat bottom sheet as the click action of the main FAB in the new app layout ([#6801](https://github.com/vector-im/element-android/issues/6801))
+ - [Devices management] Other sessions section in new layout ([#6806](https://github.com/vector-im/element-android/issues/6806))
+ - [New Layout] Adds space settings accessible through clicking the toolbar ([#6859](https://github.com/vector-im/element-android/issues/6859))
+ - Adds New App Layout FABs (hidden behind feature flag) ([#6693](https://github.com/vector-im/element-android/issues/6693))
+
+SDK API changes ⚠️
+------------------
+ - Rename `DebugService.logDbUsageInfo` (resp. `Session.logDbUsageInfo`) to `DebugService.getDbUsageInfo` (resp. `Session.getDbUsageInfo`) and return a String instead of logging. The caller may want to log the String. ([#6884](https://github.com/vector-im/element-android/issues/6884))
+
+Other changes
+-------------
+ - Removes the Login2 proof of concept - replaced by the FTUE changes ([#5974](https://github.com/vector-im/element-android/issues/5974))
+ - Enable auto-capitalization for Room creation Title field ([#6645](https://github.com/vector-im/element-android/issues/6645))
+ - Decouples the variant logic from the vector module ([#6783](https://github.com/vector-im/element-android/issues/6783))
+ - Add a developer setting to enable LeakCanary at runtime ([#6786](https://github.com/vector-im/element-android/issues/6786))
+ - [Create Room] Reduce some boilerplate with room state event contents ([#6799](https://github.com/vector-im/element-android/issues/6799))
+ - [Call] Memory leak after a call ([#6808](https://github.com/vector-im/element-android/issues/6808))
+ - Fix some string template ([#6843](https://github.com/vector-im/element-android/issues/6843))
+
+
 Changes in Element v1.4.32 (2022-08-10)
 =======================================

--- a/build.gradle
+++ b/build.gradle
@@ -28,10 +28,11 @@ buildscript {
        classpath 'com.google.gms:google-services:4.3.13'
        classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.4.0.2513'
        classpath 'com.google.android.gms:oss-licenses-plugin:0.10.5'
-        classpath "com.likethesalad.android:stem-plugin:2.1.1"
-        classpath 'org.owasp:dependency-check-gradle:7.1.1'
+        classpath "com.likethesalad.android:stem-plugin:2.2.2"
+        classpath 'org.owasp:dependency-check-gradle:7.1.2'
        classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10"
        classpath "org.jetbrains.kotlinx:kotlinx-knit:0.4.0"
+        classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
    }
@@ -39,7 +40,7 @@ buildscript {

 plugins {
    // ktlint Plugin
-    id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
+    id "org.jlleitschuh.gradle.ktlint" version "11.0.0"
    // Detekt
    id "io.gitlab.arturbosch.detekt" version "1.21.0"

--- a/changelog.d/3955.misc
+++ b/changelog.d/3955.misc
@@ -0,0 +1 @@
+Creates a dedicated strings module
--- a/changelog.d/5525.wip
+++ b/changelog.d/5525.wip
@@ -1 +1 @@
-Create DM room only on first message - Trigger the flow when the "Direct Message" action is selected from the room member details screen
+Create DM room only on first message - Create the DM and navigate to the new room after sending an event
--- a/changelog.d/5974.misc
+++ b/changelog.d/5974.misc
@@ -1 +0,0 @@
-Removes the Login2 proof of concept - replaced by the FTUE changes
--- a/changelog.d/6407.misc
+++ b/changelog.d/6407.misc
@@ -0,0 +1 @@
+Converts the vector module to a library with a parent vector-app application module
--- a/changelog.d/6505.wip
+++ b/changelog.d/6505.wip
@@ -1 +0,0 @@
-added filter tabs for new App layout's Home screen
--- a/changelog.d/6506.wip
+++ b/changelog.d/6506.wip
@@ -1 +0,0 @@
-[App Layout] added dialog to configure app layout
--- a/changelog.d/6565.wip
+++ b/changelog.d/6565.wip
@@ -0,0 +1 @@
+[App Layout] Bottom navigation tabs are removed for new home screen
--- a/changelog.d/6645.misc
+++ b/changelog.d/6645.misc
@@ -1 +0,0 @@
-Enable auto-capitalization for Room creation Title field
--- a/changelog.d/6646.misc
+++ b/changelog.d/6646.misc
@@ -0,0 +1 @@
+[App Layout] Obsolete settings are not shown when App Layout flag is enabled
--- a/changelog.d/6693.feature
+++ b/changelog.d/6693.feature
@@ -1 +0,0 @@
-Adds New App Layout FABs (hidden behind feature flag)
--- a/changelog.d/6746.feature
+++ b/changelog.d/6746.feature
@@ -1 +0,0 @@
-[Notification] - Handle creation of notification for live location and poll start
--- a/changelog.d/6749.wip
+++ b/changelog.d/6749.wip
@@ -1 +0,0 @@
-Adds space list bottom sheet for new app layout
--- a/changelog.d/6750.wip
+++ b/changelog.d/6750.wip
@@ -0,0 +1 @@
+[App Layout] fixed space switching dialog measured with wrong height sometimes
--- a/changelog.d/6754.bugfix
+++ b/changelog.d/6754.bugfix
@@ -0,0 +1 @@
+[App Layout] - space switcher now has empty state
--- a/changelog.d/6765.wip
+++ b/changelog.d/6765.wip
@@ -0,0 +1 @@
+[App Layout] Fabs doesn't go off screen anymore
--- a/changelog.d/6783.misc
+++ b/changelog.d/6783.misc
@@ -1 +0,0 @@
-Decouples the variant logic from the vector module
--- a/changelog.d/6786.misc
+++ b/changelog.d/6786.misc
@@ -1 +0,0 @@
-Add a developer setting to enable LeakCanary at runtime
--- a/changelog.d/6787.wip
+++ b/changelog.d/6787.wip
@@ -1 +0,0 @@
-[App Layout] Dialpad moved from bottom navigation tab to a separate activity accessed via home screen context menu
--- a/changelog.d/6795.wip
+++ b/changelog.d/6795.wip
@@ -1 +0,0 @@
-Makes toolbar switch title based on space in New App Layout
--- a/changelog.d/6798.wip
+++ b/changelog.d/6798.wip
@@ -1 +0,0 @@
-[Devices management] Add a feature flag and empty screen for future new layout
--- a/changelog.d/6799.misc
+++ b/changelog.d/6799.misc
@@ -1 +0,0 @@
-[Create Room] Reduce some boilerplate with room state event contents
--- a/changelog.d/6801.wip
+++ b/changelog.d/6801.wip
@@ -1 +0,0 @@
-Adds new chat bottom sheet as the click action of the main FAB in the new app layout
--- a/changelog.d/6806.wip
+++ b/changelog.d/6806.wip
@@ -1 +0,0 @@
-[Devices management] Other sessions section in new layout
--- a/changelog.d/6808.misc
+++ b/changelog.d/6808.misc
@@ -1 +0,0 @@
-[Call] Memory leak after a call
--- a/changelog.d/6827.bugfix
+++ b/changelog.d/6827.bugfix
@@ -1 +0,0 @@
-Fixing sign in/up for homeservers that rely on the SSO fallback url
--- a/changelog.d/6835.feature
+++ b/changelog.d/6835.feature
@@ -0,0 +1 @@
+[App Layout] New empty states for home screen
--- a/changelog.d/6843.misc
+++ b/changelog.d/6843.misc
@@ -1 +0,0 @@
-Fix some string template
--- a/changelog.d/6844.bugfix
+++ b/changelog.d/6844.bugfix
@@ -0,0 +1 @@
+Fixes /addToSpace and /joinSpace commands showing invalid syntax warnings
--- a/changelog.d/6864.bugfix
+++ b/changelog.d/6864.bugfix
@@ -1 +0,0 @@
-Fixes server selection being unable to trust certificates
--- a/changelog.d/6871.feature
+++ b/changelog.d/6871.feature
@@ -0,0 +1 @@
+Improves Developer Mode Debug Button UX and adds it to New App Layout
--- a/changelog.d/6876.feature
+++ b/changelog.d/6876.feature
@@ -0,0 +1 @@
+[App Layout] - Invites now show empty screen after you reject last invite
--- a/changelog.d/6877.wip
+++ b/changelog.d/6877.wip
@@ -0,0 +1 @@
+[New Layout] Adds back navigation through spaces
--- a/changelog.d/6884.bugfix
+++ b/changelog.d/6884.bugfix
@@ -1 +0,0 @@
-Ensure SyncThread is started when the app is launched after a Push has been received.
--- a/changelog.d/6884.sdk
+++ b/changelog.d/6884.sdk
@@ -1 +0,0 @@
-Rename `DebugService.logDbUsageInfo` (resp. `Session.logDbUsageInfo`) to `DebugService.getDbUsageInfo` (resp. `Session.getDbUsageInfo`) and return a String instead of logging. The caller may want to log the String.
--- a/changelog.d/6889.wip
+++ b/changelog.d/6889.wip
@@ -0,0 +1 @@
+[App Layout] new room invites screen
--- a/changelog.d/6891.bugfix
+++ b/changelog.d/6891.bugfix
@@ -1 +0,0 @@
-Fixes missing firebase notifications after logging in when UnifiedPush distributor is installed
--- a/changelog.d/6894.misc
+++ b/changelog.d/6894.misc
@@ -0,0 +1 @@
+Remove FragmentModule and the Fragment factory. No need to Inject the constructor on your Fragment, just add @AndroidEntryPoint annotation and @Inject class members.
--- a/changelog.d/6902.wip
+++ b/changelog.d/6902.wip
@@ -0,0 +1 @@
+[Device Manager] Current Session Section
--- a/changelog.d/6907.wip
+++ b/changelog.d/6907.wip
@@ -0,0 +1 @@
+[New Layout] Changes space sheet to accordion-style with expandable subspaces
--- a/changelog.d/6917.bugfix
+++ b/changelog.d/6917.bugfix
@@ -0,0 +1 @@
+Fix long incremental sync.
--- a/changelog.d/6924.wip
+++ b/changelog.d/6924.wip
@@ -0,0 +1 @@
+[New Layout] Adds space invites
--- a/changelog.d/6925.misc
+++ b/changelog.d/6925.misc
@@ -0,0 +1 @@
+Log basic Http information in production.
--- a/changelog.d/6926.misc
+++ b/changelog.d/6926.misc
@@ -0,0 +1 @@
+Focus input field when editing homeserver address to speed up login and registration.
--- a/changelog.d/6945.wip
+++ b/changelog.d/6945.wip
@@ -0,0 +1 @@
+[Device Manager] Other Sessions Section
--- a/changelog.d/6947.wip
+++ b/changelog.d/6947.wip
@@ -0,0 +1 @@
+[App Layout] fixed invites count badge bottom margin on a home screen
--- a/changelog.d/6958.feature
+++ b/changelog.d/6958.feature
@@ -0,0 +1 @@
+[App Layout] New App Layout is enabled by default
--- a/changelog.d/6964.wip
+++ b/changelog.d/6964.wip
@@ -0,0 +1 @@
+[Device Manager] Render Security Recommendations
--- a/changelog.d/6967.bugfix
+++ b/changelog.d/6967.bugfix
@@ -0,0 +1 @@
+Fix low occurrence crashes.
--- a/changelog.d/6969.bugfix
+++ b/changelog.d/6969.bugfix
@@ -0,0 +1 @@
+FTUE - Fixes optional email registration step always being mandatory
--- a/changelog.d/6978.bugfix
+++ b/changelog.d/6978.bugfix
@@ -0,0 +1 @@
+Fix crash when opening an unknown room
--- a/changelog.d/6979.bugfix
+++ b/changelog.d/6979.bugfix
@@ -0,0 +1 @@
+Fix crash on PIN code settings screen.
--- a/changelog.d/6982.bugfix
+++ b/changelog.d/6982.bugfix
@@ -0,0 +1,2 @@
+Fix autoplayed animated stickers
+Increase sticker size
--- a/changelog.d/6989.bugfix
+++ b/changelog.d/6989.bugfix
@@ -0,0 +1 @@
+Catch race condition crash in voice recording
--- a/changelog.d/7010.feature
+++ b/changelog.d/7010.feature
@@ -0,0 +1 @@
+Try to detect devices that lack Opus encoder support, use bundled libopus library for those.
--- a/changelog.d/7016.wip
+++ b/changelog.d/7016.wip
@@ -0,0 +1 @@
+[New Layout] Improves talkback accessibility
--- a/coverage.gradle
+++ b/coverage.gradle
@@ -28,8 +28,8 @@ def initializeReport(report, projects, classExcludes) {

    report.executionData {
        fileTree(rootProject.rootDir.absolutePath).include(
-            "**/build/**/*.exec",
-            "**/build/outputs/code_coverage/**/coverage.ec",
+                "**/build/**/*.exec",
+                "**/build/outputs/code_coverage/**/coverage.ec",
        )
    }
    report.reports {
@@ -74,18 +74,18 @@ def collectProjects(predicate) {
 task generateCoverageReport(type: JacocoReport) {
    outputs.upToDateWhen { false }
    rootProject.apply plugin: 'jacoco'
-    def projects = collectProjects { ['vector', 'matrix-sdk-android'].contains(it.name) }
+    def projects = collectProjects { ['vector-app', 'vector', 'matrix-sdk-android'].contains(it.name) }
    initializeReport(it, projects, excludes)
 }

 task unitTestsWithCoverage(type: GradleBuild) {
    // the 7.1.3 android gradle plugin has a bug where enableTestCoverage generates invalid coverage
-    startParameter.projectProperties.coverage = [enableTestCoverage:  false]
+    startParameter.projectProperties.coverage = [enableTestCoverage: false]
    tasks = [':vector:testGplayDebugUnitTest', ':matrix-sdk-android:testDebugUnitTest']
 }

 task instrumentationTestsWithCoverage(type: GradleBuild) {
-    startParameter.projectProperties.coverage = [enableTestCoverage:  true]
+    startParameter.projectProperties.coverage = [enableTestCoverage: true]
    startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui'
-    tasks = [':vector:connectedGplayDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
+    tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedGplayDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest']
 }
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -22,7 +22,7 @@ def markwon = "4.6.2"
 def moshi = "1.13.0"
 def lifecycle = "2.5.1"
 def flowBinding = "1.2.0"
-def flipper = "0.157.0"
+def flipper = "0.162.0"
 def epoxy = "4.6.2"
 def mavericks = "2.7.0"
 def glide = "4.13.2"
@@ -85,6 +85,8 @@ ext.libs = [
                'material'                : "com.google.android.material:material:1.6.1",
                'appdistributionApi'      : "com.google.firebase:firebase-appdistribution-api-ktx:$appDistribution",
                'appdistribution'         : "com.google.firebase:firebase-appdistribution:$appDistribution",
+                // Phone number https://github.com/google/libphonenumber
+                'phonenumber'             : "com.googlecode.libphonenumber:libphonenumber:8.12.54"
        ],
        dagger      : [
                'dagger'                  : "com.google.dagger:dagger:$dagger",
@@ -104,6 +106,7 @@ ext.libs = [
                'moshi'                  : "com.squareup.moshi:moshi:$moshi",
                'moshiKt'                : "com.squareup.moshi:moshi-kotlin:$moshi",
                'moshiKotlin'            : "com.squareup.moshi:moshi-kotlin-codegen:$moshi",
+                'moshiAdapters'          : "com.squareup.moshi:moshi-adapters:$moshi",
                'retrofit'               : "com.squareup.retrofit2:retrofit:$retrofit",
                'retrofitMoshi'          : "com.squareup.retrofit2:converter-moshi:$retrofit"
        ],
--- a/docs/hilt_migration.md
+++ b/docs/hilt_migration.md
@@ -7,8 +7,8 @@ Hilt is built on top of Dagger 2 and simplify usage by removing needs to create
 When you create a new feature, you should have the following:

 Annotate your Activity with @AndroidEntryPoint
+Annotate your Fragment with @AndroidEntryPoint
 If you have a BottomSheetFragment => Annotate it with @AndroidEntryPoint
-Otherwise => Add your Fragment to the FragmentModule
 Add your ViewModel.Factory to the MavericksViewModelModule
 Makes sure your ViewModel as the following code:

--- a/fastlane/metadata/android/cs-CZ/changelogs/40104300.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Umožňuje vylepšené přihlašování a registraci.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/cs-CZ/changelogs/40104310.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Umožňuje vylepšené přihlašování a registraci.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/cs-CZ/changelogs/40104320.txt
+++ b/fastlane/metadata/android/cs-CZ/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Hlavní změny v této verzi: Opravy různých chyb a vylepšení stability.
+Úplný seznam změn: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104260.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104260.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: UnifiedPush wird unterstützt; Dies ermöglicht Push-Benachrichtigungen ohne FCM.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104270.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104270.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104280.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104280.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104300.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verbessertes Anmelde- und Registrierungserlebnis.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104310.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verbessertes Anmelde- und Registrierungserlebnis.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/de-DE/changelogs/40104320.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Die wichtigsten Änderungen in dieser Version: Verschiedene Fehlerbehebungen und Stabilitätsverbesserungen.
+Vollständiges Änderungsprotokoll: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/en-US/changelogs/40104340.txt
+++ b/fastlane/metadata/android/en-US/changelogs/40104340.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/et/changelogs/40104300.txt
+++ b/fastlane/metadata/android/et/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: senisest parem liitumise ja sisselogimise töövoog.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/et/changelogs/40104310.txt
+++ b/fastlane/metadata/android/et/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: senisest parem liitumise ja sisselogimise töövoog.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/et/changelogs/40104320.txt
+++ b/fastlane/metadata/android/et/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Põhilised muutused selles versioonis: erinevate vigade parandused ja stabiilsust edendavad kohendused.
+Kogu ingliskeelne muudatuste logi: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fa/changelogs/40104300.txt
+++ b/fastlane/metadata/android/fa/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: به کار انداختن ورود بهبود یافته و سفرهای ورود.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fa/changelogs/40104310.txt
+++ b/fastlane/metadata/android/fa/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: به کار انداختن ورود بهبود یافته و سفرهای ورود.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fa/changelogs/40104320.txt
+++ b/fastlane/metadata/android/fa/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+تغییرات عمده در این نگارش: رفع اشکال‌های مختلف و بهبودهای پایداری.
+گزارش دگرگونی کامل: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fr-FR/changelogs/40104300.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Activation de l’authentification et du parcours d’inscription améliorés.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fr-FR/changelogs/40104310.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Activation de l’authentification et du parcours d’inscription améliorés.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/fr-FR/changelogs/40104320.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/40104320.txt
@@ -0,0 +1,2 @@
+Principaux changements pour cette version : Plusieurs corrections de bogues et d’améliorations de stabilité.
+Intégralité des changements : https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/gl-ES/changelogs/40104160.txt
+++ b/fastlane/metadata/android/gl-ES/changelogs/40104160.txt
--- a/fastlane/metadata/android/gl-ES/changelogs/40104180.txt
+++ b/fastlane/metadata/android/gl-ES/changelogs/40104180.txt
--- a/fastlane/metadata/android/gl-ES/changelogs/40104190.txt
+++ b/fastlane/metadata/android/gl-ES/changelogs/40104190.txt
--- a/fastlane/metadata/android/gl-ES/changelogs/40104200.txt
+++ b/fastlane/metadata/android/gl-ES/changelogs/40104200.txt
--- a/fastlane/metadata/android/gl-ES/changelogs/40104220.txt
+++ b/fastlane/metadata/android/gl-ES/changelogs/40104220.txt
--- a/fastlane/metadata/android/gl-ES/changelogs/40104230.txt
+++ b/fastlane/metadata/android/gl-ES/changelogs/40104230.txt
--- a/fastlane/metadata/android/gl-ES/changelogs/40104240.txt
+++ b/fastlane/metadata/android/gl-ES/changelogs/40104240.txt
--- a/fastlane/metadata/android/gl-ES/changelogs/40104250.txt
+++ b/fastlane/metadata/android/gl-ES/changelogs/40104250.txt
--- a/fastlane/metadata/android/gl-ES/changelogs/40104260.txt
+++ b/fastlane/metadata/android/gl-ES/changelogs/40104260.txt
--- a/fastlane/metadata/android/gl-ES/changelogs/40104270.txt
+++ b/fastlane/metadata/android/gl-ES/changelogs/40104270.txt
--- a/fastlane/metadata/android/gl-ES/full_description.txt
+++ b/fastlane/metadata/android/gl-ES/full_description.txt
--- a/fastlane/metadata/android/gl-ES/short_description.txt
+++ b/fastlane/metadata/android/gl-ES/short_description.txt
--- a/fastlane/metadata/android/gl-ES/title.txt
+++ b/fastlane/metadata/android/gl-ES/title.txt
--- a/fastlane/metadata/android/id/changelogs/40104300.txt
+++ b/fastlane/metadata/android/id/changelogs/40104300.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Mengaktifkan perjalanan masuk dan keluar yang diperbaiki.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
--- a/fastlane/metadata/android/id/changelogs/40104310.txt
+++ b/fastlane/metadata/android/id/changelogs/40104310.txt
@@ -0,0 +1,2 @@
+Perubahan utama dalam versi ini: Mengaktifkan perjalanan masuk dan keluar yang diperbaiki.
+Catatan perubahan lanjutan: https://github.com/vector-im/element-android/releases
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`Removes the Login2 proof of concept - replaced by the FTUE changes`
				`@@ -0,0 +1 @@`
				`Converts the vector module to a library with a parent vector-app application module`
				`@@ -1 +0,0 @@`
				`added filter tabs for new App layout's Home screen`
				`@@ -1 +0,0 @@`
				`[App Layout] added dialog to configure app layout`
				`@@ -0,0 +1 @@`
				`[App Layout] Bottom navigation tabs are removed for new home screen`
				`@@ -1 +0,0 @@`
				`Enable auto-capitalization for Room creation Title field`
				`@@ -0,0 +1 @@`
				`[App Layout] Obsolete settings are not shown when App Layout flag is enabled`
				`@@ -1 +0,0 @@`
				`Adds New App Layout FABs (hidden behind feature flag)`
				`@@ -1 +0,0 @@`
				`[Notification] - Handle creation of notification for live location and poll start`
				`@@ -1 +0,0 @@`
				`Adds space list bottom sheet for new app layout`