added addOnly() and removeOnly() method

mkrupal09 · Oct 18, 2018 · 47b6a9c · 47b6a9c
1 parent c30dd37
commit 47b6a9c
Show file tree

Hide file tree

Showing 14 changed files with 201 additions and 34 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,7 +37,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     kapt 'com.android.databinding:compiler:3.1.2'
     implementation 'com.android.support:recyclerview-v7:27.1.1'
-
+    implementation 'com.github.warkiz.widget:indicatorseekbar:2.1.0'
     implementation project(':library')
     /*implementation "com.github.mkrupal09:EasyAdapter:9be4f31"*/
     /*implementation 'com.dc.easyadapter:easyadapter:1.2'*/

diff --git a/app/src/main/AndroidManifest.xml b/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=".CountryListActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/easyadapter/dc/com/easyadapter/CategoryAdapterJava.java b/app/src/main/java/easyadapter/dc/com/easyadapter/CategoryAdapterJava.java
@@ -0,0 +1,20 @@
+package easyadapter.dc.com.easyadapter;
+
+import android.support.annotation.NonNull;
+
+import easyadapter.dc.com.easyadapter.databinding.InflaterCategoryBinding;
+import easyadapter.dc.com.library.EasyAdapter;
+
+/**
+ * Created by HB on 1/10/18.
+ */
+public class CategoryAdapterJava extends EasyAdapter<Category, InflaterCategoryBinding> {
+    public CategoryAdapterJava() {
+        super(R.layout.inflater_category);
+    }
+
+    @Override
+    public void onBind(@NonNull InflaterCategoryBinding binding, @NonNull Category model) {
+        binding.tvName.setText(model.getName());
+    }
+}
diff --git a/app/src/main/java/easyadapter/dc/com/easyadapter/MainActivity.kt b/app/src/main/java/easyadapter/dc/com/easyadapter/MainActivity.kt
@@ -6,13 +6,16 @@ import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.SearchView
+import android.util.Log
 import android.view.View
+import android.webkit.WebView
+import android.webkit.WebViewClient
 import android.widget.Toast
 import easyadapter.dc.com.easyadapter.databinding.ActivityMainBinding
 import easyadapter.dc.com.easyadapter.databinding.InflaterCategoryNameBinding
 import easyadapter.dc.com.library.EasyAdapter
-import easyadapter.dc.com.library.EasySpinner
 import easyadapter.dc.com.library.EasyArrayAdapter
+import easyadapter.dc.com.library.EasySpinner
 
 
 class MainActivity : AppCompatActivity() {
@@ -56,12 +59,14 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        Log.d("MainActivityLog", "true");
         binding = DataBindingUtil.setContentView(this, R.layout.activity_main)
         binding.recyclerView.isNestedScrollingEnabled = false
 
         adapterExample()
         spinnerExample()
         autocomplete()
+
     }
 
     private fun autocomplete() {
@@ -72,7 +77,7 @@ class MainActivity : AppCompatActivity() {
             }
 
             override fun onFilterApply(filter: Any?, model: Category): Boolean {
-                return if(filter!=null) model.parentId.equals("1") else false
+                return if (filter != null) model.parentId.equals("1") else false
             }
         }) {
             override fun onBind(binding: InflaterCategoryNameBinding, model: Category) {

diff --git a/app/src/main/java/easyadapter/dc/com/easyadapter/MainActivityJava.java b/app/src/main/java/easyadapter/dc/com/easyadapter/MainActivityJava.java
@@ -0,0 +1,23 @@
+package easyadapter.dc.com.easyadapter;
+
+import android.databinding.DataBindingUtil;
+import android.databinding.ViewDataBinding;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.RecyclerView;
+
+import easyadapter.dc.com.library.EasyAdapter;
+
+/**
+ * Created by HB on 15/10/18.
+ */
+public class MainActivityJava extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+    }
+}
diff --git a/app/src/main/java/easyadapter/dc/com/easyadapter/TestActivity.java b/app/src/main/java/easyadapter/dc/com/easyadapter/TestActivity.java
@@ -0,0 +1,21 @@
+package easyadapter.dc.com.easyadapter;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+/**
+ * Created by HB on 28/9/18.
+ */
+public class TestActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_test);
+        RecyclerView recyclerView = findViewById(R.id.recyclerView);
+        CategoryAdapter categoryAdapter = new CategoryAdapter(false);
+        recyclerView.setAdapter(categoryAdapter);
+    }
+}
diff --git a/app/src/main/res/drawable/gradient_drawable.xml b/app/src/main/res/drawable/gradient_drawable.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <gradient
+        android:startColor="@color/colorPrimary"
+        android:endColor="@color/colorAccent" />
+</shape>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -13,23 +13,14 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-
-
-            <android.support.v7.widget.RecyclerView
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="visible"
-                tools:listitem="@layout/inflater_category" />
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
                 <android.support.v7.widget.SearchView
                     android:id="@+id/searchView"
-                    android:layout_width="368dp"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:background="@drawable/rect_background"
@@ -39,27 +30,37 @@
 
                 <easyadapter.dc.com.library.EasySpinner
                     android:id="@+id/spRecyclerView"
-                    android:layout_width="wrap_content"
-                    android:visibility="gone"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
                     android:layout_height="match_parent"
                     android:background="@drawable/rect_background"
                     android:drawableRight="@drawable/dropdown_arrow"
                     android:gravity="center_vertical"
-                    android:paddingLeft="5dp"
                     android:hint="Search Category"
+                    android:paddingLeft="5dp"
                     android:textColor="@android:color/black"
-                    android:textColorHint="@android:color/black" />
+                    android:textColorHint="@android:color/black"
+                    android:visibility="gone" />
 
                 <easyadapter.dc.com.library.EasyAutoComplete
                     android:id="@+id/autcomplete"
-                    android:layout_width="250dp"
-                    android:paddingLeft="5dp"
-                    android:hint="Search Category"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="match_parent"
                     android:background="@drawable/rect_background"
                     android:drawableRight="@drawable/dropdown_arrow"
-                    android:layout_height="wrap_content" />
+                    android:hint="Search Category"
+                    android:paddingLeft="5dp" />
             </LinearLayout>
 
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="visible"
+                tools:listitem="@layout/inflater_category" />
+
+
         </LinearLayout>
     </android.support.v4.widget.NestedScrollView>
 </layout>
diff --git a/app/src/main/res/layout/activity_test.xml b/app/src/main/res/layout/activity_test.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/recyclerView"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="visible"
+                        tools:listitem="@layout/inflater_category" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_margin="20dp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+
+                    <View
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:layout_gravity="center"
+                        android:layout_width="match_parent"
+                        android:layout_height="4dp"
+                        android:background="@drawable/gradient_drawable" />
+
+                    <com.warkiz.widget.IndicatorSeekBar
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:isb_indicator_color="@color/colorPrimary"
+                        app:isb_indicator_text_color="@color/colorAccent"
+                        app:isb_indicator_text_size="18sp"
+                        app:isb_max="5"
+                        app:isb_min="0.30"
+                        app:isb_progress_value_float="true"
+                        app:isb_seek_smoothly="false"
+                        app:isb_show_indicator="rounded_rectangle"
+                        app:isb_show_tick_texts="true"
+                        app:isb_thumb_color="@color/colorPrimary"
+                        app:isb_thumb_size="20dp"
+                        app:isb_tick_texts_color="@color/colorPrimary"
+                        app:isb_tick_texts_size="0sp"
+                        app:isb_ticks_count="16"
+                        app:isb_track_background_color="@android:color/transparent"
+                        app:isb_track_background_size="4dp"
+                        app:isb_track_progress_color="@android:color/transparent"
+                        app:isb_track_progress_size="4dp" />
+                </FrameLayout>
+            </LinearLayout>
+        </FrameLayout>
+
+    </RelativeLayout>
+
+
+</layout>
diff --git a/app/src/main/res/layout/inflater_category.xml b/app/src/main/res/layout/inflater_category.xml
@@ -48,6 +48,8 @@
 
             <CheckBox
                 android:id="@+id/cbCategory"
+                tools:text="@null"
+                android:text="@null"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
         </LinearLayout>

diff --git a/library/build.gradle b/library/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'com.dc.easyadapter'
     PUBLISH_ARTIFACT_ID = 'easyadapter'
-    PUBLISH_VERSION = '2.0.3'
+    PUBLISH_VERSION = '2.0.5'
 }
 
 android {
     compileSdkVersion 27
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 15
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"

diff --git a/library/src/main/java/easyadapter/dc/com/library/EasyAdapter.java b/library/src/main/java/easyadapter/dc/com/library/EasyAdapter.java
@@ -104,12 +104,6 @@ public void clear(boolean deepClean) {
         }
     }
 
-    public void remove(M model) {
-        data.remove(model);
-        temp.remove(model);
-        notifyDataSetChanged();
-    }
-
 
     private void clearFilter() {
         data.clear();
@@ -122,12 +116,34 @@ public void add(M model) {
         notifyDataSetChanged();
     }
 
+    public int addOnly(M model) {
+        data.add(model);
+        temp.add(model);
+        return data.size() - 1;
+        /*notifyDataSetChanged();*/
+    }
+
+
+    @Deprecated
+    public void remove(M model) {
+        data.remove(model);
+        temp.remove(model);
+        notifyDataSetChanged();
+    }
+
+    public void removeOnly(int pos) {
+        M model = data.get(pos);
+        data.remove(model);
+        temp.remove(model);
+        notifyDataSetChanged();
+    }
+
     public void addAll(List<M> addAll, boolean deepCopy) {
         data.addAll(addAll);
         if (deepCopy) {
             temp.addAll(addAll);
         }
-        notifyDataSetChanged();
+        /*notifyDataSetChanged();*/
     }
 
     public EasyAdapter<M, B> setRecyclerViewItemClick(OnRecyclerViewItemClick<M> recyclerViewItemClick) {
@@ -175,7 +191,6 @@ public void performFilter(Object text, OnFilter<M> onFilter) {
     }
 
 
-
     @Override
     public final EasyHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         if (viewType == VIEW_ITEM) {
@@ -429,7 +444,7 @@ private class ProgressViewHolder extends EasyHolder {
             swipeView = v;
             startViewSize = 0;
             endViewSize = 0;
-            setEnableSwipeToDelete(v,0,0);
+            setEnableSwipeToDelete(v, 0, 0);
         }
     }