mirror of
https://github.com/bitwarden/android.git
synced 2024-12-25 02:18:27 +03:00
add zxing lib
This commit is contained in:
parent
b8cbd5e0aa
commit
ea3dcd6250
5 changed files with 1205 additions and 1180 deletions
|
@ -87,6 +87,8 @@ namespace Bit.Droid
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
|
Xamarin.Essentials.Platform.OnRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||||
|
ZXing.Net.Mobile.Forms.Android.PermissionsHandler.OnRequestPermissionsResult(
|
||||||
|
requestCode, permissions, grantResults);
|
||||||
}
|
}
|
||||||
base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
|
base.OnRequestPermissionsResult(requestCode, permissions, grantResults);
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,10 +42,13 @@ namespace Bit.Droid
|
||||||
|
|
||||||
private void RegisterLocalServices()
|
private void RegisterLocalServices()
|
||||||
{
|
{
|
||||||
// CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
|
|
||||||
Refractored.FabControl.Droid.FloatingActionButtonViewRenderer.Init();
|
Refractored.FabControl.Droid.FloatingActionButtonViewRenderer.Init();
|
||||||
// Note: This might cause a race condition. Investigate more.
|
// Note: This might cause a race condition. Investigate more.
|
||||||
Task.Run(() => FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true));
|
Task.Run(() =>
|
||||||
|
{
|
||||||
|
FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true);
|
||||||
|
ZXing.Net.Mobile.Forms.Android.Platform.Init();
|
||||||
|
});
|
||||||
CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
|
CrossFingerprint.SetCurrentActivityResolver(() => CrossCurrentActivity.Current.Activity);
|
||||||
|
|
||||||
var preferencesStorage = new PreferencesStorageService(null);
|
var preferencesStorage = new PreferencesStorageService(null);
|
||||||
|
|
2374
src/Android/Resources/Resource.designer.cs
generated
2374
src/Android/Resources/Resource.designer.cs
generated
File diff suppressed because it is too large
Load diff
|
@ -17,6 +17,7 @@
|
||||||
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
|
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
|
||||||
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.10.972" />
|
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.10.972" />
|
||||||
<PackageReference Include="Xamarin.Forms" Version="3.6.0.344457" />
|
<PackageReference Include="Xamarin.Forms" Version="3.6.0.344457" />
|
||||||
|
<PackageReference Include="ZXing.Net.Mobile.Forms" Version="2.1.47" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -28,6 +28,7 @@ namespace Bit.iOS
|
||||||
|
|
||||||
LoadApplication(new App.App(null));
|
LoadApplication(new App.App(null));
|
||||||
|
|
||||||
|
ZXing.Net.Mobile.Forms.iOS.Platform.Init();
|
||||||
return base.FinishedLaunching(app, options);
|
return base.FinishedLaunching(app, options);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue