Skip to content
Snippets Groups Projects
Unverified Commit c4671451 authored by Alex Paulescu's avatar Alex Paulescu Committed by GitHub
Browse files

New release info screen - UI (EXPOSUREAP-4591) (#2144) 

* Added layout.

* Adding UI components and images to the fragment.
parent e34204ee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Corona-Warn-App/src/main/res/drawable/ic_new_release_info.xml 0 → 100644
+ 114
− 0
View file @ c4671451
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="364dp"
android:height="204dp"
android:viewportWidth="364"
android:viewportHeight="204">
<group>
<clip-path
android:pathData="M0,0.944h364v202.222h-364z"/>
</group>
<group>
<clip-path
android:pathData="M172.9,92.956h43.478v59.656h-43.478z"/>
<path
android:pathData="M203.673,126.094C220.612,126.404 220.614,152.3 203.673,152.613C186.736,152.303 186.733,126.407 203.673,126.094ZM203.561,151.12C218.492,150.849 218.494,128.018 203.561,127.744C188.631,128.014 188.628,150.846 203.561,151.12Z"
android:fillColor="#6A7F90"/>
<path
android:pathData="M186.294,132.628C186.294,133.312 186.32,134.088 187.532,134.088L202.452,133.872C203.979,133.826 204.129,132.762 204.475,131.821C204.946,130.058 189.393,131.336 188.496,130.969C187.045,131.013 186.131,131.584 186.294,132.628Z"
android:fillColor="#6A7F90"/>
<path
android:pathData="M185.461,126.975C188.902,126.3 199.991,120.649 202.689,127.416C203.583,132.862 189.524,130.914 186.827,131.591L181.011,145.601L178.369,144.2L182.163,130.12C182.166,130.12 183.099,127.742 185.461,126.975Z"
android:fillColor="#C66A61"/>
<path
android:pathData="M202.051,107.565C201.416,107.893 200.515,107.783 200.225,107.237L199.125,103.986C198.495,102.722 201.11,101.903 201.622,102.988L203.169,105.933C203.436,106.408 203.085,106.737 202.449,106.992"
android:fillColor="#F6B893"
android:fillType="evenOdd"/>
<path
android:pathData="M195.019,98.352C194.07,101.208 196.06,105.973 197.764,105.351C201.3,104.062 202.302,104.216 203.252,101.359C205.738,94.599 197.197,91.714 195.019,98.352Z"
android:fillColor="#F6B893"/>
<path
android:pathData="M197.551,97.645C194.757,98.567 194.199,94.427 196.702,94.428C197.169,93.854 201.852,90.945 204.729,95.354C205.573,96.646 205.253,99.715 204.088,101.926C204.053,101.991 204.015,102.053 203.971,102.112C203.541,102.701 202.766,103.729 202.482,103.72C201.573,103.687 200.85,102.977 200.675,102.502C200.518,102.076 201.483,101.257 201.662,100.695C202.176,99.093 200.694,98.473 200.117,100.028C199.696,99.953 198.41,98.954 198.016,97.885C197.945,97.692 197.743,97.581 197.551,97.645Z"
android:fillColor="#663014"/>
<path
android:pathData="M202.036,105.351C196.363,105.241 194.057,116.31 192.394,124.118C193.484,126.628 200.193,130.512 202.606,128.827C203.148,127.079 205.903,117.191 206.306,113.797C206.734,110.178 204.205,105.303 202.036,105.351Z"
android:fillColor="#B1DAEF"/>
<path
android:pathData="M183.84,112.228C183.445,112.248 182.625,111.871 182.851,112.698L183.627,118.078C183.67,118.774 184.617,118.282 184.974,118.303C185.187,118.268 185.346,118.234 185.301,117.947L184.495,112.661C184.451,112.373 184.391,112.297 184.11,112.262"
android:fillColor="#4A4A4A"/>
<path
android:pathData="M186.253,118.312C185.762,118.385 184.047,119.333 183.6,118.816L182.529,117.882C181.791,117.182 182.561,114.987 183.436,115.423L184.555,115.916H186.259L186.253,118.312Z"
android:fillColor="#F6B893"/>
<path
android:pathData="M199.076,108.159C201.403,105.792 204.596,109.69 203.193,112.059L197.597,118.018C197.115,118.532 196.174,119.673 194.814,119.458L186.15,119.162L185.633,115.358L194.215,115.258L199.076,108.159Z"
android:fillColor="#B1DAEF"/>
<path
android:pathData="M187.075,124.596C187.091,125.828 188.859,125.355 189.891,125.51C191.607,125.146 205.842,127.334 205.956,124.726C205.732,122.247 193.034,123.848 190.234,123.675C189.99,123.661 189.745,123.651 189.501,123.659C188.468,123.698 187.223,123.515 187.075,124.596Z"
android:fillColor="#6A7F90"/>
<path
android:pathData="M202.89,133.79C203.409,133.898 203.958,133.211 204.48,131.781C206.339,126.679 208.065,114.114 208.76,112.149C208.83,111.953 208.882,111.751 208.901,111.542C209.001,110.432 208.156,111.049 208.065,111.101C206.188,112.187 203.102,127.879 202.163,130.422C202.119,130.541 202.084,130.663 202.06,130.789C201.708,132.539 201.809,133.924 202.89,133.79Z"
android:fillColor="#6A7F90"/>
<path
android:pathData="M188.4,133.827H186.916V147.871H188.4V133.827Z"
android:fillColor="#6A7F90"/>
<path
android:pathData="M202.298,139.824C202.27,141.838 205.344,141.838 205.316,139.824C205.344,137.81 202.27,137.81 202.298,139.824Z"
android:fillColor="#6A7F90"/>
<path
android:pathData="M184.178,148.928C184.256,153.591 190.997,153.589 191.075,148.928C190.997,144.265 184.254,144.265 184.178,148.928Z"
android:fillColor="#6A7F90"/>
<path
android:pathData="M185.134,148.936C185.149,152.326 190.161,152.326 190.175,148.936C190.161,145.546 185.149,145.546 185.134,148.936Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M189.607,124.799L179.776,148.567L180.87,149.046L190.7,125.278L189.607,124.799Z"
android:fillColor="#6A7F90"/>
<path
android:pathData="M175.175,147.465L180.151,149.642C180.576,149.837 180.776,149.321 180.887,148.999C180.893,148.991 175.515,146.647 175.515,146.644C175.002,146.412 174.653,147.246 175.175,147.465Z"
android:fillColor="#6A7F90"/>
<path
android:pathData="M173.063,145.473C172.481,145.055 173.581,144.338 174.366,144.35C175.093,144.347 178.336,144.782 178.463,143.875L181.247,144.967C180.897,145.985 179.983,148.719 178.828,148.076C178.038,147.753 173.863,146.047 173.063,145.473Z"
android:fillColor="#4A4A4A"/>
<path
android:pathData="M186.903,148.932C186.889,149.934 188.419,149.934 188.404,148.932C188.42,147.929 186.889,147.929 186.903,148.932Z"
android:fillColor="#6A7F90"/>
</group>
<group>
<clip-path
android:pathData="M98.078,1.956h182v182h-182z"/>
<path
android:pathData="M189.078,183.956C239.336,183.956 280.078,143.213 280.078,92.956C280.078,42.698 239.336,1.956 189.078,1.956C138.82,1.956 98.078,42.698 98.078,92.956C98.078,143.213 138.82,183.956 189.078,183.956Z"
android:fillColor="#E9F6FF"/>
<path
android:pathData="M139.877,119.224C140.292,111.125 140.908,103.047 141.06,94.927C141.384,78.021 140.939,61.106 140.838,44.2C132.567,41.925 126.783,40.378 126.783,40.378C126.783,40.378 111.606,35.727 110.393,42.805C109.18,49.882 126.177,55.959 126.177,55.959L128.391,56.677L128.32,65.858C128.32,65.858 111.404,81.247 111.606,86.919C111.809,92.581 120.717,91.368 120.717,91.368C120.717,91.368 113.568,105.686 116.874,110.195C119.301,113.501 122.334,112.622 122.334,112.622C122.334,112.622 114.256,118.122 116.672,124.361C117.734,127.111 125.984,129.012 125.984,129.012L139.533,130.498C139.048,126.717 139.361,122.965 139.877,119.224Z"
android:fillColor="#F6B893"/>
<path
android:pathData="M190.058,13.432H139.007C132.809,13.432 127.774,18.467 127.774,24.665V152.035C127.774,158.233 132.809,163.268 139.007,163.268H190.058C196.257,163.268 201.292,158.233 201.292,152.035V24.665C201.292,18.467 196.257,13.432 190.058,13.432ZM197.662,152.035C197.662,156.221 194.255,159.628 190.069,159.628H139.007C134.821,159.628 131.414,156.221 131.414,152.035V24.665C131.414,20.479 134.821,17.072 139.007,17.072H190.058C194.244,17.072 197.652,20.479 197.652,24.665V152.035H197.662Z"
android:fillColor="#4A4A4A"/>
<path
android:pathData="M190.059,17.062H139.008C134.822,17.062 131.414,20.469 131.414,24.655V152.025C131.414,156.211 134.822,159.618 139.008,159.618H190.059C194.245,159.618 197.652,156.211 197.652,152.025V24.665C197.662,20.469 194.255,17.062 190.059,17.062Z"
android:fillColor="#ffffff"/>
<path
android:pathData="M263.809,128.274C263.809,128.274 251.939,125.351 238.147,117.677C236.539,116.777 237.328,113.724 236.721,111.358C236.539,110.175 236.317,108.941 236.064,107.667C235.174,103.168 234.355,100.721 231.696,92.116C228.976,83.33 228.774,79.235 222.596,68.547C222.596,68.547 218.471,51.439 212.333,45.15C211.363,44.149 210.705,42.916 210.463,41.561C209.674,37.061 207.895,27.618 206.934,27.537C205.67,27.425 199.341,26.9 196.904,34.594C194.588,41.904 194.952,55.342 201.272,60.64C201.282,67.658 201.383,149.891 201.353,150.144C200.706,157.262 200.058,156.807 198.754,159.092C213.071,164.906 231.332,173.571 231.332,173.571C231.332,173.571 242.849,168.86 254.8,155.887C267.419,142.186 271.766,130.963 271.766,130.963L263.809,128.274Z"
android:fillColor="#F6B893"
android:fillType="evenOdd"/>
<path
android:pathData="M140.828,29.65H187.541C190.261,29.65 192.455,31.601 192.455,33.998V42.693C192.455,45.1 190.251,47.041 187.541,47.041H140.828C138.108,47.041 135.914,45.09 135.914,42.693V33.998C135.914,31.591 138.118,29.65 140.828,29.65Z"
android:fillColor="#E7E7E7"
android:fillType="evenOdd"/>
<path
android:pathData="M140.828,54.655H187.541C190.261,54.655 192.455,56.606 192.455,59.002V94.887C192.455,97.293 190.251,99.234 187.541,99.234H140.828C138.108,99.234 135.914,97.283 135.914,94.887V59.002C135.914,56.606 138.118,54.655 140.828,54.655Z"
android:fillColor="#E7E7E7"
android:fillType="evenOdd"/>
<path
android:pathData="M140.828,107.94H187.541C190.261,107.94 192.455,109.892 192.455,112.288V145.999C192.455,148.405 190.251,150.346 187.541,150.346H140.828C138.108,150.346 135.914,148.395 135.914,145.999V112.288C135.914,109.882 138.118,107.94 140.828,107.94Z"
android:fillColor="#E7E7E7"
android:fillType="evenOdd"/>
<path
android:pathData="M164.053,110.033C175.78,110.033 185.286,100.753 185.286,89.305C185.286,77.858 175.78,68.578 164.053,68.578C152.326,68.578 142.819,77.858 142.819,89.305C142.819,100.753 152.326,110.033 164.053,110.033Z"
android:fillColor="#657888"/>
<path
android:pathData="M154.351,89.802C155.238,88.919 156.675,88.919 157.558,89.802L160.581,92.814C160.827,93.061 161.231,93.061 161.477,92.814L171.77,82.546C172.721,81.596 174.265,81.596 175.22,82.546C176.171,83.496 176.171,85.036 175.22,85.987L162.785,98.395C161.95,99.231 160.594,99.231 159.756,98.395L154.351,93.003C153.468,92.12 153.468,90.688 154.351,89.802Z"
android:fillColor="#ffffff"
android:fillType="evenOdd"/>
</group>
</vector>
Corona-Warn-App/src/main/res/layout/new_release_info_screen_fragment.xml 0 → 100644
+ 182
− 0
View file @ c4671451
<?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">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/new_release_info_screen_container"
android:contentDescription="@string/release_info_header"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.Toolbar
android:id="@+id/new_release_info_toolbar"
android:layout_width="0dp"
android:layout_height="wrap_content"
style="@style/CWAToolbar.Close"
android:background="@color/colorBackground"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@string/release_info_header" />
<ScrollView
android:id="@+id/new_release_info_scrollview"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="@dimen/spacing_normal"
app:layout_constraintBottom_toTopOf="@+id/new_release_info_next_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/new_release_info_toolbar">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/new_release_info_illustration"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:contentDescription="@string/release_info_header"
android:focusable="true"
android:layout_marginTop="@dimen/spacing_normal"
android:src="@drawable/ic_new_release_info"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_new_release_info" />
<TextView
android:id="@+id/new_release_info_headline"
style="@style/headline5"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:layout_marginStart="@dimen/spacing_normal"
android:accessibilityHeading="true"
android:focusable="true"
android:text="@string/release_info_version_title"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/new_release_info_illustration"
tools:text="@string/release_info_version_title" />
<TextView
android:id="@+id/new_release_info_body"
style="@style/subtitleMedium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
android:layout_marginStart="@dimen/spacing_normal"
android:layout_marginEnd="@dimen/spacing_normal"
android:focusable="true"
android:text="@string/release_info_version_body"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/new_release_info_headline"
app:layout_constraintEnd_toEndOf="parent"
tools:text="@string/release_info_version_body" />
<TextView
android:id="@+id/new_release_info_encounter_history_title"
style="@style/subtitleBoldSixteen"
android:accessibilityHeading="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_medium"
android:layout_marginStart="@dimen/spacing_normal"
android:layout_marginEnd="@dimen/spacing_normal"
android:text="@string/release_info_encounter_history_title"
android:focusable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/bullet_point_encounter"
app:layout_constraintTop_toBottomOf="@id/new_release_info_body"
tools:text="@string/release_info_encounter_history_title"/>
<ImageView
android:id="@+id/bullet_point_encounter"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
android:src="@drawable/bullet_point"
android:importantForAccessibility="no"
android:layout_marginTop="@dimen/spacing_mega_tiny"
android:layout_marginStart="@dimen/spacing_normal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/new_release_info_encounter_history_title"
app:layout_constraintBottom_toBottomOf="@+id/new_release_info_encounter_history_title" />
<TextView
android:id="@+id/new_release_info_encounter_history_body"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
android:layout_marginEnd="@dimen/spacing_large"
android:focusable="true"
android:text="@string/release_info_encounter_history_body"
app:layout_constraintTop_toBottomOf="@+id/new_release_info_encounter_history_title"
app:layout_constraintStart_toStartOf="@+id/new_release_info_encounter_history_title"
app:layout_constraintEnd_toEndOf="parent"
tools:text="@string/release_info_encounter_history_body"/>
<TextView
android:id="@+id/new_release_info_statistics_title"
style="@style/subtitleBoldSixteen"
android:accessibilityHeading="true"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_medium"
android:layout_marginStart="@dimen/spacing_normal"
android:layout_marginEnd="@dimen/spacing_normal"
android:text="@string/release_info_statistics_title"
android:focusable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/bullet_point_statistics"
app:layout_constraintTop_toBottomOf="@id/new_release_info_encounter_history_body"
tools:text="@string/release_info_statistics_title"/>
<ImageView
android:id="@+id/bullet_point_statistics"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
android:src="@drawable/bullet_point"
android:importantForAccessibility="no"
android:layout_marginTop="@dimen/spacing_mega_tiny"
android:layout_marginStart="@dimen/spacing_normal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/new_release_info_statistics_title"
app:layout_constraintBottom_toBottomOf="@+id/new_release_info_statistics_title" />
<TextView
android:id="@+id/new_release_info_statistics_body"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_tiny"
android:layout_marginEnd="@dimen/spacing_large"
android:focusable="true"
android:text="@string/release_info_statistics_body"
app:layout_constraintTop_toBottomOf="@+id/new_release_info_statistics_title"
app:layout_constraintStart_toStartOf="@+id/new_release_info_statistics_title"
app:layout_constraintEnd_toEndOf="parent"
tools:text="@string/release_info_statistics_body"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
<android.widget.Button
android:id="@+id/new_release_info_next_button"
style="@style/buttonPrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_normal"
android:layout_marginEnd="@dimen/spacing_normal"
android:layout_marginBottom="@dimen/spacing_normal"
android:text="@string/release_info_continue_button"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:text="@string/release_info_continue_button" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
Corona-Warn-App/src/main/res/values/styles.xml
+ 6
− 0
View file @ c4671451
...@@ -257,6 +257,12 @@ ...@@ -257,6 +257,12 @@
<item name="android:textColor">@color/colorTextPrimary1</item> <item name="android:textColor">@color/colorTextPrimary1</item>
</style> </style>
<style name="subtitleBoldSixteen" parent="@style/TextAppearance.MaterialComponents.Subtitle1">
<item name="android:textColor">@color/colorTextPrimary1</item>
<item name="android:textSize">16sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="subtitleSemanticRed" parent="@style/subtitle"> <style name="subtitleSemanticRed" parent="@style/subtitle">
<item name="android:textColor">@color/colorTextSemanticRed</item> <item name="android:textColor">@color/colorTextSemanticRed</item>
</style> </style>
......
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