Skip to content

Commit

Permalink
Fix layout issues
Browse files Browse the repository at this point in the history
  • Loading branch information
tcqq committed Sep 24, 2019
1 parent 26afe23 commit 90384c8
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 126 deletions.
9 changes: 0 additions & 9 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ repositories {
```
dependencies {
// Using JitPack
implementation 'com.github.tcqq:searchview:2.0.2'
implementation 'com.github.tcqq:searchview:2.0.3'
}
```

Expand Down
11 changes: 7 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
}
}

dependencies {
Expand All @@ -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'
}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 9 additions & 6 deletions searchview/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
Expand Down
23 changes: 0 additions & 23 deletions searchview/src/main/res/values-land/dimens_margin.xml

This file was deleted.

23 changes: 0 additions & 23 deletions searchview/src/main/res/values-sw600dp-land/dimens_margin.xml

This file was deleted.

29 changes: 0 additions & 29 deletions searchview/src/main/res/values-sw600dp/dimens_margin.xml

This file was deleted.

9 changes: 9 additions & 0 deletions searchview/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
29 changes: 0 additions & 29 deletions searchview/src/main/res/values/dimens_margin.xml

This file was deleted.

0 comments on commit 90384c8

Please sign in to comment.