Upgrade androidx activity and fragment to 1.5.0 #6436

bmarty · 2022-07-01T15:08:09Z

Type of change

Feature
Bugfix
Technical
Other :

Content

Upgrade androidx activity and fragment to 1.5.0

The main work done here is the management of the menu, to avoid using deprecated methods.
Did a quick smoke test, everything is fine so far.
Will test the PiP behavior.

Motivation and context

Being up to date with the latest dependencies!

Screenshots / GIFs

Tests

Smoke test

Tested devices

Physical
Emulator
OS version(s):

Checklist

Changes has been tested on an Android device or Android emulator with API 21
UI change has been tested on both light and dark themes
Accessibility has been taken into account. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#accessibility
Pull request is based on the develop branch
Pull request includes a new file under ./changelog.d. See https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#changelog
Pull request includes screenshots or videos if containing UI changes
Pull request includes a sign off
You've made a self review of your PR
If you have modified the screen flow, or added new screens to the application, you have updated the test UiAllScreensSanityTest.allScreensTest()

Bumps activity from 1.4.0 to 1.5.0. --- updated-dependencies: - dependency-name: androidx.activity:activity dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps `fragment` from 1.4.1 to 1.5.0. Updates `fragment-ktx` from 1.4.1 to 1.5.0 Updates `fragment-testing` from 1.4.1 to 1.5.0 --- updated-dependencies: - dependency-name: androidx.fragment:fragment-ktx dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: androidx.fragment:fragment-testing dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bump fragment from 1.4.1 to 1.5.0

…tivity-activity-1.5.0 Bump activity from 1.4.0 to 1.5.0

…r. Rework this part a bit.

bmarty · 2022-07-01T15:09:21Z

library/ui-styles/build.gradle

@@ -53,6 +53,7 @@ android {

 dependencies {
    implementation libs.androidx.appCompat
+    implementation libs.androidx.fragmentKtx


To be able to useaddMenuProvider in DebugMaterialThemeActivity

bmarty · 2022-07-01T15:10:20Z

library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt

+                                this@DebugMaterialThemeActivity,
+                                "Menu ${menuItem.title} clicked!",
+                                Toast.LENGTH_SHORT
+                        ).show()


Added this toast to have a visual feedback

bmarty · 2022-07-01T15:11:08Z

tools/check/forbidden_strings_in_code.txt

+### Please use the MenuProvider interface now
+onCreateOptionsMenu
+onOptionsItemSelected
+onPrepareOptionsMenu


This is not deprecated (yet?) on Activities, and better to avoid using a mix of solutions (this was not working well)

bmarty · 2022-07-01T15:11:33Z

vector/src/main/java/im/vector/app/core/platform/VectorBaseActivity.kt

@@ -249,6 +253,30 @@ abstract class VectorBaseActivity<VB : ViewBinding> : AppCompatActivity(), Maver
        }
    }

+    private fun setupMenu() {
+        // Always add a MenuProvider to handle the back action from the Toolbar


I mean even if getMenuRes() returns -1

bmarty · 2022-07-01T15:17:50Z

vector/src/main/java/im/vector/app/features/devtools/RoomDevToolActivity.kt

+                        state.displayMode is RoomDevToolViewState.Mode.EditEventContent ||
+                                state.displayMode is RoomDevToolViewState.Mode.SendEventForm
+                    }
+                    else -> true


This is quite dirty and would deserve a rework...

bmarty · 2022-07-04T14:55:20Z

(FTR I will try to update our API to manage menu).

EDIT Done in the latest commits.

sonarqubecloud · 2022-07-04T20:42:31Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
2 Code Smells

0.0% Coverage
0.0% Duplication

ouchadam

thanks for the update 💯 I didn't notice any new issues with a smoke test across the app

I wonder if we should be using nulls rather than -1 to highlight the absence of menus but not a blocker since that was the existing convention

bmarty · 2022-07-06T09:24:05Z

I wonder if we should be using nulls rather than -1 to highlight the absence of menus but not a blocker since that was the existing convention

Yes, probably a bit better. the only case where we use "-1" is here https://github.com/vector-im/element-android/blob/944b447d938b117bc422feaec38f59dd60af046f/vector/src/main/java/im/vector/app/features/call/transfer/CallTransferPagerAdapter.kt#L51

dependabot bot and others added 7 commits June 29, 2022 23:10

Bump activity from 1.4.0 to 1.5.0

62a20ba

Bumps activity from 1.4.0 to 1.5.0. --- updated-dependencies: - dependency-name: androidx.activity:activity dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Merge pull request #6420 from vector-im/dependabot/gradle/fragment-1.5.0

529898d

Bump fragment from 1.4.1 to 1.5.0

Merge pull request #6419 from vector-im/dependabot/gradle/androidx.ac…

c6a89c7

…tivity-activity-1.5.0 Bump activity from 1.4.0 to 1.5.0

Fix first compilation errors

1297ccd

Migration to activity 1.5.0. Rework menu management

aae6e20

Fix regression when closing the screen to create a DM from the toolba…

944b447

…r. Rework this part a bit.

bmarty requested review from a team and ouchadam and removed request for a team July 1, 2022 15:08

bmarty commented Jul 1, 2022

View reviewed changes

bmarty added 2 commits July 1, 2022 17:30

Fix warning on onPictureInPictureModeChanged method overriding.

3976141

Fix warning on onMultiWindowModeChanged method overriding.

f7a0615

bmarty force-pushed the feature/bma/activity_fragment_1_5_0 branch from 20e8061 to f7a0615 Compare July 1, 2022 15:41

This was referenced Jul 2, 2022

Bump fragment from 1.4.1 to 1.5.0 #6440

Closed

Bump activity from 1.4.0 to 1.5.0 #6441

Closed

bmarty added 6 commits July 4, 2022 17:10

Menu: extract management to a common interface / Migrate Activities

be099dc

Menu: extract management to a common interface / Migrate Fragments

81505d3

Fix compilation issue for Fragment

1355178

Changelog

d43c802

Fix detekt issue.

3e42cec

Quick rework, better to search for expected MenuItem

293a177

ouchadam approved these changes Jul 6, 2022

View reviewed changes

bmarty merged commit 7616912 into develop Jul 6, 2022

bmarty deleted the feature/bma/activity_fragment_1_5_0 branch July 6, 2022 09:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade androidx activity and fragment to 1.5.0 #6436

Upgrade androidx activity and fragment to 1.5.0 #6436

bmarty commented Jul 1, 2022

bmarty Jul 1, 2022

bmarty Jul 1, 2022

bmarty Jul 1, 2022

bmarty Jul 1, 2022 •

edited

Loading

bmarty Jul 1, 2022

bmarty Jul 4, 2022

bmarty commented Jul 4, 2022 •

edited

Loading

sonarqubecloud bot commented Jul 4, 2022

ouchadam left a comment

bmarty commented Jul 6, 2022

Upgrade androidx activity and fragment to 1.5.0 #6436

Upgrade androidx activity and fragment to 1.5.0 #6436

Conversation

bmarty commented Jul 1, 2022

Type of change

Content

Motivation and context

Screenshots / GIFs

Tests

Tested devices

Checklist

bmarty Jul 1, 2022

Choose a reason for hiding this comment

bmarty Jul 1, 2022

Choose a reason for hiding this comment

bmarty Jul 1, 2022

Choose a reason for hiding this comment

bmarty Jul 1, 2022 • edited Loading

Choose a reason for hiding this comment

bmarty Jul 1, 2022

Choose a reason for hiding this comment

bmarty Jul 4, 2022

Choose a reason for hiding this comment

bmarty commented Jul 4, 2022 • edited Loading

sonarqubecloud bot commented Jul 4, 2022

ouchadam left a comment

Choose a reason for hiding this comment

bmarty commented Jul 6, 2022

bmarty Jul 1, 2022 •

edited

Loading

bmarty commented Jul 4, 2022 •

edited

Loading