diff --git a/app/src/main/java/com/sethchhim/kuboo_client/Extensions.kt b/app/src/main/java/com/sethchhim/kuboo_client/Extensions.kt index 1b587462..35fa4f40 100644 --- a/app/src/main/java/com/sethchhim/kuboo_client/Extensions.kt +++ b/app/src/main/java/com/sethchhim/kuboo_client/Extensions.kt @@ -21,6 +21,7 @@ import androidx.appcompat.app.AlertDialog import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.Guideline import androidx.core.content.ContextCompat +import androidx.core.graphics.drawable.DrawableCompat import androidx.core.view.ViewCompat import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager @@ -152,6 +153,10 @@ object Extensions { internal fun ImageView.colorFilterBlack() = setColorFilter(Color.BLACK, PorterDuff.Mode.MULTIPLY) + internal fun ImageView.tintLightGrey() = this.drawable?.let { DrawableCompat.setTint(it, ContextCompat.getColor(context, R.color.md_grey_500)) } + + internal fun ImageView.tintWhite() = this.drawable?.let { DrawableCompat.setTint(it, Color.WHITE) } + internal fun Int.isEven() = (this % 2) == 0 internal fun Int.isOdd() = !isEven() diff --git a/app/src/main/java/com/sethchhim/kuboo_client/ui/state/FailFragment.kt b/app/src/main/java/com/sethchhim/kuboo_client/ui/state/FailFragment.kt index 11c5af76..ac18ebfd 100644 --- a/app/src/main/java/com/sethchhim/kuboo_client/ui/state/FailFragment.kt +++ b/app/src/main/java/com/sethchhim/kuboo_client/ui/state/FailFragment.kt @@ -1,7 +1,6 @@ package com.sethchhim.kuboo_client.ui.state import android.os.Bundle -import androidx.constraintlayout.widget.ConstraintLayout import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -23,7 +22,6 @@ class FailFragment : DaggerFragment() { @Inject lateinit var dialogUtil: DialogUtil @Inject lateinit var mainActivity: MainActivity - @BindView(R.id.state_error_constraintLayout) lateinit var errorConstraintLayout: ConstraintLayout @BindView(R.id.home_layout_fail_textView2) lateinit var reasonTextView: TextView @BindView(R.id.home_layout_fail_textView3) lateinit var retryTextView: TextView diff --git a/app/src/main/res/drawable/ic_assignment_late_black_24dp.xml b/app/src/main/res/drawable/ic_assignment_late_light_grey_24dp.xml similarity index 92% rename from app/src/main/res/drawable/ic_assignment_late_black_24dp.xml rename to app/src/main/res/drawable/ic_assignment_late_light_grey_24dp.xml index 6d33343a..020e7617 100644 --- a/app/src/main/res/drawable/ic_assignment_late_black_24dp.xml +++ b/app/src/main/res/drawable/ic_assignment_late_light_grey_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_error_outline_black_24dp.xml b/app/src/main/res/drawable/ic_error_outline_light_grey_24dp.xml similarity index 91% rename from app/src/main/res/drawable/ic_error_outline_black_24dp.xml rename to app/src/main/res/drawable/ic_error_outline_light_grey_24dp.xml index a07a0f90..5eb17cb8 100644 --- a/app/src/main/res/drawable/ic_error_outline_black_24dp.xml +++ b/app/src/main/res/drawable/ic_error_outline_light_grey_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/layout/home_layout_fail.xml b/app/src/main/res/layout/home_layout_fail.xml index 6e0e63d1..a9781abe 100644 --- a/app/src/main/res/layout/home_layout_fail.xml +++ b/app/src/main/res/layout/home_layout_fail.xml @@ -15,7 +15,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:adjustViewBounds="false" - android:src="@drawable/ic_error_outline_black_24dp" + android:src="@drawable/ic_error_outline_light_grey_24dp" app:layout_constraintBottom_toTopOf="@+id/state_error_guideLine4" app:layout_constraintEnd_toStartOf="@+id/state_error_guideLine2" app:layout_constraintStart_toStartOf="@+id/state_error_guideLine1" diff --git a/app/src/main/res/layout/state_empty.xml b/app/src/main/res/layout/state_empty.xml index 3e019011..0013021c 100644 --- a/app/src/main/res/layout/state_empty.xml +++ b/app/src/main/res/layout/state_empty.xml @@ -16,7 +16,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:adjustViewBounds="false" - android:src="@drawable/ic_assignment_late_black_24dp" + android:src="@drawable/ic_assignment_late_light_grey_24dp" app:layout_constraintBottom_toTopOf="@+id/state_error_guideLine4" app:layout_constraintEnd_toStartOf="@+id/state_error_guideLine2" app:layout_constraintStart_toStartOf="@+id/state_error_guideLine1" diff --git a/app/src/main/res/layout/state_error.xml b/app/src/main/res/layout/state_error.xml index 01b408b6..42aef46a 100644 --- a/app/src/main/res/layout/state_error.xml +++ b/app/src/main/res/layout/state_error.xml @@ -16,7 +16,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:adjustViewBounds="false" - android:src="@drawable/ic_error_outline_black_24dp" + android:src="@drawable/ic_error_outline_light_grey_24dp" app:layout_constraintBottom_toTopOf="@+id/state_error_guideLine4" app:layout_constraintEnd_toStartOf="@+id/state_error_guideLine2" app:layout_constraintStart_toStartOf="@+id/state_error_guideLine1"