fix for IOS

diggsweden · Feb 4, 2022 · 80575f5 · 80575f5
1 parent 6f23ad6
commit 80575f5
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 28 deletions.
diff --git a/DGCValidator.iOS/DGCValidator.iOS.csproj b/DGCValidator.iOS/DGCValidator.iOS.csproj
@@ -236,8 +236,17 @@
     <BundleResource Include="..\DGCValidator\Resources\flash_off.png">
       <Link>Resources\flash_off.png</Link>
     </BundleResource>
-    <BundleResource Include="..\DGCValidator\Resources\Vaccinationsregler.json">
-      <Link>Resources\Vaccinationsregler.json</Link>
+    <BundleResource Include="..\DGCValidator\Resources\dccvalidator.json">
+      <Link>Resources\dccvalidator.json</Link>
+    </BundleResource>
+    <BundleResource Include="..\DGCValidator\Resources\abort.png">
+      <Link>Resources\abort.png</Link>
+    </BundleResource>
+    <BundleResource Include="..\DGCValidator\Resources\settings.png">
+      <Link>Resources\settings.png</Link>
+    </BundleResource>
+    <BundleResource Include="..\DGCValidator\Resources\digg_centered_2.png">
+      <Link>Resources\digg_centered_2.png</Link>
     </BundleResource>
   </ItemGroup>
 </Project>
diff --git a/DGCValidator/Views/DebugPage.xaml b/DGCValidator/Views/DebugPage.xaml
@@ -8,6 +8,7 @@
     <ContentPage.BindingContext>
         <viewModels:DebugViewModel/>
     </ContentPage.BindingContext>
+
     <NavigationPage.TitleView>
         <Grid>
             <Grid.ColumnDefinitions>

diff --git a/DGCValidator/Views/MainPage.xaml b/DGCValidator/Views/MainPage.xaml
@@ -22,7 +22,7 @@
                 <ColumnDefinition Width="50" />
             </Grid.ColumnDefinitions>
 
-            </Grid>
+        </Grid>
     </NavigationPage.TitleView>
     <ContentPage.Content>
         <ScrollView BackgroundColor="White">
@@ -37,8 +37,7 @@
                     <Label Style="{StaticResource Text}" Text="{x:Static resource:AppResources.InformationText}" HorizontalOptions="Center" HorizontalTextAlignment="Center" Margin="30,10,30,0"/>
                     <Image AutomationProperties.IsInAccessibleTree="True" AutomationProperties.Name="{x:Static resource:AppResources.MainViewImageText}" Source="mobil.png" HeightRequest="150" HorizontalOptions="Center" Margin="0,30,10,10"/>
                     <Label x:Name="labelValidKeysText" IsVisible="{Binding ValidKeysTextVisible}" Text="{Binding ValidKeysText}" FontSize="Large" BackgroundColor="White" FontAttributes="Bold" TextColor="Color.Red" Margin="10,20,10,20" HorizontalOptions="Center" HorizontalTextAlignment="Center"/>
-                 </StackLayout>
-
+                 </StackLayout>               
                 <Path Grid.Row="1" Fill="#195A6751" Stroke="#195A6751" StrokeThickness="0" Aspect="Fill" Data="m485.9263,382.49569c6.48247,6.3858 27.64979,5.93851 34.68626,0l0,31.60021l-34.68626,0l0,-31.60021z" Margin="0,-50,0,-50"></Path>
                 <StackLayout Grid.Row="1" Margin="0,70,0,0">
                     <Button Text="{x:Static resource:AppResources.ScanButtonText}" HorizontalOptions="FillAndExpand" Command="{Binding ScanCommand}"

diff --git a/DGCValidator/Views/SettingsPage.xaml b/DGCValidator/Views/SettingsPage.xaml
@@ -7,28 +7,29 @@
     x:Class="DGCValidator.Views.SettingsPage">
     <ContentPage.BindingContext>
         <viewModels:SettingsViewModel/>
-    </ContentPage.BindingContext>
+    </ContentPage.BindingContext>   
     <ContentPage.Content>
-        <StackLayout BackgroundColor="White">
-            <ImageButton AutomationProperties.IsInAccessibleTree="True" AutomationProperties.Name="{x:Static resource:AppResources.AboutViewCancelButtonText}" Source="abort.png" HeightRequest="60" WidthRequest="60" BackgroundColor="Transparent" CornerRadius="22" Command="{Binding BackCommand}" HorizontalOptions="End" Padding="15,15,15,15"/>
-            <Label Style="{StaticResource SubTitle}" Text="{x:Static resource:AppResources.SettingsText}" FontAttributes="Bold" Padding="30,20,30,10" />
-            <StackLayout Orientation="Horizontal" Margin="0,0,30,0">
-                <Label Style="{StaticResource LargeText}" x:Name="labelNoVerification" Text="{x:Static resource:AppResources.NoVerificationText}" IsVisible="true" Padding="30,0,30,0" HorizontalOptions="Start"/>
-                <Switch IsToggled="{Binding NoVerificationMode, Mode=TwoWay}"  Toggled="OnNoVerificationToggled" OnColor="#008204" ThumbColor="LightGray" HorizontalOptions="EndAndExpand" />
+        <ScrollView BackgroundColor="White">
+            <StackLayout BackgroundColor="White">
+                <ImageButton AutomationProperties.IsInAccessibleTree="True" AutomationProperties.Name="{x:Static resource:AppResources.AboutViewCancelButtonText}" Source="abort.png" HeightRequest="60" WidthRequest="60" BackgroundColor="Transparent" CornerRadius="22" Command="{Binding BackCommand}" HorizontalOptions="End" Padding="15,15,15,15"/>
+                <Label Style="{StaticResource SubTitle}" Text="{x:Static resource:AppResources.SettingsText}" FontAttributes="Bold" Padding="30,20,30,10" />
+                <StackLayout Orientation="Horizontal" Margin="0,0,30,0">
+                    <Label Style="{StaticResource LargeText}" x:Name="labelNoVerification" Text="{x:Static resource:AppResources.NoVerificationText}" IsVisible="true" Padding="30,0,30,0" HorizontalOptions="Start"/>
+                    <Switch IsToggled="{Binding NoVerificationMode, Mode=TwoWay}"  Toggled="OnNoVerificationToggled" OnColor="#008204" ThumbColor="LightGray" HorizontalOptions="EndAndExpand" />
+                </StackLayout>
+                <StackLayout Orientation="Horizontal" Margin="0,0,30,0">
+                    <Label Style="{StaticResource LargeText}" x:Name="labelProduction" Text="{x:Static resource:AppResources.ProductionText}" IsVisible="true" Padding="30,0,30,0" HorizontalOptions="Start"/>
+                    <Switch IsToggled="{Binding ProductionMode, Mode=TwoWay}"  Toggled="OnProductionToggled" OnColor="#008204" ThumbColor="LightGray" HorizontalOptions="EndAndExpand"/>
+                </StackLayout>
+                <Label Style="{StaticResource Text}" x:Name="labelIssuer" Text="{Binding Trust.Issuer}" IsVisible="true" Margin="30,0,30,0"/>
+                <Label Style="{StaticResource Text}" x:Name="labelIssuedDate" Text="{Binding Trust.IssuedDateString}" IsVisible="true" Margin="30,0,30,0"/>
+                <Label Style="{StaticResource Text}" x:Name="labelExpirationDate" Text="{Binding Trust.ExpirationDateString}" IsVisible="true" Margin="30,0,30,0"/>
+                <Button Text="{x:Static resource:AppResources.RefreshText}" 
+                    HorizontalOptions="FillAndExpand"
+                    BackgroundColor="#5A6751" TextColor="White"
+                    FontAttributes="Bold" FontSize="Medium" CornerRadius="25" Margin="30,20,30,0"
+                    Command="{Binding RefreshTrustListCommand}"/>
             </StackLayout>
-            <StackLayout Orientation="Horizontal" Margin="0,0,30,0">
-                <Label Style="{StaticResource LargeText}" x:Name="labelProduction" Text="{x:Static resource:AppResources.ProductionText}" IsVisible="true" Padding="30,0,30,0" HorizontalOptions="Start"/>
-                <Switch IsToggled="{Binding ProductionMode, Mode=TwoWay}"  Toggled="OnProductionToggled" OnColor="#008204" ThumbColor="LightGray" HorizontalOptions="EndAndExpand"/>
-            </StackLayout>
-            <Label Style="{StaticResource Text}" x:Name="labelIssuer" Text="{Binding Trust.Issuer}" IsVisible="true" Margin="30,0,30,0"/>
-            <Label Style="{StaticResource Text}" x:Name="labelIssuedDate" Text="{Binding Trust.IssuedDateString}" IsVisible="true" Margin="30,0,30,0"/>
-            <Label Style="{StaticResource Text}" x:Name="labelExpirationDate" Text="{Binding Trust.ExpirationDateString}" IsVisible="true" Margin="30,0,30,0"/>
-            <Button Text="{x:Static resource:AppResources.RefreshText}" 
-                HorizontalOptions="FillAndExpand"
-                BackgroundColor="#5A6751" TextColor="White"
-                FontAttributes="Bold" FontSize="Medium" CornerRadius="30" Margin="30,20,30,0"
-                Command="{Binding RefreshTrustListCommand}"/>
-
-        </StackLayout>
+         </ScrollView>
     </ContentPage.Content>
 </ContentPage>
diff --git a/DGCValidator/Views/UpdatePage.xaml b/DGCValidator/Views/UpdatePage.xaml
@@ -30,7 +30,5 @@
             </StackLayout>
             <Button Text="{x:Static resource:AppResources.UpdateViewButtonText}" FontSize="Medium" HorizontalOptions="FillAndExpand" Clicked="Button_Clicked" TextColor="White" BackgroundColor="black" CornerRadius="25" Margin="0,30,0,0"/>
         </StackLayout>
-
     </ScrollView>
-
 </ContentPage>