Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

updated external link visual help #405

Merged
merged 1 commit into from
Jun 12, 2020
Merged

updated external link visual help #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Corona-Warn-App/src/main/res/drawable/ic_link.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"
android:viewportWidth="18"
android:viewportHeight="18">
<path
android:pathData="M2,0C0.9069,0 0,0.9069 0,2L0,16C0,17.0931 0.9069,18 2,18L16,18C17.0931,18 18,17.0931 18,16L18,9L16,9L16,16L2,16L2,2L9,2L9,0L2,0ZM11,0L11,2L14.5859,2L5.293,11.293L6.707,12.707L16,3.4141L16,7L18,7L18,0L11,0Z"
android:strokeWidth="1"
android:fillColor="#17191A"
android:fillAlpha="1"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>
3 changes: 2 additions & 1 deletion Corona-Warn-App/src/main/res/layout/fragment_information.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
layout="@layout/include_row"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_link}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/information_about"
Expand Down Expand Up @@ -115,8 +116,8 @@
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_small"
android:text="@{FormatterInformationHelper.formatVersion()}"
android:focusable="true"
android:text="@{FormatterInformationHelper.formatVersion()}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline_body"
app:layout_constraintTop_toBottomOf="@+id/information_legal" />
Expand Down
6 changes: 3 additions & 3 deletions Corona-Warn-App/src/main/res/layout/include_main_faq_card.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
<ImageView
android:id="@+id/main_card_header_icon_end"
style="@style/icon"
android:layout_width="@dimen/icon_size_button"
android:layout_height="@dimen/icon_size_button"
android:layout_width="@dimen/icon_size_external_link"
android:layout_height="@dimen/icon_size_external_link"
android:importantForAccessibility="no"
android:src="@drawable/ic_forward"
android:src="@drawable/ic_link"
app:layout_constraintBottom_toBottomOf="@+id/main_card_header_headline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/main_card_header_headline" />
Expand Down
27 changes: 14 additions & 13 deletions Corona-Warn-App/src/main/res/layout/include_row.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,29 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<ImageView
android:layout_width="@dimen/icon_size_main_card"
android:layout_height="@dimen/icon_size_main_card"
android:importantForAccessibility="no"
android:src="@{icon}"
android:tint="@{FormatterHelper.formatColorIcon(iconTint)}"
android:visibility="@{FormatterHelper.formatVisibilityIcon(icon)}"
app:layout_constraintBottom_toBottomOf="@+id/main_row_item_subtitle"
app:layout_constraintEnd_toStartOf="@+id/main_row_item_subtitle"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/main_row_item_subtitle" />

<TextView
android:id="@+id/main_row_item_subtitle"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/spacing_tiny"
android:text="@{subtitle}"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintEnd_toStartOf="@+id/main_row_item_icon"
app:layout_constraintStart_toEndOf="@+id/guideline_body"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/main_row_item_icon"
style="@style/icon"
android:layout_width="@dimen/icon_size_external_link"
android:layout_height="@dimen/icon_size_external_link"
android:importantForAccessibility="no"
android:src="@{icon}"
android:visibility="@{FormatterHelper.formatVisibilityIcon(icon)}"
app:layout_constraintBottom_toBottomOf="@+id/main_row_item_subtitle"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/main_row_item_subtitle" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline_body"
android:layout_width="wrap_content"
Expand Down
1 change: 1 addition & 0 deletions Corona-Warn-App/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
<dimen name="icon_size_button">40dp</dimen>
<dimen name="icon_size_settings">40dp</dimen>
<dimen name="icon_size_risk_details_behavior">25dp</dimen>
<dimen name="icon_size_external_link">18dp</dimen>
<dimen name="icon_margin_risk_details_behavior">8dp</dimen>

<!-- Circle sizes -->
Expand Down