Commit d8ed3f15 authored by Harri Kirik's avatar Harri Kirik
Browse files

Merge branch 'feature/COVAPP-451-tablet-error' into 'develop'

The error screen is broken on large tablet screens

See merge request hoia/dp3t-app-android!133
parents 6030ac10 41d0ff12
......@@ -43,7 +43,7 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/card_error_content"
style="@style/AppTheme.CardView"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/size_16"
android:layout_marginEnd="@dimen/size_16"
......@@ -78,7 +78,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@color/pink"
android:drawableStart="@drawable/ic_error_large"
app:drawableStartCompat="@drawable/ic_error_large"
android:drawablePadding="@dimen/size_16"
android:gravity="center_vertical"
android:minHeight="@dimen/size_88"
......@@ -112,7 +112,8 @@
android:layout_marginTop="@dimen/size_6"
app:layout_constraintStart_toStartOf="@id/guide_start"
app:layout_constraintTop_toTopOf="@+id/text_try_again"
app:srcCompat="@drawable/ic_point" />
app:srcCompat="@drawable/ic_point"
android:importantForAccessibility="no" />
<TextView
android:id="@+id/text_contact"
......@@ -133,7 +134,8 @@
android:layout_marginTop="@dimen/size_6"
app:layout_constraintStart_toStartOf="@id/guide_start"
app:layout_constraintTop_toTopOf="@+id/text_contact"
app:srcCompat="@drawable/ic_point" />
app:srcCompat="@drawable/ic_point"
android:importantForAccessibility="no" />
<View
android:id="@+id/divider"
......
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
......@@ -35,7 +34,7 @@
<com.google.android.material.card.MaterialCardView
style="@style/AppTheme.CardView"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/size_16"
android:layout_marginEnd="@dimen/size_16"
......@@ -60,7 +59,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/shareDeniedIconView"
tools:ignore="ContentDescription" />
android:importantForAccessibility="no" />
<ImageView
android:id="@+id/shareDeniedIconView"
......@@ -71,7 +70,7 @@
app:layout_constraintStart_toStartOf="@id/startGuideline"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_attention"
tools:ignore="ContentDescription" />
android:importantForAccessibility="no" />
<TextView
android:id="@+id/shareDeniedTitleView"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment