dropdown click position, locales (#41)

* dropdown click pos

* comment unimplemented settings options

* full row clickable for tooggeable settings

* more locale

* Update EditScreen.kt

* Update DrawerScreen.kt

Author: wiiznokes

app/src/main/java/io/github/wiiznokes/gitnote/helper/UiHelper.kt

@@ -2,6 +2,7 @@ package io.github.wiiznokes.gitnote.helper
 
 import android.content.Context
 import android.widget.Toast
+import androidx.annotation.PluralsRes
 import androidx.annotation.StringRes
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -23,4 +24,8 @@ class UiHelper(
     fun getString(@StringRes resId: Int, vararg formatArgs: Any?): String {
         return context.getString(resId, *formatArgs)
     }
+
+    fun getQuantityString(@PluralsRes resId: Int, quantity: Int, vararg formatArgs: Any?): String {
+        return context.resources.getQuantityString(resId, quantity, formatArgs)
+    }
 }

app/src/main/java/io/github/wiiznokes/gitnote/ui/component/CustomDropDown.kt

@@ -1,6 +1,10 @@
 package io.github.wiiznokes.gitnote.ui.component
 
+import android.util.Log
 import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.shape.CornerBasedShape
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
@@ -10,12 +14,23 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.DpOffset
+import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
+import androidx.core.util.TypedValueCompat.pxToDp
 
 
+private val TAG = "CustomDropDown"
 data class CustomDropDownModel(
     val text: String,
     val onClick: () -> Unit
@@ -28,13 +43,19 @@ fun CustomDropDown(
     options: List<CustomDropDownModel?>,
     containerColor: Color = MaterialTheme.colorScheme.surfaceColorAtElevation(15.dp),
     contentColor: Color = MaterialTheme.colorScheme.onSurface,
-    onDismissRequest: (() -> Unit)? = null
+    onDismissRequest: (() -> Unit)? = null,
+    clickPosition: MutableState<Offset> = remember {
+        mutableStateOf(Offset.Zero)
+    }
 ) {
+    val m = LocalContext.current.resources.displayMetrics
+    val x = pxToDp(clickPosition.value.x, m).dp
+    val y = pxToDp(clickPosition.value.y, m).dp
+    val offset = DpOffset(x, y)
 
     MaterialTheme(
         shapes = MaterialTheme.shapes.copy(extraSmall = shape)
     ) {
-
         DropdownMenu(
             expanded = expanded.value,
             onDismissRequest = {
@@ -44,6 +65,7 @@ fun CustomDropDown(
             modifier = Modifier
                 .background(containerColor)
                 .clip(shape = shape),
+            offset = offset,
         ) {
 
             options.filterNotNull().forEach { model ->
@@ -59,6 +81,5 @@ fun CustomDropDown(
                 )
             }
         }
-
     }
 }

app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/app/DrawerScreen.kt

@@ -40,7 +40,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.pointer.pointerInteropFilter
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextDecoration
@@ -69,7 +72,7 @@ data class DrawerFolderModel(
 )
 
 
-@OptIn(ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class, ExperimentalComposeUiApi::class)
 @Composable
 fun DrawerScreen(
     vm: GridViewModel,
@@ -142,18 +145,30 @@ fun DrawerScreen(
                         mutableStateOf(false)
                     }
 
-                    CustomDropDown(
-                        expanded = dropDownExpanded,
-                        shape = MaterialTheme.shapes.medium,
-                        options = listOf(
-                            CustomDropDownModel(
-                                text = stringResource(R.string.delete_this_folder),
-                                onClick = {
-                                    vm.deleteFolder(noteFolder.relativePath)
-                                }
+                    val clickPosition = remember {
+                        mutableStateOf(Offset.Zero)
+                    }
+
+                    // todo: impl options
+                    /*
+                    // need this box for clickPosition
+                    Box {
+                        CustomDropDown(
+                            expanded = dropDownExpanded,
+                            shape = MaterialTheme.shapes.medium,
+                            options = listOf(
+                                CustomDropDownModel(
+                                    text = stringResource(R.string.delete_this_folder),
+                                    onClick = {
+                                        vm.deleteFolder(noteFolder.relativePath)
+                                    }
+                                ),
                             ),
+                            clickPosition = clickPosition
                         )
-                    )
+                    }
+
+                     */
 
                     CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Rtl) {
 
@@ -167,7 +182,11 @@ fun DrawerScreen(
                                     onClick = {
                                         vm.openFolder(noteFolder.relativePath)
                                     }
-                                ),
+                                )
+                                .pointerInteropFilter {
+                                    clickPosition.value = Offset(it.x, it.y)
+                                    false
+                                },
                             horizontalArrangement = Arrangement.SpaceBetween,
                             verticalAlignment = Alignment.CenterVertically
                         ) {

app/src/main/java/io/github/wiiznokes/gitnote/ui/screen/app/EditScreen.kt

@@ -157,7 +157,7 @@ fun EditScreen(
 
             // bug: https://issuetracker.google.com/issues/224005027
             //AnimatedVisibility(visible = currentNoteFolderRelativePath.isNotEmpty()) {
-            if (vm.name.value.text.isNotEmpty() && vm.content.value.text.isNotEmpty()) {
+            if (vm.name.value.text.isNotEmpty()) {
                 FloatingActionButton(
                     modifier = Modifier,
                     containerColor = MaterialTheme.colorScheme.primary,