diff --git a/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt b/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt index df1ed41..0d79094 100644 --- a/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt +++ b/app/src/main/java/com/finnmglas/launcher/choose/AppsRecyclerAdapter.kt @@ -13,10 +13,7 @@ import android.widget.PopupMenu import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.finnmglas.launcher.R -import com.finnmglas.launcher.extern.FontAwesome -import com.finnmglas.launcher.extern.REQUEST_CHOOSE_APP -import com.finnmglas.launcher.extern.REQUEST_UNINSTALL -import com.finnmglas.launcher.extern.openAppSettings +import com.finnmglas.launcher.extern.* import com.finnmglas.launcher.intendedChoosePause class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forApp: String?): @@ -63,6 +60,8 @@ class AppsRecyclerAdapter(val activity: Activity, val action: String?, val forAp viewHolder.textView.text = appLabel viewHolder.img.setImageDrawable(appIcon) + if (getSavedTheme(activity) == "dark") transformGrayscale(viewHolder.img) + viewHolder.menuDots.setOnClickListener{ //creating a popup menu val popup = PopupMenu(activity, viewHolder.menuDots) diff --git a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt index 25600f6..9c58602 100644 --- a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt +++ b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt @@ -7,10 +7,7 @@ import android.content.DialogInterface import android.content.Intent import android.content.SharedPreferences import android.content.pm.PackageManager -import android.graphics.Bitmap -import android.graphics.BlendMode -import android.graphics.BlendModeColorFilter -import android.graphics.Color +import android.graphics.* import android.net.Uri import android.os.Build import android.os.Bundle @@ -18,10 +15,12 @@ import android.provider.Settings import android.view.View import android.view.animation.* import android.widget.Button +import android.widget.ImageView import android.widget.Toast import com.finnmglas.launcher.R import kotlin.math.roundToInt + /** Variables for all of the app */ var upApp = "" var downApp = "" @@ -344,4 +343,13 @@ fun manipulateColor(color: Int, factor: Float): Int { g.coerceAtMost(255), b.coerceAtMost(255) ) +} + +// Taken from: https://stackoverflow.com/a/30340794/12787264 +fun transformGrayscale(imageView: ImageView){ + val matrix = ColorMatrix() + matrix.setSaturation(0f) + + val filter = ColorMatrixColorFilter(matrix) + imageView.colorFilter = filter } \ No newline at end of file diff --git a/app/src/main/java/com/finnmglas/launcher/settings/actions/ActionsRecyclerAdapter.kt b/app/src/main/java/com/finnmglas/launcher/settings/actions/ActionsRecyclerAdapter.kt index b49249f..c386266 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/actions/ActionsRecyclerAdapter.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/actions/ActionsRecyclerAdapter.kt @@ -51,6 +51,9 @@ class ActionsRecyclerAdapter(val activity: Activity): try { viewHolder.img.setImageDrawable(activity.packageManager.getApplicationIcon(content.toString())) viewHolder.img.setOnClickListener{ chooseApp(actionName.toString()) } + + if (getSavedTheme(activity) == "dark") transformGrayscale(viewHolder.img) + viewHolder.removeAction.setOnClickListener{ val sharedPref = activity.getSharedPreferences( activity.getString(R.string.preference_file_key), Context.MODE_PRIVATE)