mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-26 19:08:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'feature/maui-migration-android-autofill' into feature/maui-migration-android-autofill-redirect-page

Browse source
This commit is contained in:
Dinis Vieira 2023-12-22 22:16:17 +00:00
commit 6d4c706026
No known key found for this signature in database
GPG key ID: 9389160FF6C295F3
6 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/App/App.csproj
View file

@ -194,9 +194,6 @@
<MauiImage Include="Resources\plus.svg" TintColor="#FFFFFFFF">
<BaseSize>24,24</BaseSize>
</MauiImage>
<MauiImage Include="Resources\search.svg" TintColor="#FFFFFFFF">
<BaseSize>24,24</BaseSize>
</MauiImage>
<MauiImage Include="Resources\send.svg">
<BaseSize>24,24</BaseSize>
</MauiImage>

27
src/App/Platforms/iOS/Resources/Assets.xcassets/search.imageset/Contents.json vendored Normal file
View file

@ -0,0 +1,27 @@
{
"images": [
{
"appearances": [],
"scale": "1x",
"idiom": "universal",
"filename": "search.png"
},
{
"appearances": [],
"scale": "2x",
"idiom": "universal",
"filename": "search@2x.png"
},
{
"appearances": [],
"scale": "3x",
"idiom": "universal",
"filename": "search@3x.png"
}
],
"properties": {},
"info": {
"version": 1,
"author": ""
}
}

BIN
src/App/Platforms/iOS/Resources/Assets.xcassets/search.imageset/search.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 561 B

BIN
src/App/Platforms/iOS/Resources/Assets.xcassets/search.imageset/search@2x.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
src/App/Platforms/iOS/Resources/Assets.xcassets/search.imageset/search@3x.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

4
src/Core/Pages/Accounts/DeleteAccountPage.xaml
View file

@ -59,8 +59,9 @@
StyleClass="btn-danger"
HorizontalOptions="Start"
VerticalOptions="Start"
Margin="0,20,0,0"
Margin="0,20,6,0"
Padding="16,0"
MinimumHeightRequest="45"
CornerRadius="2"
TextTransform="Uppercase"
Clicked="DeleteAccount_Clicked"/>
@ -73,6 +74,7 @@
VerticalOptions="Start"
Margin="0,20,0,0"
Padding="16,0"
MinimumHeightRequest="45"
CornerRadius="2"
TextTransform="Uppercase"
Clicked="Close_Clicked" />