diff --git a/app/build.gradle b/app/build.gradle index a9fbf7d9..7f83f0bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,7 +20,7 @@ android { minSdkVersion 16 targetSdkVersion 29 versionCode 53 - versionName "4.18-alpha1" + versionName "4.18-alpha2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt index c795763c..c2886904 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt @@ -221,12 +221,12 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri "male" -> { setChipBackgroundColorResource(R.color.material_blue_700) setTextColor(ContextCompat.getColor(context, android.R.color.white)) - ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white) + ContextCompat.getDrawable(context, R.drawable.gender_male) } "female" -> { setChipBackgroundColorResource(R.color.material_pink_600) setTextColor(ContextCompat.getColor(context, android.R.color.white)) - ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white) + ContextCompat.getDrawable(context, R.drawable.gender_female) } else -> null } diff --git a/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt b/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt index 06c87882..548c3aec 100644 --- a/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt +++ b/app/src/main/java/xyz/quaver/pupil/ui/dialog/GalleryDialog.kt @@ -18,7 +18,6 @@ package xyz.quaver.pupil.ui.dialog -import android.app.Activity import android.app.Dialog import android.content.Context import android.content.Intent @@ -170,12 +169,12 @@ class GalleryDialog(context: Context, private val glide: RequestManager, private "male" -> { setChipBackgroundColorResource(R.color.material_blue_700) setTextColor(ContextCompat.getColor(context, android.R.color.white)) - ContextCompat.getDrawable(context, R.drawable.ic_gender_male_white) + ContextCompat.getDrawable(context, R.drawable.gender_male) } "female" -> { setChipBackgroundColorResource(R.color.material_pink_600) setTextColor(ContextCompat.getColor(context, android.R.color.white)) - ContextCompat.getDrawable(context, R.drawable.ic_gender_female_white) + ContextCompat.getDrawable(context, R.drawable.gender_female) } else -> null } diff --git a/app/src/main/res/drawable/ic_gender_female_white.xml b/app/src/main/res/drawable/ic_gender_female_white.xml deleted file mode 100644 index 6620153b..00000000 --- a/app/src/main/res/drawable/ic_gender_female_white.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_gender_male_white.xml b/app/src/main/res/drawable/ic_gender_male_white.xml deleted file mode 100644 index a6e1a428..00000000 --- a/app/src/main/res/drawable/ic_gender_male_white.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file