Fixes #210

raamcosta · Sep 13, 2022 · 7b083f7 · 7b083f7
1 parent 60070f5
commit 7b083f7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/...ions/src/main/java/com/ramcosta/composedestinations/navargs/primitives/CommonConstants.kt b/...ions/src/main/java/com/ramcosta/composedestinations/navargs/primitives/CommonConstants.kt
@@ -1,12 +1,9 @@
 package com.ramcosta.composedestinations.navargs.primitives
 
-import android.net.Uri
-import com.ramcosta.composedestinations.navargs.utils.encodeForRoute
+const val ENCODED_NULL = "%02null%03"
+const val DECODED_NULL: String = "\u0002null\u0003"
 
-const val ENCODED_NULL = "%@null@"
-val DECODED_NULL: String = Uri.decode(ENCODED_NULL)
-
-val encodedComma = encodeForRoute(",")
+const val encodedComma = "%2C"
 
 @Suppress("RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS")
 fun <E: Enum<*>> Class<E>.valueOfIgnoreCase(enumValueName: String): E {

diff --git a/...ain/java/com/ramcosta/composedestinations/navargs/primitives/DestinationsStringNavType.kt b/...ain/java/com/ramcosta/composedestinations/navargs/primitives/DestinationsStringNavType.kt
@@ -1,6 +1,5 @@
 package com.ramcosta.composedestinations.navargs.primitives
 
-import android.net.Uri
 import android.os.Bundle
 import androidx.lifecycle.SavedStateHandle
 import androidx.navigation.NavBackStackEntry
@@ -10,10 +9,10 @@ import com.ramcosta.composedestinations.navargs.utils.encodeForRoute
 object DestinationsStringNavType : DestinationsNavType<String?>() {
 
     internal const val ENCODED_EMPTY_STRING = "%02%03"
-    internal val DECODED_EMPTY_STRING: String = Uri.decode(ENCODED_EMPTY_STRING)
+    internal const val DECODED_EMPTY_STRING: String = "\u0002\u0003"
 
-    private const val ENCODED_DEFAULT_VALUE_STRING_PREFIX = "%@def@"
-    private val DECODED_DEFAULT_VALUE_STRING_PREFIX: String = Uri.decode(ENCODED_DEFAULT_VALUE_STRING_PREFIX)
+    private const val ENCODED_DEFAULT_VALUE_STRING_PREFIX = "%02def%03"
+    private const val DECODED_DEFAULT_VALUE_STRING_PREFIX: String = "\u0002def\u0003"
 
     override fun put(bundle: Bundle, key: String, value: String?) {
         StringType.put(bundle, key, value)

diff --git a/...ground/src/main/java/com/ramcosta/samples/playground/commons/DestinationsAppExtensions.kt b/...ground/src/main/java/com/ramcosta/samples/playground/commons/DestinationsAppExtensions.kt
@@ -32,7 +32,9 @@ fun DirectionDestination.DrawerContent(
         }
         GoToProfileConfirmationDestination,
         SettingsScreenDestination,
-        ThemeSettingsDestination -> Unit
+        ThemeSettingsDestination,
+        TestScreen3Destination,
+        ProfileSettingsScreenDestination -> Unit
     }
 }
 

diff --git a/...ound/src/main/java/com/ramcosta/samples/playground/ui/screens/profile/ProfileViewModel.kt b/...ound/src/main/java/com/ramcosta/samples/playground/ui/screens/profile/ProfileViewModel.kt
@@ -21,7 +21,7 @@ class ProfileViewModel(
         Log.d("ProfileViewModel", "navArgs= $navArgs")
     }
 
-    override val groupName: String = navArgs.groupName?.ifEmpty { "user doesn't belong to any group" } ?: "null"
+    override val groupName: String = navArgs.groupName?.ifEmpty { "\"\"" } ?: "null"
 
     override val id: Long = navArgs.id