jCenter Removal & Improvements

README.md

@@ -92,7 +92,8 @@ How to add to your project
 
     ````groovy
     dependencies {
-        implementation 'com.github.joielechong:countrycodepicker:2.4.2'
+        implementation 'io.michaelrocks:libphonenumber-android:8.13.2'
+        implementation 'com.github.rtsketo:CountryCodePicker:2.4.4rt'
     }
     ````
 

build.gradle

@@ -1,17 +1,16 @@
 buildscript {
   repositories {
-    jcenter()
+    mavenCentral()
     google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.6.3'
-    classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+    classpath 'com.android.tools.build:gradle:7.3.1'
   }
 }
 
 allprojects {
   repositories {
-    jcenter()
+    mavenCentral()
     google()
     maven { url "https://jitpack.io" }
     mavenLocal()

countrycodepicker/build.gradle

@@ -1,19 +1,15 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'maven-publish'
 
-group = 'com.github.joielechong'
-version = "2.4.2"
-def verCode = 242
+version = "2.4.5rt"
+def verCode = 243
 
 android {
-  compileSdkVersion 29
-  buildToolsVersion "29.0.3"
+  compileSdkVersion 33
 
   defaultConfig {
     minSdkVersion 14
-    targetSdkVersion 29
-    versionCode verCode
-    versionName version
+    targetSdkVersion 33
   }
 
   buildTypes {
@@ -25,10 +21,21 @@ android {
 }
 
 dependencies {
-//  implementation fileTree(dir: 'libs', include: ['*.jar'])
-//  testImplementation 'junit:junit:4.12'
-//  api 'io.michaelrocks:libphonenumber-android:8.10.7'
-//  api 'io.michaelrocks:libphonenumber-android:8.10.16'
-  api 'io.michaelrocks:libphonenumber-android:8.12.5'
-  implementation 'androidx.annotation:annotation:1.1.0'
+  implementation 'io.michaelrocks:libphonenumber-android:8.13.2'
+  implementation 'androidx.annotation:annotation:1.5.0'
+}
+
+task androidSourcesJar(type: Jar) {
+  archiveClassifier.set('sources')
+  from android.sourceSets.main.java.srcDirs }
+
+project.afterEvaluate {
+  publishing {
+    publications {
+      release(MavenPublication) {
+        artifact androidSourcesJar
+        from components.release
+      }
+    }
+  }
 }

countrycodepicker/src/main/java/com/rilixtech/widget/countrycodepicker/CountryCodeArrayAdapter.java

@@ -12,6 +12,7 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+
 import java.util.List;
 import java.util.Locale;
 

countrycodepicker/src/main/java/com/rilixtech/widget/countrycodepicker/CountryCodeDialog.java

@@ -18,6 +18,7 @@
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+
 import java.util.ArrayList;
 import java.util.List;
 

countrycodepicker/src/main/java/com/rilixtech/widget/countrycodepicker/CountryCodePicker.java

@@ -18,20 +18,23 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-
 import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import io.michaelrocks.libphonenumber.android.NumberParseException;
-import io.michaelrocks.libphonenumber.android.PhoneNumberUtil;
-import io.michaelrocks.libphonenumber.android.Phonenumber;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import io.michaelrocks.libphonenumber.android.BuildConfig;
+import io.michaelrocks.libphonenumber.android.NumberParseException;
+import io.michaelrocks.libphonenumber.android.PhoneNumberUtil;
+import io.michaelrocks.libphonenumber.android.Phonenumber;
+
 public class CountryCodePicker extends RelativeLayout {
-  private static String TAG = CountryCodePicker.class.getSimpleName();
+  private static final String TAG = CountryCodePicker.class.getSimpleName();
 
   private final String DEFAULT_COUNTRY = Locale.getDefault().getCountry();
   private static final String DEFAULT_ISO_COUNTRY = "ID";
@@ -62,7 +65,7 @@ public class CountryCodePicker extends RelativeLayout {
   private boolean mHideNameCode = false;
   private boolean mShowFlag = true;
   private boolean mShowFullName = false;
-  private boolean mUseFullName = false;
+  private final boolean mUseFullName = false;
   private boolean mSelectionDialogShowSearch = true;
 
   private List<Country> mPreferredCountries;
@@ -217,7 +220,7 @@ private void applyCustomProperty(AttributeSet attrs) {
         setDefaultCountryFlagAndCode();
       }
     } catch (Exception e) {
-      Log.d(TAG, "exception = " + e.toString());
+      Log.d(TAG, "exception = " + e);
       if (isInEditMode()) {
         mTvSelectedCountry.setText(
             getContext().getString(R.string.phone_code,
@@ -939,6 +942,14 @@ public void setBackgroundColor(int backgroundColor) {
     mRlyHolder.setBackgroundColor(backgroundColor);
   }
 
+  public void setDialogBackgroundColor(int backgroundColor) {
+    mBackgroundColor = backgroundColor;
+  }
+
+  public void setButtonBackgroundColor(int backgroundColor) {
+    mRlyHolder.setBackgroundColor(backgroundColor);
+  }
+
   public int getDefaultBackgroundColor() {
     return DEFAULT_BACKGROUND_COLOR;
   }
@@ -1023,7 +1034,7 @@ public void setTypeFace(@NonNull String fontAssetPath) {
       mTypeFace = typeFace;
       mTvSelectedCountry.setTypeface(typeFace);
     } catch (Exception e) {
-      Log.d(TAG, "Invalid fontPath. " + e.toString());
+      Log.d(TAG, "Invalid fontPath. " + e);
     }
   }
 
@@ -1298,7 +1309,7 @@ private void setDefaultCountryFlagAndCode() {
         if (BuildConfig.DEBUG) Log.d(TAG, "simCountryIso = " + simCountryIso);
       }
     } catch (Exception e) {
-      Log.e(TAG, "Error when getting sim country, error = " + e.toString());
+      Log.e(TAG, "Error when getting sim country, error = " + e);
       setEmptyDefault(getDefaultCountryCode());
     }
   }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jun 05 03:29:53 WIB 2020
+#Thu Dec 15 11:01:48 EET 2022
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

jitpack.yml

@@ -0,0 +1,2 @@
+jdk:
+  - openjdk11

sample/build.gradle

@@ -1,15 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 29
-  buildToolsVersion "29.0.3"
+  compileSdkVersion 33
 
   defaultConfig {
     applicationId "com.rilixtech.countrycodepicker"
     minSdkVersion 14
-    targetSdkVersion 29
+    targetSdkVersion 33
     versionCode 242
-    versionName '2.4.2'
+    versionName '2.4.3'
   }
   buildTypes {
     release {
@@ -20,12 +19,11 @@ android {
 }
 
 dependencies {
-  implementation fileTree(include: ['*.jar'], dir: 'libs')
-  testImplementation 'junit:junit:4.12'
   implementation project(':countrycodepicker')
-//  implementation 'com.github.joielechong:countrycodepicker:2.4.1'
-
-  implementation 'androidx.appcompat:appcompat:1.1.0'
+  implementation fileTree(include: ['*.jar'], dir: 'libs')
+  implementation 'io.michaelrocks:libphonenumber-android:8.13.2'
+  implementation 'androidx.appcompat:appcompat:1.5.1'
   implementation 'androidx.cardview:cardview:1.0.0'
-//  implementation 'io.michaelrocks:libphonenumber-android:8.9.14'
+
+  testImplementation 'junit:junit:4.13.2'
 }

sample/src/main/AndroidManifest.xml

@@ -10,8 +10,10 @@
       android:theme="@style/AppTheme">
     <activity
         android:name="com.rilixtech.countrycodepicker.ExampleActivity"
-        android:windowSoftInputMode="stateHidden"/>
-    <activity android:name="com.rilixtech.countrycodepicker.HomeActivity">
+        android:windowSoftInputMode="stateHidden"
+        android:exported="true"/>
+    <activity android:name="com.rilixtech.countrycodepicker.HomeActivity"
+        android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <action android:name="android.intent.action.VIEW"/>

sample/src/main/java/com/rilixtech/countrycodepicker/CountryPreferenceFragment.java

@@ -1,7 +1,6 @@
 package com.rilixtech.countrycodepicker;
 
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
@@ -11,6 +10,8 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import com.rilixtech.widget.countrycodepicker.CountryCodePicker;
 
 

sample/src/main/java/com/rilixtech/countrycodepicker/CustomColorFragment.java

@@ -2,7 +2,6 @@
 
 import android.graphics.PorterDuff;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +10,8 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import com.rilixtech.widget.countrycodepicker.CountryCodePicker;
 
 

sample/src/main/java/com/rilixtech/countrycodepicker/CustomFontFragment.java

@@ -3,13 +3,14 @@
 
 import android.graphics.Typeface;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import com.rilixtech.widget.countrycodepicker.CountryCodePicker;
 
 

sample/src/main/java/com/rilixtech/countrycodepicker/CustomMasterFragment.java

@@ -1,7 +1,6 @@
 package com.rilixtech.countrycodepicker;
 
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
@@ -11,6 +10,8 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import com.rilixtech.widget.countrycodepicker.CountryCodePicker;
 
 

sample/src/main/java/com/rilixtech/countrycodepicker/CustomSizeFragment.java

@@ -2,13 +2,14 @@
 
 
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 
 /**
  * A simple {@link Fragment} subclass.

sample/src/main/java/com/rilixtech/countrycodepicker/DefaultCountryFragment.java

@@ -2,7 +2,6 @@
 
 
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -13,6 +12,8 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.fragment.app.Fragment;
+
 import com.rilixtech.widget.countrycodepicker.CountryCodePicker;
 
 

sample/src/main/java/com/rilixtech/countrycodepicker/ExampleActivity.java

@@ -1,11 +1,12 @@
 package com.rilixtech.countrycodepicker;
 
 import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
-import androidx.appcompat.app.AppCompatActivity;
 
 public class ExampleActivity extends AppCompatActivity {
 

sample/src/main/java/com/rilixtech/countrycodepicker/FullNumberFragment.java

@@ -2,8 +2,6 @@
 
 
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.appcompat.widget.AppCompatEditText;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -12,7 +10,11 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import androidx.appcompat.widget.AppCompatEditText;
+import androidx.fragment.app.Fragment;
+
 import com.rilixtech.widget.countrycodepicker.CountryCodePicker;
+
 import io.michaelrocks.libphonenumber.android.PhoneNumberUtil;
 
 /**

sample/src/main/java/com/rilixtech/countrycodepicker/GetCountryFragment.java

@@ -2,13 +2,14 @@
 
 
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.fragment.app.Fragment;
+
 import com.rilixtech.widget.countrycodepicker.CountryCodePicker;