Skip to content
This repository has been archived by the owner on Aug 10, 2022. It is now read-only.

Commit

Permalink
Merge pull request #622 from folkehelseinstituttet/dev-R3.4
Browse files Browse the repository at this point in the history 
Dev-R3.4 to dev
  • Loading branch information
@NC-001
NC-001 authored Mar 7, 2022
2 parents 0337b02 + 5ce5479 commit 07fe25a
Show file tree
Hide file tree
Showing 70 changed files with 2,228 additions and 957 deletions.
7 changes: 6 additions & 1 deletion NDB.Covid19/NDB.Covid19.Droid/NDB.Covid19.Droid.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
Expand Down Expand Up @@ -151,6 +151,7 @@
<Compile Include="Views\LanguageSelectionActivity.cs" />
<Compile Include="Utils\DiagnosisKeysDataMappingUtils.cs" />
<Compile Include="Utils\BatteryOptimisationUtils.cs" />
<Compile Include="Views\AuthenticationFlow\QuestionnaireTestOptionActivity.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
Expand Down Expand Up @@ -1127,6 +1128,10 @@
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\layout\questionnaire_test_option.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\mipmap-anydpi-v26\ic_launcher.xml" />
Expand Down
9 changes: 7 additions & 2 deletions NDB.Covid19/NDB.Covid19.Droid/Properties/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="no.fhi.smittestopp_exposure_notification" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="3.2.2">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="no.fhi.smittestopp_exposure_notification" xmlns:tools="http://schemas.android.com/tools" android:versionCode="1" android:versionName="3.4">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="30" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" android:required="true" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
<queries>
<intent>
<action android:name="android.support.customtabs.action.CustomTabsService" />
</intent>
</queries>
<application android:allowBackup="false" android:label="@string/app_name" android:roundIcon="@mipmap/app_logono_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:icon="@mipmap/app_logono"></application>
</manifest>
7 changes: 7 additions & 0 deletions NDB.Covid19/NDB.Covid19.Droid/Resources/layout/en_developer_tools.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,13 @@
android:layout_marginVertical="1dp"
android:text="Print Preferences"/>

<Button
android:id="@+id/print_last_fetched_message_response"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginVertical="1dp"
android:text="Print last message"/>

<Button
android:id="@+id/navigate_to_force_update"
android:layout_width="wrap_content"
Expand Down
13 changes: 12 additions & 1 deletion NDB.Covid19/NDB.Covid19.Droid/Resources/layout/error_page.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
Expand All @@ -24,7 +25,7 @@
android:layout_height="24dp"
android:layout_marginEnd="@dimen/defaultHorizontalMargin"
android:layout_marginTop="@dimen/defaultVerticalMargin"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<ImageView
android:src="@drawable/ic_close_blue"
Expand Down Expand Up @@ -75,6 +76,16 @@

</ScrollView>

<Button
style="@style/ConsentButton"
android:id="@+id/continue_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="@dimen/defaultVerticalMarginContinue"
android:layout_marginHorizontal="@dimen/defaultHorizontalMargin"
android:text="Dummy Button"
android:visibility="gone"
tools:visibility="visible"/>
<Button
style="@style/ConsentButton"
android:id="@+id/error_button"
Expand Down
35 changes: 30 additions & 5 deletions NDB.Covid19/NDB.Covid19.Droid/Resources/layout/infection_status.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">

Expand Down Expand Up @@ -51,6 +52,31 @@
android:paddingBottom="54dp"
android:id="@+id/infection_status_relativeLayout">

<LinearLayout
android:id="@+id/infection_status_important_message_banner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#F5E360"
android:foreground="?android:attr/selectableItemBackground"
android:visibility="gone"
tools:visibility="visible"
tools:background="#F5E360">

<TextView
android:id="@+id/infection_status_important_message_banner_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/defaultHorizontalMargin"
android:layout_marginVertical="@dimen/defaultVerticalMargin"
android:layout_gravity="center"
android:textAlignment="center"
android:textColor="@color/primaryText"
android:textSize="18sp"
style="@style/PrimaryTextRegular"
tools:text="This is a banner text">
</TextView>
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -59,23 +85,22 @@
android:gravity="center"
android:paddingTop="36dp"
android:paddingBottom="@dimen/defaultVerticalMargin"
android:background="@color/infectionStatusButtonOnGreen"
>
android:layout_below="@+id/infection_status_important_message_banner"
android:background="@color/infectionStatusButtonOnGreen">

<ImageView
android:src="@drawable/ic_app_logo"
android:layout_width="250dp"
android:layout_height="100dp"
android:importantForAccessibility="yes"
android:id="@+id/infection_status_app_logo"
/>
android:id="@+id/infection_status_app_logo" />

<TextView
android:text="State"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/infection_status_activity_status_textView"
style="@style/PrimaryTextBold"/>
style="@style/PrimaryTextBold" />
</LinearLayout>

<TextView
Expand Down
74 changes: 74 additions & 0 deletions NDB.Covid19/NDB.Covid19.Droid/Resources/layout/questionnaire_test_option.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="UTF-8" ?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">

<ScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/questionnaire_page_scrollview">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<RelativeLayout
android:id="@+id/close_cross_btn"
android:layout_width="24dp"
android:accessibilityTraversalAfter="@id/error_button"
android:layout_height="24dp"
android:layout_marginEnd="@dimen/defaultHorizontalMargin"
android:layout_marginTop="@dimen/defaultVerticalMargin"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

<ImageView
android:src="@drawable/ic_close_blue"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</RelativeLayout>

<TextView
android:id="@id/questionnaire_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/defaultHorizontalMargin"
android:layout_marginTop="@dimen/defaultVerticalMargin"
android:paddingBottom="@dimen/defaultVerticalMargin"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/close_cross_btn"
android:text="Dummy title"
style="@style/HeaderText"/>

<Button
style="@style/ConsentButton"
android:id="@+id/questionnaire_button_msis_test"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="@dimen/defaultVerticalMargin"
android:layout_marginHorizontal="@dimen/defaultHorizontalMargin"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/questionnaire_title"
android:text="Dummy Button 1"/>

<Button
style="@style/ConsentButton"
android:id="@+id/questionnaire_button_self_test"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginVertical="@dimen/defaultVerticalMargin"
android:layout_marginHorizontal="@dimen/defaultHorizontalMargin"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/questionnaire_button_msis_test"
android:text="Dummy Button 2"/>

</androidx.constraintlayout.widget.ConstraintLayout>

</ScrollView>

</LinearLayout>
47 changes: 38 additions & 9 deletions NDB.Covid19/NDB.Covid19.Droid/Resources/layout/spinner_dialog.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,41 @@
<?xml version="1.0" encoding="UTF-8" ?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp">
<NumberPicker
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp"
android:orientation="vertical">
<NumberPicker
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/picker"
/>
</LinearLayout>
android:id="@+id/picker"/>
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@+id/picker">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/relativeLayout2">
<Button
android:id="@+id/spinner_dialog_ok_button"
android:layout_width="50dp"
android:layout_height="wrap_content"
android:paddingBottom="6dp"
android:text="Ok"
android:textAlignment="center"
android:layout_alignParentEnd="true"
android:textSize="14sp"
android:gravity="bottom"
android:background="@android:color/transparent"
android:textColor="@android:color/holo_blue_dark"
style="@style/AlertDialog.AppCompat"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
1 change: 1 addition & 0 deletions NDB.Covid19/NDB.Covid19.Droid/Resources/values/dimens.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<dimen name="buttonToScreenEdgeMarginHorizontal">24dp</dimen>
<dimen name="defaultHorizontalMargin">16dp</dimen>
<dimen name="defaultVerticalMargin">24dp</dimen>
<dimen name="defaultVerticalMarginContinue">0dp</dimen>
<dimen name="backButton">36dp</dimen>
<dimen name="smallMargin">8dp</dimen>
<dimen name="welcomeTitlePadding">54dp</dimen>
Expand Down
21 changes: 16 additions & 5 deletions NDB.Covid19/NDB.Covid19.Droid/Utils/AuthErrorUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,40 +14,51 @@ public static class AuthErrorUtils
{
public static void GoToNotInfectedError(Activity parent, LogSeverity severity, Exception e, string errorMessage)
{
GoToErrorPage(parent, REGISTER_ERROR_NOMATCH_HEADER, REGISTER_ERROR_NOMATCH_DESCRIPTION, REGISTER_ERROR_DISMISS);
GoToErrorPage(parent, REGISTER_ERROR_NOMATCH_HEADER, REGISTER_ERROR_NOMATCH_DESCRIPTION, REGISTER_ERROR_DISMISS, REGISTER_CONTINUE_WITH_SELF_TEST_BUTTON_TEXT);
LogUtils.LogException(severity, e, errorMessage);
}

public static void GoToManyTriesError(Activity parent, LogSeverity severity, Exception e, string errorMessage)
{
GoToErrorPage(parent, REGISTER_ERROR_TOOMANYTRIES_HEADER, REGISTER_ERROR_TOOMANYTRIES_DESCRIPTION, REGISTER_ERROR_DISMISS);
GoToErrorPage(parent, REGISTER_ERROR_TOOMANYTRIES_HEADER, REGISTER_ERROR_TOOMANYTRIES_DESCRIPTION, REGISTER_ERROR_DISMISS, REGISTER_CONTINUE_WITH_SELF_TEST_BUTTON_TEXT);
LogUtils.LogException(severity, e, errorMessage);
}

public static void GoToTechnicalError(Activity parent, LogSeverity severity, Exception e, string errorMessage)
{
GoToErrorPage(parent, REGISTER_ERROR_HEADER, REGISTER_ERROR_DESCRIPTION, REGISTER_ERROR_DISMISS);
GoToErrorPage(parent, REGISTER_ERROR_HEADER, REGISTER_ERROR_DESCRIPTION, REGISTER_ERROR_DISMISS, REGISTER_CONTINUE_WITH_SELF_TEST_BUTTON_TEXT);
LogUtils.LogException(severity, e, errorMessage);
}

public static void GoToTechnicalErrorFHINumbers(Activity parent, LogSeverity severity, Exception e, string errorMessage)
{
GoToErrorPage(parent, REGISTER_ERROR_FETCH_FHI_DATA_HEADER, REGISTER_ERROR_FETCH_FHI_DATA_DESCRIPTION, REGISTER_ERROR_DISMISS);
GoToErrorPage(parent, REGISTER_ERROR_FETCH_FHI_DATA_HEADER, REGISTER_ERROR_FETCH_FHI_DATA_DESCRIPTION, REGISTER_ERROR_DISMISS, REGISTER_CONTINUE_WITH_SELF_TEST_BUTTON_TEXT);
LogUtils.LogException(severity, e, errorMessage);
}

public static void GoToErrorPage(Activity parent, string title, string description, string button, string subtitle = null)
public static void GoToUnderagedError(Activity parent, LogSeverity severity, Exception e, string errorMessage)
{
GoToErrorPage(parent, REGISTER_ERROR_NOT16YEARSOLD_HEADER, REGISTER_ERROR_NOT16YEARSOLD_DESCRIPTION, REGISTER_ERROR_DISMISS, REGISTER_CONTINUE_WITH_SELF_TEST_BUTTON_TEXT);
LogUtils.LogException(severity, e, errorMessage);
}

public static void GoToErrorPage(Activity parent, string title, string description, string button, string continuebutton, string subtitle = null)
{
UpdateCorrelationId(null);
Intent intent = new Intent(parent, typeof(GeneralErrorActivity));
Bundle bundle = new Bundle();
bundle.PutString("title", title);
bundle.PutString("description", description);
bundle.PutString("button", button);
bundle.PutString("continuebutton", continuebutton);
if (subtitle != null)
{
bundle.PutString("subtitle", subtitle);
}
if (title == REGISTER_ERROR_NOMATCH_HEADER)
{
bundle.PutBoolean("canContinueReportingInfected", true);
}
intent.PutExtras(bundle);
parent.StartActivity(intent);
}
Expand Down
8 changes: 6 additions & 2 deletions NDB.Covid19/NDB.Covid19.Droid/Utils/DialogUtils.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static Task<bool> DisplayDialogAsync(
return tcs.Task;
}

var dialog = new AlertDialog.Builder(activity, Android.Resource.Style.ThemeDeviceDefaultLightDialog)
var dialog = new AlertDialog.Builder(activity)
.SetTitle(title)
.SetMessage(message)
.SetCancelable(false);
Expand Down Expand Up @@ -138,7 +138,11 @@ private static void SetResultWithCatch(TaskCompletionSource<bool> tcs, bool resu
}
}

public static async Task<bool> DisplayDialogAsync(Activity current, DialogViewModel viewModel, Action actionOk = null, Action actionNotOk = null)
public static async Task<bool> DisplayDialogAsync(
Activity current,
DialogViewModel viewModel,
Action actionOk = null,
Action actionNotOk = null)
{
TaskCompletionSource<bool> tcs = new TaskCompletionSource<bool>();
if (current == null || current.IsFinishing)
Expand Down
Loading

0 comments on commit 07fe25a

Please sign in to comment.