From f9cac0b123018c1176ef64346b320af7409593ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Deniz=20D=C3=BCzg=C3=B6ren?= Date: Tue, 6 Aug 2019 11:56:44 +0200 Subject: [PATCH] Added iOS colours for user customisation, "No internet available" snackbar now tinted red --- .../denizd/substitutionplan/CardAdapter.kt | 17 ++- .../denizd/substitutionplan/ColourAdapter.kt | 8 ++ .../denizd/substitutionplan/DataFetcher.kt | 5 +- .../substitutionplan/SettingsFragment.kt | 16 ++- app/src/main/res/layout/bg_colour_picker.xml | 118 ++++++++++++++++++ app/src/main/res/values-night/colors.xml | 13 ++ app/src/main/res/values/colors.xml | 18 +++ 7 files changed, 187 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt index dd11901..540de36 100644 --- a/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt +++ b/app/src/main/java/com/denizd/substitutionplan/CardAdapter.kt @@ -31,10 +31,6 @@ class CardAdapter(private var mSubst: List) : RecyclerView.Adapter) : RecyclerView.Adapter R.color.colorTextDark + R.color.bgPureBlack -> R.color.colorTextLight + else -> R.color.colorText + } + holder.mImageView.setColorFilter(ContextCompat.getColor(holder.mImageView.context, textColor)) + holder.mGroup.setTextColor(ContextCompat.getColor(holder.mImageView.context, textColor)) + holder.mDate.setTextColor(ContextCompat.getColor(holder.mImageView.context, textColor)) + holder.mTime.setTextColor(ContextCompat.getColor(holder.mImageView.context, textColor)) + holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.context, textColor)) + holder.mRoom.setTextColor(ContextCompat.getColor(holder.mImageView.context, textColor)) + holder.mAdditional.setTextColor(ContextCompat.getColor(holder.mImageView.context, textColor)) } override fun getItemCount(): Int = mSubst.size diff --git a/app/src/main/java/com/denizd/substitutionplan/ColourAdapter.kt b/app/src/main/java/com/denizd/substitutionplan/ColourAdapter.kt index 9c88d5b..e2e18cd 100644 --- a/app/src/main/java/com/denizd/substitutionplan/ColourAdapter.kt +++ b/app/src/main/java/com/denizd/substitutionplan/ColourAdapter.kt @@ -42,6 +42,14 @@ class ColourAdapter(private var mColours: List, onClickListener: OnClick R.color.colorBackgroundLight } holder.cardView.setCardBackgroundColor(ContextCompat.getColor(holder.image.context, colour)) + + val textColor = when (colour) { + R.color.bgPureWhite -> R.color.colorTextDark + R.color.bgPureBlack -> R.color.colorTextLight + else -> R.color.colorText + } + holder.image.setColorFilter(ContextCompat.getColor(holder.image.context, textColor)) + holder.title.setTextColor(ContextCompat.getColor(holder.title.context, textColor)) } override fun getItemCount(): Int = mColours.size diff --git a/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt b/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt index 1f3a28c..58099a9 100644 --- a/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt +++ b/app/src/main/java/com/denizd/substitutionplan/DataFetcher.kt @@ -11,6 +11,7 @@ import android.preference.PreferenceManager import android.view.View import android.widget.RemoteViews import androidx.core.app.NotificationCompat +import androidx.core.content.ContextCompat import androidx.swiperefreshlayout.widget.SwipeRefreshLayout import com.google.android.material.snackbar.Snackbar import org.jsoup.Jsoup @@ -41,7 +42,7 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte private val edit = prefs.edit() private var currentTime = "" private var currentFoodTime = "" - private val substUrl = "https://djd4rkn355.github.io/subst.html" + private val substUrl = "https://djd4rkn355.github.io/subst_test.html" private val foodUrl = "https://djd4rkn355.github.io/food.html" override fun doInBackground(vararg params: Void?): Void? { @@ -224,7 +225,7 @@ class DataFetcher(isplan: Boolean, ismenu: Boolean, isjobservice: Boolean, conte } catch (e: Exception) { mView?.let { v: View -> val snackBarView = v.findViewById(R.id.coordination) - Snackbar.make(snackBarView, mContext.getString(R.string.noInternet), Snackbar.LENGTH_LONG).show() + Snackbar.make(snackBarView, mContext.getString(R.string.noInternet), Snackbar.LENGTH_LONG).setBackgroundTint(ContextCompat.getColor(mContext, R.color.colorError)).show() } } return null diff --git a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt index 1fe4fcb..c22c9f8 100644 --- a/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt +++ b/app/src/main/java/com/denizd/substitutionplan/SettingsFragment.kt @@ -307,8 +307,20 @@ class SettingsFragment : Fragment(R.layout.content_settings), View.OnClickListen colourPickerBuilder.setView(pickerDialogView) val colourPickerDialog: AlertDialog = colourPickerBuilder.create() - val buttons = arrayOf(picker.findViewById(R.id.def), picker.findViewById(R.id.red), picker.findViewById(R.id.orange), picker.findViewById(R.id.yellow), picker.findViewById(R.id.green), picker.findViewById(R.id.teal), picker.findViewById(R.id.cyan), picker.findViewById(R.id.blue), picker.findViewById(R.id.purple), picker.findViewById(R.id.pink), picker.findViewById(R.id.brown), picker.findViewById(R.id.grey)) - val colours = intArrayOf(0, R.color.bgRed, R.color.bgOrange, R.color.bgYellow, R.color.bgGreen, R.color.bgTeal, R.color.bgCyan, R.color.bgBlue, R.color.bgPurple, R.color.bgPink, R.color.bgBrown, R.color.bgGrey) + val buttons = arrayOf(picker.findViewById(R.id.def), picker.findViewById(R.id.red), + picker.findViewById(R.id.orange), picker.findViewById(R.id.yellow), picker.findViewById(R.id.green), + picker.findViewById(R.id.teal), picker.findViewById(R.id.cyan), picker.findViewById(R.id.blue), + picker.findViewById(R.id.purple), picker.findViewById(R.id.pink), picker.findViewById(R.id.brown), + picker.findViewById(R.id.grey), picker.findViewById(R.id.pureWhite), picker.findViewById(R.id.salmon), + picker.findViewById(R.id.tangerine), picker.findViewById(R.id.banana), picker.findViewById(R.id.flora), + picker.findViewById(R.id.spindrift), picker.findViewById(R.id.sky), picker.findViewById(R.id.orchid), + picker.findViewById(R.id.lavender), picker.findViewById(R.id.carnation), picker.findViewById(R.id.brown2), + picker.findViewById(R.id.pureBlack)) + + val colours = intArrayOf(0, R.color.bgRed, R.color.bgOrange, R.color.bgYellow, R.color.bgGreen, + R.color.bgTeal, R.color.bgCyan, R.color.bgBlue, R.color.bgPurple, R.color.bgPink, R.color.bgBrown, R.color.bgGrey, + R.color.bgPureWhite, R.color.bgSalmon, R.color.bgTangerine, R.color.bgBanana, R.color.bgFlora, R.color.bgSpindrift, + R.color.bgSky, R.color.bgOrchid, R.color.bgLavender, R.color.bgCarnation, R.color.bgBrown2, R.color.bgPureBlack) for (i2 in 0 until buttons.size) { buttons[i2].setOnClickListener { diff --git a/app/src/main/res/layout/bg_colour_picker.xml b/app/src/main/res/layout/bg_colour_picker.xml index 12e3210..978079b 100644 --- a/app/src/main/res/layout/bg_colour_picker.xml +++ b/app/src/main/res/layout/bg_colour_picker.xml @@ -122,4 +122,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 45f3588..91b10af 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -19,5 +19,18 @@ #442F1B #3C3F43 + #7F3E3C + #7F4900 + #7F7D3C + #397C3C + #397D6A + #3A6A7F + #3C407F + #6B417F + #7F446B + #554633 + + #CF6679 + @color/colorText \ 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 dd02bdf..647477b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -22,6 +22,24 @@ #E6C9A8 #BDBDBD + #FFFFFF + #FF7E79 + #FF9300 + #FFFC79 + #73FA79 + #73FCD6 + #76D6FF + #7A81FF + #D783FF + #FF8AD8 + #AC8E68 + #000000 + + #212121 + #e0e0e0 + + #B00020 + #757575 @color/colorAccent