Merge branch 'master' into master

Author: SerggioC

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: hbb20

CHANGELOG.md

@@ -0,0 +1,15 @@
+package in.hbb20.countrycodepickerproject;
+
+import com.hbb20.CCPCountry;
+import com.hbb20.CCPTalkBackTextProvider;
+
+class CCPCustomTalkBackProvider implements CCPTalkBackTextProvider {
+    @Override
+    public String getTalkBackTextForCountry(CCPCountry country) {
+        if (country != null) {
+            return "Country code is +" + country.getPhoneCode();
+        } else {
+            return null;
+        }
+    }
+}

README.md

@@ -28,9 +28,9 @@ class IntroductionFragment: Fragment() {
 
 	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
 		super.onViewCreated(view, savedInstanceState)
-
 		assignViews()
 		setClickListener()
+		setCustomTalkBackProvider()
 	}
 
 	private fun assignViews() {
@@ -43,4 +43,8 @@ class IntroductionFragment: Fragment() {
 	private fun setClickListener() {
 		buttonGo.setOnClickListener { (activity as ExampleActivity).viewPager.currentItem = 1 }
 	}
+
+	private fun setCustomTalkBackProvider() {
+		countryCodePicker.setTalkBackTextProvider(CCPCustomTalkBackProvider())
+	}
 }

app/src/main/java/in/hbb20/countrycodepickerproject/CCPCustomTalkBackProvider.java

@@ -3,13 +3,14 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-		classpath 'com.android.tools.build:gradle:4.2.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+		    classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.14.2'
+        classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.10.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -18,10 +19,10 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
         maven {
             url "https://maven.google.com"
         }
+        mavenCentral()
     }
 }
 

app/src/main/java/in/hbb20/countrycodepickerproject/IntroductionFragment.kt

@@ -25,6 +25,7 @@ ext {
 
 }
 
+apply plugin: 'com.vanniktech.maven.publish'
 
 android {
     compileSdkVersion 30
@@ -52,12 +53,10 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     implementation 'androidx.recyclerview:recyclerview:1.2.0'
     implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'io.michaelrocks:libphonenumber-android:8.12.13'
+    implementation 'io.michaelrocks:libphonenumber-android:8.12.19-2'
     implementation "androidx.cardview:cardview:1.0.0"
 }
 
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
-apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
 
 /**
  * While uploading,

build.gradle

@@ -0,0 +1,18 @@
+GROUP=com.hbb20
+POM_ARTIFACT_ID=ccp
+VERSION_NAME=2.5.2
+POM_NAME=CountryCodePicker
+POM_PACKAGING=aar
+POM_DESCRIPTION=Country Code Picker (CCP) is an android library which provides an easy way to search and select international country code for the phone number.
+POM_INCEPTION_YEAR=2021
+POM_URL=https://github.com/hbb20/CountryCodePickerProject
+POM_SCM_URL=https://github.com/hbb20/CountryCodePickerProject
+POM_SCM_CONNECTION=scm:git@github.com:hbb20/CountryCodePickerProject.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:hbb20/CountryCodePickerProject.git
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+POM_DEVELOPER_ID=hbb20
+POM_DEVELOPER_NAME=Harsh Bhakta
+POM_DEVELOPER_URL=https://github.com/hbb20
+# ./gradlew ccp:uploadArchives --no-daemon --no-parallel -i

ccp/build.gradle

@@ -0,0 +1,19 @@
+package com.hbb20;
+
+public interface CCPTalkBackTextProvider {
+    public String getTalkBackTextForCountry(CCPCountry country);
+}
+
+class InternalTalkBackTextProvider implements CCPTalkBackTextProvider {
+
+    @Override
+    public String getTalkBackTextForCountry(CCPCountry country) {
+        if (country == null) {
+            return null;
+        } else {
+            return country.name + " phone code is +" + country.phoneCode;
+        }
+    }
+}
+
+

ccp/gradle.properties

@@ -51,6 +51,7 @@ public class CountryCodePicker extends RelativeLayout {
     static int LIB_DEFAULT_COUNTRY_CODE = 91;
     private static int TEXT_GRAVITY_LEFT = -1, TEXT_GRAVITY_RIGHT = 1, TEXT_GRAVITY_CENTER = 0;
     private static String ANDROID_NAME_SPACE = "http://schemas.android.com/apk/res/android";
+    private CCPTalkBackTextProvider talkBackTextProvider = new InternalTalkBackTextProvider();
     String CCP_PREF_FILE = "CCP_PREF_FILE";
     int defaultCountryCode;
     String defaultCountryNameCode;
@@ -71,7 +72,6 @@ public class CountryCodePicker extends RelativeLayout {
     TextGravity currentTextGravity;
     String originalHint = "";
     int ccpPadding;
-
     // see attr.xml to see corresponding values for pref
     AutoDetectionPref selectedAutoDetectionPref = AutoDetectionPref.SIM_NETWORK_LOCALE;
     PhoneNumberUtil phoneUtil;
@@ -779,6 +779,9 @@ private CCPCountry getSelectedCountry() {
     }
 
     void setSelectedCountry(CCPCountry selectedCCPCountry) {
+        if (talkBackTextProvider != null && talkBackTextProvider.getTalkBackTextForCountry(selectedCCPCountry) != null) {
+            textView_selectedCountry.setContentDescription(talkBackTextProvider.getTalkBackTextForCountry(selectedCCPCountry));
+        }
 
         //force disable area code country detection
         countryDetectionBasedOnAreaAllowed = false;
@@ -1061,7 +1064,12 @@ Language getCustomDefaultLanguage() {
     private void setCustomDefaultLanguage(Language customDefaultLanguage) {
         this.customDefaultLanguage = customDefaultLanguage;
         updateLanguageToApply();
-        setSelectedCountry(CCPCountry.getCountryForNameCodeFromLibraryMasterList(context, getLanguageToApply(), selectedCCPCountry.getNameCode()));
+        if (selectedCCPCountry != null) {
+            CCPCountry country = CCPCountry.getCountryForNameCodeFromLibraryMasterList(context, getLanguageToApply(), selectedCCPCountry.getNameCode());
+            if (country != null) {
+                setSelectedCountry(country);
+            }
+        }
     }
 
     private View getHolderView() {
@@ -1735,7 +1743,7 @@ public String getSelectedCountryNameCode() {
      * For example for georgia it returns R.drawable.flag_georgia
      */
     @DrawableRes
-    public int getSelectedCountryFlagResourceId(){
+    public int getSelectedCountryFlagResourceId() {
         return getSelectedCountry().flagResID;
     }
 
@@ -2247,7 +2255,7 @@ public boolean detectSIMCountry(boolean loadDefaultWhenFails) {
         try {
             TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
             String simCountryISO = telephonyManager.getSimCountryIso();
-            if (simCountryISO == null || simCountryISO.isEmpty()) {
+            if (simCountryISO == null || simCountryISO.isEmpty() || !isNameCodeInCustomMasterList(simCountryISO)) {
                 if (loadDefaultWhenFails) {
                     resetToDefaultCountry();
                 }
@@ -2264,6 +2272,16 @@ public boolean detectSIMCountry(boolean loadDefaultWhenFails) {
         }
     }
 
+    private boolean isNameCodeInCustomMasterList(String nameCode) {
+        List<CCPCountry> allowedList = CCPCountry.getCustomMasterCountryList(context, this);
+        for (CCPCountry country : allowedList) {
+            if (country.nameCode.equalsIgnoreCase(nameCode)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * This will detect country from NETWORK info and then load it into CCP.
      *
@@ -2275,7 +2293,7 @@ public boolean detectNetworkCountry(boolean loadDefaultWhenFails) {
         try {
             TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
             String networkCountryISO = telephonyManager.getNetworkCountryIso();
-            if (networkCountryISO == null || networkCountryISO.isEmpty()) {
+            if (networkCountryISO == null || networkCountryISO.isEmpty() || !isNameCodeInCustomMasterList(networkCountryISO)) {
                 if (loadDefaultWhenFails) {
                     resetToDefaultCountry();
                 }
@@ -2302,7 +2320,7 @@ public boolean detectNetworkCountry(boolean loadDefaultWhenFails) {
     public boolean detectLocaleCountry(boolean loadDefaultWhenFails) {
         try {
             String localeCountryISO = context.getResources().getConfiguration().locale.getCountry();
-            if (localeCountryISO == null || localeCountryISO.isEmpty()) {
+            if (localeCountryISO == null || localeCountryISO.isEmpty() || !isNameCodeInCustomMasterList(localeCountryISO)) {
                 if (loadDefaultWhenFails) {
                     resetToDefaultCountry();
                 }
@@ -2355,6 +2373,11 @@ public boolean isDialogInitialScrollToSelectionEnabled() {
         return ccpDialogInitialScrollToSelection;
     }
 
+    public void setTalkBackTextProvider(CCPTalkBackTextProvider talkBackTextProvider) {
+        this.talkBackTextProvider = talkBackTextProvider;
+        setSelectedCountry(selectedCCPCountry);
+    }
+
     /**
      * This will decide initial scroll position of countries list in dialog.
      *
@@ -2422,6 +2445,7 @@ public enum Language {
         SPANISH("es"),
         SWEDISH("sv"),
         TAGALOG("tl"),
+        THAI("th"),
         TURKISH("tr"),
         UKRAINIAN("uk"),
         URDU("ur"),
@@ -2432,16 +2456,6 @@ public enum Language {
         private String country;
         private String script;
 
-        public static Language forCountryNameCode(String code) {
-            Language lang = Language.ENGLISH;
-            for (Language language : Language.values()) {
-                if (language.code.equals(code)) {
-                    lang = language;
-                }
-            }
-            return lang;
-        }
-
         Language(String code, String country, String script) {
             this.code = code;
             this.country = country;
@@ -2452,6 +2466,16 @@ public static Language forCountryNameCode(String code) {
             this.code = code;
         }
 
+        public static Language forCountryNameCode(String code) {
+            Language lang = Language.ENGLISH;
+            for (Language language : Language.values()) {
+                if (language.code.equals(code)) {
+                    lang = language;
+                }
+            }
+            return lang;
+        }
+
         public String getCode() {
             return code;
         }