Fixes

Author: Martin Lapiš

README.md

@@ -1,5 +1,6 @@
 ![API](https://img.shields.io/badge/API-26%2B-brightgreen.svg?style=flat)
-[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.5.30-blue.svg)](https://kotlinlang.org)
+[![Kotlin Version](https://img.shields.io/badge/Kotlin-1.5.31-blue.svg)](https://kotlinlang.org)
+[![Download](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Frepo1.maven.org%2Fmaven2%2Fio%2Fgithub%2Flapism%2Fsearch%2Fmaven-metadata.xml) ](https://repo1.maven.org/maven2/io/github/lapism/search/1.0.0/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 # Search
@@ -28,7 +29,7 @@ Add the dependency to your gradle file:
     }
 
     dependencies {
-        implementation 'io.github.lapism:search:1.1.0'
+        implementation 'io.github.lapism:search:1.0.0'
     }
 ```
 
@@ -102,7 +103,7 @@ Add the dependency to your gradle file:
 ```
 
 ### Layout
-You have to use app theme Theme.Material3.* or Theme.MaterialComponents.*
+You have to use app theme Theme.Material3.* or Theme.MaterialComponents.*.
 
 ```xml
 <?xml version="1.0" encoding="utf-8"?>

src/main/kotlin/com/lapism/search/internal/TouchObserverFrameLayout.kt

@@ -0,0 +1,16 @@
+package com.lapism.search.internal
+
+import android.content.Context
+import android.util.AttributeSet
+import android.widget.FrameLayout
+
+
+class TouchObserverFrameLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0,
+    defStyleRes: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
+
+
+}

src/main/kotlin/com/lapism/search/widget/MaterialSearchBar.kt

@@ -28,7 +28,7 @@ class MaterialSearchBar @JvmOverloads constructor(
     init {
         View.inflate(context, R.layout.material_search_bar, this)
 
-        /* TODO BINDING ?
+        /* TODO BINDING ? pruhlednost, edittext ztraci focus
         private lateinit var binding: ViewSearchBinding
         val inflater = LayoutInflater.from(context)
         val binding = MaterialSearchBarBinding.inflate(inflater, this)*/

src/main/kotlin/com/lapism/search/widget/MaterialSearchView.kt

@@ -3,7 +3,6 @@ package com.lapism.search.widget
 import android.content.Context
 import android.graphics.Rect
 import android.graphics.drawable.Drawable
-import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
 import android.text.Editable
@@ -16,11 +15,9 @@ import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.LinearLayout
 import androidx.annotation.*
-import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.customview.view.AbsSavedState
 import androidx.transition.*
-import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.MaterialToolbar
 import com.lapism.search.R
 import com.lapism.search.internal.FocusEditText
@@ -32,8 +29,7 @@ class MaterialSearchView @JvmOverloads constructor(
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0,
     defStyleRes: Int = 0
-) : MaterialSearchLayout(context, attrs, defStyleAttr, defStyleRes),
-    CoordinatorLayout.AttachedBehavior {
+) : MaterialSearchLayout(context, attrs, defStyleAttr, defStyleRes) {
 
     private var scrim: View? = null
     private var background: LinearLayout? = null
@@ -234,6 +230,14 @@ class MaterialSearchView @JvmOverloads constructor(
         queryListener = listener
     }
 
+    private fun showAnimation() {
+        // TODO
+    }
+
+    private fun hideAnimation() {
+        // TODO
+    }
+
     fun showKeyboard() {
         if (!isInEditMode) {
             val inputMethodManager =
@@ -245,14 +249,6 @@ class MaterialSearchView @JvmOverloads constructor(
         }
     }
 
-    private fun showAnimation() {
-        // TODO
-    }
-
-    private fun hideAnimation() {
-        // TODO
-    }
-
     fun hideKeyboard() {
         if (!isInEditMode) {
             val inputMethodManager =
@@ -299,7 +295,6 @@ class MaterialSearchView @JvmOverloads constructor(
         superState?.let {
             val state = SavedState(it)
             state.text = getTextQuery().toString()
-            state.hasFocus = editText?.hasFocus()!!
             return state
         } ?: run {
             return superState
@@ -310,18 +305,11 @@ class MaterialSearchView @JvmOverloads constructor(
         if (state is SavedState) {
             super.onRestoreInstanceState(state.superState)
             setTextQuery(state.text, false)
-            if (state.hasFocus) {
-                editText?.requestFocus()
-            }
         } else {
             super.onRestoreInstanceState(state)
         }
     }
 
-    override fun getBehavior(): CoordinatorLayout.Behavior<*> {
-        return Behavior()
-    }
-
     interface OnFocusChangeListener {
 
         fun onFocusChange(hasFocus: Boolean)
@@ -339,35 +327,20 @@ class MaterialSearchView @JvmOverloads constructor(
         fun onClearClick()
     }
 
-    // NOT INNER CLASS = STATIC,
     @Suppress("unused")
     class SavedState : AbsSavedState {
 
         var text: String? = null
-        var textChar: CharSequence? = null // TODO unused
-        var hasFocus = false
 
         constructor(superState: Parcelable) : super(superState)
 
         constructor(source: Parcel, loader: ClassLoader? = null) : super(source, loader) {
             text = source.readString()
-            textChar = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(source)
-            hasFocus = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                source.readBoolean()
-            } else {
-                source.readInt() == 1
-            }
         }
 
         override fun writeToParcel(dest: Parcel, flags: Int) {
             super.writeToParcel(dest, flags)
             dest.writeString(text)
-            TextUtils.writeToParcel(textChar, dest, flags)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                dest.writeBoolean(hasFocus)
-            } else {
-                dest.writeInt(if (hasFocus) 1 else 0)
-            }
         }
 
         companion object {
@@ -392,31 +365,4 @@ class MaterialSearchView @JvmOverloads constructor(
 
     }
 
-    class Behavior : CoordinatorLayout.Behavior<MaterialSearchView>() {
-
-        override fun layoutDependsOn(
-            parent: CoordinatorLayout,
-            child: MaterialSearchView,
-            dependency: View
-        ): Boolean {
-            return if (dependency is AppBarLayout) {
-                true
-            } else {
-                super.layoutDependsOn(parent, child, dependency)
-            }
-        }
-
-        override fun onDependentViewChanged(
-            parent: CoordinatorLayout,
-            child: MaterialSearchView,
-            dependency: View
-        ): Boolean {
-            if (dependency is AppBarLayout) {
-                return true
-            }
-            return super.onDependentViewChanged(parent, child, dependency)
-        }
-
-    }
-
 }

src/main/res/layout/material_search_view.xml

@@ -9,7 +9,7 @@
         android:background="?scrimBackground" />
 
     <com.lapism.search.internal.ClippableFrameLayout
-        android:id="@+id/clip"
+        android:id="@+id/search_view_root"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:focusable="true"
@@ -19,7 +19,6 @@
             android:id="@+id/search_view_background"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="?android:attr/colorBackground"
             android:orientation="vertical">
 
             <com.google.android.material.appbar.MaterialToolbar

src/main/res/values/public.xml

@@ -10,6 +10,5 @@
     <public name="search_scrimColor" type="attr" />
 
     <public name="material_search_bar_scrolling_view_behavior" type="string" />
-    <public name="material_search_view_behavior" type="string" />
 
 </resources>

src/main/res/values/strings.xml

@@ -2,6 +2,5 @@
 <resources>
 
     <string name="material_search_bar_scrolling_view_behavior">com.lapism.search.widget.MaterialSearchBar$ScrollingViewBehavior</string>
-    <string name="material_search_view_behavior">com.lapism.search.widget.MaterialSearchView$Behavior</string>
 
 </resources>