sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-19 20:29:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to AndroidX

Browse source
This commit is contained in:
Phillip Thelen 2018-11-06 16:11:02 +01:00
parent 8c15df4d8a
commit d10bedd990
225 changed files with 767 additions and 761 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -213,7 +213,7 @@
</service>
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="@string/content_provider"
android:grantUriPermissions="true"
android:exported="false">

15
Habitica/build.gradle
View file

@ -9,6 +9,7 @@ apply plugin: 'realm-android'
buildscript {
repositories {
mavenLocal()
google()
mavenCentral()
maven { url 'https://maven.fabric.io/public' }
jcenter()
@ -60,10 +61,10 @@ dependencies {
kapt 'com.google.dagger:dagger-compiler:2.17'
compileOnly 'javax.annotation:javax.annotation-api:1.3.1'
//App Compatibility and Material Design
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.android.support:preference-v14:28.0.0'
implementation 'androidx.appcompat:appcompat:1.0.1'
implementation 'com.google.android.material:material:1.1.0-alpha01'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
//QR Code
implementation 'com.github.kenglxn.QRGen:android:2.5.0'
// Emojis
@ -124,8 +125,12 @@ dependencies {
exclude group: 'com.android.support', module: 'multidex'
}
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:multidex:1.0.3'
implementation 'androidx.multidex:multidex:2.0.0'
implementation 'com.nex3z:flow-layout:1.2.2'
implementation 'androidx.core:core-ktx:1.0.1'
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.0.0"
kapt "androidx.lifecycle:lifecycle-compiler:2.0.0"
}
android {

4
Habitica/res/layout/activity_about.xml
View file

@ -5,7 +5,7 @@
android:layout_height="match_parent"
tools:context=".ui.activities.AboutActivity">
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -14,7 +14,7 @@
android:minHeight="?attr/actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="fill_parent"

20
Habitica/res/layout/activity_challenge_detail.xml
View file

@ -6,14 +6,14 @@
android:layout_height="match_parent"
tools:context=".ui.activities.MainActivity">
<android.support.v4.widget.DrawerLayout
<androidx.drawerlayout.widget.DrawerLayout
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:gravity="center">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -26,13 +26,13 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="false">
<android.support.design.widget.CollapsingToolbarLayout
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -150,7 +150,7 @@
</LinearLayout>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -159,9 +159,9 @@
app:layout_collapseMode="pin"
app:popupTheme="@style/Theme.AppCompat.Light" />
</android.support.design.widget.CollapsingToolbarLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/detail_tabs"
android:layout_width="match_parent"
android:layout_height="54dp"
@ -178,7 +178,7 @@
app:tabGravity="fill"
app:tabIndicatorColor="@android:color/white"
app:tabMode="fixed" />
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/floating_menu_wrapper"
@ -191,6 +191,6 @@
android:layout_marginRight="8dp"
app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior" />
</android.support.design.widget.CoordinatorLayout>
</android.support.v4.widget.DrawerLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.drawerlayout.widget.DrawerLayout>
</FrameLayout>

20
Habitica/res/layout/activity_class_selection.xml
View file

@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/healerWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -39,8 +39,8 @@
style="@style/CardText"/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/mageWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -71,8 +71,8 @@
style="@style/CardText"/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/rogueWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -103,8 +103,8 @@
style="@style/CardText"/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/warriorWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -136,8 +136,8 @@
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/optOutWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -159,6 +159,6 @@
android:text="@string/opt_out_description"
style="@style/CardText"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>
</ScrollView>

20
Habitica/res/layout/activity_create_challenge.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_create_challenge"
@ -25,7 +25,7 @@
android:paddingTop="22dp">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@color/brand_500"
@ -44,9 +44,9 @@
tools:text="Get in shape"
android:inputType="text" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColorHint="@color/brand_500"
@ -66,7 +66,7 @@
android:textColor="@color/white"
android:textColorHighlight="@color/brand_500"
android:textColorHint="@color/brand_500" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
@ -175,7 +175,7 @@
android:text="@string/short_name"
android:textColor="#cc000000" />
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -191,7 +191,7 @@
android:maxLines="1"
android:textColor="@color/gray_100"
android:textColorHint="#61000000" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<TextView
@ -215,13 +215,13 @@
</LinearLayout>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"
android:id="@+id/create_challenge_task_list">
</android.support.v7.widget.RecyclerView>
</androidx.recyclerview.widget.RecyclerView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

6
Habitica/res/layout/activity_fixcharacter.xml
View file

@ -7,11 +7,11 @@
android:orientation="vertical"
tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity"
android:background="@color/white">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -20,7 +20,7 @@
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<ScrollView android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout

30
Habitica/res/layout/activity_full_profile.xml
View file

@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
style="@style/CardView.Default"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -179,9 +179,9 @@
tools:text="100"/>
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
style="@style/CardView.Default"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -216,10 +216,10 @@
android:visibility="gone"
android:id="@+id/copy_username" />
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
style="@style/CardView.Default"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -243,9 +243,9 @@
android:shrinkColumns="1"
android:stretchColumns="0" />
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/profile_costume_card"
style="@style/CardView.Default"
android:layout_width="match_parent"
@ -270,9 +270,9 @@
android:shrinkColumns="1"
android:stretchColumns="0" />
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/profile_attributes_card"
style="@style/CardView.Default"
android:layout_width="match_parent"
@ -307,7 +307,7 @@
android:text="@string/attributes"
android:textStyle="bold" />
<android.support.v7.widget.AppCompatImageView
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/attributes_collapse_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -339,10 +339,10 @@
</TableLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
style="@style/CardView.Default"
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -408,10 +408,10 @@
</TableRow>
</TableLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/profile_achievements_card"
style="@style/CardView.Default"
android:layout_width="match_parent"
@ -444,7 +444,7 @@
android:scrollbarThumbVertical="@color/scrollbarThumb"
android:scrollbars="vertical" />
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>
</ScrollView>

22
Habitica/res/layout/activity_gem_purchase.xml
View file

@ -5,34 +5,34 @@
android:layout_height="match_parent"
tools:context=".ui.activities.MainActivity"
android:id="@+id/overlayFrameLayout">
<android.support.v4.widget.DrawerLayout
<androidx.drawerlayout.widget.DrawerLayout
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:gravity="center">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:elevation="0dp"
tools:context=".ui.activities.MainActivity">
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="false">
<android.support.design.widget.CollapsingToolbarLayout
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -53,7 +53,7 @@
android:paddingBottom="21dp"
android:contentDescription="@string/support_habitica"/>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -61,9 +61,9 @@
android:theme="@style/Toolbar"
app:layout_collapseMode="pin"
app:popupTheme="@style/Theme.AppCompat.Light" />
</android.support.design.widget.CollapsingToolbarLayout>
</com.google.android.material.appbar.CollapsingToolbarLayout>
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="54dp"
@ -80,8 +80,8 @@
app:tabGravity="fill"
app:tabIndicatorColor="@android:color/white"
app:tabMode="fixed" />
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
</android.support.design.widget.CoordinatorLayout>
</android.support.v4.widget.DrawerLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.drawerlayout.widget.DrawerLayout>
</FrameLayout>

8
Habitica/res/layout/activity_group_form.xml
View file

@ -8,7 +8,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
@ -20,7 +20,7 @@
android:hint="@string/name"
android:textColor="@android:color/black"
android:inputType="textCapSentences" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:layout_width="match_parent"
@ -37,7 +37,7 @@
android:focusable="true"
android:focusableInTouchMode="true" />
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
@ -50,7 +50,7 @@
android:hint="@string/description"
android:textColor="@android:color/black"
android:inputType="textCapSentences|textMultiLine" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout

2
Habitica/res/layout/activity_intro.xml
View file

@ -4,7 +4,7 @@
android:layout_width="match_parent"
xmlns:tools="http://schemas.android.com/tools"
tools:background="@color/brand">
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent" />

24
Habitica/res/layout/activity_main.xml
View file

@ -1,5 +1,5 @@
<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
<android.support.v4.widget.DrawerLayout
<androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
@ -12,7 +12,7 @@
space available using match_parent in both dimensions. -->
<FrameLayout android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinatorLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -25,12 +25,12 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.CollapsingToolbarLayout
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/collapsing_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -48,7 +48,7 @@
android:layout_marginTop="?attr/actionBarSize"
app:layout_collapseMode="parallax" />
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -82,10 +82,10 @@
android:layout_alignParentRight="true"/>
</RelativeLayout>
</android.support.v7.widget.Toolbar>
</android.support.design.widget.CollapsingToolbarLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/detail_tabs"
android:layout_width="match_parent"
android:layout_height="54dp"
@ -102,7 +102,7 @@
app:tabGravity="fill"
app:tabIndicatorColor="@android:color/white"
app:tabMode="fixed" />
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:id="@+id/bottom_wrapper"
@ -113,7 +113,7 @@
android:layout_alignParentBottom="true"
app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior"
android:padding="0dp">
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/floating_menu_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -136,7 +136,7 @@
/>
</LinearLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -157,4 +157,4 @@
android:layout_marginRight="32dp"
tools:layout="@layout/drawer_main"/>
</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>

4
Habitica/res/layout/activity_party_invite.xml
View file

@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@ -23,7 +23,7 @@
app:tabIndicatorColor="@android:color/white"
app:tabMode="fixed" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="0px"

6
Habitica/res/layout/activity_prefs.xml
View file

@ -7,11 +7,11 @@
tools:context=".ui.activities.PrefsActivity"
android:orientation="vertical">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -20,7 +20,7 @@
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"

2
Habitica/res/layout/activity_skill_members.xml
View file

@ -5,7 +5,7 @@
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"

4
Habitica/res/layout/activity_skill_tasks.xml
View file

@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@ -23,7 +23,7 @@
app:tabIndicatorColor="@android:color/white"
app:tabMode="fixed" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="0px"

16
Habitica/res/layout/activity_task_form.xml
View file

@ -32,7 +32,7 @@
android:focusable="true"
android:focusableInTouchMode="true" />
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
@ -46,7 +46,7 @@
android:textColor="@android:color/black"
android:inputType="textCapSentences|textMultiLine"
android:maxLines="3"/>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
@ -61,7 +61,7 @@
android:layout_gravity="center_vertical"
android:contentDescription="Toogle Emoji" />
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hintTextAppearance="@style/TextAppearance.AppCompat">
@ -74,10 +74,10 @@
android:hint="@string/notes"
android:textColor="@android:color/black"
android:inputType="textCapSentences|textMultiLine" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/task_value_layout"
android:layout_width="match_parent"
android:layout_height="72dp"
@ -91,7 +91,7 @@
android:hint="@string/task_value"
android:textColor="@android:color/black"
android:inputType="numberDecimal" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:layout_width="match_parent"
@ -202,7 +202,7 @@
android:text="@string/checklist"
android:textAppearance="?android:attr/textAppearanceLarge" />
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/checklist_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@ -398,7 +398,7 @@
android:text="@string/reminders"
android:textAppearance="?android:attr/textAppearanceLarge" />
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/reminders_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

4
Habitica/res/layout/animal_overview_item.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/card_view"
android:layout_height="wrap_content"
android:layout_width="match_parent">
@ -29,4 +29,4 @@
android:id="@+id/ownedTextView"
style="@style/RowText"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>

4
Habitica/res/layout/avatar_setup_drawer.xml
View file

@ -13,7 +13,7 @@
android:background="@drawable/avatar_customization_subcategory_bg"
android:layout_alignParentTop="true">
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/subcategory_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -26,7 +26,7 @@
app:tabPaddingStart="24dp"
/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/customization_list"
android:layout_width="wrap_content"
android:layout_height="0dp"

4
Habitica/res/layout/customization_grid_background_item.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/card_view"
android:layout_height="wrap_content"
android:layout_width="match_parent">
@ -34,4 +34,4 @@
android:layout_centerHorizontal="true" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>

4
Habitica/res/layout/customization_grid_item.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/card_view"
android:layout_height="wrap_content"
android:layout_width="match_parent">
@ -34,4 +34,4 @@
android:layout_centerHorizontal="true" />
</RelativeLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>

2
Habitica/res/layout/dialog_challenge_filter.xml
View file

@ -62,7 +62,7 @@
android:padding="0dp"/>
</LinearLayout>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/challenge_filter_recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
Habitica/res/layout/drawer_main.xml
View file

@ -118,7 +118,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent" />

4
Habitica/res/layout/fixvalues_edittext.xml
View file

@ -17,7 +17,7 @@
<LinearLayout
android:layout_height="match_parent"
android:layout_width="match_parent">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/editTextWrapper"
android:layout_height="match_parent"
android:layout_width="0dp"
@ -31,7 +31,7 @@
android:layout_height="match_parent"
android:inputType="numberDecimal"
android:background="@android:color/transparent"/>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<ImageView
android:id="@+id/iconView"
android:layout_width="56dp"

4
Habitica/res/layout/fragment_about.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -118,4 +118,4 @@
android:textSize="@dimen/abc_text_size_small_material" />
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

16
Habitica/res/layout/fragment_avatar_overview.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -21,7 +21,7 @@
android:text="@string/avatar_body"
android:textAppearance="?android:attr/textAppearanceMedium" />
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/CardView.Default">
@ -74,7 +74,7 @@
android:id="@+id/avatarChairView"
app:equipmentTitle="@string/avatar_wheelchair"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -82,7 +82,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SectionTitle"/>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/CardView.Default">
@ -123,7 +123,7 @@
android:id="@+id/avatarHairMustacheView"
app:equipmentTitle="@string/avatar_mustache" />
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<TextView
android:layout_width="wrap_content"
@ -132,7 +132,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
style="@style/SectionTitle"/>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/CardView.Default">
@ -146,6 +146,6 @@
android:id="@+id/avatarBackgroundView"
app:equipmentTitle="@string/avatar_background" />
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

4
Habitica/res/layout/fragment_challenge_detail.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -208,4 +208,4 @@
style="@style/HabiticaButton.Red"/>
</FrameLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

4
Habitica/res/layout/fragment_challengeslist.xml
View file

@ -1,4 +1,4 @@
<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/refreshLayout"
@ -58,4 +58,4 @@
</LinearLayout>
</FrameLayout>
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

4
Habitica/res/layout/fragment_chat.xml
View file

@ -3,7 +3,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.widget.SwipeRefreshLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
@ -12,7 +12,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<com.habitrpg.android.habitica.ui.views.social.ChatBarView
android:id="@+id/chatBarView"
android:layout_width="match_parent"

12
Habitica/res/layout/fragment_equipment_overview.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -20,7 +20,7 @@
style="@style/SectionTitle"
android:text="@string/battle_gear"
android:textAppearance="?android:attr/textAppearanceMedium" />
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/CardView.Default">
@ -71,7 +71,7 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -93,7 +93,7 @@
android:id="@+id/costumeSwitch"/>
</LinearLayout>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/CardView.Default">
@ -144,6 +144,6 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

4
Habitica/res/layout/fragment_faq_detail.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -33,4 +33,4 @@
android:textAppearance="?android:attr/textAppearanceMedium"
/>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

4
Habitica/res/layout/fragment_gem_purchase.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -132,4 +132,4 @@
style="@style/GemPurchaseListItem"
/>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

16
Habitica/res/layout/fragment_group_info.xml
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/refreshLayout">
<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarSize="3dp"
@ -15,7 +15,7 @@
android:orientation="vertical"
android:paddingBottom="?android:actionBarSize">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/CardView.Default"
@ -53,7 +53,7 @@
style="?android:buttonBarButtonStyle" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<LinearLayout
android:id="@+id/noPartyWrapper"
@ -129,7 +129,7 @@
android:layout_height="wrap_content"
style="@style/SectionTitle"/>
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:id="@+id/groupDescriptionWrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -185,7 +185,7 @@
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.core.widget.NestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

12
Habitica/res/layout/fragment_guilds_overview.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.SwipeRefreshLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/chat.refresh.layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
@ -22,7 +22,7 @@
android:text="@string/my_guilds"
android:textAppearance="?android:attr/textAppearanceMedium" />
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/CardView.Default">
@ -34,7 +34,7 @@
android:divider="?android:listDivider"
android:showDividers="middle">
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<Button
android:id="@+id/publicGuildsButton"
android:layout_width="match_parent"
@ -42,5 +42,5 @@
android:layout_margin="@dimen/card_horizontal_padding"
android:text="@string/public_guilds" />
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.core.widget.NestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

8
Habitica/res/layout/fragment_inbox.xml
View file

@ -1,4 +1,4 @@
<android.support.v4.widget.SwipeRefreshLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/inbox_refresh_layout"
@ -6,7 +6,7 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="?attr/actionBarSize">
@ -18,5 +18,5 @@
android:divider="?android:listDivider"
android:showDividers="middle">
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.core.widget.NestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

4
Habitica/res/layout/fragment_inbox_message_list.xml
View file

@ -3,7 +3,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.widget.SwipeRefreshLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
@ -12,7 +12,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<com.habitrpg.android.habitica.ui.views.social.ChatBarView
android:id="@+id/chatBarView"
android:layout_width="match_parent"

4
Habitica/res/layout/fragment_items.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinatorLayout"
@ -66,4 +66,4 @@
</LinearLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

12
Habitica/res/layout/fragment_party_detail.xml
View file

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/refreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="?attr/actionBarSize">
<android.support.v7.widget.CardView
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/CardView.Default"
@ -50,7 +50,7 @@
style="?android:buttonBarButtonStyle" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>
<TextView
android:id="@+id/title_view"
@ -218,5 +218,5 @@
style="@style/HabiticaButton.Red"
android:text="@string/leave_party"/>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.core.widget.NestedScrollView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

4
Habitica/res/layout/fragment_quest_detail.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@ -157,4 +157,4 @@
style="@style/HabiticaButton.Red" />
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

4
Habitica/res/layout/fragment_recyclerview.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/coordinatorLayout"
android:layout_width="match_parent"
@ -22,4 +22,4 @@
style="@style/EmptyView"
android:visibility="gone"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

4
Habitica/res/layout/fragment_refresh_recyclerview.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/refreshLayout"
@ -55,4 +55,4 @@
</LinearLayout>
</FrameLayout>
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

2
Habitica/res/layout/fragment_setup_tasks.xml
View file

@ -33,7 +33,7 @@
android:layout_centerHorizontal="true"
android:layout_alignTop="@id/avatar_background"
android:layout_marginTop="6dp"/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="230dp"
android:layout_alignParentBottom="true"

4
Habitica/res/layout/fragment_shop.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinatorLayout"
@ -35,4 +35,4 @@
android:gravity="center" />
</LinearLayout>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

2
Habitica/res/layout/fragment_skills.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/recyclerView"
android:layout_width="match_parent"

4
Habitica/res/layout/fragment_stats.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -233,4 +233,4 @@
android:layout_marginBottom="28dp"/>
</LinearLayout>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

4
Habitica/res/layout/fragment_subscription.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@ -240,4 +240,4 @@
android:layout_marginTop="16dp"/>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

4
Habitica/res/layout/fragment_tavern_detail.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@ -104,4 +104,4 @@
android:text="@string/tiers_descriptions"/>
</com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

2
Habitica/res/layout/fragment_viewpager.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"

2
Habitica/res/layout/material_drawer.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/material_drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"

4
Habitica/res/layout/pet_detail_item.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/card_view"
android:layout_height="wrap_content"
android:layout_width="match_parent">
@ -30,4 +30,4 @@
android:id="@+id/trainedProgressBar"
android:max="50" />
</LinearLayout>
</android.support.v7.widget.CardView>
</androidx.cardview.widget.CardView>

4
Habitica/res/layout/profile_new_message_dialog.xml
View file

@ -20,7 +20,7 @@
android:layout_height="match_parent"
android:baselineAligned="false">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="72dp"
@ -36,7 +36,7 @@
android:textColor="@android:color/black"
android:inputType="textCapSentences|textMultiLine" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</LinearLayout>

2
Habitica/res/layout/stats_slider_view.xml
View file

@ -42,7 +42,7 @@
android:text="+"
android:textColor="@color/gray_100"
android:textSize="16sp"/>
<android.support.v7.widget.AppCompatEditText
<androidx.appcompat.widget.AppCompatEditText
android:id="@+id/valueEditText"
android:layout_width="40dp"
android:layout_height="wrap_content"

4
Habitica/res/layout/tavern_chat_new_entry_item.xml
View file

@ -26,7 +26,7 @@
android:tint="@color/brand_400"
android:layout_gravity="center"/>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@ -49,7 +49,7 @@
android:paddingTop="4dp"
android:paddingBottom="4dp"
tools:height="200dp"/>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"

4
Habitica/res/layout/widget_configure_habit_button.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/recyclerView"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
</android.support.v7.widget.RecyclerView>
</androidx.recyclerview.widget.RecyclerView>

2
Habitica/res/menu/menu_public_guild.xml
View file

@ -10,5 +10,5 @@
android:orderInCategory="103"
android:visible="true"
app:showAsAction="always"
app:actionViewClass="android.support.v7.widget.SearchView"/>
app:actionViewClass="androidx.appcompat.widget.SearchView"/>
</menu>

4
Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
View file

@ -10,8 +10,8 @@ import android.content.res.Resources
import android.database.DatabaseErrorHandler
import android.database.sqlite.SQLiteDatabase
import android.preference.PreferenceManager
import android.support.multidex.MultiDexApplication
import android.support.v7.app.AppCompatDelegate
import androidx.multidex.MultiDexApplication
import androidx.appcompat.app.AppCompatDelegate
import android.util.Log
import com.amplitude.api.Amplitude

2
Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
View file

@ -3,7 +3,7 @@ package com.habitrpg.android.habitica;
import android.content.Context;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import com.habitrpg.android.habitica.data.ApiClient;
import com.habitrpg.android.habitica.events.UserSubscribedEvent;

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
View file

@ -1,7 +1,7 @@
package com.habitrpg.android.habitica.data.implementation
import android.content.Context
import android.support.v7.app.AlertDialog
import androidx.appcompat.app.AlertDialog
import android.util.Log
import com.amplitude.api.Amplitude
import com.google.gson.JsonSyntaxException

2
Habitica/src/main/java/com/habitrpg/android/habitica/extensions/AlertDialog-Extensions.kt
View file

@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.extensions
import android.app.AlertDialog
import android.app.Dialog
import android.content.DialogInterface
import android.support.annotation.IdRes
import androidx.annotation.IdRes
import android.view.View
import com.habitrpg.android.habitica.R

2
Habitica/src/main/java/com/habitrpg/android/habitica/extensions/ViewExt.kt
View file

@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.extensions
import android.content.Context
import android.graphics.drawable.Drawable
import android.os.Build
import android.support.annotation.IdRes
import androidx.annotation.IdRes
import android.view.View

2
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PopupNotificationsManager.java
View file

@ -1,7 +1,7 @@
package com.habitrpg.android.habitica.helpers;
import android.content.Context;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.data.ApiClient;

4
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java
View file

@ -5,8 +5,8 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Bitmap;
import android.os.Environment;
import android.support.annotation.Nullable;
import android.support.v7.preference.PreferenceManager;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceManager;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.widget.Button;

4
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemindersManager.java
View file

@ -5,8 +5,8 @@ import android.app.TimePickerDialog;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Build;
import android.support.annotation.Nullable;
import android.support.v7.preference.PreferenceManager;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceManager;
import android.widget.Button;
import android.widget.DatePicker;
import android.widget.TimePicker;

2
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/RemoteConfigManager.java
View file

@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.helpers;
import android.content.Context;
import android.os.AsyncTask;
import android.support.v7.preference.PreferenceManager;
import androidx.preference.PreferenceManager;
import org.json.JSONException;
import org.json.JSONObject;

2
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
View file

@ -6,7 +6,7 @@ import android.content.Context
import android.content.Intent
import android.os.Build
import android.os.Build.VERSION.SDK_INT
import android.support.v7.preference.PreferenceManager
import androidx.preference.PreferenceManager
import com.habitrpg.android.habitica.data.TaskRepository
import com.habitrpg.android.habitica.events.ReminderDeleteEvent
import com.habitrpg.android.habitica.models.tasks.RemindersItem

6
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/notifications/HabiticaLocalNotification.kt
View file

@ -7,9 +7,9 @@ import android.content.Context
import android.content.Intent
import android.media.RingtoneManager
import android.os.Build
import android.support.annotation.CallSuper
import android.support.annotation.RequiresApi
import android.support.v4.app.NotificationCompat
import androidx.annotation.CallSuper
import androidx.annotation.RequiresApi
import androidx.core.app.NotificationCompat
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.ui.activities.MainActivity

2
Habitica/src/main/java/com/habitrpg/android/habitica/interactors/DisplayItemDropUseCase.java
View file

@ -1,7 +1,7 @@
package com.habitrpg.android.habitica.interactors;
import android.os.Handler;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.view.ViewGroup;
import com.habitrpg.android.habitica.executors.PostExecutionThread;

4
Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
View file

@ -1,8 +1,8 @@
package com.habitrpg.android.habitica.interactors;
import android.app.Activity;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.TextView;

6
Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.kt
View file

@ -3,9 +3,9 @@ package com.habitrpg.android.habitica.interactors
import android.content.Context
import android.graphics.Bitmap
import android.graphics.drawable.BitmapDrawable
import android.support.v4.content.ContextCompat
import android.support.v4.util.Pair
import android.support.v7.app.AppCompatActivity
import androidx.core.content.ContextCompat
import androidx.core.util.Pair
import androidx.appcompat.app.AppCompatActivity
import android.text.SpannableStringBuilder
import android.view.Gravity
import android.view.View

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/Avatar.java
View file

@ -1,7 +1,7 @@
package com.habitrpg.android.habitica.models;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.habitrpg.android.habitica.models.user.Outfit;
import com.habitrpg.android.habitica.models.user.Stats;

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Customization.java
View file

@ -1,6 +1,6 @@
package com.habitrpg.android.habitica.models.inventory;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.Date;

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/inventory/Mount.java
View file

@ -1,6 +1,6 @@
package com.habitrpg.android.habitica.models.inventory;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import io.realm.RealmObject;
import io.realm.annotations.Ignore;

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/members/PlayerTier.kt
View file

@ -1,7 +1,7 @@
package com.habitrpg.android.habitica.models.members
import android.content.Context
import android.support.v4.content.ContextCompat
import androidx.core.content.ContextCompat
import com.habitrpg.android.habitica.R
class PlayerTier(val title: String, val id: Int) {

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
View file

@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.models.tasks
import android.os.Parcel
import android.os.Parcelable
import android.support.annotation.StringDef
import androidx.annotation.StringDef
import com.google.gson.annotations.SerializedName
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.models.Tag

2
Habitica/src/main/java/com/habitrpg/android/habitica/models/user/SubscriptionPlan.java
View file

@ -1,6 +1,6 @@
package com.habitrpg.android.habitica.models.user;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.Date;

2
Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.java
View file

@ -4,7 +4,7 @@ import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.support.v7.preference.PreferenceManager;
import androidx.preference.PreferenceManager;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.data.ApiClient;

2
Habitica/src/main/java/com/habitrpg/android/habitica/prefs/TimePreference.java
View file

@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.prefs;
import android.content.Context;
import android.content.res.TypedArray;
import android.support.v7.preference.DialogPreference;
import androidx.preference.DialogPreference;
import android.util.AttributeSet;
public class TimePreference extends DialogPreference {

2
Habitica/src/main/java/com/habitrpg/android/habitica/prefs/scanner/IntentIntegrator.java
View file

@ -24,7 +24,7 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;
import android.util.Log;
import java.util.Arrays;

6
Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
View file

@ -7,9 +7,9 @@ import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import android.os.Build
import android.support.v4.app.NotificationCompat
import android.support.v4.content.ContextCompat
import android.support.v4.content.WakefulBroadcastReceiver
import androidx.core.app.NotificationCompat
import androidx.core.content.ContextCompat
import androidx.legacy.content.WakefulBroadcastReceiver
import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.data.TaskRepository

2
Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.kt
View file

@ -8,7 +8,7 @@ import android.content.Context
import android.content.Intent
import android.media.RingtoneManager
import android.os.Build
import android.support.v4.app.NotificationCompat
import androidx.core.app.NotificationCompat
import com.habitrpg.android.habitica.HabiticaApplication
import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.R

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/ItemDetailDialog.kt
View file

@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.ui
import android.content.Context
import android.content.DialogInterface
import android.support.v7.app.AlertDialog
import androidx.appcompat.app.AlertDialog
import android.view.Gravity
import android.view.View
import android.widget.ImageView

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/WrapContentRecyclerViewLayoutManager.java
View file

@ -1,7 +1,9 @@
package com.habitrpg.android.habitica.ui;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.View;
@ -10,7 +12,7 @@ import com.habitrpg.android.habitica.BuildConfig;
/**
* http://stackoverflow.com/a/29945693/1315039
*/
public class WrapContentRecyclerViewLayoutManager extends android.support.v7.widget.LinearLayoutManager {
public class WrapContentRecyclerViewLayoutManager extends LinearLayoutManager {
private static final int CHILD_WIDTH = 0;
private static final int CHILD_HEIGHT = 1;

16
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.kt
View file

@ -1,11 +1,11 @@
package com.habitrpg.android.habitica.ui.activities
import android.os.Bundle
import android.support.design.widget.TabLayout
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
import android.support.v4.app.FragmentStatePagerAdapter
import android.support.v4.view.ViewPager
import com.google.android.material.tabs.TabLayout
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentStatePagerAdapter
import androidx.viewpager.widget.ViewPager
import android.view.MenuItem
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.AppComponent
@ -16,7 +16,7 @@ import com.mikepenz.aboutlibraries.LibsBuilder
class AboutActivity : BaseActivity() {
private val pager: ViewPager by bindView(R.id.pager)
private val pager: androidx.viewpager.widget.ViewPager by bindView(R.id.pager)
private val tabLayout: TabLayout by bindView(R.id.tab_layout)
override fun getLayoutResId(): Int {
@ -80,9 +80,9 @@ class AboutActivity : BaseActivity() {
return super.onOptionsItemSelected(item)
}
private inner class PagerAdapter(fm: FragmentManager, internal var mNumOfTabs: Int) : FragmentStatePagerAdapter(fm) {
private inner class PagerAdapter(fm: androidx.fragment.app.FragmentManager, internal var mNumOfTabs: Int) : FragmentStatePagerAdapter(fm) {
override fun getItem(position: Int): Fragment? {
override fun getItem(position: Int): androidx.fragment.app.Fragment? {
return when (position) {
0 -> AboutFragment()
1 -> LibsBuilder()

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt
View file

@ -4,8 +4,8 @@ import android.app.Activity
import android.appwidget.AppWidgetManager
import android.content.Intent
import android.os.Bundle
import android.support.v7.app.AppCompatActivity
import android.support.v7.preference.PreferenceManager
import androidx.appcompat.app.AppCompatActivity
import androidx.preference.PreferenceManager
import android.widget.Button
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.models.tasks.Task

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
View file

@ -4,9 +4,9 @@ import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.provider.Settings
import android.support.v7.app.AlertDialog
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.Toolbar
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import com.habitrpg.android.habitica.HabiticaApplication
import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.R

24
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeFormActivity.kt
View file

@ -6,13 +6,13 @@ import android.content.Context
import android.content.Intent
import android.graphics.drawable.ColorDrawable
import android.os.Bundle
import android.support.design.widget.TextInputLayout
import android.support.v4.content.ContextCompat
import android.support.v7.app.AlertDialog
import android.support.v7.widget.AppCompatCheckedTextView
import android.support.v7.widget.AppCompatTextView
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import com.google.android.material.textfield.TextInputLayout
import androidx.core.content.ContextCompat
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.AppCompatCheckedTextView
import androidx.appcompat.widget.AppCompatTextView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import android.view.*
import android.widget.*
import com.habitrpg.android.habitica.R
@ -51,7 +51,7 @@ class ChallengeFormActivity : BaseActivity() {
private val challengeLocationSpinner: Spinner by bindView(R.id.challenge_location_spinner)
private val challengeAddGemBtn: Button by bindView(R.id.challenge_add_gem_btn)
private val challengeRemoveGemBtn: Button by bindView(R.id.challenge_remove_gem_btn)
private val createChallengeTaskList: RecyclerView by bindView(R.id.create_challenge_task_list)
private val createChallengeTaskList: androidx.recyclerview.widget.RecyclerView by bindView(R.id.create_challenge_task_list)
private val gemIconView: ImageView by bindView(R.id.gem_icon)
private val challengeCreationViews: ViewGroup by bindView(R.id.challenge_creation_views)
@ -373,14 +373,14 @@ class ChallengeFormActivity : BaseActivity() {
}
}, RxErrorHandler.handleEmptyError()))
createChallengeTaskList.addOnItemTouchListener(object : RecyclerView.SimpleOnItemTouchListener() {
override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
createChallengeTaskList.addOnItemTouchListener(object : androidx.recyclerview.widget.RecyclerView.SimpleOnItemTouchListener() {
override fun onInterceptTouchEvent(rv: androidx.recyclerview.widget.RecyclerView, e: MotionEvent): Boolean {
// Stop only scrolling.
return rv.scrollState == RecyclerView.SCROLL_STATE_DRAGGING
return rv.scrollState == androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING
}
})
createChallengeTaskList.adapter = challengeTasks
createChallengeTaskList.layoutManager = LinearLayoutManager(this)
createChallengeTaskList.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
}
private fun fillControlsByChallenge() {

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
View file

@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.ui.activities
import android.app.ProgressDialog
import android.os.Bundle
import android.support.v7.app.AlertDialog
import androidx.appcompat.app.AlertDialog
import android.view.View
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.AppComponent

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
View file

@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.ui.activities
import android.app.ProgressDialog
import android.os.Bundle
import android.support.v4.content.ContextCompat
import androidx.core.content.ContextCompat
import android.view.Menu
import android.view.MenuItem
import com.habitrpg.android.habitica.R

24
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
View file

@ -4,12 +4,12 @@ import android.content.Context
import android.content.Intent
import android.graphics.Typeface
import android.os.Bundle
import android.support.v4.content.ContextCompat
import android.support.v7.app.AlertDialog
import android.support.v7.widget.AppCompatImageView
import android.support.v7.widget.CardView
import android.support.v7.widget.GridLayoutManager
import android.support.v7.widget.RecyclerView
import androidx.core.content.ContextCompat
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.AppCompatImageView
import androidx.cardview.widget.CardView
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import android.view.*
import android.widget.*
import com.facebook.drawee.backends.pipeline.Fresco
@ -60,21 +60,21 @@ class FullProfileActivity : BaseActivity() {
private val avatarView: AvatarView by bindView(R.id.avatarView)
private val copyUsernameButton: Button by bindView(R.id.copy_username)
private val usernameText: TextView by bindView(R.id.username)
private val attributesCardView: CardView by bindView(R.id.profile_attributes_card)
private val attributesCardView: androidx.cardview.widget.CardView by bindView(R.id.profile_attributes_card)
private val attributesTableLayout: TableLayout by bindView(R.id.attributes_table)
private val attributesCollapseIcon: AppCompatImageView by bindView(R.id.attributes_collapse_icon)
private val equipmentTableLayout: TableLayout by bindView(R.id.equipment_table)
private val costumeTableLayout: TableLayout by bindView(R.id.costume_table)
private val costumeCard: CardView by bindView(R.id.profile_costume_card)
private val costumeCard: androidx.cardview.widget.CardView by bindView(R.id.profile_costume_card)
private val avatar_with_bars: View by bindView(R.id.avatar_with_bars)
private val fullprofile_scrollview: ScrollView by bindView(R.id.fullprofile_scrollview)
private val petsFoundCount: TextView by bindView(R.id.profile_pets_found_count)
private val mountsTamedCount: TextView by bindView(R.id.profile_mounts_tamed_count)
private val currentPetDrawee: SimpleDraweeView by bindView(R.id.current_pet_drawee)
private val currentMountDrawee: SimpleDraweeView by bindView(R.id.current_mount_drawee)
private val achievementCard: CardView by bindView(R.id.profile_achievements_card)
private val achievementCard: androidx.cardview.widget.CardView by bindView(R.id.profile_achievements_card)
private val achievementProgress: ProgressBar by bindView(R.id.avatar_achievements_progress)
private val achievementGroupList: RecyclerView by bindView(R.id.recyclerView)
private val achievementGroupList: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recyclerView)
private val joinedView: TextView by bindView(R.id.joined_view)
private val lastLoginView: TextView by bindView(R.id.last_login_view)
private val totalCheckinsView: TextView by bindView(R.id.total_checkins_view)
@ -242,8 +242,8 @@ class FullProfileActivity : BaseActivity() {
val adapter = AchievementAdapter()
adapter.setItemList(items)
val layoutManager = GridLayoutManager(this, 3)
layoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
val layoutManager = androidx.recyclerview.widget.GridLayoutManager(this, 3)
layoutManager.spanSizeLookup = object : androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup() {
override fun getSpanSize(position: Int): Int {
return if (adapter.getItemViewType(position) == 0) {
layoutManager.spanCount

16
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GemPurchaseActivity.kt
View file

@ -3,11 +3,11 @@ package com.habitrpg.android.habitica.ui.activities
import android.content.Intent
import android.os.Bundle
import android.support.design.widget.TabLayout
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentPagerAdapter
import android.support.v4.view.ViewPager
import android.support.v7.widget.Toolbar
import com.google.android.material.tabs.TabLayout
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentPagerAdapter
import androidx.viewpager.widget.ViewPager
import androidx.appcompat.widget.Toolbar
import android.view.MenuItem
import com.habitrpg.android.habitica.HabiticaBaseApplication
import com.habitrpg.android.habitica.R
@ -36,7 +36,7 @@ class GemPurchaseActivity : BaseActivity(), InAppMessageListener {
lateinit var userRepository: UserRepository
internal val tabLayout: TabLayout by bindView(R.id.tab_layout)
internal val viewPager: ViewPager by bindView(R.id.viewPager)
internal val viewPager: androidx.viewpager.widget.ViewPager by bindView(R.id.viewPager)
internal var fragments: MutableList<CheckoutFragment> = ArrayList()
var activityCheckout: ActivityCheckout? = null
@ -204,7 +204,7 @@ class GemPurchaseActivity : BaseActivity(), InAppMessageListener {
viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) {
override fun getItem(position: Int): Fragment {
override fun getItem(position: Int): androidx.fragment.app.Fragment {
val gemPurchasePosition = if (showSubscriptionPageFirst) 1 else 0
val fragment: CheckoutFragment = if (position == gemPurchasePosition) {
GemsPurchaseFragment()
@ -221,7 +221,7 @@ class GemPurchaseActivity : BaseActivity(), InAppMessageListener {
if (billingRequests != null) {
fragment.setBillingRequests(billingRequests)
}
return fragment as Fragment
return fragment as androidx.fragment.app.Fragment
}
override fun getCount(): Int {

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.kt
View file

@ -4,7 +4,7 @@ import android.app.Activity
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.support.v4.content.ContextCompat
import androidx.core.content.ContextCompat
import android.view.KeyEvent
import android.view.Menu
import android.view.MenuItem

12
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/HabitButtonWidgetActivity.kt
View file

@ -4,9 +4,9 @@ import android.app.Activity
import android.appwidget.AppWidgetManager
import android.content.Intent
import android.os.Bundle
import android.support.v7.preference.PreferenceManager
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import androidx.preference.PreferenceManager
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.AppComponent
import com.habitrpg.android.habitica.data.TaskRepository
@ -28,7 +28,7 @@ class HabitButtonWidgetActivity : BaseActivity() {
@field:[Inject Named(AppModule.NAMED_USER_ID)]
lateinit var userId: String
internal val recyclerView: RecyclerView by bindView(R.id.recyclerView)
internal val recyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recyclerView)
private var widgetId: Int = 0
private var adapter: SkillTasksRecyclerViewAdapter? = null
@ -55,10 +55,10 @@ class HabitButtonWidgetActivity : BaseActivity() {
finish()
}
var layoutManager: LinearLayoutManager? = recyclerView.layoutManager as? LinearLayoutManager
var layoutManager: androidx.recyclerview.widget.LinearLayoutManager? = recyclerView.layoutManager as? androidx.recyclerview.widget.LinearLayoutManager
if (layoutManager == null) {
layoutManager = LinearLayoutManager(this)
layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
recyclerView.layoutManager = layoutManager
}

20
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.kt
View file

@ -3,12 +3,12 @@ package com.habitrpg.android.habitica.ui.activities
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
import android.support.v4.app.FragmentPagerAdapter
import android.support.v4.content.ContextCompat
import android.support.v4.content.res.ResourcesCompat
import android.support.v4.view.ViewPager
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentPagerAdapter
import androidx.core.content.ContextCompat
import androidx.core.content.res.ResourcesCompat
import androidx.viewpager.widget.ViewPager
import android.view.View
import android.view.WindowManager
import android.widget.Button
@ -25,12 +25,12 @@ import com.viewpagerindicator.IconPagerAdapter
import io.reactivex.functions.Consumer
import javax.inject.Inject
class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChangeListener {
class IntroActivity : BaseActivity(), View.OnClickListener, androidx.viewpager.widget.ViewPager.OnPageChangeListener {
@Inject
lateinit var contentRepository: InventoryRepository
private val pager: ViewPager by bindView(R.id.viewPager)
private val pager: androidx.viewpager.widget.ViewPager by bindView(R.id.viewPager)
private val indicator: IconPageIndicator by bindView(R.id.view_pager_indicator)
private val skipButton: Button by bindView(R.id.skipButton)
private val finishButton: Button by bindView(R.id.finishButton)
@ -99,9 +99,9 @@ class IntroActivity : BaseActivity(), View.OnClickListener, ViewPager.OnPageChan
}
private inner class PagerAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm), IconPagerAdapter {
private inner class PagerAdapter(fm: androidx.fragment.app.FragmentManager) : FragmentPagerAdapter(fm), IconPagerAdapter {
override fun getItem(position: Int): Fragment {
override fun getItem(position: Int): androidx.fragment.app.Fragment {
val fragment = IntroFragment()
when (position) {

10
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
View file

@ -9,10 +9,10 @@ import android.content.SharedPreferences
import android.graphics.Color
import android.os.Build
import android.os.Bundle
import android.support.design.widget.Snackbar
import android.support.v4.content.ContextCompat
import android.support.v7.app.AlertDialog
import android.support.v7.preference.PreferenceManager
import com.google.android.material.snackbar.Snackbar
import androidx.core.content.ContextCompat
import androidx.appcompat.app.AlertDialog
import androidx.preference.PreferenceManager
import android.text.InputType
import android.text.SpannableString
import android.text.style.UnderlineSpan
@ -349,7 +349,7 @@ class LoginActivity : BaseActivity(), Consumer<UserAuthResponse> {
private fun showValidationError(resourceMessageString: Int) {
mProgressBar.visibility = View.GONE
android.support.v7.app.AlertDialog.Builder(this)
androidx.appcompat.app.AlertDialog.Builder(this)
.setTitle(R.string.login_validation_error_title)
.setMessage(resourceMessageString)
.setNeutralButton(android.R.string.ok) { _, _ -> }

20
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
View file

@ -15,15 +15,15 @@ import android.os.Build.VERSION.SDK_INT
import android.os.Bundle
import android.os.Trace
import android.preference.PreferenceManager
import android.support.design.widget.AppBarLayout
import android.support.design.widget.CollapsingToolbarLayout
import android.support.design.widget.TabLayout
import android.support.v4.content.ContextCompat
import android.support.v4.content.FileProvider
import android.support.v4.widget.DrawerLayout
import android.support.v7.app.ActionBarDrawerToggle
import android.support.v7.app.AlertDialog
import android.support.v7.widget.Toolbar
import com.google.android.material.appbar.AppBarLayout
import com.google.android.material.appbar.CollapsingToolbarLayout
import com.google.android.material.tabs.TabLayout
import androidx.core.content.ContextCompat
import androidx.core.content.FileProvider
import androidx.drawerlayout.widget.DrawerLayout
import androidx.appcompat.app.ActionBarDrawerToggle
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.widget.Toolbar
import android.util.Log
import android.util.TypedValue
import android.view.*
@ -215,7 +215,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
this@MainActivity.setUserData()
}, RxErrorHandler.handleEmptyError()))
val drawerLayout = findViewById<DrawerLayout>(R.id.drawer_layout)
val drawerLayout = findViewById<androidx.drawerlayout.widget.DrawerLayout>(R.id.drawer_layout)
drawerFragment = supportFragmentManager.findFragmentById(R.id.navigation_drawer) as? NavigationDrawerFragment

12
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PartyInviteActivity.kt
View file

@ -4,10 +4,10 @@ import android.app.Activity
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.support.design.widget.TabLayout
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentPagerAdapter
import android.support.v4.view.ViewPager
import com.google.android.material.tabs.TabLayout
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentPagerAdapter
import androidx.viewpager.widget.ViewPager
import android.view.Menu
import android.view.MenuItem
import android.widget.Toast
@ -37,7 +37,7 @@ class PartyInviteActivity : BaseActivity() {
lateinit var userRepository: UserRepository
internal val tabLayout: TabLayout by bindView(R.id.tab_layout)
internal val viewPager: ViewPager by bindView(R.id.viewPager)
internal val viewPager: androidx.viewpager.widget.ViewPager by bindView(R.id.viewPager)
internal var fragments: MutableList<PartyInviteFragment> = ArrayList()
private var userIdToInvite: String? = null
@ -98,7 +98,7 @@ class PartyInviteActivity : BaseActivity() {
viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) {
override fun getItem(position: Int): Fragment {
override fun getItem(position: Int): androidx.fragment.app.Fragment {
val fragment = PartyInviteFragment()
fragment.isEmailInvite = position == 0

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.kt
View file

@ -1,8 +1,8 @@
package com.habitrpg.android.habitica.ui.activities
import android.os.Bundle
import android.support.v7.preference.PreferenceFragmentCompat
import android.support.v7.preference.PreferenceScreen
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.PreferenceScreen
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.AppComponent
import com.habitrpg.android.habitica.ui.fragments.preferences.APIPreferenceFragment

20
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
View file

@ -5,13 +5,13 @@ import android.content.Intent
import android.graphics.drawable.Drawable
import android.os.Build
import android.os.Bundle
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentManager
import android.support.v4.app.FragmentPagerAdapter
import android.support.v4.content.ContextCompat
import android.support.v4.view.ViewPager
import android.support.v7.content.res.AppCompatResources
import android.support.v7.preference.PreferenceManager
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentPagerAdapter
import androidx.core.content.ContextCompat
import androidx.viewpager.widget.ViewPager
import androidx.appcompat.content.res.AppCompatResources
import androidx.preference.PreferenceManager
import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.Button
@ -41,7 +41,7 @@ import org.greenrobot.eventbus.Subscribe
import java.util.*
import javax.inject.Inject
class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
class SetupActivity : BaseActivity(), androidx.viewpager.widget.ViewPager.OnPageChangeListener {
@Inject
lateinit var apiClient: ApiClient
@ -247,9 +247,9 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
.subscribe(Consumer { }, RxErrorHandler.handleEmptyError()))
}
private inner class ViewPageAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm), IconPagerAdapter {
private inner class ViewPageAdapter(fm: androidx.fragment.app.FragmentManager) : FragmentPagerAdapter(fm), IconPagerAdapter {
override fun getItem(position: Int): Fragment {
override fun getItem(position: Int): androidx.fragment.app.Fragment {
return when (position) {
1 -> {
val fragment = AvatarSetupFragment()

8
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.kt
View file

@ -3,8 +3,8 @@ package com.habitrpg.android.habitica.ui.activities
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.support.v7.widget.LinearLayoutManager
import android.support.v7.widget.RecyclerView
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.AppComponent
import com.habitrpg.android.habitica.data.SocialRepository
@ -16,7 +16,7 @@ import io.reactivex.functions.Consumer
import javax.inject.Inject
class SkillMemberActivity : BaseActivity() {
private val recyclerView: RecyclerView by bindView(R.id.recyclerView)
private val recyclerView: androidx.recyclerview.widget.RecyclerView by bindView(R.id.recyclerView)
private var viewAdapter: PartyMemberRecyclerViewAdapter? = null
@ -39,7 +39,7 @@ class SkillMemberActivity : BaseActivity() {
}
private fun loadMemberList() {
recyclerView.layoutManager = LinearLayoutManager(this)
recyclerView.layoutManager = androidx.recyclerview.widget.LinearLayoutManager(this)
viewAdapter = PartyMemberRecyclerViewAdapter(null, true)
viewAdapter?.getUserClickedEvents()?.subscribe(Consumer { userId ->
val resultIntent = Intent()

12
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.kt
View file

@ -3,10 +3,10 @@ package com.habitrpg.android.habitica.ui.activities
import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.support.design.widget.TabLayout
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentPagerAdapter
import android.support.v4.view.ViewPager
import com.google.android.material.tabs.TabLayout
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentPagerAdapter
import androidx.viewpager.widget.ViewPager
import android.util.SparseArray
import com.habitrpg.android.habitica.R
import com.habitrpg.android.habitica.components.AppComponent
@ -27,7 +27,7 @@ class SkillTasksActivity : BaseActivity() {
@field:[Inject Named(AppModule.NAMED_USER_ID)]
lateinit var userId: String
private val viewPager: ViewPager by bindView(R.id.viewPager)
private val viewPager: androidx.viewpager.widget.ViewPager by bindView(R.id.viewPager)
private val tabLayout: TabLayout by bindView(R.id.tab_layout)
internal var viewFragmentsDictionary = SparseArray<SkillTasksRecyclerViewFragment>()
@ -50,7 +50,7 @@ class SkillTasksActivity : BaseActivity() {
viewPager.adapter = object : FragmentPagerAdapter(fragmentManager) {
override fun getItem(position: Int): Fragment {
override fun getItem(position: Int): androidx.fragment.app.Fragment {
val fragment = SkillTasksRecyclerViewFragment()
when (position) {
0 -> fragment.taskType = Task.TYPE_HABIT

Some files were not shown because too many files have changed in this diff Show more