From fb5bd1c908e6c651ec94f8251161f40192cee092 Mon Sep 17 00:00:00 2001
From: dmorozov <dmytro.morozov@yalantis.net>
Date: Tue, 20 Sep 2022 14:40:00 +0300
Subject: [PATCH 1/2] Update project

- Update gradle version
- Fix gradle issues
- Update Kotlin plugin version
- Update compileSdkVersion
- Update targetSdkVersion
- Update buildToolsVersion
- Migrate to AndroidX
---
 .gitignore                                     |  2 ++
 build.gradle                                   | 10 ++++++----
 demo/build.gradle                              | 13 +++++++------
 demo/src/main/AndroidManifest.xml              |  1 +
 .../jellyanimation/demo/MainActivity.java      |  5 +++--
 demo/src/main/res/layout/edit_text.xml         |  2 +-
 gradle.properties                              |  6 ++++++
 gradle/wrapper/gradle-wrapper.properties       |  3 +--
 library/build.gradle                           | 12 ++++++------
 .../com/yalantis/jellytoolbar/extensions.kt    |  2 +-
 .../jellytoolbar/listener/AnimationListener.kt |  8 ++++----
 .../jellytoolbar/widget/ContentLayout.kt       |  5 +++--
 .../jellytoolbar/widget/JellyToolbar.kt        | 18 ++++++++++--------
 .../yalantis/jellytoolbar/widget/JellyView.kt  |  2 +-
 library/src/main/res/layout/jelly_toolbar.xml  |  2 +-
 library/src/main/res/layout/layout_content.xml |  4 ++--
 16 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index 39fb081..411a8f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 *.iml
 .gradle
 /local.properties
+.idea/*
+/.idea/*
 /.idea/workspace.xml
 /.idea/libraries
 .DS_Store
diff --git a/build.gradle b/build.gradle
index 7114aa0..979c2a9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.0.4'
+    ext.kotlin_version = '1.7.10'
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,7 +17,8 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
 
 }
diff --git a/demo/build.gradle b/demo/build.gradle
index dbc392a..2fedf27 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 33
+    buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "com.yalantis.jellyanimation.demo"
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 
@@ -30,7 +30,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile project(':library')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':library')
+
+    implementation "androidx.appcompat:appcompat:1.5.1"
 }
diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
index f4b244b..9ee4f0f 100644
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
+            android:exported="true"
             android:name=".MainActivity"
             android:windowSoftInputMode="stateHidden">
             <intent-filter>
diff --git a/demo/src/main/java/com/yalantis/jellyanimation/demo/MainActivity.java b/demo/src/main/java/com/yalantis/jellyanimation/demo/MainActivity.java
index 22d7dd9..b09017a 100644
--- a/demo/src/main/java/com/yalantis/jellyanimation/demo/MainActivity.java
+++ b/demo/src/main/java/com/yalantis/jellyanimation/demo/MainActivity.java
@@ -1,12 +1,13 @@
 package com.yalantis.jellyanimation.demo;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.AppCompatEditText;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.AppCompatEditText;
+
 import com.yalantis.jellytoolbar.listener.JellyListener;
 import com.yalantis.jellytoolbar.widget.JellyToolbar;
 
diff --git a/demo/src/main/res/layout/edit_text.xml b/demo/src/main/res/layout/edit_text.xml
index a42b3b9..8faec98 100644
--- a/demo/src/main/res/layout/edit_text.xml
+++ b/demo/src/main/res/layout/edit_text.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.AppCompatEditText xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.AppCompatEditText xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/colorTransparent"
diff --git a/gradle.properties b/gradle.properties
index 6e9f926..8267344 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,6 +11,12 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+
+
 RELEASE_STORE_FILE=keys/release.jks
 RELEASE_KEYSTORE_PASSWORD=jellytoolbar
 RELEASE_KEY_ALIAS_NAME=android
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..41dfb87 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Dec 28 10:00:20 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index f522951..f5fd90a 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '25.0.2'
+    compileSdkVersion 33
+    buildToolsVersion '30.0.3'
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
     }
@@ -23,9 +23,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "androidx.appcompat:appcompat:1.5.1"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 repositories {
     mavenCentral()
diff --git a/library/src/main/java/com/yalantis/jellytoolbar/extensions.kt b/library/src/main/java/com/yalantis/jellytoolbar/extensions.kt
index 5c5142a..457a89e 100644
--- a/library/src/main/java/com/yalantis/jellytoolbar/extensions.kt
+++ b/library/src/main/java/com/yalantis/jellytoolbar/extensions.kt
@@ -1,7 +1,7 @@
 package com.yalantis.jellytoolbar
 
-import android.support.annotation.DimenRes
 import android.view.View
+import androidx.annotation.DimenRes
 
 /**
  * Created by irinagalata on 11/23/16.
diff --git a/library/src/main/java/com/yalantis/jellytoolbar/listener/AnimationListener.kt b/library/src/main/java/com/yalantis/jellytoolbar/listener/AnimationListener.kt
index 5ad73cc..d55bd19 100644
--- a/library/src/main/java/com/yalantis/jellytoolbar/listener/AnimationListener.kt
+++ b/library/src/main/java/com/yalantis/jellytoolbar/listener/AnimationListener.kt
@@ -7,12 +7,12 @@ import android.animation.Animator
  */
 abstract class AnimationListener : Animator.AnimatorListener {
 
-    override fun onAnimationRepeat(animation: Animator?) = Unit
+    override fun onAnimationRepeat(animation: Animator) = Unit
 
-    override fun onAnimationStart(animation: Animator?) = Unit
+    override fun onAnimationStart(animation: Animator) = Unit
 
-    override fun onAnimationCancel(animation: Animator?) = Unit
+    override fun onAnimationCancel(animation: Animator) = Unit
 
-    override abstract fun onAnimationEnd(animation: Animator?)
+    override abstract fun onAnimationEnd(animation: Animator)
 
 }
\ No newline at end of file
diff --git a/library/src/main/java/com/yalantis/jellytoolbar/widget/ContentLayout.kt b/library/src/main/java/com/yalantis/jellytoolbar/widget/ContentLayout.kt
index 2a099d1..42f9b5b 100644
--- a/library/src/main/java/com/yalantis/jellytoolbar/widget/ContentLayout.kt
+++ b/library/src/main/java/com/yalantis/jellytoolbar/widget/ContentLayout.kt
@@ -2,11 +2,11 @@ package com.yalantis.jellytoolbar.widget
 
 import android.animation.ValueAnimator
 import android.content.Context
-import android.support.annotation.DrawableRes
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.RelativeLayout
+import androidx.annotation.DrawableRes
 import com.yalantis.jellytoolbar.Constant
 import com.yalantis.jellytoolbar.R
 import com.yalantis.jellytoolbar.getDimen
@@ -26,7 +26,8 @@ class ContentLayout : RelativeLayout, JellyWidget {
                 field = value
             }
         }
-    @DrawableRes var iconRes: Int? = null
+    @DrawableRes
+    var iconRes: Int? = null
         set(value) {
             value?.let {
                 icon.setBackgroundResource(it)
diff --git a/library/src/main/java/com/yalantis/jellytoolbar/widget/JellyToolbar.kt b/library/src/main/java/com/yalantis/jellytoolbar/widget/JellyToolbar.kt
index a499372..9b61eb6 100644
--- a/library/src/main/java/com/yalantis/jellytoolbar/widget/JellyToolbar.kt
+++ b/library/src/main/java/com/yalantis/jellytoolbar/widget/JellyToolbar.kt
@@ -3,14 +3,14 @@ package com.yalantis.jellytoolbar.widget
 import android.content.Context
 import android.os.Bundle
 import android.os.Parcelable
-import android.support.annotation.ColorInt
-import android.support.annotation.DrawableRes
-import android.support.v7.widget.Toolbar
 import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.FrameLayout
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import androidx.appcompat.widget.Toolbar
 import com.yalantis.jellytoolbar.Constant
 import com.yalantis.jellytoolbar.R
 import com.yalantis.jellytoolbar.listener.JellyListener
@@ -36,7 +36,8 @@ class JellyToolbar : FrameLayout, JellyWidget {
             contentLayout.contentView = value
             field = value
         }
-    @DrawableRes var iconRes: Int? = null
+    @DrawableRes
+    var iconRes: Int? = null
         set(value) {
             contentLayout.iconRes = value
             field = value
@@ -46,7 +47,8 @@ class JellyToolbar : FrameLayout, JellyWidget {
             contentLayout.cancelIconRes = value
             field = value
         }
-    @ColorInt var startColor: Int? = null
+    @ColorInt
+    var startColor: Int? = null
         set(value) {
             value?.let {
                 jellyView.startColor = value
@@ -64,9 +66,9 @@ class JellyToolbar : FrameLayout, JellyWidget {
 
     private var isExpanded = false
 
-    constructor(context: Context?) : this(context, null)
-    constructor(context: Context?, attrs: AttributeSet?) : this(context, attrs, 0)
-    constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+    constructor(context: Context) : this(context, null)
+    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
         LayoutInflater.from(context).inflate(R.layout.jelly_toolbar, this)
 
         attrs?.let { retrieveAttributes(attrs) }
diff --git a/library/src/main/java/com/yalantis/jellytoolbar/widget/JellyView.kt b/library/src/main/java/com/yalantis/jellytoolbar/widget/JellyView.kt
index f0f05d3..0cbaae8 100644
--- a/library/src/main/java/com/yalantis/jellytoolbar/widget/JellyView.kt
+++ b/library/src/main/java/com/yalantis/jellytoolbar/widget/JellyView.kt
@@ -115,7 +115,7 @@ class JellyView : View, JellyWidget {
                 invalidate()
             }
             addListener(object : AnimationListener() {
-                override fun onAnimationEnd(animation: Animator?) {
+                override fun onAnimationEnd(animation: Animator) {
                     difference = 0f
                     invalidate()
 
diff --git a/library/src/main/res/layout/jelly_toolbar.xml b/library/src/main/res/layout/jelly_toolbar.xml
index 273135f..c57fb09 100644
--- a/library/src/main/res/layout/jelly_toolbar.xml
+++ b/library/src/main/res/layout/jelly_toolbar.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="80dp">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/defaultToolbar"
         android:layout_width="match_parent"
         android:layout_height="80dp" />
diff --git a/library/src/main/res/layout/layout_content.xml b/library/src/main/res/layout/layout_content.xml
index cfda723..1296cba 100644
--- a/library/src/main/res/layout/layout_content.xml
+++ b/library/src/main/res/layout/layout_content.xml
@@ -5,11 +5,11 @@
     android:paddingLeft="@dimen/icon_padding"
     android:paddingRight="@dimen/icon_padding">
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/icon"
         style="@style/Icon" />
 
-    <android.support.v7.widget.AppCompatImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/cancelIcon"
         style="@style/Icon"
         android:layout_alignParentEnd="true"

From 3abcf8c90d71faaee422bc8c36d2ec63cfaf3a26 Mon Sep 17 00:00:00 2001
From: dmorozov <dmytro.morozov@yalantis.net>
Date: Thu, 22 Sep 2022 13:01:52 +0300
Subject: [PATCH 2/2] Update library version

- Update library version
- Update README.md
---
 README.md            | 2 +-
 demo/build.gradle    | 4 ++--
 library/build.gradle | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f08b690..39faa86 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ allprojects {
 Add the dependency:
 ```Groovy
 dependencies {
-  compile 'com.github.yalantis:jellytoolbar:v1.0'
+  implementation 'com.github.yalantis:jellytoolbar:v1.0.1'
 }
 ```
 
diff --git a/demo/build.gradle b/demo/build.gradle
index 2fedf27..2dd7cc7 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.yalantis.jellyanimation.demo"
         minSdkVersion 16
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
 
     }
     signingConfigs {
diff --git a/library/build.gradle b/library/build.gradle
index f5fd90a..165bb1b 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
     }
     buildTypes {
         release {