Skip to content
This repository was archived by the owner on Aug 22, 2024. It is now read-only.

Commit d9d9361

Browse files
hossain-khanhossain-khan
authored
Merge pull request #61 from amardeshbd/46_migrate_to_androidx
Android X Migration.
2 parents de99504 + e0e8a06 commit d9d9361

27 files changed

+111
-84
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
# Our Android Docker images are currently tagged with the suffix -alpha.
1212
# This is to indicate the images are currently under development and
1313
# might change in backwards incompatible ways from week to week.
14-
- image: circleci/android:api-27-alpha
14+
- image: circleci/android:api-28-alpha
1515
environment:
1616
JVM_OPTS: -Xmx3200m
1717
steps:

‎.idea/encodings.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222
buildConfigField "String", "GIT_SHA", "\"${gitSha()}\""
2323
buildConfigField "String", "BUILD_TIME", "\"${buildTime()}\""
2424

25-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
25+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2626
}
2727
buildTypes {
2828
release {
@@ -44,26 +44,26 @@ android {
4444
dependencies {
4545
implementation fileTree(dir: 'libs', include: ['*.jar'])
4646
// Kotlin support
47-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
47+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
4848

4949
// Android Support libs and Google Android libs
50-
implementation "com.android.support:support-v13:$rootProject.supportLibraryVersion"
51-
implementation "com.android.support:design:$rootProject.supportLibraryVersion"
52-
implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
50+
implementation "androidx.legacy:legacy-support-v13:$rootProject.supportLibraryVersion"
51+
implementation "com.google.android.material:material:$rootProject.supportLibraryVersion"
52+
implementation "androidx.cardview:cardview:$rootProject.supportLibraryVersion"
5353

54-
implementation "com.android.support.constraint:constraint-layout:$rootProject.constraintLayoutVersion"
54+
implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayoutVersion"
5555

5656
// ViewModel and LiveData
5757
// https://developer.android.com/topic/libraries/architecture/adding-components
58-
implementation "android.arch.lifecycle:extensions:$rootProject.archComponentVersion"
58+
implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.archComponentVersion"
5959

6060
// https://developer.chrome.com/multidevice/android/customtabs
61-
implementation "com.android.support:customtabs:$rootProject.supportLibraryVersion"
61+
implementation "androidx.browser:browser:$rootProject.supportLibraryVersion"
6262

6363
// ========================================================
6464
// 3rd party libraries
6565
// ========================================================
66-
implementation 'com.android.support.constraint:constraint-layout:1.1.0'
66+
implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
6767
debugImplementation "com.squareup.leakcanary:leakcanary-android:$rootProject.leakcanaryLibraryVersion"
6868
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$rootProject.leakcanaryLibraryVersion"
6969

@@ -98,11 +98,11 @@ dependencies {
9898
// Mocking framework for unit tests written in Java
9999
testImplementation "org.mockito:mockito-core:$rootProject.mockitoVersion"
100100

101-
androidTestImplementation("com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion", {
101+
androidTestImplementation("androidx.test.espresso:espresso-core:$rootProject.espressoVersion", {
102102
exclude group: 'com.android.support', module: 'support-annotations'
103103
})
104-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
105-
testImplementation "android.arch.core:core-testing:$rootProject.archComponentVersion"
104+
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
105+
testImplementation "androidx.arch.core:core-testing:$rootProject.archComponentVersion"
106106
}
107107

108108
// ADD THIS AT THE BOTTOM

‎app/src/androidTest/java/com/hossainkhan/android/demo/ExampleInstrumentedTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.hossainkhan.android.demo
22

3-
import android.support.test.InstrumentationRegistry
4-
import android.support.test.runner.AndroidJUnit4
3+
import androidx.test.InstrumentationRegistry
4+
import androidx.test.runner.AndroidJUnit4
55

66
import org.junit.Test
77
import org.junit.runner.RunWith

‎app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
package com.hossainkhan.android.demo.browse
1818

19-
import android.arch.lifecycle.ViewModelProviders
19+
import androidx.lifecycle.ViewModelProviders
2020
import android.os.Bundle
21-
import android.support.v7.app.AppCompatActivity
22-
import android.support.v7.widget.GridLayoutManager
23-
import android.support.v7.widget.RecyclerView
21+
import androidx.appcompat.app.AppCompatActivity
22+
import androidx.recyclerview.widget.GridLayoutManager
23+
import androidx.recyclerview.widget.RecyclerView
2424
import com.hossainkhan.android.demo.R
2525
import com.hossainkhan.android.demo.layoutpreview.LayoutChainStyleActivity
2626
import com.hossainkhan.android.demo.layoutpreview.LayoutPreviewBaseActivity

‎app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseAdapter.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.hossainkhan.android.demo.browse
1818

19-
import android.arch.lifecycle.LifecycleOwner
20-
import android.arch.lifecycle.Observer
21-
import android.support.v7.widget.RecyclerView
19+
import androidx.lifecycle.LifecycleOwner
20+
import androidx.lifecycle.Observer
21+
import androidx.recyclerview.widget.RecyclerView
2222
import android.view.LayoutInflater
2323
import android.view.View
2424
import android.view.ViewGroup

‎app/src/main/java/com/hossainkhan/android/demo/browse/LayoutBrowseViewModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
package com.hossainkhan.android.demo.browse
1818

19-
import android.arch.lifecycle.LiveData
20-
import android.arch.lifecycle.MutableLiveData
21-
import android.arch.lifecycle.ViewModel
19+
import androidx.lifecycle.LiveData
20+
import androidx.lifecycle.MutableLiveData
21+
import androidx.lifecycle.ViewModel
2222
import com.hossainkhan.android.demo.data.AppDataStore
2323
import com.hossainkhan.android.demo.data.LayoutInformation
2424
import timber.log.Timber

‎app/src/main/java/com/hossainkhan/android/demo/data/LayoutDataStore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.hossainkhan.android.demo.data
1818

1919
import android.content.res.Resources
20-
import android.support.annotation.LayoutRes
20+
import androidx.annotation.LayoutRes
2121
import com.hossainkhan.android.demo.R
2222
import com.hossainkhan.android.demo.base.AppConfig
2323
import javax.inject.Inject

‎app/src/main/java/com/hossainkhan/android/demo/data/LayoutInformation.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.hossainkhan.android.demo.data
1818

19-
import android.support.annotation.DrawableRes
20-
import android.support.annotation.LayoutRes
19+
import androidx.annotation.DrawableRes
20+
import androidx.annotation.LayoutRes
2121

2222
/**
2323
* A simple data class containing layout resource ID and it's respective description.

‎app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutChainStyleActivity.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ package com.hossainkhan.android.demo.layoutpreview
1919
import android.content.Context
2020
import android.content.Intent
2121
import android.os.Bundle
22-
import android.support.annotation.StringRes
23-
import android.support.constraint.ConstraintLayout
24-
import android.support.constraint.ConstraintSet
25-
import android.support.constraint.ConstraintSet.CHAIN_PACKED
26-
import android.support.constraint.ConstraintSet.CHAIN_SPREAD
27-
import android.support.constraint.ConstraintSet.CHAIN_SPREAD_INSIDE
28-
import android.support.transition.TransitionManager
22+
import androidx.annotation.StringRes
23+
import androidx.constraintlayout.widget.ConstraintLayout
24+
import androidx.constraintlayout.widget.ConstraintSet
25+
import androidx.constraintlayout.widget.ConstraintSet.CHAIN_PACKED
26+
import androidx.constraintlayout.widget.ConstraintSet.CHAIN_SPREAD
27+
import androidx.constraintlayout.widget.ConstraintSet.CHAIN_SPREAD_INSIDE
28+
import androidx.transition.TransitionManager
2929
import android.view.View
3030
import com.hossainkhan.android.demo.R
3131
import android.widget.RadioButton

‎app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutInfoViewModel.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
package com.hossainkhan.android.demo.layoutpreview
1818

19-
import android.arch.lifecycle.LiveData
20-
import android.arch.lifecycle.MutableLiveData
21-
import android.arch.lifecycle.ViewModel
22-
import android.support.annotation.LayoutRes
19+
import androidx.lifecycle.LiveData
20+
import androidx.lifecycle.MutableLiveData
21+
import androidx.lifecycle.ViewModel
22+
import androidx.annotation.LayoutRes
2323
import com.hossainkhan.android.demo.data.AppDataStore
2424
import com.hossainkhan.android.demo.data.LayoutInformation
2525
import timber.log.Timber

‎app/src/main/java/com/hossainkhan/android/demo/layoutpreview/LayoutPreviewBaseActivity.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616

1717
package com.hossainkhan.android.demo.layoutpreview
1818

19-
import android.arch.lifecycle.Observer
20-
import android.arch.lifecycle.ViewModelProvider
19+
import androidx.lifecycle.Observer
20+
import androidx.lifecycle.ViewModelProvider
2121
import android.content.Context
2222
import android.content.Intent
2323
import android.net.Uri
2424
import android.os.Bundle
25-
import android.support.annotation.LayoutRes
26-
import android.support.customtabs.CustomTabsIntent
27-
import android.support.v4.app.NavUtils
28-
import android.support.v7.app.AppCompatActivity
25+
import androidx.annotation.LayoutRes
26+
import androidx.browser.customtabs.CustomTabsIntent
27+
import androidx.core.app.NavUtils
28+
import androidx.appcompat.app.AppCompatActivity
2929
import android.view.Menu
3030
import android.view.MenuItem
3131
import com.andrognito.flashbar.Flashbar

‎app/src/main/java/com/hossainkhan/android/demo/viewmodel/LayoutPreviewViewModelFactory.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.hossainkhan.android.demo.viewmodel
1818

19-
import android.arch.lifecycle.ViewModel
20-
import android.arch.lifecycle.ViewModelProvider
19+
import androidx.lifecycle.ViewModel
20+
import androidx.lifecycle.ViewModelProvider
2121
import com.hossainkhan.android.demo.browse.LayoutBrowseViewModel
2222
import com.hossainkhan.android.demo.data.AppDataStore
2323
import com.hossainkhan.android.demo.layoutpreview.LayoutInfoViewModel

‎app/src/main/res/layout/activity_main.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
tools:context="com.hossainkhan.android.demo.browse.LayoutBrowseActivity">
88

9-
<android.support.v7.widget.RecyclerView
9+
<androidx.recyclerview.widget.RecyclerView
1010
android:id="@+id/recycler_view"
1111
android:layout_width="match_parent"
1212
android:layout_height="match_parent"
1313
android:scrollbars="vertical"
14+
tools:listitem="@layout/list_item_layout_preview"
1415
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
1516

16-
</android.support.constraint.ConstraintLayout>
17+
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/list_item_layout_preview.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
17+
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
1818
xmlns:app="http://schemas.android.com/apk/res-auto"
1919
xmlns:tools="http://schemas.android.com/tools"
2020
android:layout_width="match_parent"
@@ -25,7 +25,7 @@
2525
app:cardMaxElevation="5dp"
2626
app:contentPadding="5dp">
2727

28-
<android.support.constraint.ConstraintLayout
28+
<androidx.constraintlayout.widget.ConstraintLayout
2929
android:layout_width="match_parent"
3030
android:layout_height="match_parent">
3131

@@ -58,5 +58,5 @@
5858
app:layout_constraintTop_toTopOf="parent"
5959
tools:text="This is the layout title. If this is long, it will be truncated." />
6060

61-
</android.support.constraint.ConstraintLayout>
62-
</android.support.v7.widget.CardView>
61+
</androidx.constraintlayout.widget.ConstraintLayout>
62+
</androidx.cardview.widget.CardView>

‎app/src/main/res/layout/preview_chain_style_main.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
~ limitations under the License.
1717
-->
1818

19-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
19+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2020
xmlns:app="http://schemas.android.com/apk/res-auto"
2121
xmlns:tools="http://schemas.android.com/tools"
2222
android:id="@+id/constraint_layout_root"
@@ -56,4 +56,4 @@
5656
-->
5757
<include layout="@layout/include_layout_chain_style" />
5858

59-
</android.support.constraint.ConstraintLayout>
59+
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/preview_chain_weighted.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
~ limitations under the License.
1717
-->
1818

19-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
19+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2020
xmlns:app="http://schemas.android.com/apk/res-auto"
2121
xmlns:tools="http://schemas.android.com/tools"
2222
android:id="@+id/constraint_layout_root"
@@ -77,4 +77,4 @@
7777
app:layout_constraintTop_toBottomOf="@+id/view_chain_view_middle" />
7878

7979

80-
</android.support.constraint.ConstraintLayout>
80+
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/preview_positioning_bias.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
17+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
1818
xmlns:app="http://schemas.android.com/apk/res-auto"
1919
xmlns:tools="http://schemas.android.com/tools"
2020
android:layout_width="match_parent"
@@ -54,4 +54,4 @@
5454
<include layout="@layout/include_layout_positioning_bias" />
5555

5656

57-
</android.support.constraint.ConstraintLayout>
57+
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/preview_positioning_centered.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<android.support.constraint.ConstraintLayout
17+
<androidx.constraintlayout.widget.ConstraintLayout
1818
xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:app="http://schemas.android.com/apk/res-auto"
2020
xmlns:tools="http://schemas.android.com/tools"
@@ -35,4 +35,4 @@
3535
app:layout_constraintStart_toStartOf="parent"
3636
app:layout_constraintTop_toTopOf="parent"
3737
style="@style/MediumBox" />
38-
</android.support.constraint.ConstraintLayout>
38+
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/preview_positioning_circular.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
~ limitations under the License.
1717
-->
1818

19-
<android.support.constraint.ConstraintLayout
19+
<androidx.constraintlayout.widget.ConstraintLayout
2020
xmlns:android="http://schemas.android.com/apk/res/android"
2121
xmlns:app="http://schemas.android.com/apk/res-auto"
2222
xmlns:tools="http://schemas.android.com/tools"
@@ -44,7 +44,7 @@
4444
app:layout_constraintCircle="@+id/view_centered"
4545
app:layout_constraintCircleAngle="45"
4646
app:layout_constraintCircleRadius="100dp"
47-
tools:ignore="HardcodedText" />
47+
tools:ignore="HardcodedText,MissingConstraints" />
4848

4949
<!--
5050
Text at 220 degree with distance 150dp from centered box.
@@ -55,7 +55,7 @@
5555
app:layout_constraintCircle="@+id/view_centered"
5656
app:layout_constraintCircleAngle="220"
5757
app:layout_constraintCircleRadius="150dp"
58-
tools:ignore="HardcodedText" />
58+
tools:ignore="HardcodedText,MissingConstraints" />
5959

6060

6161
<!--
@@ -64,4 +64,4 @@
6464
-->
6565
<include layout="@layout/include_layout_positioning_circle_overlay" />
6666

67-
</android.support.constraint.ConstraintLayout>
67+
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/layout/preview_positioning_top_left.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
~ limitations under the License.
1515
-->
1616

17-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
17+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
1818
xmlns:app="http://schemas.android.com/apk/res-auto"
1919
xmlns:tools="http://schemas.android.com/tools"
2020
android:layout_width="match_parent"
@@ -34,4 +34,4 @@
3434
android:background="@color/md_purple_700"
3535
app:layout_constraintStart_toStartOf="parent"
3636
app:layout_constraintTop_toTopOf="parent" />
37-
</android.support.constraint.ConstraintLayout>
37+
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)