Updated and Code Cleanup

Author: togisoft

.idea/deploymentTargetDropDown.xml

@@ -8,7 +8,6 @@ Jetpack Compose Country Code Picker
 
 If you are looking for Country Phone Code Picker for Jetpack Compose you can use the package.
 
-
 * Country numbers hints
 * Phone number visualTransformation (Automatic number formatting)
 * Automatic country recognition (detection by sim card if sim card is inserted)
@@ -25,8 +24,7 @@ Languages:
 * Italian
 * Arabic
 * Russian
-
-New features will be added every day. This project is open source without any profit motive.
+* Dutch
 
 For language support, you can translate the file below and send it to me.
 https://github.com/togisoft/jetpack_compose_country_code_picker/blob/master/ccp/src/main/res/values/strings.xml
@@ -44,166 +42,84 @@ https://github.com/togisoft/jetpack_compose_country_code_picker/blob/master/ccp/
  </div>
 
 
-**** Specifications ****
 
-<h3> DEFAULT </h3>
+<h3> USAGE </h3>
 
 ```kotlin
 @Composable
 fun TogiCountryCodePicker(
-    text: String,
-    onValueChange: (String) -> Unit,
     modifier: Modifier = Modifier,
-    color: Color = MaterialTheme.colors.background,
-    showCountryCode: Boolean = true,
-    showCountryFlag: Boolean = true,
-    defaultCountry: CountryData,
-    pickedCountry: (CountryData) -> Unit,
-    focusedBorderColor: Color = MaterialTheme.colors.primary,
-    unfocusedBorderColor: Color = MaterialTheme.colors.onSecondary,
-    cursorColor: Color = MaterialTheme.colors.primary,
-    error: Boolean,
-    rowPadding: Modifier = modifier.padding(vertical = 16.dp, horizontal = 16.dp)
-)
-
-```  
-
-<h3> Rounded </h3>
-
-```kotlin
-@Composable
-fun TogiRoundedPicker(
-    value: String,
-    onValueChange: (String) -> Unit,
-    modifier: Modifier = Modifier,
-    shape: Shape = RoundedCornerShape(24.dp),
-    color: Color = MaterialTheme.colors.background,
-    showCountryCode: Boolean = true,
-    showCountryFlag: Boolean = true,
-    defaultCountry: CountryData,
-    pickedCountry: (CountryData) -> Unit,
-    focusedBorderColor: Color = MaterialTheme.colors.primary,
-    unFocusedBorderColor: Color = MaterialTheme.colors.onSecondary,
-    cursorColor: Color = MaterialTheme.colors.primary,
-    error: Boolean,
-    rowPadding: Modifier = modifier.padding(vertical = 16.dp, horizontal = 16.dp)
-)
-
-```  
-
-<h3> Bottom Text Field </h3>
-
-```kotlin
-@Composable
-fun TogiBottomCodePicker(
     text: String,
     onValueChange: (String) -> Unit,
-    modifier: Modifier = Modifier,
+    shape: Shape = RoundedCornerShape(24.dp),
     color: Color = MaterialTheme.colors.background,
     showCountryCode: Boolean = true,
     showCountryFlag: Boolean = true,
-    showCountryName: Boolean = true,
-    defaultCountry: CountryData,
-    pickedCountry: (CountryData) -> Unit,
     focusedBorderColor: Color = MaterialTheme.colors.primary,
     unfocusedBorderColor: Color = MaterialTheme.colors.onSecondary,
     cursorColor: Color = MaterialTheme.colors.primary,
-    error: Boolean,
-    rowPadding: Modifier = modifier.padding(vertical = 16.dp, horizontal = 16.dp)
+    bottomStyle: Boolean = false
 )
 
 ```  
 
+<h3> EXAMPLE </h3>
 
-<h3> Rounded Field Usage </h3>
 
 ```kotlin
-val context = LocalContext.current
-var phoneCode by rememberSaveable { mutableStateOf(getDefaultPhoneCode(context)) }
-var defaultLang by rememberSaveable { mutableStateOf(getDefaultLangCode(context)) }
-val phoneNumber = rememberSaveable { mutableStateOf("") }
-var isValidPhone by remember { mutableStateOf(true) }
-
-TogiRoundedPicker(
-    value = phoneNumber.value,
-    onValueChange = { phoneNumber.value = it },
-    defaultCountry = getLibCountries().single { it.countryCode == defaultLang },
-    pickedCountry = {
-        phoneCode = it.countryPhoneCode
-        defaultLang = it.countryCode
-    },
-    error = isValidPhone
-)
-
-
-```  
-
-```kotlin
-  // With Country Phone Code
 @Composable
-fun SelectCountryWithCountryCode() {
-    val context = LocalContext.current
-    var phoneCode by rememberSaveable { mutableStateOf(getDefaultPhoneCode(context)) }
-    var defaultLang by rememberSaveable { mutableStateOf(getDefaultLangCode(context)) }
-    val phoneNumber = rememberSaveable { mutableStateOf("") }
-    var isValidPhone by remember { mutableStateOf(true) }
-    var verifyText by remember { mutableStateOf("") }
+fun CountryCodePickerExample() {
     Column(
-        modifier = Modifier.padding(16.dp)
+        modifier = Modifier
+            .verticalScroll(rememberScrollState())
+            .fillMaxSize(),
+        verticalArrangement = Arrangement.Center,
+        horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Text(
-            text = verifyText,
-            fontWeight = FontWeight.Bold,
-            modifier = Modifier
-                .fillMaxWidth()
-                .wrapContentSize(Alignment.Center)
-        )
+
+        val phoneNumber = rememberSaveable { mutableStateOf("") }
+        val fullPhoneNumber = rememberSaveable { mutableStateOf("") }
+        val onlyPhoneNumber = rememberSaveable { mutableStateOf("") }
+
         TogiCountryCodePicker(
-            pickedCountry = {
-                phoneCode = it.countryPhoneCode
-                defaultLang = it.countryCode
-            },
-            defaultCountry = getLibCountries().single { it.countryCode == defaultLang },
-            focusedBorderColor = MaterialTheme.colors.primary,
-            unfocusedBorderColor = MaterialTheme.colors.primary,
-            error = isValidPhone,
             text = phoneNumber.value,
-            onValueChange = { phoneNumber.value = it }
+            onValueChange = { phoneNumber.value = it },
+            unfocusedBorderColor = MaterialTheme.colors.primary,
+            bottomStyle =false, //  if true the text-field is below the country code selector at the top.
+            shape = RoundedCornerShape(24.dp)
         )
+        Spacer(modifier = Modifier.height(10.dp))
+        Button(onClick = {
+            if (!isPhoneNumber()) {
+                fullPhoneNumber.value = getFullPhoneNumber()
+                onlyPhoneNumber.value = getOnlyPhoneNumber()
+            } else {
+                fullPhoneNumber.value = "Error"
+                onlyPhoneNumber.value = "Error"
+            }
+        }) {
+            Text(text = "Check")
+        }
 
-        val fullPhoneNumber = "$phoneCode${phoneNumber.value}"
-        val checkPhoneNumber = checkPhoneNumber(
-            phone = phoneNumber.value,
-            fullPhoneNumber = fullPhoneNumber,
-            countryCode = defaultLang
+        Text(
+            text = "Full Phone Number: ${fullPhoneNumber.value}",
+            color = if (getErrorStatus()) Color.Red else Color.Green
+        )
+
+        Text(
+            text = "Only Phone Number: ${onlyPhoneNumber.value}",
+            color = if (getErrorStatus()) Color.Red else Color.Green
         )
-        Button(
-            onClick = {
-                verifyText = if (checkPhoneNumber) {
-                    isValidPhone = true
-                    "Phone Number Correct"
-                } else {
-                    isValidPhone = false
-                    "Phone Number is Wrong"
-
-                }
-            },
-            modifier = Modifier.fillMaxWidth()
-                .padding(16.dp)
-                .height(60.dp)
-        ) {
-            Text(text = "Phone Verify")
-        }
     }
 }
-```
 
-<h3><- ********* Extras ********* -></h3>
+```
 
-* focusedBorderColor = TextField Border Color
-* unfocusedBorderColor = TextField Unfocused Border Color
-* cursorColor = TextField Cursor Color
+<h3><- Functions -></h3>
 
+<b>getFullPhoneNumber()</b>  => Phone number with country code => return type <b>String</b> 
+<b>getOnlyPhoneNumber()</b> => Phone number only => return type <b>String</b> 
+<b>isPhoneNumber()</b> => Checks if the phone number is correct based on the country code => return type <b>Boolean</b>
 
 <h3> How to add in your project </h3>
 

.idea/inspectionProfiles/Project_Default.xml

@@ -52,13 +52,13 @@ dependencies {
     implementation "androidx.compose.material:material:$compose_version"
     implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation 'androidx.activity:activity-compose:1.6.0'
+    implementation 'androidx.activity:activity-compose:1.6.1'
     implementation 'com.google.accompanist:accompanist-systemuicontroller:0.26.5-rc'
 
     implementation project(path: ':ccp')
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
     androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
     debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
 }