diff --git a/app/src/main/java/eu/ottop/yamlauncher/AppMenuActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/AppMenuActivity.kt index ba05a92..23cb068 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/AppMenuActivity.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/AppMenuActivity.kt @@ -7,27 +7,20 @@ import android.os.Bundle import android.os.UserHandle import android.text.Editable import android.text.TextWatcher -import android.util.Log -import android.view.LayoutInflater import android.view.View -import android.view.ViewGroup import android.widget.EditText -import android.widget.FrameLayout import android.widget.LinearLayout import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import eu.ottop.yamlauncher.databinding.ActivityAppMenuBinding import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job -import kotlinx.coroutines.cancel import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import kotlinx.coroutines.runBlocking import kotlinx.coroutines.withContext @@ -133,7 +126,7 @@ class AppMenuActivity : AppCompatActivity(), AppMenuAdapter.OnItemClickListener, } - fun String.clean(): String { + private fun String.clean(): String { return this.replace("[^a-zA-Z0-9]".toRegex(), "") } @@ -204,22 +197,4 @@ class AppMenuActivity : AppCompatActivity(), AppMenuAdapter.OnItemClickListener, return true } -} - -class AppMenuDiffCallback( - private val oldList: List>>, - private val newList: List>> -) : DiffUtil.Callback() { - - override fun getOldListSize(): Int = oldList.size - override fun getNewListSize(): Int = newList.size - - override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { - return oldList[oldItemPosition].first.componentName == newList[newItemPosition].first.componentName - } - - override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { - // If the items are the same, no need to update - return oldList[oldItemPosition] == newList[newItemPosition] - } } \ No newline at end of file diff --git a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt index 66ab482..7410598 100644 --- a/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt +++ b/app/src/main/java/eu/ottop/yamlauncher/MainActivity.kt @@ -2,16 +2,21 @@ package eu.ottop.yamlauncher import android.content.Intent import android.os.Bundle +import android.util.Log import android.view.GestureDetector import android.view.MotionEvent import android.view.View +import android.widget.LinearLayout import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.children import eu.ottop.yamlauncher.databinding.ActivityMainBinding +import kotlin.math.abs class MainActivity : AppCompatActivity() { private lateinit var binding: ActivityMainBinding private lateinit var gestureDetector: GestureDetector + private val sharedPreferenceManager = SharedPreferenceManager() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -19,6 +24,16 @@ class MainActivity : AppCompatActivity() { setContentView(binding.root) setSupportActionBar(null) + for (i in findViewById(R.id.shortcuts).children) { + i.setOnClickListener { + Log.d("hHJKJFAF", "Click done") + } + i.setOnLongClickListener { + Log.d("hHJKJFAF", "long click done") + return@setOnLongClickListener true + } + } + gestureDetector = GestureDetector(this, GestureListener()) } @@ -38,7 +53,7 @@ class MainActivity : AppCompatActivity() { // Detect swipe up gesture if (e1 != null) { val deltaY = e2.y - e1.y - if (deltaY < -SWIPE_THRESHOLD && Math.abs(velocityY) > SWIPE_VELOCITY_THRESHOLD) { + if (deltaY < -SWIPE_THRESHOLD && abs(velocityY) > SWIPE_VELOCITY_THRESHOLD) { openAppMenuActivity() return true } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index ebd93f7..9db353d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -24,5 +24,81 @@ android:fontFamily= "@null" android:textAppearance= "@android:style/TextAppearance.DeviceDefault" /> + + + + + + + + + + + + +