Merge pull request #13 from onstonboy/develop

1.0.3
onstonboy · Sep 30, 2019 · 86244ad · 86244ad
2 parents 7c3c691 + 6b01f64
commit 86244ad
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 45 deletions.
diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
diff --git a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
diff --git a/.gradle/5.4.1/javaCompile/jarAnalysis.bin b/.gradle/5.4.1/javaCompile/jarAnalysis.bin
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/app/src/main/java/com/ccc/countrycodepicker/MainActivity.kt b/app/src/main/java/com/ccc/countrycodepicker/MainActivity.kt
@@ -26,7 +26,6 @@ class MainActivity : AppCompatActivity(), OnCountryPickedListener {
         val fm = supportFragmentManager
         val newFragment =
             com.ccc.ccp.CountryCodePickerFragment.getInstance(country, Locale.getDefault().language)
-        newFragment.setOnCountryPickedListener(this)
         newFragment.show(fm, com.ccc.ccp.CountryCodePickerFragment.TAG)
     }
 }
diff --git a/ccp/.gitignore b/ccp/.gitignore
@@ -1 +1,11 @@
+*.iml
+.gradle
+/local.properties
+/.idea
+/release
+/keystores
+.DS_Store
 /build
+/captures
+.externalNativeBuild
+.cxx
diff --git a/ccp/src/main/java/com/ccc/ccp/CountryCodePickerFragment.kt b/ccp/src/main/java/com/ccc/ccp/CountryCodePickerFragment.kt
@@ -1,6 +1,6 @@
 package com.ccc.ccp
 
-import android.app.Dialog
+import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -18,6 +18,20 @@ class CountryCodePickerFragment : DialogFragment(), CountryCodeAdapter.OnItemCli
 
     private var mOnCountryPicked: OnCountryPickedListener? = null
 
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        if (mOnCountryPicked == null && context is OnCountryPickedListener) {
+            mOnCountryPicked = context
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (mOnCountryPicked == null && parentFragment is OnCountryPickedListener) {
+            mOnCountryPicked = parentFragment as? OnCountryPickedListener
+        }
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -70,7 +84,12 @@ class CountryCodePickerFragment : DialogFragment(), CountryCodeAdapter.OnItemCli
         val manager = LinearLayoutManager(context)
         mView.recyclerView.layoutManager = manager
         mView.recyclerView.adapter = mAdapter
-        mAdapter.updateData(Country.loadCountryDataFromXML(context, arguments?.getString("LanguageCode")?: Locale.getDefault().language))
+        mAdapter.updateData(
+            Country.loadCountryDataFromXML(
+                context,
+                arguments?.getString("LanguageCode") ?: Locale.getDefault().language
+            )
+        )
         mAdapter.setOnItemClickListener(this)
     }