@momo-kits/native-kits 0.89.6 → 0.89.8

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Screen.kt

@@ -21,6 +21,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.min
 import vn.momo.kits.const.AppTheme
@@ -47,13 +48,15 @@ fun Screen(
     titlePosition: TitlePosition = TitlePosition.LEFT,
     goBack: (() -> Unit) = { },
     scrollable: Boolean = true,
+    useAvoidKeyboard: Boolean = true,
     footer: @Composable (() -> Unit)? = null,
     headerRight: @Composable (() -> Unit)? = null,
     content: @Composable () -> Unit,
 ) {
     val keyboardController = LocalSoftwareKeyboardController.current
     val keyboardHeight = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
-    val avoidKeyboard = when {
+    val keyboardSize = when {
+        !useAvoidKeyboard -> 0.dp
         keyboardHeight > 100.dp && footer == null -> keyboardHeight
         keyboardHeight > 100.dp && footer != null -> keyboardHeight - 21.dp
         else -> 0.dp
@@ -81,9 +84,9 @@ fun Screen(
             )
 
             Column(
-                modifier = if (scrollable) Modifier.weight(1f).padding(bottom = avoidKeyboard)
+                modifier = if (scrollable) Modifier.weight(1f).padding(bottom = keyboardSize)
                     .verticalScroll(rememberScrollState()) else
-                    Modifier.padding(bottom = avoidKeyboard),
+                    Modifier.padding(bottom = keyboardSize),
                 verticalArrangement = verticalArrangement,
                 horizontalAlignment = horizontalAlignment
             ) {
@@ -91,19 +94,18 @@ fun Screen(
             }
 
             footer?.let {
-                Footer(footer)
+                Footer(footer, keyboardSize)
             }
         }
     }
 }
 
 @Composable
-fun Footer(footer: @Composable (() -> Unit)? = null) {
+fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp) {
     val indicator = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
-    val keyboardHeight = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
     Box(
         Modifier
-            .offset(y = if (keyboardHeight > 150.dp) -keyboardHeight + 21.dp else 0.dp)
+            .offset(y = - keyboardSize)
             .padding(bottom = min(indicator, 21.dp))
             .shadow(
                 Colors.black_20.copy(alpha = 0.1f),

package/compose/src/commonMain/kotlin/vn/momo/kits/components/Text.kt

@@ -7,6 +7,7 @@ import androidx.compose.ui.text.TextLayoutResult
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.sp
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.const.Typography
@@ -21,6 +22,7 @@ fun Text(
     textAlign: TextAlign? = TextAlign.Start,
     modifier: Modifier = Modifier,
     maxLines: Int = Int.MAX_VALUE,
+    overflow: TextOverflow = TextOverflow.Clip,
     textDecoration: TextDecoration? = null,
     onTextLayout: ((TextLayoutResult) -> Unit)? = null,
 ) {
@@ -38,5 +40,6 @@ fun Text(
         maxLines = maxLines,
         textDecoration = textDecoration,
         onTextLayout = onTextLayout,
+        overflow = overflow
     )
 }

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Mar 04 18:29:01 ICT 2024
+#Thu May 16 11:34:53 ICT 2024
 sdk.dir=/Users/wem/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.6",
+  "version": "0.89.8",
   "private": false,
   "dependencies": {},
   "devDependencies": {},

package/publish.sh

@@ -16,4 +16,4 @@ npm publish --tag beta --access=public
 cd ..
 rm -rf dist
 
-curl -X POST -H 'Content-Type: application/json' 'https://chat.googleapis.com/v1/spaces/AAAAbP8987c/messages?key=AIzaSyDdI0hCZtE6vySjMm-WEfRq3CPzqKqqsHI&token=UGSFRvk_oYb9uGsAgs31bVvMm6jDkmD8zihGm3eyaQA%3D&threadKey=JoaXTEYaNNkl' -d '{"text": "@momo-kits/native new version release: '*"$VERSION"*' https://www.npmjs.com/package/@momo-kits/native-kits"}'
+#curl -X POST -H 'Content-Type: application/json' 'https://chat.googleapis.com/v1/spaces/AAAAbP8987c/messages?key=AIzaSyDdI0hCZtE6vySjMm-WEfRq3CPzqKqqsHI&token=UGSFRvk_oYb9uGsAgs31bVvMm6jDkmD8zihGm3eyaQA%3D&threadKey=JoaXTEYaNNkl' -d '{"text": "@momo-kits/native new version release: '*"$VERSION"*' https://www.npmjs.com/package/@momo-kits/native-kits"}'

package/android/.gradle/config.properties

@@ -1,2 +0,0 @@
-#Wed Dec 27 16:34:14 ICT 2023
-java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home

package/android/.idea/gradle.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-        <option name="resolveExternalAnnotations" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>

package/android/.idea/migrations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>

package/android/.idea/misc.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

package/android/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>

package/android/.idea/workspace.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="NONE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="7ac6a412-719a-420a-88c9-469c04bccebf" name="Changes" comment="" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="ClangdSettings">
-    <option name="formatViaClangd" value="false" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
-  </component>
-  <component name="ProjectId" id="2a7VYs7GWpDvnabiqoEP3S5zR6T" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "android.gradle.sync.needed": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "dart.analysis.tool.window.visible": "false",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.17",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "preferences.lookFeel",
-    "show.migrate.to.gradle.popup": "false"
-  }
-}]]></component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="7ac6a412-719a-420a-88c9-469c04bccebf" name="Changes" comment="" />
-      <created>1703669655154</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1703669655154</updated>
-    </task>
-    <servers />
-  </component>
-</project>

package/android/local.properties

@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Wed Dec 27 16:34:14 ICT 2023
-sdk.dir=/Users/wem/Library/Android/sdk