Skip to content

Commit a612dae

Browse files
author
daniels
committed
Convert to androidx;
Fix dark mode (resolve MiguelCatalan#98) Fix ads appearing in adfree mode (resolve MiguelCatalan#97)
1 parent 390e78b commit a612dae

11 files changed

Lines changed: 29 additions & 30 deletions

File tree

library/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ buildscript {
1212

1313
android {
1414
compileSdkVersion 23
15-
buildToolsVersion "23.0.1"
1615

1716
defaultConfig {
1817
minSdkVersion 14
@@ -30,8 +29,8 @@ android {
3029

3130
dependencies {
3231
compile fileTree(dir: 'libs', include: ['*.jar'])
33-
compile 'com.android.support:appcompat-v7:23.1.1'
34-
compile 'com.android.support:design:23.1.1'
32+
compile 'androidx.appcompat:appcompat:1.0.0-beta01'
33+
compile 'com.google.android.material:material:1.0.0-beta01'
3534
}
3635

3736
publish {

library/src/main/java/com/miguelcatalan/materialsearchview/utils/AnimationUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.animation.AnimatorListenerAdapter;
55
import android.annotation.TargetApi;
66
import android.os.Build;
7-
import android.support.v4.view.ViewCompat;
8-
import android.support.v4.view.ViewPropertyAnimatorListener;
7+
import androidx.core.view.ViewCompat;
8+
import androidx.core.view.ViewPropertyAnimatorListener;
99
import android.util.TypedValue;
1010
import android.view.View;
1111
import android.view.ViewAnimationUtils;

sample/src/main/java/com/miguelcatalan/materialsearchview/sample/ColoredActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import android.content.Intent;
44
import android.speech.RecognizerIntent;
5-
import android.support.design.widget.Snackbar;
6-
import android.support.v7.app.AppCompatActivity;
5+
import com.google.android.material.snackbar.Snackbar;
6+
import androidx.appcompat.app.AppCompatActivity;
77
import android.os.Bundle;
8-
import android.support.v7.widget.Toolbar;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.text.TextUtils;
1010
import android.view.Menu;
1111
import android.view.MenuItem;

sample/src/main/java/com/miguelcatalan/materialsearchview/sample/DefaultActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import android.content.Intent;
44
import android.speech.RecognizerIntent;
5-
import android.support.design.widget.Snackbar;
6-
import android.support.v7.app.AppCompatActivity;
5+
import com.google.android.material.snackbar.Snackbar;
6+
import androidx.appcompat.app.AppCompatActivity;
77
import android.os.Bundle;
8-
import android.support.v7.widget.Toolbar;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.text.TextUtils;
1010
import android.view.Menu;
1111
import android.view.MenuItem;

sample/src/main/java/com/miguelcatalan/materialsearchview/sample/DummyFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.miguelcatalan.materialsearchview.sample;
22

33
import android.os.Bundle;
4-
import android.support.v4.app.Fragment;
4+
import androidx.fragment.app.Fragment;
55
import android.view.LayoutInflater;
66
import android.view.View;
77
import android.view.ViewGroup;

sample/src/main/java/com/miguelcatalan/materialsearchview/sample/InputTypeActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.content.Intent;
44
import android.os.Bundle;
55
import android.speech.RecognizerIntent;
6-
import android.support.design.widget.Snackbar;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
6+
import com.google.android.material.snackbar.Snackbar;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.text.TextUtils;
1010
import android.view.Menu;
1111
import android.view.MenuItem;

sample/src/main/java/com/miguelcatalan/materialsearchview/sample/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.view.View;
77
import android.widget.Button;
88

sample/src/main/java/com/miguelcatalan/materialsearchview/sample/StickyActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import android.content.Intent;
44
import android.os.Bundle;
55
import android.speech.RecognizerIntent;
6-
import android.support.design.widget.Snackbar;
7-
import android.support.v7.app.AppCompatActivity;
8-
import android.support.v7.widget.Toolbar;
6+
import com.google.android.material.snackbar.Snackbar;
7+
import androidx.appcompat.app.AppCompatActivity;
8+
import androidx.appcompat.widget.Toolbar;
99
import android.text.TextUtils;
1010
import android.view.Menu;
1111
import android.view.MenuItem;

sample/src/main/java/com/miguelcatalan/materialsearchview/sample/TabActivity.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import android.content.Intent;
44
import android.os.Bundle;
55
import android.speech.RecognizerIntent;
6-
import android.support.design.widget.Snackbar;
7-
import android.support.design.widget.TabLayout;
8-
import android.support.v4.view.ViewPager;
9-
import android.support.v7.app.AppCompatActivity;
10-
import android.support.v7.widget.Toolbar;
6+
import com.google.android.material.snackbar.Snackbar;
7+
import com.google.android.material.tabs.TabLayout;
8+
import androidx.viewpager.widget.ViewPager;
9+
import androidx.appcompat.app.AppCompatActivity;
10+
import androidx.appcompat.widget.Toolbar;
1111
import android.text.TextUtils;
1212
import android.view.Menu;
1313
import android.view.MenuItem;

sample/src/main/java/com/miguelcatalan/materialsearchview/sample/ViewPagerAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.miguelcatalan.materialsearchview.sample;
22

3-
import android.support.v4.app.Fragment;
4-
import android.support.v4.app.FragmentManager;
5-
import android.support.v4.app.FragmentPagerAdapter;
3+
import androidx.fragment.app.Fragment;
4+
import androidx.fragment.app.FragmentManager;
5+
import androidx.fragment.app.FragmentPagerAdapter;
66

77
import java.util.ArrayList;
88
import java.util.List;

0 commit comments

Comments
 (0)