Skip to content
Snippets Groups Projects
Unverified Commit 35f38bf5 authored by Chilja Gossow's avatar Chilja Gossow Committed by GitHub
Browse files

Adapt contact diary tab color(EXPOSURERAPP-4403) #1990


* adapt colors to match design

* elevation

Co-authored-by: default avatarRalf Gehrer <ralfgehrer@users.noreply.github.com>
parent 5f4524c6
No related branches found
No related tags found
No related merge requests found
......@@ -56,7 +56,7 @@ class ContactDiaryDayFragment : Fragment(R.layout.contact_diary_day_fragment), A
viewModel.onCreateButtonClicked(adapter.tabs[contactDiaryDayTabLayout.selectedTabPosition])
}
contactDiaryDayHeader.headerButtonBack.buttonIcon.setOnClickListener {
contactDiaryDayHeader.setNavigationOnClickListener {
viewModel.onBackPressed()
}
}
......
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true" android:color="@color/colorTextPrimary1"/>
<item android:color="@color/colorTextPrimary2"/>
</selector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="40dp" android:height="40dp" android:viewportWidth="40"
android:viewportHeight="40">
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M18.0352,12.9297l-7.0703,7.0703l7.0703,7.0703l1.5,-1.5l-4.5703,-4.5703l14.0703,0l0,-2l-14.0703,0l4.5703,-4.5703z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
<?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:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
......@@ -8,22 +9,26 @@
android:contentDescription="@string/settings_title"
android:focusable="true">
<include
<androidx.appcompat.widget.Toolbar
android:id="@+id/contact_diary_day_header"
layout="@layout/include_contact_diary_header"
android:layout_width="@dimen/match_constraint"
android:layout_height="wrap_content"
app:icon="@{@drawable/ic_back}"
android:background="@drawable/contact_diary_background"
android:elevation="@dimen/elevation_weak"
app:navigationIcon="@drawable/ic_back"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/settings_title}" />
tools:title="Mittwoch, 23.12.2020"/>
<com.google.android.material.tabs.TabLayout
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"
android:elevation="@dimen/elevation_weak"
app:tabTextColor="@color/contact_diary_tab_text_color"
app:tabIndicatorColor="@color/colorAccent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/contact_diary_day_header" />
......
......@@ -18,7 +18,6 @@
app:layout_constraintTop_toTopOf="parent"
app:title="@{@string/contact_diary_overview_header}" />
<TextView
android:id="@+id/onboarding_headline"
style="@style/headline5Bold"
......
......@@ -31,7 +31,7 @@
<color name="colorTextSemanticRed">#C00F2D</color>
<color name="colorTextSemanticGreen">#2E854B</color>
<color name="colorTextSemanticNeutral">@color/cwaGrayHighlight</color>
<color name="colorTextTint">#007FAD</color>
<color name="colorTextTint">@color/colorAccent</color>
<!-- Semantic -->
<color name="colorSemanticHighRisk">#C00F2D</color>
......@@ -44,9 +44,10 @@
<color name="colorSemanticUnknownRiskPressed">#E7E8E8</color>
<!-- Accent -->
<color name="colorAccentTintButton">#007FAD</color>
<color name="colorAccent">#007FAD</color>
<color name="colorAccentTintButton">@color/colorAccent</color>
<color name="colorAccentTintButtonPressed">#02759E</color>
<color name="colorAccentTintIcon">#007FAD</color>
<color name="colorAccentTintIcon">@color/colorAccent</color>
<!-- Misc -->
<color name="colorTransparent">#00FFFFFF</color>
......@@ -68,8 +69,8 @@
<color name="colorCalendarTextSelected">@color/colorTextPrimary1Inverted</color>
<color name="colorCalendarTextUnselected">@color/colorTextPrimary1</color>
<color name="colorCalendarSelectedDayBackground">@color/colorCalendarBackgroundSelected</color>
<color name="colorCalendarTodayBorder">#007FAD</color>
<color name="colorCalendarTodayText">#007FAD</color>
<color name="colorCalendarTodayBorder">@color/colorAccent</color>
<color name="colorCalendarTodayText">@color/colorAccent</color>
<color name="colorCalendarMonthText">#DE000000</color>
<!-- Contact Diary -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment