Skip to content
This repository has been archived by the owner on Apr 12, 2023. It is now read-only.

Commit

Permalink
Revert "途中"
Browse files Browse the repository at this point in the history 
This reverts commit 69cda43.
  • Loading branch information
@Murayu0225
Murayu0225 committed Sep 10, 2021
1 parent 69cda43 commit a4cb5a5
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 121 deletions.
151 changes: 55 additions & 96 deletions Covid19Radar/Covid19Radar.Android/Covid19Radar.Android.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -112,16 +112,12 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<AndroidUseSharedRuntime>true</AndroidUseSharedRuntime>
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
<EmbedAssembliesIntoApk>false</EmbedAssembliesIntoApk>
<AndroidUseAapt2>true</AndroidUseAapt2>
<AndroidPackageFormat>apk</AndroidPackageFormat>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<MandroidI18n>CJK</MandroidI18n>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
<BundleAssemblies>false</BundleAssemblies>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
Expand Down Expand Up @@ -210,136 +206,92 @@
<AndroidResource Include="Resources\mipmap-xhdpi\ic_launcher.png" />
<AndroidResource Include="Resources\mipmap-xxhdpi\ic_launcher.png" />
<AndroidResource Include="Resources\xml\backup_settings.xml">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-xhdpi\privacypolicy_img01.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-xxhdpi\privacypolicy_img01.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-xhdpi\arrow_icon.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-xxhdpi\arrow_icon.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-xxhdpi\notify_img02.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-xxhdpi\notify_img01.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-xhdpi\notify_img02.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-xhdpi\notify_img01.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xxhdpi\HelpPage20.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xxhdpi\HelpPage21.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xxhdpi\HelpPage22.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xxhdpi\HelpPage31.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xxhdpi\HelpPage32.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xhdpi\HelpPage20.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xhdpi\HelpPage21.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xhdpi\HelpPage22.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xhdpi\HelpPage31.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xhdpi\HelpPage32.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xhdpi\Nocontact10.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-zh-xxhdpi\Nocontact10.png">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_notification.xml">
<SubType>
</SubType>
<Generator>
</Generator>
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -498,7 +450,14 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable-xxhdpi\TutorialPage60.png" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Folder Include="Renderers\" />
<Folder Include="Resources\xml\" />
<Folder Include="Services\Logs\" />
<Folder Include="Resources\drawable-zh-xxhdpi\" />
<Folder Include="Resources\drawable-zh-xhdpi\" />
<Folder Include="Services\Migration\" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable-ja-xhdpi\HelpPage22.png" />
</ItemGroup>
Expand Down Expand Up @@ -562,4 +521,4 @@
<ItemGroup>
<AndroidResource Include="Resources\values-ja\Strings.xml" />
</ItemGroup>
</Project>
</Project>
1 change: 1 addition & 0 deletions Covid19Radar/Covid19Radar/Covid19Radar.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Services\Logs\" />
<Folder Include="Controls\" />
<Folder Include="Services\Migration\" />
</ItemGroup>
Expand Down
13 changes: 0 additions & 13 deletions Covid19Radar/Covid19Radar/Services/Logs/ILogShareService.cs
View file

This file was deleted.

3 changes: 0 additions & 3 deletions Covid19Radar/Covid19Radar/ViewModels/HelpPage/SendLogConfirmationPageViewModel.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ namespace Covid19Radar.ViewModels
public class SendLogConfirmationPageViewModel : ViewModelBase
{
private readonly ILoggerService loggerService;
private readonly ILogShareService LogShareService;
private readonly ILogFileService logFileService;
private readonly ILogUploadService logUploadService;
private readonly ILogPathService logPathService;
Expand All @@ -30,14 +29,12 @@ public class SendLogConfirmationPageViewModel : ViewModelBase

public SendLogConfirmationPageViewModel(
INavigationService navigationService,
ILogShareService logShareService,
ILogFileService logFileService,
ILoggerService loggerService,
ILogUploadService logUploadService,
ILogPathService logPathService) : base(navigationService)
{
this.loggerService = loggerService;
this.LogShareService = logShareService;
this.logFileService = logFileService;
this.logUploadService = logUploadService;
this.logPathService = logPathService;
Expand Down
9 changes: 0 additions & 9 deletions ...Tests/Covid19Radar.UnitTests/ViewModels/HelpPage/SendLogConfirmationPageViewModelTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public class SendLogConfirmationPageViewModelTests
private readonly MockRepository mockRepository;
private readonly Mock<IUserDialogs> mockUserDialogs;
private readonly Mock<INavigationService> mockNavigationService;
private readonly Mock<ILogShareService> mockLogShareService;
private readonly Mock<ILogFileService> mockLogFileService;
private readonly Mock<ILoggerService> mockLoggerService;
private readonly Mock<ILogUploadService> mockLogUploadService;
Expand All @@ -34,7 +33,6 @@ public SendLogConfirmationPageViewModelTests()
UserDialogs.Instance = mockUserDialogs.Object;

mockNavigationService = mockRepository.Create<INavigationService>();
mockLogShareService = mockRepository.Create<ILogShareService>();
mockLogFileService = mockRepository.Create<ILogFileService>();
mockLoggerService = mockRepository.Create<ILoggerService>();
mockLogUploadService = mockRepository.Create<ILogUploadService>();
Expand All @@ -45,7 +43,6 @@ private SendLogConfirmationPageViewModel CreateViewModel()
{
var vm = new SendLogConfirmationPageViewModel(
mockNavigationService.Object,
mockLogShareService.Object,
mockLogFileService.Object,
mockLoggerService.Object,
mockLogUploadService.Object,
Expand Down Expand Up @@ -116,8 +113,6 @@ public void OnClickConfirmLogCommandTests_Success()
mockLogFileService.Setup(x => x.CreateLogUploadingFileToTmpPath(testZipFileName)).Returns(true);
mockLogFileService.Setup(x => x.CopyLogUploadingFileToPublicPath(testZipFileName)).Returns(true);

var path = Path.Combine("~/.cocoa/logs", testZipFileName);

var unitUnderTest = CreateViewModel();
unitUnderTest.Initialize(new NavigationParameters());

Expand All @@ -129,10 +124,6 @@ public void OnClickConfirmLogCommandTests_Success()

mockUserDialogs.Verify(x => x.ShowLoading(It.IsAny<string>(), null), Times.Once());
mockUserDialogs.Verify(x => x.HideLoading(), Times.Once());
<<<<<<< Updated upstream
=======
mockLogShareService.Verify(x => x.RequestAsync(), Times.Once());
>>>>>>> Stashed changes
}

[Fact]
Expand Down

0 comments on commit a4cb5a5

Please sign in to comment.