Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2025-02-16 21:18:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix toolbar and toolbar icon colors

Browse source
This commit is contained in:
Felix 2020-04-05 14:15:15 +02:00
parent e0de037d1e
commit d220dcb9d8
11 changed files with 95 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
touch/src/main/res/drawable/ic_search.xml
View file

@ -1,5 +1,8 @@
<vector android:height="96dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="96dp" xmlns:android="http://schemas.android.com/apk/res/android">
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="96dp"
android:tint="?android:attr/textColorPrimary"
android:viewportHeight="24.0"
android:viewportWidth="24.0"
android:width="96dp">
<path android:fillColor="#FF000000" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
</vector>

9
touch/src/main/res/drawable/ic_share.xml
View file

@ -1,5 +1,8 @@
<vector android:height="96dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="96dp" xmlns:android="http://schemas.android.com/apk/res/android">
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="96dp"
android:height="96dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="#FFFFFF">
<path android:fillColor="#FF000000" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
</vector>

1
touch/src/main/res/layout/fragment_conferences_page.xml
View file

@ -5,7 +5,6 @@
android:id="@+id/list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
app:layout_anchor="@id/sliding_tabs"
app:layout_anchorGravity="bottom"
app:layout_behavior="@string/appbar_scrolling_view_behavior"

3
touch/src/main/res/layout/fragment_events_list.xml
View file

@ -21,8 +21,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:background="@color/background">
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list"

4
touch/src/main/res/layout/fragment_tab_pager_layout.xml
View file

@ -23,9 +23,7 @@
app:layout_anchor="@id/toolbar"
app:layout_anchorGravity="bottom"
app:tabMode="scrollable"
app:tabSelectedTextColor="@color/white"
app:tabIndicatorColor="@color/white"
app:tabTextColor="@color/inactive_tab_color"/>
style="@style/TabsStyle"/>
</com.google.android.material.appbar.AppBarLayout>

79
touch/src/main/res/layout/item_conference_cardview.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/tools"
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
@ -23,7 +23,7 @@
android:layout_gravity="center"
android:foreground="?android:attr/selectableItemBackground">
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="8dp"
@ -31,48 +31,51 @@
<ImageView
android:id="@+id/imageView"
imageUrl="@{conference.logoUrl}"
android:layout_width="@dimen/thumbnail_width"
android:layout_height="@dimen/thumbnail_height"
imageUrl="@{conference.logoUrl}"
android:scaleType="fitCenter"/>
android:maxWidth="200dp"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:srcCompat="@tools:sample/backgrounds/scenic" />
<LinearLayout
android:layout_width="wrap_content"
<TextView
android:id="@+id/title_text"
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:gravity="right"
android:orientation="vertical">
android:text="@{conference.title}"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toTopOf="parent"
tools:text="@tools:sample/last_names" />
<TextView
android:id="@+id/title_text"
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="4dp"
android:layout_weight="1"
android:text="@{conference.title}"
android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
<TextView
android:id="@+id/subtitle_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:layout_weight="1"
android:text="@{conference.acronym}"
android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/title_text"
app:layout_constraintStart_toStartOf="@+id/title_text"
app:layout_constraintTop_toBottomOf="@+id/title_text"
app:layout_constraintVertical_bias="0.0"
tools:text="@tools:sample/date/hhmmss" />
<TextView
android:id="@+id/subtitle_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@{conference.acronym}"
android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"/>
<TextView
android:id="@+id/conference_name_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="bottom|right"
android:text=""/>
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>

21
touch/src/main/res/layout/item_event_cardview.xml
View file

@ -35,6 +35,7 @@
imageUrl="@{event.thumbUrl}"
android:layout_width="0dp"
android:layout_height="100dp"
android:maxWidth="200dp"
android:adjustViewBounds="true"
android:contentDescription="@string/titleimage"
android:scaleType="centerCrop"
@ -44,22 +45,25 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.1"
app:srcCompat="@drawable/unknown"
tools:srcCompat="@drawable/unknown"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
android:layout_width="0dp"
android:layout_height="100dp"
android:layout_height="wrap_content"
android:maxHeight="100dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:text="@{event.title}"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:autoSizeMaxTextSize="20sp"
app:autoSizeTextType="uniform"
app:layout_constraintBottom_toTopOf="@+id/subtitle_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/conference_name_text"
tools:text="This is a very long title text that propably won't fit in one line, maybe even need three." />
@ -69,18 +73,19 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:text="@{event.subtitle}"
android:textAppearance="@style/Base.TextAppearance.AppCompat.Small"
android:visibility="@{event.subtitle.length() == 0 ? View.GONE : View.VISIBLE}"
android:maxHeight="50dp"
android:textStyle="italic"
app:autoSizeMaxTextSize="15sp"
app:autoSizeTextType="uniform"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/title_text"
app:layout_constraintVertical_bias="0.0"
tools:text="subtitle"/>
tools:text="subtitle" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/conference_name_text"
@ -89,6 +94,10 @@
android:layout_marginTop="8dp"
android:text="@{event.conference}"
android:visibility="gone"
android:maxHeight="50dp"
android:textStyle="bold"
app:autoSizeMaxTextSize="15sp"
app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="@+id/title_text"
app:layout_constraintStart_toStartOf="@+id/title_text"
app:layout_constraintTop_toTopOf="parent"

3
touch/src/main/res/layout/toolbar.xml
View file

@ -9,10 +9,9 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="?attr/actionBarSize"
style="@style/ToolbarStyle"
app:layout_scrollFlags="scroll|enterAlways|snap"
tools:title="Title"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tools:showIn="@layout/activity_browse"/>
</merge>
</layout>

2
touch/src/main/res/menu/events_menu.xml
View file

@ -4,7 +4,7 @@
<item
android:id="@+id/search"
android:title="@string/search_title"
android:icon="@drawable/ic_search"
app:showAsAction="collapseActionView|always"
android:icon="@drawable/ic_search"
app:actionViewClass="android.widget.SearchView"/>
</menu>

1
touch/src/main/res/values/colors.xml
View file

@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="background">#5A5251</color>
</resources>

33
touch/src/main/res/values/styles.xml
View file

@ -1,34 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- <style name="AppTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">-->
<style name="AppTheme" parent="@style/Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowContentTransitions">true</item>
<item name="colorPrimary">@color/primary</item>
<item name="android:colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="android:colorAccent">@color/accent</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="preferenceTheme">@style/SettingsStyle</item>
</style>
<style name="ToolbarStyle" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
<item name="android:background">@color/primary</item>
<item name="android:textColorPrimary">?android:attr/textColorPrimary</item>
<item name="android:textColorSecondary">?android:attr/textColorSecondary</item>
</style>
<style name="SettingsStyle" parent="@style/PreferenceThemeOverlay.v14.Material">
<item name="colorControlNormal">@android:color/darker_gray</item>
</style>
<style name="TabsStyle" parent="@style/ThemeOverlay.MaterialComponents">
<item name="tabSelectedTextColor">?android:attr/textColorPrimary</item>
<item name="tabIndicatorColor">?android:attr/textColorPrimary</item>
<item name="tabTextColor">?android:attr/textColorSecondary</item>
</style>
<style name="DetailsTitleStyleExpanded" parent="@style/TextAppearance.AppCompat.Display1">
<item name="android:textColor">@color/white</item>
<item name="android:textColorPrimary">@color/white</item>
<item name="android:textColorSecondary">@color/white</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textColorPrimary">?android:attr/textColorPrimary</item>
<item name="android:textColorSecondary">?android:attr/textColorPrimary</item>
</style>
<style name="DetailsTitleStyleCollapsed" parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">@color/white</item>
<item name="android:textColorPrimary">@color/white</item>
<item name="android:textColorSecondary">@color/white</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textColorPrimary">?android:attr/textColorPrimary</item>
<item name="android:textColorSecondary">?android:attr/textColorPrimary</item>
</style>
<style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">