Merge branch 'develop'

Author: EhsanMashhadi

app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme" >
-    <activity android:name=".MainActivity" >
+    <activity android:name=".MainActivity" android:windowSoftInputMode="adjustPan">
         <intent-filter>
             <action android:name="android.intent.action.MAIN"/>
 

library/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 28
         versionCode 1
-        versionName "1.0"
+        versionName "0.2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 

library/src/main/java/com/ehsanmashhadi/library/view/BaseView.java

@@ -5,4 +5,7 @@
 interface BaseView {
 
     void showView(View view);
+
+    void dismissView();
+
 }

library/src/main/java/com/ehsanmashhadi/library/view/BottomSheetFragment.java

@@ -36,6 +36,13 @@ public void showView(View view) {
         this.show(mActivityCompat.getSupportFragmentManager(), "bottomsheet");
     }
 
+    @Override
+    public void dismissView() {
+
+        this.dismiss();
+    }
+
+
     public void setActivity(AppCompatActivity appCompatActivity) {
 
         mActivityCompat = appCompatActivity;

library/src/main/java/com/ehsanmashhadi/library/view/CountryPicker.java

@@ -46,7 +46,7 @@ public interface OnAutoDetectCountryListener {
     private SearchView mSearchViewCountry;
     private int mStyle;
     private DetectionMethod mDetectionMethod = DetectionMethod.NONE;
-
+    private BaseView mBaseView;
     private RecyclerViewAdapter.OnCountryClickListener mOnCountryClickListener;
     private OnAutoDetectCountryListener mOnAutoDetectCountryListener;
     private View mView;
@@ -114,10 +114,14 @@ private void initView() {
         LayoutInflater layoutInflater = LayoutInflater.from(mContext);
         mView = layoutInflater.inflate(R.layout.layout_countrypicker, null);
         mRecyclerView = mView.findViewById(R.id.recyclerview_countries);
+
         mRecyclerView.addItemDecoration(new DividerItemDecoration(mContext, DividerItemDecoration.VERTICAL));
         RecyclerViewAdapter recyclerViewAdapter = new RecyclerViewAdapter(mCountries, mPreSelectedCountry, mShowingFlag, mShowingDialCode);
         if (mOnCountryClickListener != null)
-            recyclerViewAdapter.setListener(mOnCountryClickListener);
+            recyclerViewAdapter.setListener(country -> {
+                mOnCountryClickListener.onCountrySelected(country);
+                dismiss();
+            });
         LinearLayoutManager layoutManager = new LinearLayoutManager(mContext);
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setAdapter(recyclerViewAdapter);
@@ -236,8 +240,14 @@ private void detectByNetwork() {
 
     public void show(AppCompatActivity activity) {
 
-        BaseView baseView = ViewFactory.create(mViewType, activity);
-        baseView.showView(mView);
+        mBaseView = ViewFactory.create(mViewType, activity);
+        mBaseView.showView(mView);
+
+    }
+
+    public void dismiss() {
+
+        mBaseView.dismissView();
     }
 
     @Override

library/src/main/java/com/ehsanmashhadi/library/view/MyDialog.java

@@ -18,4 +18,10 @@ public void showView(View view) {
         this.setContentView(view);
         show();
     }
+
+    @Override
+    public void dismissView() {
+
+        this.dismiss();
+    }
 }

library/src/main/java/com/ehsanmashhadi/library/view/RecyclerViewAdapter.java

@@ -18,7 +18,6 @@ public class RecyclerViewAdapter extends RecyclerView.Adapter<RecyclerViewAdapte
 
     public interface OnCountryClickListener {
         void onCountrySelected(Country country);
-
     }
 
     private List<Country> mCountryList;

library/src/main/res/layout/layout_countrypicker.xml

@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/rootView"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:id="@+id/rootView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
 
     <androidx.appcompat.widget.SearchView
         android:id="@+id/searchview_country"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerview_countries"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:layout_below="@id/searchview_country"/>
 
-</LinearLayout>
+</RelativeLayout>