Skip to content

Commit a5e61ea

Browse files
WaboodooWaboodoo
committed
Updated to AndroidX
1 parent 8371aa7 commit a5e61ea

File tree

68 files changed

+195
-194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+195
-194
lines changed

‎HTTPShortcuts/app/build.gradle‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-kapt'
44

55
android {
6-
compileSdkVersion 27
6+
compileSdkVersion 28
77
buildToolsVersion '28.0.3'
88

99
lintOptions {
@@ -50,15 +50,15 @@ repositories {
5050
}
5151

5252
dependencies {
53-
implementation 'com.android.support:multidex:1.0.3'
53+
implementation 'androidx.multidex:multidex:2.0.0'
5454
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
5555

5656
/* Support libraries */
57-
implementation 'com.android.support:appcompat-v7:27.1.1'
58-
implementation 'com.android.support:design:27.1.1'
59-
implementation 'com.android.support:recyclerview-v7:27.1.1'
60-
implementation 'com.android.support:support-annotations:27.1.1'
61-
implementation 'com.android.support:cardview-v7:27.1.1'
57+
implementation 'androidx.appcompat:appcompat:1.0.2'
58+
implementation 'com.google.android.material:material:1.1.0-alpha01'
59+
implementation 'androidx.recyclerview:recyclerview:1.0.0'
60+
implementation 'androidx.annotation:annotation:1.0.0'
61+
implementation 'androidx.cardview:cardview:1.0.0'
6262

6363
/* UI */
6464
implementation 'com.satsuware.lib:usefulviews:2.3.1'
@@ -84,7 +84,7 @@ dependencies {
8484
}
8585

8686
/* Image selection */
87-
implementation 'com.theartofdev.edmodo:android-image-cropper:2.7.0'
87+
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
8888

8989
/* HTTP & Network */
9090
implementation 'com.android.volley:volley:1.1.1'

‎HTTPShortcuts/app/src/main/java/ch/rmy/android/http_shortcuts/Application.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ch.rmy.android.http_shortcuts
22

33
import android.content.Context
4-
import android.support.multidex.MultiDex
4+
import androidx.multidex.MultiDex
55
import ch.rmy.android.http_shortcuts.utils.CrashReporting
66
import ch.rmy.android.http_shortcuts.utils.Settings
77
import com.facebook.stetho.Stetho

‎HTTPShortcuts/app/src/main/java/ch/rmy/android/http_shortcuts/actions/ActionsView.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package ch.rmy.android.http_shortcuts.actions
22

33
import android.content.Context
4-
import android.support.v7.widget.LinearLayoutManager
5-
import android.support.v7.widget.RecyclerView
64
import android.util.AttributeSet
75
import android.widget.Button
86
import android.widget.FrameLayout
7+
import androidx.recyclerview.widget.LinearLayoutManager
8+
import androidx.recyclerview.widget.RecyclerView
99
import ch.rmy.android.http_shortcuts.R
1010
import ch.rmy.android.http_shortcuts.actions.types.ActionFactory
1111
import ch.rmy.android.http_shortcuts.actions.types.BaseAction

‎HTTPShortcuts/app/src/main/java/ch/rmy/android/http_shortcuts/activities/BaseActivity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import android.content.Context
44
import android.graphics.PorterDuff
55
import android.os.Build
66
import android.os.Bundle
7-
import android.support.annotation.StringRes
8-
import android.support.design.widget.Snackbar
9-
import android.support.v7.app.AppCompatActivity
10-
import android.support.v7.widget.Toolbar
117
import android.view.MenuItem
128
import android.view.ViewGroup
139
import android.view.WindowManager
10+
import androidx.annotation.StringRes
11+
import androidx.appcompat.app.AppCompatActivity
12+
import androidx.appcompat.widget.Toolbar
1413
import ch.rmy.android.http_shortcuts.R
1514
import ch.rmy.android.http_shortcuts.realm.Controller
1615
import ch.rmy.android.http_shortcuts.utils.Destroyer
1716
import ch.rmy.android.http_shortcuts.utils.ThemeHelper
1817
import ch.rmy.android.http_shortcuts.utils.color
1918
import ch.rmy.android.http_shortcuts.utils.consume
2019
import ch.rmy.android.http_shortcuts.utils.drawable
20+
import com.google.android.material.snackbar.Snackbar
2121

2222
abstract class BaseActivity : AppCompatActivity() {
2323

‎HTTPShortcuts/app/src/main/java/ch/rmy/android/http_shortcuts/activities/BaseFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package ch.rmy.android.http_shortcuts.activities
22

33
import android.os.Bundle
4-
import android.support.v4.app.Fragment
54
import android.view.LayoutInflater
65
import android.view.View
76
import android.view.ViewGroup
7+
import androidx.fragment.app.Fragment
88
import ch.rmy.android.http_shortcuts.R
99
import ch.rmy.android.http_shortcuts.utils.Destroyer
1010

‎HTTPShortcuts/app/src/main/java/ch/rmy/android/http_shortcuts/activities/CategoriesActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ package ch.rmy.android.http_shortcuts.activities
22

33
import android.content.Context
44
import android.os.Bundle
5-
import android.support.design.widget.FloatingActionButton
6-
import android.support.v7.widget.LinearLayoutManager
7-
import android.support.v7.widget.RecyclerView
5+
import androidx.recyclerview.widget.LinearLayoutManager
6+
import androidx.recyclerview.widget.RecyclerView
87
import ch.rmy.android.http_shortcuts.R
98
import ch.rmy.android.http_shortcuts.adapters.CategoryAdapter
109
import ch.rmy.android.http_shortcuts.dialogs.MenuDialogBuilder
@@ -15,6 +14,7 @@ import ch.rmy.android.http_shortcuts.utils.DragOrderingHelper
1514
import ch.rmy.android.http_shortcuts.utils.mapIf
1615
import ch.rmy.android.http_shortcuts.utils.showIfPossible
1716
import com.afollestad.materialdialogs.MaterialDialog
17+
import com.google.android.material.floatingactionbutton.FloatingActionButton
1818
import kotterknife.bindView
1919

2020
class CategoriesActivity : BaseActivity() {

‎HTTPShortcuts/app/src/main/java/ch/rmy/android/http_shortcuts/activities/ListFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ch.rmy.android.http_shortcuts.activities
22

3-
import android.support.v7.widget.LinearLayoutManager
4-
import android.support.v7.widget.RecyclerView
3+
import androidx.recyclerview.widget.LinearLayoutManager
4+
import androidx.recyclerview.widget.RecyclerView
55
import ch.rmy.android.http_shortcuts.R
66
import ch.rmy.android.http_shortcuts.adapters.ShortcutAdapter
77
import ch.rmy.android.http_shortcuts.adapters.ShortcutGridAdapter

‎HTTPShortcuts/app/src/main/java/ch/rmy/android/http_shortcuts/activities/MainActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ import android.app.Activity
55
import android.content.Intent
66
import android.graphics.Color
77
import android.os.Bundle
8-
import android.support.design.widget.FloatingActionButton
9-
import android.support.design.widget.TabLayout
10-
import android.support.v4.view.ViewPager
118
import android.text.InputType
129
import android.view.Menu
1310
import android.view.MenuItem
11+
import androidx.viewpager.widget.ViewPager
1412
import ch.rmy.android.http_shortcuts.R
1513
import ch.rmy.android.http_shortcuts.adapters.CategoryPagerAdapter
1614
import ch.rmy.android.http_shortcuts.dialogs.ChangeLogDialog
@@ -26,6 +24,8 @@ import ch.rmy.android.http_shortcuts.utils.consume
2624
import ch.rmy.android.http_shortcuts.utils.showIfPossible
2725
import ch.rmy.android.http_shortcuts.utils.visible
2826
import com.afollestad.materialdialogs.MaterialDialog
27+
import com.google.android.material.floatingactionbutton.FloatingActionButton
28+
import com.google.android.material.tabs.TabLayout
2929
import kotterknife.bindView
3030

3131
class MainActivity : BaseActivity(), ListFragment.TabHost {

‎HTTPShortcuts/app/src/main/java/ch/rmy/android/http_shortcuts/activities/ShareActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package ch.rmy.android.http_shortcuts.activities
22

33
import android.content.Intent
44
import android.os.Bundle
5-
import android.support.annotation.StringRes
5+
import androidx.annotation.StringRes
66
import ch.rmy.android.http_shortcuts.R
77
import ch.rmy.android.http_shortcuts.dialogs.MenuDialogBuilder
88
import ch.rmy.android.http_shortcuts.realm.Controller

‎HTTPShortcuts/app/src/main/java/ch/rmy/android/http_shortcuts/activities/VariablesActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ package ch.rmy.android.http_shortcuts.activities
22

33
import android.content.Context
44
import android.os.Bundle
5-
import android.support.design.widget.FloatingActionButton
6-
import android.support.v7.widget.LinearLayoutManager
7-
import android.support.v7.widget.RecyclerView
85
import android.view.Menu
96
import android.view.MenuItem
7+
import androidx.recyclerview.widget.LinearLayoutManager
8+
import androidx.recyclerview.widget.RecyclerView
109
import ch.rmy.android.http_shortcuts.R
1110
import ch.rmy.android.http_shortcuts.adapters.VariableAdapter
1211
import ch.rmy.android.http_shortcuts.dialogs.HelpDialogBuilder
@@ -19,6 +18,7 @@ import ch.rmy.android.http_shortcuts.utils.Settings
1918
import ch.rmy.android.http_shortcuts.utils.consume
2019
import ch.rmy.android.http_shortcuts.utils.showIfPossible
2120
import com.afollestad.materialdialogs.MaterialDialog
21+
import com.google.android.material.floatingactionbutton.FloatingActionButton
2222
import kotterknife.bindView
2323

2424
class VariablesActivity : BaseActivity() {

0 commit comments

Comments
 (0)