Provide Darkmode Icon/Layout (EXPOSUREAPP-4237) (#1967)

* Avoid opening the contact diary multiple times on certain devices

* Updated darkmode for list items

* Changed darkmode visuals in day screen

* Updated darkmode for edit screen

* Aligned naming of list items

* added missing dimens

* Aligned text size in day screen

* Fixed bug in lowe android versions

* Aligned styling of day screen placeholder

* fix button type

Co-authored-by: BMItter <46747780+BMItter@users.noreply.github.com>
Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Co-authored-by: ralfgehrer <mail@ralfgehrer.com>

Corona-Warn-App/src/main/AndroidManifest.xml

@@ -80,6 +80,7 @@
             android:name=".contactdiary.ui.ContactDiaryActivity"
             android:exported="false"
             android:screenOrientation="portrait"
+            android:launchMode= "singleTop"
             android:theme="@style/AppTheme.ContactDiary"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden"/>
 

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/location/ContactDiaryLocationListAdapter.kt

@@ -4,7 +4,7 @@ import android.view.ViewGroup
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.contactdiary.model.ContactDiaryLocation
 import de.rki.coronawarnapp.contactdiary.util.SelectableItem
-import de.rki.coronawarnapp.databinding.ContactDiaryLocationListLineBinding
+import de.rki.coronawarnapp.databinding.ContactDiaryLocationListItemBinding
 import de.rki.coronawarnapp.ui.lists.BaseAdapter
 import de.rki.coronawarnapp.util.lists.BindableVH
 import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
@@ -34,11 +34,11 @@ class ContactDiaryLocationListAdapter(
 
     class CachedLocationViewHolder(
         parent: ViewGroup
-    ) : BaseAdapter.VH(R.layout.contact_diary_location_list_line, parent),
-        BindableVH<SelectableItem<ContactDiaryLocation>, ContactDiaryLocationListLineBinding> {
-        override val viewBinding = lazy { ContactDiaryLocationListLineBinding.bind(itemView) }
+    ) : BaseAdapter.VH(R.layout.contact_diary_location_list_item, parent),
+        BindableVH<SelectableItem<ContactDiaryLocation>, ContactDiaryLocationListItemBinding> {
+        override val viewBinding = lazy { ContactDiaryLocationListItemBinding.bind(itemView) }
 
-        override val onBindData: ContactDiaryLocationListLineBinding.(
+        override val onBindData: ContactDiaryLocationListItemBinding.(
             key: SelectableItem<ContactDiaryLocation>
         ) -> Unit =
             {

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/day/tabs/person/ContactDiaryPersonListAdapter.kt

@@ -4,7 +4,7 @@ import android.view.ViewGroup
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.contactdiary.model.ContactDiaryPerson
 import de.rki.coronawarnapp.contactdiary.util.SelectableItem
-import de.rki.coronawarnapp.databinding.ContactDiaryPersonListLineBinding
+import de.rki.coronawarnapp.databinding.ContactDiaryPersonListItemBinding
 import de.rki.coronawarnapp.ui.lists.BaseAdapter
 import de.rki.coronawarnapp.util.lists.BindableVH
 import de.rki.coronawarnapp.util.lists.diffutil.AsyncDiffUtilAdapter
@@ -34,11 +34,11 @@ class ContactDiaryPersonListAdapter(
 
     class CachedPersonViewHolder(
         parent: ViewGroup
-    ) : BaseAdapter.VH(R.layout.contact_diary_person_list_line, parent),
-        BindableVH<SelectableItem<ContactDiaryPerson>, ContactDiaryPersonListLineBinding> {
-        override val viewBinding = lazy { ContactDiaryPersonListLineBinding.bind(itemView) }
+    ) : BaseAdapter.VH(R.layout.contact_diary_person_list_item, parent),
+        BindableVH<SelectableItem<ContactDiaryPerson>, ContactDiaryPersonListItemBinding> {
+        override val viewBinding = lazy { ContactDiaryPersonListItemBinding.bind(itemView) }
 
-        override val onBindData: ContactDiaryPersonListLineBinding.(
+        override val onBindData: ContactDiaryPersonListItemBinding.(
             key: SelectableItem<ContactDiaryPerson>
         ) -> Unit = {
             contactDiaryPersonListLineName.text = it.item.fullName

Corona-Warn-App/src/main/res/color/contact_diary_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/colorContactDiaryBackground" /> <!-- default -->
+</selector>

Corona-Warn-App/src/main/res/drawable-night/ic_close.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M14.2843,13L13,14.2843L18.7157,20L13,25.7157L14.2843,27L20,21.2843L25.7157,27L27,25.7157L21.2843,20L27,14.2843L25.7157,13L20,18.7157L14.2843,13Z"
+      android:fillColor="#ffffff"/>
+</vector>

Corona-Warn-App/src/main/res/drawable/contact_diary_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/contact_diary_background" />
+        </shape>
+    </item>
+</selector>

Corona-Warn-App/src/main/res/layout/contact_diary_day_fragment.xml

@@ -10,8 +10,8 @@
 
         <include
             android:id="@+id/contact_diary_day_header"
-            layout="@layout/include_header"
-            android:layout_width="0dp"
+            layout="@layout/include_contact_diary_header"
+            android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
             app:icon="@{@drawable/ic_back}"
             app:layout_constraintEnd_toEndOf="parent"
@@ -23,6 +23,7 @@
             android:id="@+id/contact_diary_day_tab_layout"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
+            android:background="@drawable/contact_diary_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/contact_diary_day_header" />

Corona-Warn-App/src/main/res/layout/contact_diary_edit_list_item.xml

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="4dp"
-    style="@style/cardGrey"
+    style="@style/contactDiaryCard"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <TextView

Corona-Warn-App/src/main/res/layout/contact_diary_edit_locations_fragment.xml

@@ -11,6 +11,7 @@
             android:id="@+id/toolbar"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
+            android:background="@drawable/contact_diary_background"
             app:title="@string/contact_diary_edit_locations_title"
             app:navigationIcon="@drawable/ic_close"
             app:layout_constraintStart_toStartOf="parent"
@@ -52,8 +53,8 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/locations_recycler_view"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_width="@dimen/match_constraint"
+            android:layout_height="@dimen/match_constraint"
             android:layout_marginStart="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_small"
             android:layout_marginTop="@dimen/spacing_normal"

Corona-Warn-App/src/main/res/layout/contact_diary_edit_persons_fragment.xml

@@ -9,9 +9,10 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
             app:title="@string/contact_diary_edit_persons_title"
+            android:background="@drawable/contact_diary_background"
             app:navigationIcon="@drawable/ic_close"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -52,8 +53,8 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/persons_recycler_view"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_width="@dimen/match_constraint"
+            android:layout_height="@dimen/match_constraint"
             android:layout_marginStart="@dimen/spacing_small"
             android:layout_marginEnd="@dimen/spacing_small"
             android:layout_marginTop="@dimen/spacing_normal"

Corona-Warn-App/src/main/res/layout/contact_diary_location_bottom_sheet_fragment.xml

@@ -64,7 +64,7 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
-        <Button
+        <android.widget.Button
             android:id="@+id/contact_diary_location_bottom_sheet_save_button"
             style="@style/buttonPrimary"
             android:layout_width="@dimen/match_constraint"

Corona-Warn-App/src/main/res/layout/contact_diary_location_list_fragment.xml

@@ -37,7 +37,7 @@
 
         <TextView
             android:id="@+id/contact_diary_location_list_no_items_title"
-            style="@style/subtitleMedium"
+            style="@style/subtitle"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/spacing_huge"

Corona-Warn-App/src/main/res/layout/contact_diary_location_list_line.xml → Corona-Warn-App/src/main/res/layout/contact_diary_location_list_item.xml

@@ -6,13 +6,13 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="60dp"
-        android:background="@color/colorSurface2">
+        android:minHeight="@dimen/spacing_huge"
+        style="@style/contactDiaryCard">
 
         <ImageView
             android:id="@+id/contact_diary_location_list_line_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/spacing_medium"
+            android:layout_height="@dimen/spacing_medium"
             android:layout_marginStart="@dimen/spacing_small"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -21,6 +21,7 @@
 
         <TextView
             android:id="@+id/contact_diary_location_list_line_name"
+            style="@style/subtitle"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/spacing_small"

Corona-Warn-App/src/main/res/layout/contact_diary_person_list_fragment.xml

@@ -37,7 +37,7 @@
 
         <TextView
             android:id="@+id/contact_diary_person_list_no_items_title"
-            style="@style/subtitleMedium"
+            style="@style/subtitle"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/spacing_huge"

Corona-Warn-App/src/main/res/layout/contact_diary_person_list_line.xml → Corona-Warn-App/src/main/res/layout/contact_diary_person_list_item.xml

@@ -6,13 +6,13 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:minHeight="60dp"
-        android:background="@color/colorSurface2">
+        android:minHeight="@dimen/spacing_huge"
+        style="@style/contactDiaryCard">
 
         <ImageView
             android:id="@+id/contact_diary_person_list_line_icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="@dimen/spacing_medium"
+            android:layout_height="@dimen/spacing_medium"
             android:layout_marginStart="@dimen/spacing_small"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -21,6 +21,7 @@
 
         <TextView
             android:id="@+id/contact_diary_person_list_line_name"
+            style="@style/subtitle"
             android:layout_width="@dimen/match_constraint"
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="@dimen/spacing_small"

Corona-Warn-App/src/main/res/layout/include_contact_diary_header.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+        <variable
+            name="icon"
+            type="android.graphics.drawable.Drawable" />
+
+        <variable
+            name="title"
+            type="String" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/header_main"
+        android:paddingTop="@dimen/spacing_tiny"
+        android:background="@drawable/contact_diary_background"
+        android:paddingBottom="@dimen/spacing_tiny">
+
+        <include
+            android:id="@+id/header_button_back"
+            layout="@layout/include_button_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:icon="@{icon}"
+            app:iconDescription="@{@string/accessibility_back}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="@id/guideline_back"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/header_title"
+            style="@style/headline6"
+            android:accessibilityHeading="true"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/guideline_body_title"
+            android:text="@{title}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/guideline_end"
+            app:layout_constraintStart_toStartOf="@id/guideline_start"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="@string/settings_title" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_begin="@dimen/guideline_start" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline_end"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_end="@dimen/guideline_end" />
+
+        <androidx.constraintlayout.widget.Guideline
+            android:id="@+id/guideline_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_constraintGuide_begin="@dimen/guideline_back" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
\ No newline at end of file

Corona-Warn-App/src/main/res/values-night/colors.xml

@@ -59,6 +59,6 @@
     <!-- Contact Diary -->
     <color name="colorContactDiaryListItem">#232324</color>
     <color name="colorContactDiaryListItemPressed">#39393A</color>
-
+    <color name="colorContactDiaryBackground">#232324</color>
 
 </resources>

Corona-Warn-App/src/main/res/values/colors.xml

@@ -71,4 +71,6 @@
     <!-- Contact Diary -->
     <color name="colorContactDiaryListItem">#F5F5F5</color>
     <color name="colorContactDiaryListItemPressed">#D7D7D7</color>
+    <color name="colorContactDiaryBackground">#FFFFFF</color>
+
 </resources>