diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57812aa82..cef8a7a2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,6 +71,11 @@ jobs: with: nuget-version: 5.9.0 + - name: Set up .NET + uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 + with: + dotnet-version: '3.1.x' + - name: Set up MSBuild uses: microsoft/setup-msbuild@1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c # v1.3.1 diff --git a/.github/workflows/version-auto-bump.yml b/.github/workflows/version-auto-bump.yml index 5e2d17fb9..c486d1535 100644 --- a/.github/workflows/version-auto-bump.yml +++ b/.github/workflows/version-auto-bump.yml @@ -32,14 +32,10 @@ jobs: echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT trigger_version_bump: - name: "Version bump" - runs-on: ubuntu-22.04 - needs: - - setup - steps: - - name: Bump version to ${{ needs.setup.outputs.version_number }} - uses: ./.github/workflows/version-bump.yml - secrets: - AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} - with: - version_number: ${{ needs.setup.outputs.version_number }} + name: Bump version to ${{ needs.setup.outputs.version_number }} + needs: setup + uses: ./.github/workflows/version-bump.yml + secrets: + AZURE_PROD_KV_CREDENTIALS: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} + with: + version_number: ${{ needs.setup.outputs.version_number }} diff --git a/README.md b/README.md index 2839f95ab..d740a0266 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Bitwarden Mobile Application -Get it on Google Play Get it on Google Play +Get it on Google Play Get it on F-Droid The Bitwarden mobile application is written in C# with Xamarin Android, Xamarin iOS, and Xamarin Forms. diff --git a/crowdin.yml b/crowdin.yml index 57dfe8ff7..45e3e516d 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -38,3 +38,15 @@ files: pt-PT: pt-PT en-GB: en-GB en-IN: en-IN + - source: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/Localizable.strings" + dest: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization/en.lproj/%original_file_name%" + translation: "/src/watchOS/bitwarden/bitwarden WatchKit Extension/Localization//%two_letters_code%.lproj/%original_file_name%" + update_option: update_as_unapproved + languages_mapping: + two_letters_code: + zh-CN: zh-Hans + zh-TW: zh-Hant + pt-BR: pt-BR + pt-PT: pt-PT + en-GB: en-GB + en-IN: en-IN diff --git a/src/Android/Android.csproj b/src/Android/Android.csproj index c5f838ff8..8561fb4f1 100644 --- a/src/Android/Android.csproj +++ b/src/Android/Android.csproj @@ -233,6 +233,18 @@ + + + + + + + + + + + + diff --git a/src/Android/Assets/bwi-font.ttf b/src/Android/Assets/bwi-font.ttf index 7c7afd4cd..f9b63283e 100644 Binary files a/src/Android/Assets/bwi-font.ttf and b/src/Android/Assets/bwi-font.ttf differ diff --git a/src/Android/Properties/AndroidManifest.xml b/src/Android/Properties/AndroidManifest.xml index eb035e7a6..b4658aa9d 100644 --- a/src/Android/Properties/AndroidManifest.xml +++ b/src/Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/src/Android/Renderers/CustomLabelRenderer.cs b/src/Android/Renderers/CustomLabelRenderer.cs index 62287087d..838b9b967 100644 --- a/src/Android/Renderers/CustomLabelRenderer.cs +++ b/src/Android/Renderers/CustomLabelRenderer.cs @@ -1,10 +1,10 @@ -using System; -using Bit.App.Controls; -using System.ComponentModel; -using Xamarin.Forms.Platform.Android; +using System.ComponentModel; using Android.Content; -using Xamarin.Forms; +using Android.OS; +using Bit.App.Controls; using Bit.Droid.Renderers; +using Xamarin.Forms; +using Xamarin.Forms.Platform.Android; [assembly: ExportRenderer(typeof(CustomLabel), typeof(CustomLabelRenderer))] namespace Bit.Droid.Renderers @@ -15,6 +15,19 @@ namespace Bit.Droid.Renderers : base(context) { } + protected override void OnElementChanged(ElementChangedEventArgs @@ -442,5 +443,6 @@ + diff --git a/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs b/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs index ea21df7dc..b5150b003 100644 --- a/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs +++ b/src/App/Controls/CipherViewCell/CipherViewCellViewModel.cs @@ -31,7 +31,7 @@ namespace Bit.App.Controls public bool ShowIconImage { get => WebsiteIconsEnabled - && !string.IsNullOrWhiteSpace(Cipher.Login?.Uri) + && !string.IsNullOrWhiteSpace(Cipher.LaunchUri) && IconImageSource != null; } @@ -41,7 +41,7 @@ namespace Bit.App.Controls { if (_iconImageSource == string.Empty) // default value since icon source can return null { - _iconImageSource = IconImageHelper.GetLoginIconImage(Cipher); + _iconImageSource = IconImageHelper.GetIconImage(Cipher); } return _iconImageSource; } diff --git a/src/App/Controls/CustomLabel.cs b/src/App/Controls/CustomLabel.cs index e822d3304..77d1fda79 100644 --- a/src/App/Controls/CustomLabel.cs +++ b/src/App/Controls/CustomLabel.cs @@ -1,5 +1,4 @@ -using System; -using Xamarin.Forms; +using Xamarin.Forms; namespace Bit.App.Controls { @@ -8,6 +7,7 @@ namespace Bit.App.Controls public CustomLabel() { } + + public int? FontWeight { get; set; } } } - diff --git a/src/App/Pages/Settings/BlockAutofillUrisPage.xaml b/src/App/Pages/Settings/BlockAutofillUrisPage.xaml new file mode 100644 index 000000000..8514edcad --- /dev/null +++ b/src/App/Pages/Settings/BlockAutofillUrisPage.xaml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +