fix(ui/better_location): open popup button

Signed-off-by: rhunk <101876869+rhunk@users.noreply.github.com>
This commit is contained in:
rhunk 2024-06-04 20:48:40 +02:00
parent 6885555621
commit 4623c5cb1a

View File

@ -5,13 +5,17 @@ import android.location.LocationManager
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.RelativeLayout import android.widget.RelativeLayout
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.EditLocation import androidx.compose.material.icons.filled.EditLocation
import androidx.compose.material3.FilledIconButton import androidx.compose.material3.FilledIconButton
import androidx.compose.material3.Icon import androidx.compose.material3.Icon
import androidx.compose.material3.IconButtonDefaults
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import me.rhunk.snapenhance.common.ui.OverlayType import me.rhunk.snapenhance.common.ui.OverlayType
import me.rhunk.snapenhance.common.ui.createComposeView import me.rhunk.snapenhance.common.ui.createComposeView
@ -27,6 +31,7 @@ import me.rhunk.snapenhance.core.util.RandomWalking
import me.rhunk.snapenhance.core.util.hook.HookStage import me.rhunk.snapenhance.core.util.hook.HookStage
import me.rhunk.snapenhance.core.util.hook.hook import me.rhunk.snapenhance.core.util.hook.hook
import me.rhunk.snapenhance.core.util.ktx.getId import me.rhunk.snapenhance.core.util.ktx.getId
import me.rhunk.snapenhance.core.util.ktx.isDarkTheme
import me.rhunk.snapenhance.mapper.impl.CallbackMapper import me.rhunk.snapenhance.mapper.impl.CallbackMapper
import java.nio.ByteBuffer import java.nio.ByteBuffer
import java.util.UUID import java.util.UUID
@ -188,16 +193,25 @@ class BetterLocation : Feature("Better Location", loadParams = FeatureLoadParams
view.addOnAttachStateChangeListener(object: View.OnAttachStateChangeListener { view.addOnAttachStateChangeListener(object: View.OnAttachStateChangeListener {
override fun onViewAttachedToWindow(v: View) { override fun onViewAttachedToWindow(v: View) {
view.addView(createComposeView(view.context) { view.addView(createComposeView(view.context) {
FilledIconButton( val darkTheme = remember { context.androidContext.isDarkTheme() }
modifier = Modifier.size(54.dp).padding(8.dp), Box(
onClick = { openManagementOverlay() } modifier = Modifier.padding(start = 8.dp)
) { ) {
Icon(Icons.Default.EditLocation, contentDescription = null) FilledIconButton(
modifier = Modifier.size(40.dp),
colors = IconButtonDefaults.filledIconButtonColors(
containerColor = if (darkTheme) Color(0xFF1D1D1D) else Color.White,
contentColor = if (darkTheme) Color.White else Color(0xFF151A1A),
),
onClick = { openManagementOverlay() }
) {
Icon(Icons.Default.EditLocation, contentDescription = null)
}
} }
}.apply { }.apply {
layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply { layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
addRule(RelativeLayout.BELOW, mapLayerSelectorId) addRule(RelativeLayout.ALIGN_PARENT_LEFT)
addRule(RelativeLayout.ALIGN_PARENT_END) setMargins(0, (60 * context.resources.displayMetrics.density).toInt(), 0, 0)
} }
}) })
} }