fix androidx compile error

voiddog · Dec 3, 2019 · ae8f976 · ae8f976
1 parent c2c60dd
commit ae8f976
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 12 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.voiddog.android.sample">
 
     <application
@@ -8,7 +9,8 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/org/voiddog/android/sample/MainActivity.kt b/app/src/main/java/org/voiddog/android/sample/MainActivity.kt
@@ -3,7 +3,6 @@ package org.voiddog.android.sample
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.View
 import kotlinx.android.synthetic.main.activity_main.*
 

diff --git a/app/src/main/java/org/voiddog/android/sample/MainMenuAdapter.kt b/app/src/main/java/org/voiddog/android/sample/MainMenuAdapter.kt
@@ -1,6 +1,5 @@
 package org.voiddog.android.sample
 
-import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

diff --git a/app/src/main/java/org/voiddog/android/sample/NestedDampLayoutActivity.kt b/app/src/main/java/org/voiddog/android/sample/NestedDampLayoutActivity.kt
@@ -2,7 +2,6 @@ package org.voiddog.android.sample
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_nested_damp_layout.*
 import org.voiddog.android.damp.view.NestedDampLayout
 

diff --git a/app/src/main/java/org/voiddog/android/sample/OverScrollAppBarActivity.kt b/app/src/main/java/org/voiddog/android/sample/OverScrollAppBarActivity.kt
@@ -2,7 +2,6 @@ package org.voiddog.android.sample
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_over_scroll_app_bar.*
 
 class OverScrollAppBarActivity : AppCompatActivity() {

diff --git a/app/src/main/java/org/voiddog/android/sample/SwipeRefreshActivity.kt b/app/src/main/java/org/voiddog/android/sample/SwipeRefreshActivity.kt
@@ -2,7 +2,6 @@ package org.voiddog.android.sample
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.activity_swipe_refresh.*
 
 class SwipeRefreshActivity : AppCompatActivity() {

diff --git a/app/src/main/res/layout/activity_over_scroll_app_bar.xml b/app/src/main/res/layout/activity_over_scroll_app_bar.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".OverScrollAppBarActivity">
 
-    <android.support.design.widget.OverScrollAppBarLayout
+    <com.google.android.material.appbar.OverScrollAppBarLayout
         android:id="@+id/over_scroll_bar"
         app:ovd_damp_appbar_close_height="?android:attr/actionBarSize"
         app:ovd_damp_appbar_brother_id="@+id/rec_list"
@@ -22,7 +22,7 @@
             android:layout_width="match_parent"
             android:layout_height="300dp" />
 
-    </android.support.design.widget.OverScrollAppBarLayout>
+    </com.google.android.material.appbar.OverScrollAppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rec_list"

diff --git a/damp/build.gradle b/damp/build.gradle
@@ -28,7 +28,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    api 'androidx.appcompat:appcompat:1.0.0'
+    api 'androidx.appcompat:appcompat:1.1.0'
     api 'com.google.android.material:material:1.0.0'
     api 'androidx.dynamicanimation:dynamicanimation:1.0.0'
 

diff --git a/damp/src/main/java/com/google/android/material/appbar/OverScrollAppBarLayout.java b/damp/src/main/java/com/google/android/material/appbar/OverScrollAppBarLayout.java
@@ -1,4 +1,4 @@
-package android.support.design.widget;
+package com.google.android.material.appbar;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -21,7 +21,6 @@
 import android.widget.FrameLayout;
 
 import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import com.google.android.material.appbar.HeaderScrollingViewBehavior;
 
 import org.voiddog.android.damp.R;
 import org.voiddog.android.damp.util.DampViewUtil;

diff --git a/damp/src/main/res/values/strings.xml b/damp/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
     <string name="behavior_org_voiddog_damp_osabl">
-        android.support.design.widget.OverScrollAppBarLayout$ScrollingViewBehavior
+        com.google.android.material.appbar.OverScrollAppBarLayout$ScrollingViewBehavior
     </string>
 </resources>