From 90384c8f1ef6e5edb0f658fc56a5375d480e3674 Mon Sep 17 00:00:00 2001
From: tcqq <usertcqq@gmail.com>
Date: Tue, 24 Sep 2019 18:45:25 +0800
Subject: [PATCH] Fix layout issues

---
 .idea/codeStyles/Project.xml                  |  9 ------
 README.md                                     |  2 +-
 app/build.gradle                              | 11 ++++---
 build.gradle                                  |  4 +--
 searchview/build.gradle                       | 15 ++++++----
 .../main/res/values-land/dimens_margin.xml    | 23 ---------------
 .../res/values-sw600dp-land/dimens_margin.xml | 23 ---------------
 .../main/res/values-sw600dp/dimens_margin.xml | 29 -------------------
 searchview/src/main/res/values/dimens.xml     |  9 ++++++
 .../src/main/res/values/dimens_margin.xml     | 29 -------------------
 10 files changed, 28 insertions(+), 126 deletions(-)
 delete mode 100644 searchview/src/main/res/values-land/dimens_margin.xml
 delete mode 100644 searchview/src/main/res/values-sw600dp-land/dimens_margin.xml
 delete mode 100644 searchview/src/main/res/values-sw600dp/dimens_margin.xml
 delete mode 100644 searchview/src/main/res/values/dimens_margin.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 77c941a..37358c4 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,21 +1,12 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <MarkdownNavigatorCodeStyleSettings>
       <option name="RIGHT_MARGIN" value="72" />
     </MarkdownNavigatorCodeStyleSettings>
-    <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </XML>
     <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
       </indentOptions>
diff --git a/README.md b/README.md
index 7eef9f0..d762c19 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ repositories {
 ```
 dependencies {
     // Using JitPack
-    implementation 'com.github.tcqq:searchview:2.0.2'
+    implementation 'com.github.tcqq:searchview:2.0.3'
 }
 ```
 
diff --git a/app/build.gradle b/app/build.gradle
index 269fc56..2ab415e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,6 +41,9 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
         sourceCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
@@ -53,18 +56,18 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     //Android X
-    implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
-    implementation 'androidx.core:core-ktx:1.2.0-alpha02'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0-alpha04'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
 
     //Google
-    implementation 'com.google.android.material:material:1.1.0-alpha07'
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
 
     //SearchView
     implementation project(':searchview')
     
     //FlexibleAdapter - https://github.com/davideas/FlexibleAdapter
-    api 'eu.davidea:flexible-adapter:5.1.0'
+    implementation 'eu.davidea:flexible-adapter:5.1.0'
     //Logger - https://github.com/JakeWharton/timber
     implementation 'com.jakewharton.timber:timber:4.7.1'
 }
diff --git a/build.gradle b/build.gradle
index fc1148e..f17fd92 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,14 +15,14 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.3.40'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
         jcenter()
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.0-alpha03'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/searchview/build.gradle b/searchview/build.gradle
index e379936..2ac26b5 100644
--- a/searchview/build.gradle
+++ b/searchview/build.gradle
@@ -34,8 +34,8 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 29
-        versionCode 8
-        versionName "2.0.2"
+        versionCode 9
+        versionName "2.0.3"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -48,20 +48,23 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
         sourceCompatibility JavaVersion.VERSION_1_8
     }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 dependencies {
     //AndroidX
-    implementation 'androidx.appcompat:appcompat:1.1.0-beta01'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha06'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-beta04'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.core:core-ktx:1.2.0-alpha02'
+    implementation 'androidx.core:core-ktx:1.2.0-alpha04'
 
     //Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     //Google
-    implementation 'com.google.android.material:material:1.1.0-alpha07'
+    implementation 'com.google.android.material:material:1.1.0-alpha10'
 
     //ViewAnimator - https://github.com/florent37/ViewAnimator
     implementation 'com.github.florent37:viewanimator:1.1.1'
diff --git a/searchview/src/main/res/values-land/dimens_margin.xml b/searchview/src/main/res/values-land/dimens_margin.xml
deleted file mode 100644
index b720b92..0000000
--- a/searchview/src/main/res/values-land/dimens_margin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 Martin Lapis, Alan Dreamer
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-
-    <dimen name="search_toolbar_margin_top_bottom">8dp</dimen>
-    <dimen name="search_toolbar_margin_left_right">16dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/searchview/src/main/res/values-sw600dp-land/dimens_margin.xml b/searchview/src/main/res/values-sw600dp-land/dimens_margin.xml
deleted file mode 100644
index 6d4f41a..0000000
--- a/searchview/src/main/res/values-sw600dp-land/dimens_margin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 Martin Lapis, Alan Dreamer
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-
-    <dimen name="search_toolbar_margin_top_bottom">16dp</dimen>
-    <dimen name="search_toolbar_margin_left_right">24dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/searchview/src/main/res/values-sw600dp/dimens_margin.xml b/searchview/src/main/res/values-sw600dp/dimens_margin.xml
deleted file mode 100644
index 1446442..0000000
--- a/searchview/src/main/res/values-sw600dp/dimens_margin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 Martin Lapis, Alan Dreamer
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-
-    <dimen name="search_bar_margin_top">20dp</dimen>
-    <dimen name="search_bar_margin_left_right">24dp</dimen>
-    <dimen name="search_bar_margin_bottom">10dp</dimen>
-
-    <dimen name="search_toolbar_margin_top_bottom">16dp</dimen>
-    <dimen name="search_toolbar_margin_left_right">16dp</dimen>
-
-    <dimen name="search_menu_item_margin">8dp</dimen>
-
-</resources>
\ No newline at end of file
diff --git a/searchview/src/main/res/values/dimens.xml b/searchview/src/main/res/values/dimens.xml
index 680b933..a6a04ec 100644
--- a/searchview/src/main/res/values/dimens.xml
+++ b/searchview/src/main/res/values/dimens.xml
@@ -39,4 +39,13 @@
 
     <dimen name="search_menu_margin_right">10dp</dimen>
 
+    <dimen name="search_bar_margin_top">12dp</dimen>
+    <dimen name="search_bar_margin_left_right">24dp</dimen>
+    <dimen name="search_bar_margin_bottom">10dp</dimen>
+
+    <dimen name="search_toolbar_margin_top_bottom">8dp</dimen>
+    <dimen name="search_toolbar_margin_left_right">8dp</dimen>
+
+    <dimen name="search_menu_item_margin">4dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/searchview/src/main/res/values/dimens_margin.xml b/searchview/src/main/res/values/dimens_margin.xml
deleted file mode 100644
index 03ffd39..0000000
--- a/searchview/src/main/res/values/dimens_margin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2018 Martin Lapis, Alan Dreamer
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     https://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-
-    <dimen name="search_bar_margin_top">12dp</dimen>
-    <dimen name="search_bar_margin_left_right">24dp</dimen>
-    <dimen name="search_bar_margin_bottom">10dp</dimen>
-
-    <dimen name="search_toolbar_margin_top_bottom">8dp</dimen>
-    <dimen name="search_toolbar_margin_left_right">8dp</dimen>
-
-    <dimen name="search_menu_item_margin">4dp</dimen>
-
-</resources>
\ No newline at end of file