Skip to content

Commit ddf16c2

Browse files
TenkeiTenkei
committed
Refactor dependecies using migrate to androidX tool
1 parent bd2aefc commit ddf16c2

28 files changed

+102
-100
lines changed

‎app/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ android {
2626
targetSdkVersion 28
2727
versionName "1.4.3"
2828
versionCode 9
29-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
}
3131
buildTypes {
3232
release {
@@ -53,15 +53,15 @@ dependencies {
5353
implementation('com.crashlytics.sdk.android:answers:1.3.12@aar') {
5454
transitive = true
5555
}
56-
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
56+
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
5757
exclude group: 'com.android.support', module: 'support-annotations'
5858
})
5959
testImplementation 'junit:junit:4.12'
60-
implementation 'com.android.support:support-v4:28.0.0'
61-
implementation 'com.android.support:appcompat-v7:28.0.0'
62-
implementation 'com.android.support:design:28.0.0'
63-
implementation 'com.android.support:cardview-v7:28.0.0'
64-
implementation 'com.android.support:recyclerview-v7:28.0.0'
60+
implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01'
61+
implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
62+
implementation 'com.google.android.material:material:1.0.0-beta01'
63+
implementation 'androidx.cardview:cardview:1.0.0-beta01'
64+
implementation 'androidx.recyclerview:recyclerview:1.0.0-beta01'
6565

6666
implementation 'com.google.firebase:firebase-core:16.0.1'
6767
implementation 'com.google.firebase:firebase-messaging:17.3.4'

‎app/src/androidTest/java/com/esbati/keivan/persiancalendar/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.esbati.keivan.persiancalendar;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.InstrumentationRegistry;
5+
import androidx.test.runner.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

‎app/src/main/java/com/esbati/keivan/persiancalendar/components/views/CalendarBottomSheet.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package com.esbati.keivan.persiancalendar.components.views
33
import android.annotation.SuppressLint
44
import android.content.Context
55
import android.os.Handler
6-
import android.support.design.widget.BottomSheetBehavior
7-
import android.support.design.widget.FloatingActionButton
8-
import android.support.v4.widget.NestedScrollView
9-
import android.support.v7.app.AlertDialog
6+
import com.google.android.material.bottomsheet.BottomSheetBehavior
7+
import com.google.android.material.floatingactionbutton.FloatingActionButton
8+
import androidx.core.widget.NestedScrollView
9+
import androidx.appcompat.app.AlertDialog
1010
import android.text.TextUtils
1111
import android.util.AttributeSet
1212
import android.view.LayoutInflater

‎app/src/main/java/com/esbati/keivan/persiancalendar/components/views/CalendarPager.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.esbati.keivan.persiancalendar.components.views
22

33
import android.content.Context
4-
import android.support.v4.app.Fragment
5-
import android.support.v4.app.FragmentManager
6-
import android.support.v4.view.ViewPager
4+
import androidx.fragment.app.Fragment
5+
import androidx.fragment.app.FragmentManager
6+
import androidx.viewpager.widget.ViewPager
77
import android.util.AttributeSet
88
import com.esbati.keivan.persiancalendar.R
99

@@ -27,7 +27,7 @@ class CalendarPager @JvmOverloads constructor(context: Context, attrs: Attribute
2727
super.setCurrentItem(position)
2828
}
2929

30-
fun getPage(year: Int, month: Int, fm: FragmentManager): Fragment? {
30+
fun getPage(year: Int, month: Int, fm: androidx.fragment.app.FragmentManager): androidx.fragment.app.Fragment? {
3131
val pageNumber = getPageNumber(year, month)
3232

3333
return fm.findFragmentByTag("android:switcher:" + R.id.pager + ":" + pageNumber)
@@ -69,7 +69,7 @@ class CalendarPager @JvmOverloads constructor(context: Context, attrs: Attribute
6969
})
7070
}
7171

72-
abstract class OnPageChangeListener : ViewPager.SimpleOnPageChangeListener(){
72+
abstract class OnPageChangeListener : androidx.viewpager.widget.ViewPager.SimpleOnPageChangeListener(){
7373
abstract fun onPageSelected(year: Int, month: Int)
7474
}
7575
}

‎app/src/main/java/com/esbati/keivan/persiancalendar/components/views/SmoothViewPager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.esbati.keivan.persiancalendar.components.views;
22

33
import android.content.Context;
4-
import android.support.v4.view.ViewPager;
4+
import androidx.viewpager.widget.ViewPager;
55
import android.util.AttributeSet;
66
import android.view.animation.DecelerateInterpolator;
77
import android.view.animation.Interpolator;

‎app/src/main/java/com/esbati/keivan/persiancalendar/features/calendarPage/CalendarAdapter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.esbati.keivan.persiancalendar.features.calendarPage
22

33
import android.animation.AnimatorInflater
44
import android.os.Build
5-
import android.support.v7.widget.RecyclerView
5+
import androidx.recyclerview.widget.RecyclerView
66
import android.text.TextUtils
77
import android.view.LayoutInflater
88
import android.view.View
@@ -14,7 +14,7 @@ import com.esbati.keivan.persiancalendar.repository.PreferencesHelper
1414
import com.esbati.keivan.persiancalendar.utils.ColorHelper
1515
import com.esbati.keivan.persiancalendar.utils.setTextColorResource
1616

17-
class CalendarAdapter(val year: Int, val month: Int, days: List<CalendarDay>) : RecyclerView.Adapter<CalendarAdapter.DayHolder>() {
17+
class CalendarAdapter(val year: Int, val month: Int, days: List<CalendarDay>) : androidx.recyclerview.widget.RecyclerView.Adapter<CalendarAdapter.DayHolder>() {
1818

1919
var onCalendarClickListener: OnCalendarClickListener? = null
2020
val calendarDays = ArrayList<CalendarDay>(days)
@@ -23,7 +23,7 @@ class CalendarAdapter(val year: Int, val month: Int, days: List<CalendarDay>) :
2323
fun onCalendarClick(day: CalendarDay)
2424
}
2525

26-
inner class DayHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
26+
inner class DayHolder(itemView: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
2727

2828
private val mDayNo = itemView.findViewById(R.id.calendar_day_no) as TextView
2929
private val mEvents = itemView.findViewById(R.id.calendar_events) as TextView

‎app/src/main/java/com/esbati/keivan/persiancalendar/features/calendarPage/CalendarFragment.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.esbati.keivan.persiancalendar.features.calendarPage
22

33
import android.os.Bundle
4-
import android.support.v4.app.Fragment
5-
import android.support.v7.widget.GridLayoutManager
6-
import android.support.v7.widget.RecyclerView
7-
import android.support.v7.widget.RecyclerView.VERTICAL
4+
import androidx.fragment.app.Fragment
5+
import androidx.recyclerview.widget.GridLayoutManager
6+
import androidx.recyclerview.widget.RecyclerView
7+
import androidx.recyclerview.widget.RecyclerView.VERTICAL
88
import android.view.LayoutInflater
99
import android.view.View
1010
import android.view.ViewGroup
@@ -16,13 +16,13 @@ import com.esbati.keivan.persiancalendar.pojos.CalendarDay
1616
import com.esbati.keivan.persiancalendar.repository.Repository
1717
import com.esbati.keivan.persiancalendar.utils.bindView
1818

19-
class CalendarFragment: Fragment() {
19+
class CalendarFragment: androidx.fragment.app.Fragment() {
2020

2121
private val mYear by lazy { arguments!!.get(EXTRA_YEAR) as Int }
2222
private val mMonth by lazy { arguments!!.get(EXTRA_MONTH) as Int }
2323
private val repository: Repository by locate()
2424

25-
private val mRecyclerView: RecyclerView by bindView(R.id.list)
25+
private val mRecyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.list)
2626
private val mAdapter by lazy {
2727
CalendarAdapter(mYear, mMonth, repository.prepareDays(mYear, mMonth)).apply {
2828
onCalendarClickListener = object: CalendarAdapter.OnCalendarClickListener {
@@ -54,7 +54,7 @@ class CalendarFragment: Fragment() {
5454
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
5555
super.onViewCreated(view, savedInstanceState)
5656

57-
mRecyclerView.layoutManager = GridLayoutManager(activity, 7, VERTICAL, false)
57+
mRecyclerView.layoutManager = androidx.recyclerview.widget.GridLayoutManager(activity, 7, VERTICAL, false)
5858
mRecyclerView.adapter = mAdapter
5959
}
6060

‎app/src/main/java/com/esbati/keivan/persiancalendar/features/home/HomeFragment.kt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import android.Manifest
44
import android.content.pm.PackageManager
55
import android.os.Build
66
import android.os.Bundle
7-
import android.support.design.widget.AppBarLayout
8-
import android.support.design.widget.CollapsingToolbarLayout
9-
import android.support.design.widget.CoordinatorLayout
10-
import android.support.design.widget.FloatingActionButton
11-
import android.support.v4.app.Fragment
12-
import android.support.v4.app.FragmentManager
13-
import android.support.v4.app.FragmentPagerAdapter
14-
import android.support.v4.content.ContextCompat
15-
import android.support.v7.widget.Toolbar
7+
import com.google.android.material.appbar.AppBarLayout
8+
import com.google.android.material.appbar.CollapsingToolbarLayout
9+
import androidx.coordinatorlayout.widget.CoordinatorLayout
10+
import com.google.android.material.floatingactionbutton.FloatingActionButton
11+
import androidx.fragment.app.Fragment
12+
import androidx.fragment.app.FragmentManager
13+
import androidx.fragment.app.FragmentPagerAdapter
14+
import androidx.core.content.ContextCompat
15+
import androidx.appcompat.widget.Toolbar
1616
import android.text.TextUtils
1717
import android.util.Log
1818
import android.view.LayoutInflater
@@ -36,7 +36,7 @@ import com.esbati.keivan.persiancalendar.utils.bindView
3636
import com.esbati.keivan.persiancalendar.utils.showToast
3737
import com.esbati.keivan.persiancalendar.utils.toDp
3838

39-
class HomeFragment : Fragment() {
39+
class HomeFragment : androidx.fragment.app.Fragment() {
4040

4141
private val repository: Repository by locate()
4242
private var mDisplayedMonth: Int = 0
@@ -45,7 +45,7 @@ class HomeFragment : Fragment() {
4545

4646
//Toolbar
4747
private var mToolbarMargin: Int = 0
48-
private val mCoordinatorLayout: CoordinatorLayout by bindView(R.id.coordinator_layout)
48+
private val mCoordinatorLayout: androidx.coordinatorlayout.widget.CoordinatorLayout by bindView(R.id.coordinator_layout)
4949
private val mAppbar: AppBarLayout by bindView(R.id.appbar)
5050
private val mCollapsingToolbar: CollapsingToolbarLayout by bindView(R.id.collapsing_toolbar)
5151
private val mToolbar: Toolbar by bindView(R.id.toolbar)
@@ -272,9 +272,9 @@ class HomeFragment : Fragment() {
272272
else -> false
273273
}
274274

275-
inner class HomeAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm) {
275+
inner class HomeAdapter(fm: androidx.fragment.app.FragmentManager) : androidx.fragment.app.FragmentPagerAdapter(fm) {
276276

277-
override fun getItem(position: Int): Fragment {
277+
override fun getItem(position: Int): androidx.fragment.app.Fragment {
278278
val (year, month) = mPager.getYearAndMonth(position)
279279
return CalendarFragment.newInstance(year, month)
280280
}

‎app/src/main/java/com/esbati/keivan/persiancalendar/features/home/MainActivity.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import android.Manifest
44
import android.content.pm.PackageManager
55
import android.os.Build
66
import android.os.Bundle
7-
import android.support.v4.app.ActivityCompat
8-
import android.support.v4.app.Fragment
9-
import android.support.v7.app.AlertDialog
10-
import android.support.v7.app.AppCompatActivity
7+
import androidx.core.app.ActivityCompat
8+
import androidx.fragment.app.Fragment
9+
import androidx.appcompat.app.AlertDialog
10+
import androidx.appcompat.app.AppCompatActivity
1111
import android.view.View
1212
import com.esbati.keivan.persiancalendar.R
1313
import com.esbati.keivan.persiancalendar.utils.checkPermissions
@@ -55,7 +55,7 @@ class MainActivity : AppCompatActivity() {
5555
}
5656

5757
private fun setupFragment(refresh: Boolean = false) {
58-
var fragment: Fragment? = supportFragmentManager.findFragmentById(R.id.fragment_container)
58+
var fragment: androidx.fragment.app.Fragment? = supportFragmentManager.findFragmentById(R.id.fragment_container)
5959

6060
if (fragment == null || refresh)
6161
fragment = HomeFragment()

‎app/src/main/java/com/esbati/keivan/persiancalendar/features/notification/NotificationHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import android.content.Context
99
import android.content.Intent
1010
import android.os.Build
1111
import android.provider.Settings
12-
import android.support.v4.app.NotificationCompat
12+
import androidx.core.app.NotificationCompat
1313
import android.text.TextUtils
1414
import com.esbati.keivan.persiancalendar.BuildConfig
1515
import com.esbati.keivan.persiancalendar.R

‎app/src/main/java/com/esbati/keivan/persiancalendar/features/notification/NotificationService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import android.app.Service
55
import android.content.Context
66
import android.content.Intent
77
import android.content.IntentFilter
8-
import android.support.v4.content.ContextCompat
8+
import androidx.core.content.ContextCompat
99
import android.util.Log
1010
import com.esbati.keivan.persiancalendar.components.locate
1111
import com.esbati.keivan.persiancalendar.repository.Repository

‎app/src/main/java/com/esbati/keivan/persiancalendar/features/notification/NotificationUpdateService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.esbati.keivan.persiancalendar.features.notification
22

33
import android.content.Context
44
import android.content.Intent
5-
import android.support.v4.app.JobIntentService
5+
import androidx.core.app.JobIntentService
66
import android.util.Log
77
import com.esbati.keivan.persiancalendar.components.locate
88
import com.esbati.keivan.persiancalendar.repository.PreferencesHelper

‎app/src/main/java/com/esbati/keivan/persiancalendar/features/settings/SettingsDsl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.esbati.keivan.persiancalendar.features.settings
22

33
import android.content.Context
4-
import android.support.annotation.StringRes
4+
import androidx.annotation.StringRes
55
import android.view.View
66
import android.view.ViewGroup
77
import android.widget.LinearLayout

‎app/src/main/java/com/esbati/keivan/persiancalendar/features/settings/SettingsFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import android.app.AlertDialog
44
import android.graphics.Color
55
import android.os.Build
66
import android.os.Bundle
7-
import android.support.design.widget.BottomSheetDialogFragment
7+
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
88
import android.view.LayoutInflater
99
import android.view.ViewGroup
1010
import android.widget.NumberPicker

‎app/src/main/java/com/esbati/keivan/persiancalendar/features/settings/cells/TextCheckCell.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.esbati.keivan.persiancalendar.features.settings.cells
33
import android.content.Context
44
import android.graphics.Canvas
55
import android.graphics.Paint
6-
import android.support.v7.widget.SwitchCompat
6+
import androidx.appcompat.widget.SwitchCompat
77
import android.util.TypedValue
88
import android.view.Gravity
99
import android.view.View

‎app/src/main/java/com/esbati/keivan/persiancalendar/repository/CalendarDataStore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import android.content.ContentResolver
66
import android.content.ContentUris
77
import android.content.ContentValues
88
import android.provider.CalendarContract
9-
import android.support.annotation.RequiresPermission
9+
import androidx.annotation.RequiresPermission
1010
import com.esbati.keivan.persiancalendar.pojos.DeviceCalendar
1111
import com.esbati.keivan.persiancalendar.pojos.UserEvent
1212
import java.util.*

‎app/src/main/java/com/esbati/keivan/persiancalendar/repository/PreferencesHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.esbati.keivan.persiancalendar.repository
22

33
import android.content.SharedPreferences
44
import android.preference.PreferenceManager
5-
import android.support.v4.app.NotificationCompat
5+
import androidx.core.app.NotificationCompat
66
import com.esbati.keivan.persiancalendar.components.ApplicationController
77

88
/**

‎app/src/main/java/com/esbati/keivan/persiancalendar/repository/RemarkDataStore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.esbati.keivan.persiancalendar.repository
22

33
import android.content.res.Resources
4-
import android.support.annotation.RawRes
4+
import androidx.annotation.RawRes
55
import android.util.Log
66
import com.esbati.keivan.persiancalendar.R
77
import com.esbati.keivan.persiancalendar.components.ApplicationController

‎app/src/main/java/com/esbati/keivan/persiancalendar/repository/Repository.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.esbati.keivan.persiancalendar.repository
22

33
import android.Manifest
44
import android.content.pm.PackageManager
5-
import android.support.annotation.RequiresPermission
6-
import android.support.v4.content.ContextCompat
5+
import androidx.annotation.RequiresPermission
6+
import androidx.core.content.ContextCompat
77
import com.esbati.keivan.persiancalendar.components.ApplicationController
88
import com.esbati.keivan.persiancalendar.pojos.CalendarDay
99
import com.esbati.keivan.persiancalendar.pojos.CalendarRemark

‎app/src/main/java/com/esbati/keivan/persiancalendar/utils/AndroidUtilities.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package com.esbati.keivan.persiancalendar.utils
33
import android.content.Context
44
import android.content.pm.PackageManager
55
import android.os.Build
6-
import android.support.annotation.ColorRes
7-
import android.support.annotation.FontRes
8-
import android.support.annotation.StringRes
9-
import android.support.v4.app.ActivityCompat
10-
import android.support.v4.content.ContextCompat
11-
import android.support.v4.content.res.ResourcesCompat
12-
import android.support.v7.app.AlertDialog
13-
import android.support.v7.app.AppCompatActivity
6+
import androidx.annotation.ColorRes
7+
import androidx.annotation.FontRes
8+
import androidx.annotation.StringRes
9+
import androidx.core.app.ActivityCompat
10+
import androidx.core.content.ContextCompat
11+
import androidx.core.content.res.ResourcesCompat
12+
import androidx.appcompat.app.AlertDialog
13+
import androidx.appcompat.app.AppCompatActivity
1414
import android.view.View
1515
import android.view.inputmethod.InputMethodManager
1616
import android.widget.TextView

‎app/src/main/java/com/esbati/keivan/persiancalendar/utils/ButterKnife.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import android.app.Activity
44
import android.app.Dialog
55
import android.app.DialogFragment
66
import android.app.Fragment
7-
import android.arch.lifecycle.Lifecycle
8-
import android.arch.lifecycle.LifecycleObserver
9-
import android.arch.lifecycle.LifecycleOwner
10-
import android.arch.lifecycle.OnLifecycleEvent
11-
import android.support.v7.widget.RecyclerView.ViewHolder
7+
import androidx.lifecycle.Lifecycle
8+
import androidx.lifecycle.LifecycleObserver
9+
import androidx.lifecycle.LifecycleOwner
10+
import androidx.lifecycle.OnLifecycleEvent
11+
import androidx.recyclerview.widget.RecyclerView.ViewHolder
1212
import android.view.View
1313
import kotlin.properties.ReadOnlyProperty
1414
import kotlin.reflect.KProperty
15-
import android.support.v4.app.DialogFragment as SupportDialogFragment
16-
import android.support.v4.app.Fragment as SupportFragment
15+
import androidx.fragment.app.DialogFragment as SupportDialogFragment
16+
import androidx.fragment.app.Fragment as SupportFragment
1717

1818

1919
public fun <V : View> View.bindView(id: Int)

0 commit comments

Comments
 (0)