Skip to content

Commit f53867b

Browse files
shekiboboshekibobo
authored
Use AndroidX (#58)
1 parent 6857533 commit f53867b

30 files changed

+93
-91
lines changed

‎gradle.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ org.gradle.parallel=true
2323
org.gradle.configureondemand=true
2424
# Set to true or false to enable or disable the build cache.
2525
#If this parameter is not set, the build cache is disabled by default.
26-
android.enableBuildCache=true
26+
android.enableBuildCache=true
27+
android.useAndroidX=true
28+
android.enableJetifier=true

‎library/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ dependencies {
174174
implementation supportLibs
175175
implementation networkLibs
176176
implementation otherLibs
177-
implementation 'com.android.support:support-v4:28.0.0'
178-
implementation 'com.android.support:cardview-v7:28.0.0'
177+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
178+
implementation 'androidx.cardview:cardview:1.0.0'
179179
kapt annotationProcessorLibs
180180
kaptTest daggerCompiler
181181
kaptAndroidTest daggerCompiler

‎library/src/main/java/io/constructor/features/base/BaseActivity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.constructor.features.base
22

33
import android.os.Bundle
4-
import android.support.annotation.LayoutRes
5-
import android.support.v4.util.LongSparseArray
6-
import android.support.v7.app.AppCompatActivity
4+
import androidx.annotation.LayoutRes
5+
import androidx.collection.LongSparseArray
6+
import androidx.appcompat.app.AppCompatActivity
77
import android.view.MenuItem
88
import io.constructor.core.ConstructorIo
99
import io.constructor.injection.component.ActivityComponent
@@ -73,4 +73,4 @@ abstract class BaseActivity : AppCompatActivity() {
7373
}
7474

7575
fun activityComponent() = activityComponent as ActivityComponent
76-
}
76+
}

‎library/src/main/java/io/constructor/features/base/BaseFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.constructor.features.base
22

33
import android.os.Bundle
4-
import android.support.annotation.LayoutRes
5-
import android.support.v4.app.Fragment
4+
import androidx.annotation.LayoutRes
5+
import androidx.fragment.app.Fragment
66
import android.util.LongSparseArray
77
import android.view.LayoutInflater
88
import android.view.View
@@ -71,4 +71,4 @@ abstract class BaseFragment : Fragment() {
7171
}
7272

7373
fun fragmentComponent() = fragmentComponent as FragmentComponent
74-
}
74+
}

‎library/src/main/java/io/constructor/injection/module/FragmentModule.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.constructor.injection.module
22

33
import android.content.Context
4-
import android.support.v4.app.Fragment
5-
import android.support.v4.app.FragmentActivity
4+
import androidx.fragment.app.Fragment
5+
import androidx.fragment.app.FragmentActivity
66
import dagger.Module
77
import dagger.Provides
88
import io.constructor.injection.ActivityContext
@@ -23,4 +23,4 @@ class FragmentModule(private val fragment: Fragment) {
2323
@ActivityContext
2424
internal fun providesContext(): Context? = fragment.context
2525

26-
}
26+
}

‎library/src/main/java/io/constructor/ui/base/BaseSuggestionFragment.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import android.content.Context
55
import android.content.Intent
66
import android.content.IntentFilter
77
import android.os.Bundle
8-
import android.support.v4.content.LocalBroadcastManager
9-
import android.support.v7.widget.LinearLayoutManager
10-
import android.support.v7.widget.RecyclerView
8+
import androidx.localbroadcastmanager.content.LocalBroadcastManager
9+
import androidx.recyclerview.widget.LinearLayoutManager
10+
import androidx.recyclerview.widget.RecyclerView
1111
import android.text.Editable
1212
import android.text.TextUtils
1313
import android.text.TextWatcher
@@ -183,4 +183,4 @@ abstract class BaseSuggestionFragment : BaseFragment(), SuggestionsView {
183183
this.listener = listener
184184
}
185185

186-
}
186+
}

‎library/src/main/java/io/constructor/ui/base/BaseSuggestionsAdapter.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package io.constructor.ui.base
22

33
import android.graphics.Color
44
import android.graphics.Typeface
5-
import android.support.annotation.IdRes
6-
import android.support.annotation.LayoutRes
7-
import android.support.v7.widget.RecyclerView
5+
import androidx.annotation.IdRes
6+
import androidx.annotation.LayoutRes
7+
import androidx.recyclerview.widget.RecyclerView
88
import android.text.Spannable
99
import android.text.style.ForegroundColorSpan
1010
import android.text.style.StyleSpan
@@ -82,4 +82,4 @@ abstract class BaseSuggestionsAdapter : RecyclerView.Adapter<BaseSuggestionsAdap
8282
var suggestionGroupName: TextView = itemView.findViewById(suggestionGroupNameId)
8383
}
8484

85-
}
85+
}

‎library/src/main/java/io/constructor/util/Extensions.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package io.constructor.util
33
import android.content.Context
44
import android.content.Intent
55
import android.os.Parcelable
6-
import android.support.v4.content.LocalBroadcastManager
6+
import androidx.localbroadcastmanager.content.LocalBroadcastManager
77
import android.util.Base64
88
import android.util.Log
99
import io.reactivex.Observable

‎library/src/main/res/layout/fragment_suggestions.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,17 @@
4646

4747
</RelativeLayout>
4848

49-
<android.support.v7.widget.CardView
49+
<androidx.cardview.widget.CardView
5050
android:layout_width="match_parent"
5151
android:layout_height="wrap_content"
5252
android:layout_below="@+id/searchContainer"
5353
android:layout_margin="8dp">
5454

55-
<android.support.v7.widget.RecyclerView
55+
<androidx.recyclerview.widget.RecyclerView
5656
android:id="@+id/suggestionItems"
5757
android:layout_width="match_parent"
5858
android:layout_height="wrap_content" />
5959

60-
</android.support.v7.widget.CardView>
60+
</androidx.cardview.widget.CardView>
6161

6262
</RelativeLayout>

‎sample/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
targetSdkVersion 28
1111
versionCode 1
1212
versionName "1.0"
13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1414
}
1515
buildTypes {
1616
release {
@@ -28,15 +28,15 @@ dependencies {
2828
implementation fileTree(include: ['*.jar'], dir: 'libs')
2929
implementation project(':library')
3030
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
31-
implementation 'com.android.support:appcompat-v7:28.0.0'
32-
implementation 'com.android.support:recyclerview-v7:28.0.0'
33-
implementation "com.android.support:cardview-v7:28.0.0"
34-
implementation "com.android.support:design:28.0.0"
31+
implementation 'androidx.appcompat:appcompat:1.0.0'
32+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
33+
implementation 'androidx.cardview:cardview:1.0.0'
34+
implementation 'com.google.android.material:material:1.0.0'
3535
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
3636
implementation 'io.reactivex.rxjava2:rxjava:2.2.6'
3737
implementation 'io.reactivex.rxjava2:rxkotlin:2.2.0'
38-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
38+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3939
implementation 'com.github.bumptech.glide:glide:4.9.0'
4040
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
4141
testImplementation 'junit:junit:4.12'
42-
}
42+
}

0 commit comments

Comments
 (0)