From 74c341e427223d1b4dabe9ed8888390dfcef835d Mon Sep 17 00:00:00 2001
From: Stevan Medic <stevan.medic@outlook.com>
Date: Tue, 9 May 2023 17:14:23 +0200
Subject: [PATCH 1/4] Added options to style text better Fixed paddings Added
 basic french translations

---
 .idea/compiler.xml                            |  2 +-
 .idea/gradle.xml                              |  2 +-
 .idea/kotlinc.xml                             |  6 +++++
 .idea/misc.xml                                |  2 +-
 .../java/com/togitech/togii/MainActivity.kt   | 10 ++++++-
 .../togitech/ccp/component/TogiCodePicker.kt  | 23 +++++++++-------
 .../ccp/component/TogiCountryCodePicker.kt    | 26 ++++++++++++++++---
 ccp/src/main/res/values-fr/strings.xml        |  7 +++++
 8 files changed, 62 insertions(+), 16 deletions(-)
 create mode 100644 .idea/kotlinc.xml
 create mode 100644 ccp/src/main/res/values-fr/strings.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2567ed1..371f4e1 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="corretto-18" />
+        <option name="gradleJvm" value="corretto-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..0fc3113
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.10" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6a32753..8cb974b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/togitech/togii/MainActivity.kt b/app/src/main/java/com/togitech/togii/MainActivity.kt
index 761caa3..ee4fffd 100644
--- a/app/src/main/java/com/togitech/togii/MainActivity.kt
+++ b/app/src/main/java/com/togitech/togii/MainActivity.kt
@@ -14,7 +14,9 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.togitech.ccp.component.*
 import com.togitech.togii.ui.theme.TogiiTheme
@@ -65,7 +67,13 @@ fun CountryCodePick() {
             onValueChange = { phoneNumber.value = it },
             unfocusedBorderColor = MaterialTheme.colors.primary,
             bottomStyle = false,
-            shape = RoundedCornerShape(24.dp)
+            shape = RoundedCornerShape(24.dp),
+            codeFontColor = Color.Black,
+            codeFontSize = 18.sp,
+            codeFontWeight = FontWeight.SemiBold,
+            phoneNumberFontColor = Color.Black,
+            phoneNumberFontSize = 18.sp,
+            phoneNumberFontWeight = FontWeight.SemiBold,
         )
         Spacer(modifier = Modifier.height(10.dp))
         Button(onClick = {
diff --git a/ccp/src/main/java/com/togitech/ccp/component/TogiCodePicker.kt b/ccp/src/main/java/com/togitech/ccp/component/TogiCodePicker.kt
index 05f187b..1ca57b8 100644
--- a/ccp/src/main/java/com/togitech/ccp/component/TogiCodePicker.kt
+++ b/ccp/src/main/java/com/togitech/ccp/component/TogiCodePicker.kt
@@ -40,12 +40,16 @@ import com.togitech.ccp.utils.searchCountry
 @Composable
 fun TogiCodeDialog(
     modifier: Modifier = Modifier,
-    padding: Dp = 15.dp,
+    paddingStart: Dp = 12.dp,
+    paddingEnd: Dp = 0.dp,
     defaultSelectedCountry: CountryData = getLibCountries.first(),
     showCountryCode: Boolean = true,
     pickedCountry: (CountryData) -> Unit,
     showFlag: Boolean = true,
     showCountryName: Boolean = false,
+    fontWeight: FontWeight = FontWeight.Bold,
+    fontSize: TextUnit = 18.sp,
+    fontColor: Color = MaterialTheme.colors.onSurface,
 
     ) {
     val context = LocalContext.current
@@ -58,7 +62,7 @@ fun TogiCodeDialog(
     val interactionSource = remember { MutableInteractionSource() }
 
     Column(modifier = modifier
-        .padding(padding)
+        .padding(start = paddingStart, end = paddingEnd)
         .clickable(
             interactionSource = interactionSource,
             indication = null,
@@ -82,20 +86,20 @@ fun TogiCodeDialog(
             if (showCountryCode) {
                 Text(
                     text = isPickCountry.countryPhoneCode,
-                    fontWeight = FontWeight.Bold,
+                    fontWeight = fontWeight,
                     modifier = Modifier.padding(start = 6.dp),
-                    fontSize = 18.sp,
-                    color = MaterialTheme.colors.onSurface
+                    fontSize = fontSize,
+                    color = fontColor,
                 )
                 Icon(imageVector = Icons.Default.ArrowDropDown, contentDescription = null)
             }
             if (showCountryName) {
                 Text(
                     text = stringResource(id = getCountryName(isPickCountry.countryCode.lowercase())),
-                    fontWeight = FontWeight.Bold,
+                    fontWeight = fontWeight,
                     modifier = Modifier.padding(start = 6.dp),
-                    fontSize = 18.sp,
-                    color = MaterialTheme.colors.onSurface
+                    fontSize = fontSize,
+                    color = fontColor,
                 )
                 Icon(imageVector = Icons.Default.ArrowDropDown, contentDescription = null)
             }
@@ -155,6 +159,7 @@ fun CountryDialog(
                                 )
                             },
                             modifier = Modifier
+                                .padding(top = 10.dp)
                                 .clip(RoundedCornerShape(50))
                                 .height(40.dp),
                         )
@@ -211,7 +216,7 @@ private fun SearchTextField(
     textColor: Color = Color.Black,
     onValueChange: (String) -> Unit,
     hint: String = stringResource(id = R.string.search),
-    fontSize: TextUnit = MaterialTheme.typography.body2.fontSize
+    fontSize: TextUnit = MaterialTheme.typography.body2.fontSize,
 ) {
     BasicTextField(modifier = modifier
         .fillMaxWidth()
diff --git a/ccp/src/main/java/com/togitech/ccp/component/TogiCountryCodePicker.kt b/ccp/src/main/java/com/togitech/ccp/component/TogiCountryCodePicker.kt
index 9cfff1a..1020255 100644
--- a/ccp/src/main/java/com/togitech/ccp/component/TogiCountryCodePicker.kt
+++ b/ccp/src/main/java/com/togitech/ccp/component/TogiCountryCodePicker.kt
@@ -19,9 +19,12 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalTextInputService
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.togitech.ccp.R
 import com.togitech.ccp.data.utils.getDefaultLangCode
 import com.togitech.ccp.data.utils.getDefaultPhoneCode
@@ -48,7 +51,13 @@ fun TogiCountryCodePicker(
     focusedBorderColor: Color = MaterialTheme.colors.primary,
     unfocusedBorderColor: Color = MaterialTheme.colors.onSecondary,
     cursorColor: Color = MaterialTheme.colors.primary,
-    bottomStyle: Boolean = false
+    bottomStyle: Boolean = false,
+    codeFontWeight: FontWeight = FontWeight.Bold,
+    codeFontSize: TextUnit = 18.sp,
+    codeFontColor: Color = MaterialTheme.colors.onSurface,
+    phoneNumberFontWeight: FontWeight = FontWeight.Bold,
+    phoneNumberFontSize: TextUnit = 18.sp,
+    phoneNumberFontColor: Color = MaterialTheme.colors.onSurface,
 ) {
     val context = LocalContext.current
     var textFieldValue by rememberSaveable { mutableStateOf("") }
@@ -82,7 +91,10 @@ fun TogiCountryCodePicker(
                     defaultSelectedCountry = getLibCountries.single { it.countryCode == defaultLang },
                     showCountryCode = showCountryCode,
                     showFlag = showCountryFlag,
-                    showCountryName = true
+                    showCountryName = true,
+                    fontWeight = codeFontWeight,
+                    fontSize = codeFontSize,
+                    fontColor = codeFontColor,
                 )
             }
             Row(
@@ -92,6 +104,11 @@ fun TogiCountryCodePicker(
                 OutlinedTextField(modifier = modifier.fillMaxWidth(),
                     shape = shape,
                     value = textFieldValue,
+                    textStyle = TextStyle(
+                        fontSize = phoneNumberFontSize,
+                        fontWeight = phoneNumberFontWeight,
+                        color = phoneNumberFontColor,
+                    ),
                     onValueChange = {
                         textFieldValue = it
                         if (text != it) {
@@ -124,7 +141,10 @@ fun TogiCountryCodePicker(
                                         },
                                         defaultSelectedCountry = getLibCountries.single { it.countryCode == defaultLang },
                                         showCountryCode = showCountryCode,
-                                        showFlag = showCountryFlag
+                                        showFlag = showCountryFlag,
+                                        fontWeight = codeFontWeight,
+                                        fontSize = codeFontSize,
+                                        fontColor = codeFontColor,
                                     )
                                 }
                             }
diff --git a/ccp/src/main/res/values-fr/strings.xml b/ccp/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..c34ccc5
--- /dev/null
+++ b/ccp/src/main/res/values-fr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="unkown">Inconnue</string>
+    <string name="search">Recherche…</string>
+    <string name="select_country">Choisissez le pays</string>
+    <string name="invalid_number">Numéro de téléphone invalide</string>
+</resources>
\ No newline at end of file

From eff5893afc0cacc9a4ecf0a76c7cea4aa3e39528 Mon Sep 17 00:00:00 2001
From: Stevan Medic <stevan.medic@outlook.com>
Date: Tue, 9 May 2023 17:19:39 +0200
Subject: [PATCH 2/4] Added .idea to gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 4c7f363..19e0266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 /.idea/jarRepositories.xml
+/.idea/
 .DS_Store
 /build
 /captures

From 0097b64e36055bba8d3fcbec9d081c28e573181d Mon Sep 17 00:00:00 2001
From: Stevan Medic <stevan.medic@outlook.com>
Date: Wed, 10 May 2023 02:02:31 +0200
Subject: [PATCH 3/4] Upgraded all libs and compose + gradle

---
 .idea/misc.xml                           |  2 +-
 app/build.gradle                         | 13 ++++++++-----
 app/src/main/AndroidManifest.xml         |  3 +--
 build.gradle                             |  4 ++--
 ccp/build.gradle                         |  4 ++--
 ccp/src/main/AndroidManifest.xml         |  3 +--
 gradle.properties                        |  3 +--
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8cb974b..1e68b09 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index b507a5e..3d2a02d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,16 +44,19 @@ android {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'
         }
     }
+    namespace 'com.togitech.togii'
 }
 
 dependencies {
 
-    implementation "androidx.core:core-ktx:$core_ktx_version"
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
+    implementation platform('androidx.compose:compose-bom:2022.10.00')
+    implementation 'androidx.compose.ui:ui'
+    implementation 'androidx.compose.material:material:1.4.3'
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+
+    implementation 'androidx.core:core-ktx:1.10.0'
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
-    implementation "androidx.activity:activity-compose:$activity_compose_version"
+    implementation 'androidx.activity:activity-compose:1.7.1'
     implementation 'com.google.accompanist:accompanist-systemuicontroller:0.29.1-alpha'
 
     implementation project(path: ':ccp')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c42fc78..4fbadff 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.togitech.togii">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"
diff --git a/build.gradle b/build.gradle
index afc2719..410c7a7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,8 +9,8 @@ buildscript {
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.0' apply false
+    id 'com.android.library' version '8.0.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
     id "com.github.ben-manes.versions" version "0.46.0"
 }
diff --git a/ccp/build.gradle b/ccp/build.gradle
index b98ec0b..3d77822 100644
--- a/ccp/build.gradle
+++ b/ccp/build.gradle
@@ -54,8 +54,8 @@ dependencies {
 
     //noinspection GradleDependency
     implementation "androidx.core:core-ktx:$core_ktx_version"
-    implementation "androidx.activity:activity-compose:$activity_compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
+    implementation 'androidx.activity:activity-compose:1.7.1'
+    implementation 'androidx.compose.material:material:1.4.3'
     implementation "androidx.lifecycle:lifecycle-viewmodel-compose:$lifecycle_version"
     implementation 'com.googlecode.libphonenumber:libphonenumber:8.13.7'
 
diff --git a/ccp/src/main/AndroidManifest.xml b/ccp/src/main/AndroidManifest.xml
index 3d6c414..a5918e6 100644
--- a/ccp/src/main/AndroidManifest.xml
+++ b/ccp/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.togitech.ccp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 9eb5a07..cd0519b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,5 +20,4 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
-android.disableAutomaticComponentCreation=true
\ No newline at end of file
+android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e2623f8..7287995 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Apr 14 12:41:17 CEST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

From e93a3c495b694bd6c5dc803e7363d1ddff10d9e1 Mon Sep 17 00:00:00 2001
From: Stevan Medic <stevan.medic@outlook.com>
Date: Wed, 10 May 2023 02:12:09 +0200
Subject: [PATCH 4/4] Added check for phone number validity

---
 .../java/com/togitech/ccp/component/TogiCountryCodePicker.kt    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ccp/src/main/java/com/togitech/ccp/component/TogiCountryCodePicker.kt b/ccp/src/main/java/com/togitech/ccp/component/TogiCountryCodePicker.kt
index 1020255..d1461fe 100644
--- a/ccp/src/main/java/com/togitech/ccp/component/TogiCountryCodePicker.kt
+++ b/ccp/src/main/java/com/togitech/ccp/component/TogiCountryCodePicker.kt
@@ -1,5 +1,6 @@
 package com.togitech.ccp.component
 
+import android.util.Log
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
@@ -113,6 +114,7 @@ fun TogiCountryCodePicker(
                         textFieldValue = it
                         if (text != it) {
                             onValueChange(it)
+                            isPhoneNumber()
                         }
                     },
                     singleLine = true,