[PM-3349] [PM-3350] MAUI Migration Initial by fedemkr · Pull Request #2806 · bitwarden/mobile

fedemkr · 2023-09-29T14:03:53Z

Type of change

Objective

Migrate app to NET MAUI

Before you submit

Please check for formatting errors (dotnet format --verify-no-changes) (required)
Please add unit tests where it makes sense to do so (encouraged but not required)
If this change requires a documentation update - notify the documentation team
If this change has particular deployment requirements - notify the DevOps team

bitwarden-bot · 2023-09-29T14:08:03Z

Checkmarx One – Scan Summary & Details – a6f03895-0189-451c-bd5c-34aa7140205c

New Issues

Severity	Issue	Source File / Package	Checkmarx Insight
	Unpinned Actions Full Length Commit SHA	/build.yml: 491	Pinning an action to a full length commit SHA is currently the only way to use an action as an immutable release. Pinning to a particular SHA helps...

Fixed Issues

Severity	Issue	Source File / Package
	Privacy_Violation	/src/App/App.xaml.cs: 111
	Privacy_Violation	/src/App/App.xaml.cs: 67
	Unpinned Actions Full Length Commit SHA	/build.yml: 500

…yncCommand canExecute null exception

Added CustomTabbedPageHandler for Android to handle the tab "reselection" for PopToRoot. Commented support for Windows in App.csproj Disabled Interpreter on Android to avoid very slow app in Debug (during Login for example) Added some null checks that were causing crashes (on GeneratorPageVM and PickerVM) Minor TabsPage cleanup

…TabbedPageHandler

… opening Secure Notes.

Changed MainApplication SpecialFolder.Personal to SpecialFolder.LocalApplicationData

…/mobile into feature/maui-migration

…d factor auth flows Ensured CustomTabbedPageHandler had it's DisconnectHandler called Some minor code upgrades of older obsolete Xamarin Forms code.

…Android bugs where they fill much larger space.

Added (migrated) CustomNavigationHandler (which should partially fix the AvatarIcon in the NavBar in iOS) Added (migrated) CustomContentPageHandler (which should mostly place the AvatarIcon in the navBar in the correct place for iOS) Added Task.Delay (workaround) to allow the Avatar to load in iOS on the LoginPage Added workaround for iOS bug with the toolbar size (more info in comment in AvatarImageSource.cs) Went through the AccountViewCell MAUI-Migration comments. (and deleted/added more comments as needed) Migrated some Device calls to DeviceInfo and MainThread Added (migrated) CustomTabbedHandler (for managing the iOS TabBar)

…the buggy shadows on the Android Fab Button.

…ttons.

…h fonts as MAUI is taking care of Accessibility and no custom code should be needed Migrated SelectableLabelRenderer to Handler Cleaned LabelHandlerMappings and added logic to migrate the CustomLabelRenderer

Added Argon libraries for Android minor change to gitignore so that the Argon x86 lib is not ignored on the Android platform

…ound with some comments to be able to see the Generated Password on iOS

SearchBarHandlerMapping: IME options working as intended SliderHandlerMappings: The MAUI "replacement" for Color.Default seems to be White so the old use case doesn't seem to be needed anymore.

# Conflicts: # src/App/Platforms/Android/AndroidManifest.xml

…n the Directory.Build.props

…hat is causing the background crash on iOS; so we can test this in TestFlight

* workaround for sliding elements in duo 2fa flow * restrict workaround to Android * restrict workaround to Android * Revert "restrict workaround to Android" This reverts commit c2753d5. * Revert "restrict workaround to Android" This reverts commit 69688cf.

…/mobile into feature/maui-migration

…2974)

andrebispo5

Awesome work!
Just a couple of things that came to attention on a first pass.

andrebispo5 · 2024-02-01T17:21:07Z

@@ -8,13 +9,14 @@ public class IconButton : Button
        public IconButton()
        {
            Padding = 0;
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes


❓ was this address? can it be removed?

As you can see Device.RuntimePlatform is still being used, it should be changed for DeviceInfo.Platform instead or use precompiler directives. However, this is really low priority.

andrebispo5 · 2024-02-01T17:21:36Z

@@ -9,13 +10,14 @@ public class IconLabel : Label

        public IconLabel()
        {
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes


❓ was this address? can it be removed?

As you can see Device.RuntimePlatform is still being used, it should be changed for DeviceInfo.Platform instead or use precompiler directives. However, this is really low priority.

andrebispo5 · 2024-02-01T17:24:00Z

@@ -7,13 +8,14 @@ public class MiButton : Button
        public MiButton()
        {
            Padding = 0;
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes


❓ was this address? can it be removed?

As you can see Device.RuntimePlatform is still being used, it should be changed for DeviceInfo.Platform instead or use precompiler directives. However, this is really low priority.

andrebispo5 · 2024-02-01T17:24:12Z


 namespace Bit.App.Controls
 {
    public class MiLabel : Label
    {
        public MiLabel()
        {
+            // TODO Xamarin.Forms.Device.RuntimePlatform is no longer supported. Use Microsoft.Maui.Devices.DeviceInfo.Platform instead. For more details see https://learn.microsoft.com/en-us/dotnet/maui/migration/forms-projects#device-changes


❓ was this address? can it be removed?

As you can see Device.RuntimePlatform is still being used, it should be changed for DeviceInfo.Platform instead or use precompiler directives. However, this is really low priority.

andrebispo5 · 2024-02-01T21:43:48Z

                        StyleClass="box-value"
-                        AutomationProperties.IsInAccessibleTree="True"
-                        AutomationProperties.Name="{u:I18n Name}"
+                        SemanticProperties.Description="{u:I18n Name}"


🔧 According to Microsoft docs Entry's should use Placeholder instead of Description because of Android's Talkback.
SemanticProperties.Placeholder="{u:I18n Name}"
MicrosoftDocs
Github Issue

If we proceed with this change there a couple more places that this is happening and needs to me fixed.

Nice finding 🎉 , can you create a Jira ticket with this? At the moment, we just replaced the whole solution Name with Description to compile, but yes we should definitely tackle this at some point.

aj-rosado

Great work!
Just added some comments regarding cleanup work and a couple workarounds that seem to be fixed.

aj-rosado · 2024-02-02T12:26:19Z

        {
            base.OnResume();
-            Xamarin.Essentials.Platform.OnResume();
+            //Xamarin.Essentials.Platform.OnResume();


If this is not necessary anymore we could remove this

aj-rosado · 2024-02-02T12:26:43Z

-                Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
-                PermissionsHandler.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+                Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
+                //Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);


If not necessary, remove the commented code

aj-rosado · 2024-02-02T12:28:23Z

-                ZXing.Net.Mobile.Forms.Android.Platform.Init();
-            });
-            CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
+            //Task.Run(() =>


Can this be removed?

aj-rosado · 2024-02-02T12:36:54Z

+
+            //Workaround: [MAUI-Migration] There is currently a bug in MAUI where the actual size of the image is used instead of the size it should occupy in the Toolbar.
+            //This causes some issues with the position of the icon. As a workaround we make the icon smaller until this is fixed.
+            //Github issues: https://github.com/dotnet/maui/issues/12359  and  https://github.com/dotnet/maui/pull/17120


This issues have been closed

I think @dinisvieira tested it and the issue was still happening. Was it? Maybe we should check again.

…rs and also made easier to maintain loading the argon2id library on the iOS projects by setting a general Directory.Build.props that is shared.

…rties instead of replacing the existing Options object which would cause the AccountSwitcher button bug (#2973)

…on (#2969) * PM-5896 Fix background crash on iOS due to lock files when app gets suspended. Changed loading and error placeholders of the CachedImage to not be used and use default icon of IconLabel instead changing visibility. * PM-5896 Changed methods to be protected so that they don't get removed by the linker. * PM-5896 Added stub class and references to it so to have stronger references to Icon_Success and Icon_Error so the linker doesn't remove them.

…s not needed anymore.

LRNcardozoWDF

Amazing work! Just found a nitpick.

LRNcardozoWDF · 2024-02-01T08:13:53Z

+                    var magImage = (Android.Widget.ImageView)handler.PlatformView.FindViewById(magId);
+                    magImage.LayoutParameters = new Android.Widget.LinearLayout.LayoutParams(0, 0);
+                }
+                catch { }


Is this empty catch intentional?

Yes, it's the same we have on the current Xamarin app https://github.com/bitwarden/mobile/blob/main/src/Android/Renderers/CustomSearchBarRenderer.cs#L27

… be used on iOS.Core (#2983)

… light theme on iOS (#2982) * PM-5907 workaround for incorrect textcolor when programmatically changing text on Entry * Update src/Core/Pages/Vault/CipherAddEditPage.xaml.cs Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> --------- Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>

…when using light theme on iOS (#2981) * PM-5906 workaround for incorrect textcolor when programmatically changing text on Entry * Update src/Core/Pages/Send/SendAddEditPage.xaml.cs Co-authored-by: Federico Maccaroni <fedemkr@gmail.com> --------- Co-authored-by: Federico Maccaroni <fedemkr@gmail.com>

…g when it's not possible

aj-rosado

LGTM!

PM-3349 PM-3350 MAUI Migration Initial

8ef9443

github-actions[bot] mannequin added android iOS labels Sep 29, 2023

fedemkr and others added 26 commits September 29, 2023 12:12

PM-3349 PM-3350 MAUI Migration fix nullable exception bindings and As…

b8f0747

…yncCommand canExecute null exception

PM-3349 PM-3350 MAUI Migration fix nullable bindings and fallbacks

d17789d

TabBarEffect removed and it's behavior is now taken care of by Custom…

9f6c860

…TabbedPageHandler

PM-3349 PM-3350 Add null checks on CipherDetailsPageVM to avoid crash…

0dbc23f

… opening Secure Notes.

PM-3349 PM-3350 MAUI Migration Start iOS extensions

990de4e

fix conflicts

7542d1a

Changes to solution to hopefully fix Config Mappings

87eebda

PM-3349 Removed Deploy from iOS.Autofill to allow running Android

8280557

Changed MainApplication SpecialFolder.Personal to SpecialFolder.LocalApplicationData

PM-3350 MAUI Migration Fix iOS Autofill extension

90649d1

Merge branch 'feature/maui-migration' of https://github.com/bitwarden…

efb8763

…/mobile into feature/maui-migration

PM-3349 Changed UseMauiApp init so that Android Handlers still get added

1dcd3a3

PM-3349 Implemented HybridWebViewHandler for Android which enables 2n…

c92cd90

…d factor auth flows Ensured CustomTabbedPageHandler had it's DisconnectHandler called Some minor code upgrades of older obsolete Xamarin Forms code.

PM-3349 Implemented HybridWebViewHandler for iOS

d63a219

hardcoded AccountViewCell Avatar image to 40x40 to avoid current iOS/…

2e4da1b

…Android bugs where they fill much larger space.

PM-3349 Replaced the FabShadowEffect with the new MAUI Shadow to fix …

3cdf1c2

…the buggy shadows on the Android Fab Button.

PM-3349 ToolbarHandler created for setting text on Android go back bu…

8c623a2

…ttons.

PM-3350 Migrated the CustomViewCellRenderer for iOS

455c3a2

PM-3350 Removed ButtonHandlerMappings and some other code related wit…

14b2960

…h fonts as MAUI is taking care of Accessibility and no custom code should be needed Migrated SelectableLabelRenderer to Handler Cleaned LabelHandlerMappings and added logic to migrate the CustomLabelRenderer

Enabled argon2Id for iOS

4bcc7c0

PM-3349

174acbc

Added Argon libraries for Android minor change to gitignore so that the Argon x86 lib is not ignored on the Android platform

PM-3350 Migrated some Device to DeviceInfo and added temporary workar…

8be8abb

…ound with some comments to be able to see the Generated Password on iOS

PM-3350 Added some missing images in iOS

62213c0

PM-3349 PRM-3350 Replaced XZing with Camera.MAUI for QRCodes

f1d5921

Checked some [MAUI-Migration] and deleted when it's working as intended.

f177968

SearchBarHandlerMapping: IME options working as intended SliderHandlerMappings: The MAUI "replacement" for Color.Default seems to be White so the old use case doesn't seem to be needed anymore.

fedemkr and others added 8 commits January 29, 2024 13:58

Merge branch 'main' into feature/maui-migration

ec1ade7

# Conflicts: # src/App/Platforms/Android/AndroidManifest.xml

PM-3350 Enabled iOS extensions and WatchOS app to be included based o…

d2965e6

…n the Directory.Build.props

PM-3350 Go back to include argon2id and interpreter

5f43681

Removing error/loading placeholders of icons on the cells to see if t…

155c753

…hat is causing the background crash on iOS; so we can test this in TestFlight

Merge branch 'main' into feature/maui-migration

cd89522

Merge branch 'feature/maui-migration' of https://github.com/bitwarden…

f8e4218

…/mobile into feature/maui-migration

Merge branch 'main' into feature/maui-migration

b23bed1

fedemkr added the MAUI label Jan 31, 2024

PM-5902 fix for account switcher not dismissing when tapping outside (#…

7ddea4c

…2974)

andrebispo5 reviewed Feb 1, 2024

View reviewed changes

aj-rosado reviewed Feb 2, 2024

View reviewed changes

fedemkr and others added 4 commits February 2, 2024 15:48

PM-3350 Fix iossimulator-x64 argon2id load so we can test on simulato…

eb95a54

…rs and also made easier to maintain loading the argon2id library on the iOS projects by setting a general Directory.Build.props that is shared.

PM-5903 Changed App.xaml.cs SetOption to only update the needed prope…

f1854f2

…rties instead of replacing the existing Options object which would cause the AccountSwitcher button bug (#2973)

Merge branch 'main' into feature/maui-migration

04cc53b

vgrassia self-requested a review February 5, 2024 15:54

PM-3349 Removed commented code from build.yml regarding FDroid that i…

b1a0801

…s not needed anymore.

LRNcardozoWDF reviewed Feb 5, 2024

View reviewed changes

PM-6077 Separated Android and iOS HybridWebViewHandler so that it can…

759627b

… be used on iOS.Core (#2983)

dinisvieira mannequin dismissed a stale review via 759627b February 7, 2024 17:50

dinisvieira and others added 4 commits February 7, 2024 19:08

Merged main into maui-migration

51ee6a8

PM-3349 PM-3350 Fixed Unit tests because of referencing FFImageLoadin…

4631a9e

…g when it's not possible

aj-rosado approved these changes Feb 8, 2024

View reviewed changes

vgrassia approved these changes Feb 8, 2024

View reviewed changes

mpbw2 approved these changes Feb 8, 2024

View reviewed changes

fedemkr merged commit 39a34bd into main Feb 8, 2024

fedemkr deleted the feature/maui-migration branch February 8, 2024 19:05

Uh oh!

Conversation

fedemkr commented Sep 29, 2023

Type of change

Objective

Before you submit

Uh oh!

bitwarden-bot mannequin commented Sep 29, 2023

New Issues

Fixed Issues

Uh oh!

andrebispo5 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aj-rosado left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LRNcardozoWDF left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aj-rosado left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants