From 86c5e7d431afe729b8485e8783f4b1e2876e15db Mon Sep 17 00:00:00 2001 From: Seyed Mansour Mirbehbahani Date: Sun, 12 Mar 2023 10:47:05 +0330 Subject: [PATCH 1/2] :arrow_up: updated project to gradle version '7.4.2' --- app/build.gradle | 26 +++++++++---------- app/src/main/AndroidManifest.xml | 6 ++--- boommenu/build.gradle | 13 +++------- boommenu/src/main/AndroidManifest.xml | 11 ++------ build.gradle | 32 +++--------------------- gradle.properties | 19 +++++++------- gradle/wrapper/gradle-wrapper.properties | 6 ++--- settings.gradle | 16 ++++++++++++ 8 files changed, 54 insertions(+), 75 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 78843c4..5333fc6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,15 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 26 - buildToolsVersion "25.0.2" + namespace "com.nightonke.boommenusample" + compileSdk 33 defaultConfig { applicationId "com.nightonke.boommenusample" - minSdkVersion 14 - targetSdkVersion 26 + minSdk 14 + targetSdk 33 versionCode 2110 versionName "2.1.1" } @@ -20,12 +22,10 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile project(':boommenu') - compile 'com.android.support:appcompat-v7:26.0.2' - compile 'com.android.support:recyclerview-v7:26.0.2' - compile 'com.android.support:support-v4:26.0.2' - compile 'com.android.support:design:26.0.2' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - testCompile 'junit:junit:4.12' + implementation project(':boommenu') + implementation 'com.android.support:appcompat-v7:26.0.2' + implementation 'com.android.support:recyclerview-v7:26.0.2' + implementation 'com.android.support:support-v4:26.0.2' + implementation 'com.android.support:design:26.0.2' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3bc5b90..24335d3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + diff --git a/boommenu/build.gradle b/boommenu/build.gradle index 3c3ae28..49e84d0 100644 --- a/boommenu/build.gradle +++ b/boommenu/build.gradle @@ -25,12 +25,12 @@ ext { } android { - compileSdkVersion 26 - buildToolsVersion "25.0.2" + namespace 'com.nightonke.boommenu' + compileSdk 33 defaultConfig { - minSdkVersion 14 - targetSdkVersion 26 + minSdk 14 + targetSdk 33 versionCode 2110 versionName "2.1.1" } @@ -43,9 +43,4 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' } - -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle' -apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle' \ No newline at end of file diff --git a/boommenu/src/main/AndroidManifest.xml b/boommenu/src/main/AndroidManifest.xml index f89e691..9a40236 100644 --- a/boommenu/src/main/AndroidManifest.xml +++ b/boommenu/src/main/AndroidManifest.xml @@ -1,10 +1,3 @@ - - - - - - + + diff --git a/build.gradle b/build.gradle index 5f06e06..f05eacf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,29 +1,5 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4' - classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1' - } -} - -allprojects { - repositories { - jcenter() - maven { - url "https://maven.google.com" - } - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} +plugins { + id 'com.android.application' version '7.4.2' apply false + id 'com.android.library' version '7.4.2' apply false +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 89e0d99..35a362c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,17 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - -# For more details on how to configure your build environment visit +## For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m +# Default value: -Xmx1024m -XX:MaxPermSize=256m # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 - +# # When configured, Gradle will run in incubating parallel mode. # 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 +#Sun Mar 12 10:38:08 IRST 2023 +android.nonTransitiveRClass=true +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding\=UTF-8 +android.useAndroidX=false +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a220298..19906c4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Mar 27 20:25:57 CST 2017 +#Sat Dec 31 08:18:25 IRST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 40666f2..fe85f81 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,17 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + maven { url 'https://jitpack.io' } + } +} +rootProject.name = "BoomMenu" include ':app', ':boommenu' From 6c66ae4b0ea4bfaddb9e8c3abd30790fa8c60f75 Mon Sep 17 00:00:00 2001 From: Seyed Mansour Mirbehbahani Date: Sun, 12 Mar 2023 11:02:05 +0330 Subject: [PATCH 2/2] :arrow_up: migrated to androidX --- app/build.gradle | 11 ++++++----- .../nightonke/boommenusample/ActionBarActivity.java | 7 ++++--- .../com/nightonke/boommenusample/BMBFragment.java | 3 ++- .../nightonke/boommenusample/BoomExampleActivity.java | 3 ++- .../boommenusample/ButtonPlaceAlignmentActivity.java | 3 ++- .../boommenusample/ChangeBoomButtonActivity.java | 3 ++- .../com/nightonke/boommenusample/ControlActivity.java | 3 ++- .../boommenusample/CustomPositionActivity.java | 3 ++- .../nightonke/boommenusample/DraggableActivity.java | 3 ++- .../com/nightonke/boommenusample/EaseActivity.java | 3 ++- .../nightonke/boommenusample/FadeViewsActivity.java | 3 ++- .../nightonke/boommenusample/FragmentActivity.java | 9 +++++---- .../nightonke/boommenusample/HamButtonActivity.java | 3 ++- .../nightonke/boommenusample/ListViewActivity.java | 3 ++- .../nightonke/boommenusample/ListenerActivity.java | 3 ++- .../com/nightonke/boommenusample/MainActivity.java | 3 ++- .../boommenusample/OrderExampleActivity.java | 3 ++- .../nightonke/boommenusample/OrientationActivity.java | 3 ++- .../boommenusample/RecyclerViewActivity.java | 7 ++++--- .../nightonke/boommenusample/RecyclerViewAdapter.java | 3 ++- .../com/nightonke/boommenusample/ShareActivity.java | 3 ++- .../boommenusample/SimpleCircleButtonActivity.java | 3 ++- .../SquareAndPieceCornerRadiusActivity.java | 3 ++- .../TextInsideCircleButtonActivity.java | 3 ++- .../TextOutsideCircleButtonActivity.java | 3 ++- .../boommenusample/ThreeDAnimationActivity.java | 3 ++- .../com/nightonke/boommenusample/ToolBarActivity.java | 5 +++-- app/src/main/res/layout/activity_fragment.xml | 2 +- app/src/main/res/layout/activity_recycler_view.xml | 2 +- app/src/main/res/layout/activity_tool_bar.xml | 8 ++++---- gradle.properties | 2 +- 31 files changed, 73 insertions(+), 46 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5333fc6..186b603 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,9 +23,10 @@ android { dependencies { implementation project(':boommenu') - implementation 'com.android.support:appcompat-v7:26.0.2' - implementation 'com.android.support:recyclerview-v7:26.0.2' - implementation 'com.android.support:support-v4:26.0.2' - implementation 'com.android.support:design:26.0.2' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.recyclerview:recyclerview:1.3.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'com.google.android.material:material:1.8.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0' } diff --git a/app/src/main/java/com/nightonke/boommenusample/ActionBarActivity.java b/app/src/main/java/com/nightonke/boommenusample/ActionBarActivity.java index e551161..32b6cd6 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ActionBarActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ActionBarActivity.java @@ -1,13 +1,14 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; + import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomMenuButton; import com.nightonke.boommenu.ButtonEnum; diff --git a/app/src/main/java/com/nightonke/boommenusample/BMBFragment.java b/app/src/main/java/com/nightonke/boommenusample/BMBFragment.java index 82d8dd9..f148b4b 100644 --- a/app/src/main/java/com/nightonke/boommenusample/BMBFragment.java +++ b/app/src/main/java/com/nightonke/boommenusample/BMBFragment.java @@ -1,7 +1,8 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; + import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/com/nightonke/boommenusample/BoomExampleActivity.java b/app/src/main/java/com/nightonke/boommenusample/BoomExampleActivity.java index 398ccaf..8ef1803 100644 --- a/app/src/main/java/com/nightonke/boommenusample/BoomExampleActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/BoomExampleActivity.java @@ -1,12 +1,13 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.Animation.BoomEnum; import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomMenuButton; diff --git a/app/src/main/java/com/nightonke/boommenusample/ButtonPlaceAlignmentActivity.java b/app/src/main/java/com/nightonke/boommenusample/ButtonPlaceAlignmentActivity.java index cf0548b..17320c5 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ButtonPlaceAlignmentActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ButtonPlaceAlignmentActivity.java @@ -1,7 +1,6 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; @@ -9,6 +8,8 @@ import android.widget.SeekBar; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomButtons.ButtonPlaceAlignmentEnum; import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomMenuButton; diff --git a/app/src/main/java/com/nightonke/boommenusample/ChangeBoomButtonActivity.java b/app/src/main/java/com/nightonke/boommenusample/ChangeBoomButtonActivity.java index 580d4f9..65729f6 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ChangeBoomButtonActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ChangeBoomButtonActivity.java @@ -2,7 +2,8 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; import com.nightonke.boommenu.BoomButtons.BoomButton; import com.nightonke.boommenu.BoomButtons.HamButton; diff --git a/app/src/main/java/com/nightonke/boommenusample/ControlActivity.java b/app/src/main/java/com/nightonke/boommenusample/ControlActivity.java index d17094e..25e3dc5 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ControlActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ControlActivity.java @@ -1,9 +1,10 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomMenuButton; public class ControlActivity extends AppCompatActivity implements View.OnClickListener { diff --git a/app/src/main/java/com/nightonke/boommenusample/CustomPositionActivity.java b/app/src/main/java/com/nightonke/boommenusample/CustomPositionActivity.java index fc5284b..53cedbd 100644 --- a/app/src/main/java/com/nightonke/boommenusample/CustomPositionActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/CustomPositionActivity.java @@ -2,7 +2,8 @@ import android.graphics.PointF; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; import com.nightonke.boommenu.BoomMenuButton; import com.nightonke.boommenu.Util; diff --git a/app/src/main/java/com/nightonke/boommenusample/DraggableActivity.java b/app/src/main/java/com/nightonke/boommenusample/DraggableActivity.java index d4358ce..57a5725 100644 --- a/app/src/main/java/com/nightonke/boommenusample/DraggableActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/DraggableActivity.java @@ -1,10 +1,11 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.widget.CompoundButton; import android.widget.Switch; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomMenuButton; import com.nightonke.boommenu.ButtonEnum; diff --git a/app/src/main/java/com/nightonke/boommenusample/EaseActivity.java b/app/src/main/java/com/nightonke/boommenusample/EaseActivity.java index ca87cef..1ef8a80 100644 --- a/app/src/main/java/com/nightonke/boommenusample/EaseActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/EaseActivity.java @@ -1,7 +1,8 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; import com.nightonke.boommenu.BoomMenuButton; diff --git a/app/src/main/java/com/nightonke/boommenusample/FadeViewsActivity.java b/app/src/main/java/com/nightonke/boommenusample/FadeViewsActivity.java index ba3bbd6..744fb91 100644 --- a/app/src/main/java/com/nightonke/boommenusample/FadeViewsActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/FadeViewsActivity.java @@ -1,7 +1,8 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; import com.nightonke.boommenu.BoomMenuButton; diff --git a/app/src/main/java/com/nightonke/boommenusample/FragmentActivity.java b/app/src/main/java/com/nightonke/boommenusample/FragmentActivity.java index 85d1e1e..d2fd4d1 100644 --- a/app/src/main/java/com/nightonke/boommenusample/FragmentActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/FragmentActivity.java @@ -1,10 +1,11 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; public class FragmentActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/nightonke/boommenusample/HamButtonActivity.java b/app/src/main/java/com/nightonke/boommenusample/HamButtonActivity.java index 361c949..88f27e1 100644 --- a/app/src/main/java/com/nightonke/boommenusample/HamButtonActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/HamButtonActivity.java @@ -1,13 +1,14 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.util.Pair; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomMenuButton; import com.nightonke.boommenu.ButtonEnum; diff --git a/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java b/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java index 00aede7..c4a509e 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java @@ -1,7 +1,6 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -10,6 +9,8 @@ import android.widget.ListView; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomMenuButton; public class ListViewActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/nightonke/boommenusample/ListenerActivity.java b/app/src/main/java/com/nightonke/boommenusample/ListenerActivity.java index 5119dcf..6f9963f 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ListenerActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ListenerActivity.java @@ -1,10 +1,11 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomButtons.BoomButton; import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomButtons.OnBMClickListener; diff --git a/app/src/main/java/com/nightonke/boommenusample/MainActivity.java b/app/src/main/java/com/nightonke/boommenusample/MainActivity.java index 111db8a..3ff8104 100644 --- a/app/src/main/java/com/nightonke/boommenusample/MainActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/MainActivity.java @@ -2,9 +2,10 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; + public class MainActivity extends AppCompatActivity implements View.OnClickListener { @Override diff --git a/app/src/main/java/com/nightonke/boommenusample/OrderExampleActivity.java b/app/src/main/java/com/nightonke/boommenusample/OrderExampleActivity.java index 1d782b5..b5bbd90 100644 --- a/app/src/main/java/com/nightonke/boommenusample/OrderExampleActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/OrderExampleActivity.java @@ -1,12 +1,13 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.Animation.OrderEnum; import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomMenuButton; diff --git a/app/src/main/java/com/nightonke/boommenusample/OrientationActivity.java b/app/src/main/java/com/nightonke/boommenusample/OrientationActivity.java index 97896ba..7d4de74 100644 --- a/app/src/main/java/com/nightonke/boommenusample/OrientationActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/OrientationActivity.java @@ -1,7 +1,8 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomMenuButton; diff --git a/app/src/main/java/com/nightonke/boommenusample/RecyclerViewActivity.java b/app/src/main/java/com/nightonke/boommenusample/RecyclerViewActivity.java index 8b08113..84d0e09 100644 --- a/app/src/main/java/com/nightonke/boommenusample/RecyclerViewActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/RecyclerViewActivity.java @@ -1,9 +1,10 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; public class RecyclerViewActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/nightonke/boommenusample/RecyclerViewAdapter.java b/app/src/main/java/com/nightonke/boommenusample/RecyclerViewAdapter.java index c703c1d..f28ae7d 100644 --- a/app/src/main/java/com/nightonke/boommenusample/RecyclerViewAdapter.java +++ b/app/src/main/java/com/nightonke/boommenusample/RecyclerViewAdapter.java @@ -1,11 +1,12 @@ package com.nightonke.boommenusample; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.nightonke.boommenu.BoomMenuButton; diff --git a/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java b/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java index c898045..8a18270 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java @@ -2,10 +2,11 @@ import android.graphics.Color; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.widget.SeekBar; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomMenuButton; public class ShareActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/nightonke/boommenusample/SimpleCircleButtonActivity.java b/app/src/main/java/com/nightonke/boommenusample/SimpleCircleButtonActivity.java index 1be65ac..b673aa8 100644 --- a/app/src/main/java/com/nightonke/boommenusample/SimpleCircleButtonActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/SimpleCircleButtonActivity.java @@ -1,13 +1,14 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.util.Pair; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomMenuButton; import com.nightonke.boommenu.ButtonEnum; diff --git a/app/src/main/java/com/nightonke/boommenusample/SquareAndPieceCornerRadiusActivity.java b/app/src/main/java/com/nightonke/boommenusample/SquareAndPieceCornerRadiusActivity.java index 419dd5f..15a8b14 100644 --- a/app/src/main/java/com/nightonke/boommenusample/SquareAndPieceCornerRadiusActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/SquareAndPieceCornerRadiusActivity.java @@ -1,7 +1,8 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; + +import androidx.appcompat.app.AppCompatActivity; import com.nightonke.boommenu.BoomMenuButton; diff --git a/app/src/main/java/com/nightonke/boommenusample/TextInsideCircleButtonActivity.java b/app/src/main/java/com/nightonke/boommenusample/TextInsideCircleButtonActivity.java index bf10652..767c1fc 100644 --- a/app/src/main/java/com/nightonke/boommenusample/TextInsideCircleButtonActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/TextInsideCircleButtonActivity.java @@ -1,13 +1,14 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.util.Pair; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomMenuButton; import com.nightonke.boommenu.ButtonEnum; diff --git a/app/src/main/java/com/nightonke/boommenusample/TextOutsideCircleButtonActivity.java b/app/src/main/java/com/nightonke/boommenusample/TextOutsideCircleButtonActivity.java index 9977706..f84d378 100644 --- a/app/src/main/java/com/nightonke/boommenusample/TextOutsideCircleButtonActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/TextOutsideCircleButtonActivity.java @@ -1,13 +1,14 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.util.Pair; import android.view.View; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.ListView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomButtons.ButtonPlaceEnum; import com.nightonke.boommenu.BoomMenuButton; import com.nightonke.boommenu.ButtonEnum; diff --git a/app/src/main/java/com/nightonke/boommenusample/ThreeDAnimationActivity.java b/app/src/main/java/com/nightonke/boommenusample/ThreeDAnimationActivity.java index 4475d36..8815211 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ThreeDAnimationActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ThreeDAnimationActivity.java @@ -1,12 +1,13 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import android.widget.CompoundButton; import android.widget.SeekBar; import android.widget.Switch; import android.widget.TextView; +import androidx.appcompat.app.AppCompatActivity; + import com.nightonke.boommenu.BoomMenuButton; public class ThreeDAnimationActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/nightonke/boommenusample/ToolBarActivity.java b/app/src/main/java/com/nightonke/boommenusample/ToolBarActivity.java index 136b3f0..44ae259 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ToolBarActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ToolBarActivity.java @@ -1,8 +1,9 @@ package com.nightonke.boommenusample; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import com.nightonke.boommenu.BoomMenuButton; import com.nightonke.boommenu.ButtonEnum; diff --git a/app/src/main/res/layout/activity_fragment.xml b/app/src/main/res/layout/activity_fragment.xml index fcf6f62..eb94b80 100644 --- a/app/src/main/res/layout/activity_fragment.xml +++ b/app/src/main/res/layout/activity_fragment.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" tools:context="com.nightonke.boommenusample.FragmentActivity"> - diff --git a/app/src/main/res/layout/activity_recycler_view.xml b/app/src/main/res/layout/activity_recycler_view.xml index 4b517a2..0a43f68 100644 --- a/app/src/main/res/layout/activity_recycler_view.xml +++ b/app/src/main/res/layout/activity_recycler_view.xml @@ -10,7 +10,7 @@ android:paddingTop="@dimen/activity_vertical_margin" tools:context="com.nightonke.boommenusample.RecyclerViewActivity"> - diff --git a/app/src/main/res/layout/activity_tool_bar.xml b/app/src/main/res/layout/activity_tool_bar.xml index a92eb79..b38e9d2 100644 --- a/app/src/main/res/layout/activity_tool_bar.xml +++ b/app/src/main/res/layout/activity_tool_bar.xml @@ -1,5 +1,5 @@ - - - + - + diff --git a/gradle.properties b/gradle.properties index 35a362c..b8b7826 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,5 +13,5 @@ #Sun Mar 12 10:38:08 IRST 2023 android.nonTransitiveRClass=true org.gradle.jvmargs=-Xmx2048m -Dfile.encoding\=UTF-8 -android.useAndroidX=false +android.useAndroidX=true android.enableJetifier=true