Updated Gradle to 9.0.0

This commit is contained in:
partisan 2025-05-16 16:39:16 +02:00
parent 2939fb55d1
commit 27cd0a829e
7 changed files with 75 additions and 41 deletions

View file

@ -29,7 +29,7 @@ android {
buildTypes {
release {
minifyEnabled = false
signingConfig signingConfigs.release
signingConfig = signingConfigs.release
proguardFiles(getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro')
}
}

View file

@ -1,5 +1,7 @@
package partisan.weforge.xyz.pulse
import android.graphics.Rect
import android.os.Build
import android.os.Bundle
import android.util.DisplayMetrics
import android.view.LayoutInflater
@ -8,6 +10,7 @@ import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.core.content.getSystemService
import partisan.weforge.xyz.pulse.databinding.FragmentPopupSettingsBinding
class PopupSettingsFragment : Fragment() {
@ -75,9 +78,16 @@ class PopupSettingsFragment : Fragment() {
}
private fun getScreenHeightPx(): Int {
val metrics = DisplayMetrics()
requireActivity().windowManager.defaultDisplay.getMetrics(metrics)
return metrics.heightPixels
val wm = requireContext().getSystemService<android.view.WindowManager>()!!
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
val bounds: Rect = wm.currentWindowMetrics.bounds
bounds.height()
} else {
val metrics = DisplayMetrics()
@Suppress("DEPRECATION")
requireActivity().windowManager.defaultDisplay.getMetrics(metrics)
metrics.heightPixels
}
}
override fun onDestroyView() {

View file

@ -66,8 +66,8 @@ class ServiceAdapter(
viewHolder: RecyclerView.ViewHolder,
target: RecyclerView.ViewHolder
): Boolean {
val from = viewHolder.adapterPosition
val to = target.adapterPosition
val from = viewHolder.bindingAdapterPosition
val to = target.bindingAdapterPosition
services.add(to, services.removeAt(from))
notifyItemMoved(from, to)
return true