commit 4623c5cb1ae3aabb6dcdb3ca04383a13526b96f7
parent 6885555621c2ab5b70e27aa2ed0ed7ddc52e76e2
Author: rhunk <101876869+rhunk@users.noreply.github.com>
Date: Tue, 4 Jun 2024 20:48:40 +0200
fix(ui/better_location): open popup button
Signed-off-by: rhunk <101876869+rhunk@users.noreply.github.com>
Diffstat:
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/BetterLocation.kt b/core/src/main/kotlin/me/rhunk/snapenhance/core/features/impl/experiments/BetterLocation.kt
@@ -5,13 +5,17 @@ import android.location.LocationManager
import android.view.View
import android.view.ViewGroup
import android.widget.RelativeLayout
+import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.EditLocation
import androidx.compose.material3.FilledIconButton
import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButtonDefaults
+import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import me.rhunk.snapenhance.common.ui.OverlayType
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.hook
import me.rhunk.snapenhance.core.util.ktx.getId
+import me.rhunk.snapenhance.core.util.ktx.isDarkTheme
import me.rhunk.snapenhance.mapper.impl.CallbackMapper
import java.nio.ByteBuffer
import java.util.UUID
@@ -188,16 +193,25 @@ class BetterLocation : Feature("Better Location", loadParams = FeatureLoadParams
view.addOnAttachStateChangeListener(object: View.OnAttachStateChangeListener {
override fun onViewAttachedToWindow(v: View) {
view.addView(createComposeView(view.context) {
- FilledIconButton(
- modifier = Modifier.size(54.dp).padding(8.dp),
- onClick = { openManagementOverlay() }
+ val darkTheme = remember { context.androidContext.isDarkTheme() }
+ Box(
+ 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 {
layoutParams = RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT).apply {
- addRule(RelativeLayout.BELOW, mapLayerSelectorId)
- addRule(RelativeLayout.ALIGN_PARENT_END)
+ addRule(RelativeLayout.ALIGN_PARENT_LEFT)
+ setMargins(0, (60 * context.resources.displayMetrics.density).toInt(), 0, 0)
}
})
}
