diff --git a/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java index 5efabbf..b9f0369 100644 --- a/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java +++ b/app/src/main/java/be/digitalia/fosdem/activities/SearchResultActivity.java @@ -3,13 +3,13 @@ package be.digitalia.fosdem.activities; import android.app.SearchManager; import android.content.Context; import android.content.Intent; +import android.content.res.TypedArray; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; import androidx.annotation.NonNull; import androidx.appcompat.widget.SearchView; -import androidx.core.content.ContextCompat; import androidx.lifecycle.ViewModelProviders; import com.google.android.material.snackbar.Snackbar; @@ -74,9 +74,14 @@ public class SearchResultActivity extends SimpleToolbarActivity { viewModel.setQuery(query); if (SearchViewModel.isQueryTooShort(query)) { + TypedArray a = getTheme().obtainStyledAttributes(R.styleable.ErrorColors); + int textColor = a.getColor(R.styleable.ErrorColors_colorOnError, 0); + int backgroundColor = a.getColor(R.styleable.ErrorColors_colorError, 0); + a.recycle(); + Snackbar.make(findViewById(R.id.content), R.string.search_length_error, Snackbar.LENGTH_LONG) - .setTextColor(ContextCompat.getColor(this, R.color.color_on_error)) - .setBackgroundTint(ContextCompat.getColor(this, R.color.color_error)) + .setTextColor(textColor) + .setBackgroundTint(backgroundColor) .show(); } diff --git a/app/src/main/java/be/digitalia/fosdem/adapters/BookmarksAdapter.java b/app/src/main/java/be/digitalia/fosdem/adapters/BookmarksAdapter.java index 81c484d..0b0c43f 100644 --- a/app/src/main/java/be/digitalia/fosdem/adapters/BookmarksAdapter.java +++ b/app/src/main/java/be/digitalia/fosdem/adapters/BookmarksAdapter.java @@ -2,6 +2,7 @@ package be.digitalia.fosdem.adapters; import android.content.Context; import android.content.Intent; +import android.content.res.TypedArray; import android.graphics.Typeface; import android.text.SpannableString; import android.text.Spanned; @@ -13,11 +14,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import java.text.DateFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; - import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -30,6 +26,12 @@ import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ListAdapter; import androidx.recyclerview.widget.RecyclerView; import androidx.savedstate.SavedStateRegistryOwner; + +import java.text.DateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; + import be.digitalia.fosdem.R; import be.digitalia.fosdem.activities.EventDetailsActivity; import be.digitalia.fosdem.api.FosdemApi; @@ -68,7 +70,9 @@ public class BookmarksAdapter extends ListAdapter + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-nodpi/white_background.png b/app/src/main/res/drawable-nodpi/white_background.png new file mode 100644 index 0000000..de29bc7 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/white_background.png differ diff --git a/app/src/main/res/layout/fragment_event_details.xml b/app/src/main/res/layout/fragment_event_details.xml index 5365b27..24af15b 100644 --- a/app/src/main/res/layout/fragment_event_details.xml +++ b/app/src/main/res/layout/fragment_event_details.xml @@ -95,12 +95,13 @@ android:id="@+id/abstract_text" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/abstract_background" + android:background="@drawable/white_background" android:padding="@dimen/content_margin" android:saveEnabled="false" android:textAppearance="?textAppearanceBody1" android:textIsSelectable="true" - tools:text="FOSDEM welcome and opening talk."/> + app:backgroundTint="@color/abstract_background" + tools:text="FOSDEM welcome and opening talk." /> - - + + - - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 043933b..1d84d58 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,11 +5,8 @@ #76005e #3479c4 #663479c4 - #0c000000 #29000000 @color/color_secondary - @color/design_default_color_error - @color/design_default_color_on_error #F5F5F5 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 563ae13..67804ea 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -14,7 +14,6 @@ @color/color_secondary @color/design_default_color_on_primary @color/design_default_color_on_primary - @color/color_error @style/AlertDialogTheme @null