Merge pull request #1 from ChintanRathod/migrate-to-androix

Migrated from Support to AndroidX
TayfunCesur · Jun 27, 2019 · 7952e9c · 7952e9c
2 parents 1b1d97a + 22f15b8
commit 7952e9c
Show file tree

Hide file tree

Showing 21 changed files with 175 additions and 174 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,7 +12,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -23,10 +23,14 @@ android {
 }
 
 dependencies {
+    implementation project(path: ':lib')
+
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation "com.android.support:design:28.0.0"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+
+    implementation 'com.google.android.material:material:1.0.0'
+
     implementation 'de.hdodenhof:circleimageview:3.0.0'
-    implementation project(path: ':lib')
 }
diff --git a/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/CurvedAndBottomAndConcaveActivity.kt b/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/CurvedAndBottomAndConcaveActivity.kt
@@ -1,7 +1,7 @@
 package com.tayfuncesur.curvedbottomsheetdemo
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.util.DisplayMetrics
 import com.tayfuncesur.curvedbottomsheet.CurvedBottomSheet
 import kotlinx.android.synthetic.main.curved_bottom_concave.*

diff --git a/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/CurvedAndBottomAndConvexActivity.kt b/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/CurvedAndBottomAndConvexActivity.kt
@@ -1,7 +1,7 @@
 package com.tayfuncesur.curvedbottomsheetdemo
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.util.DisplayMetrics
 import com.tayfuncesur.curvedbottomsheet.CurvedBottomSheet
 import kotlinx.android.synthetic.main.curved_bottom_concave.*

diff --git a/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/CurvedAndTopAndConcaveActivity.kt b/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/CurvedAndTopAndConcaveActivity.kt
@@ -1,7 +1,7 @@
 package com.tayfuncesur.curvedbottomsheetdemo
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.util.DisplayMetrics
 import com.tayfuncesur.curvedbottomsheet.CurvedBottomSheet
 import kotlinx.android.synthetic.main.curved_bottom_concave.*

diff --git a/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/CurvedAndTopAndConvexActivity.kt b/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/CurvedAndTopAndConvexActivity.kt
@@ -1,7 +1,7 @@
 package com.tayfuncesur.curvedbottomsheetdemo
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.util.DisplayMetrics
 import com.tayfuncesur.curvedbottomsheet.CurvedBottomSheet
 import kotlinx.android.synthetic.main.curved_bottom_concave.*

diff --git a/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/MainActivity.kt b/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/MainActivity.kt
@@ -1,9 +1,9 @@
 package com.tayfuncesur.curvedbottomsheetdemo
 
 import android.content.Intent
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.support.design.widget.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetBehavior
 import android.view.View
 import com.tayfuncesur.curvedbottomsheet.CurvedBottomSheet
 import com.tayfuncesur.curvedbottomsheet.CurvedLayout

diff --git a/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/MixedActivity.kt b/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/MixedActivity.kt
@@ -1,7 +1,7 @@
 package com.tayfuncesur.curvedbottomsheetdemo
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.util.DisplayMetrics
 import com.tayfuncesur.curvedbottomsheet.CurvedBottomSheet
 import kotlinx.android.synthetic.main.curved_bottom_concave.*

diff --git a/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/WavedActivity.kt b/app/src/main/java/com/tayfuncesur/curvedbottomsheetdemo/WavedActivity.kt
@@ -1,7 +1,7 @@
 package com.tayfuncesur.curvedbottomsheetdemo
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.util.DisplayMetrics
 import android.view.View
 import com.tayfuncesur.curvedbottomsheet.Callback

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             android:id="@+id/appbarLayout"
             android:theme="@style/AppTheme.AppBarOverlay">
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
@@ -28,7 +28,7 @@
                 app:contentInsetLeft="0dp"
                 app:popupTheme="@style/AppTheme.PopupOverlay">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:gravity="center_vertical"
@@ -39,11 +39,11 @@
                     android:textSize="18sp"
             />
 
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="match_parent"
             android:id="@+id/mainTitle"
             android:text="Curved bottom sheet has many different types. You can use;\n
@@ -60,7 +60,7 @@ All of them are enums. And default params are, Curve,Bottom and Concave shape."
             android:layout_height="wrap_content"/>
 
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             app:fontFamily="@font/manropemedium"
             app:layout_constraintTop_toBottomOf="@+id/mainTitle"
@@ -72,7 +72,7 @@ All of them are enums. And default params are, Curve,Bottom and Concave shape."
             android:textStyle="bold"
             android:layout_height="wrap_content"/>
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
             android:layout_width="wrap_content"
             app:layout_constraintLeft_toLeftOf="parent"
             android:layout_marginStart="8sp"
@@ -84,7 +84,7 @@ All of them are enums. And default params are, Curve,Bottom and Concave shape."
             android:layout_marginLeft="8sp"/>
 
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
             android:layout_width="wrap_content"
             app:layout_constraintLeft_toLeftOf="parent"
             android:layout_marginStart="8sp"
@@ -96,7 +96,7 @@ All of them are enums. And default params are, Curve,Bottom and Concave shape."
             android:layout_marginLeft="8sp"/>
 
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
             android:layout_width="wrap_content"
             app:layout_constraintTop_toBottomOf="@+id/curveLabel"
             app:layout_constraintLeft_toRightOf="@+id/bottomAndConcave"
@@ -109,7 +109,7 @@ All of them are enums. And default params are, Curve,Bottom and Concave shape."
             android:layout_marginRight="8sp"/>
 
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
             android:layout_width="wrap_content"
             app:layout_constraintTop_toBottomOf="@+id/bottomAndConcave"
             app:layout_constraintLeft_toRightOf="@+id/bottomAndConvex"
@@ -121,7 +121,7 @@ All of them are enums. And default params are, Curve,Bottom and Concave shape."
             android:layout_marginEnd="8sp"
             android:layout_marginRight="8sp"/>
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             app:fontFamily="@font/manropemedium"
             app:layout_constraintTop_toBottomOf="@+id/bottomAndConvex"
@@ -134,7 +134,7 @@ All of them are enums. And default params are, Curve,Bottom and Concave shape."
             android:layout_height="wrap_content"/>
 
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
             android:layout_width="wrap_content"
             android:layout_marginStart="16sp"
             app:layout_constraintTop_toBottomOf="@+id/waveLabel"
@@ -145,7 +145,7 @@ All of them are enums. And default params are, Curve,Bottom and Concave shape."
             android:layout_height="wrap_content"
             android:layout_marginLeft="16sp"/>
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             app:fontFamily="@font/manropemedium"
             app:layout_constraintTop_toBottomOf="@+id/waveActivity"
@@ -158,7 +158,7 @@ All of them are enums. And default params are, Curve,Bottom and Concave shape."
             android:layout_height="wrap_content"/>
 
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
             android:layout_width="wrap_content"
             android:layout_marginStart="16sp"
             app:layout_constraintTop_toBottomOf="@+id/MixedLabel"
@@ -169,4 +169,4 @@ All of them are enums. And default params are, Curve,Bottom and Concave shape."
             android:layout_height="wrap_content"
             android:layout_marginLeft="16sp"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/curved_bottom_concave.xml b/app/src/main/res/layout/curved_bottom_concave.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             android:id="@+id/appbarLayout"
             android:theme="@style/AppTheme.AppBarOverlay">
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
@@ -29,7 +29,7 @@
                 app:contentInsetLeft="0dp"
                 app:popupTheme="@style/AppTheme.PopupOverlay">
 
-            <android.support.v7.widget.AppCompatTextView
+            <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:gravity="center_vertical"
@@ -40,11 +40,11 @@
                     android:textSize="18sp"
             />
 
-        </android.support.v7.widget.Toolbar>
-    </android.support.design.widget.AppBarLayout>
+        </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.AppBarLayout>
 
 
-    <android.support.v7.widget.AppCompatTextView
+    <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -58,15 +58,15 @@
             android:id="@+id/title"
             android:textColor="#000000"/>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             android:paddingBottom="300dp"
             app:layout_constraintTop_toBottomOf="@+id/title"
             android:layout_height="0dp">
 
-        <android.support.v7.widget.AppCompatTextView
+        <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingStart="16sp"
@@ -77,9 +77,9 @@
                 android:textColor="#000000"/>
 
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:layout_width="match_parent"
             android:layout_height="0dp"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -97,9 +97,9 @@
                 app:showControlPoints="true"
                 app:behavior_hideable="false"
                 app:behavior_peekHeight="200dp"
-                app:layout_behavior="android.support.design.widget.BottomSheetBehavior">
+                app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
-            <android.support.v4.widget.NestedScrollView
+            <androidx.core.widget.NestedScrollView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent">
 
@@ -114,7 +114,7 @@
                     android:orientation="vertical"
                     android:padding="16dp">
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/text"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -132,7 +132,7 @@
                         app:civ_border_color="#FFFFFF"/>
 
 
-                <android.support.v7.widget.AppCompatTextView
+                <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="10dp"
@@ -142,10 +142,10 @@
 
             </LinearLayout>
 
-            </android.support.v4.widget.NestedScrollView>
+            </androidx.core.widget.NestedScrollView>
         </com.tayfuncesur.curvedbottomsheet.CurvedLayout>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>