diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 7c64dc2ae..5789ca275 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -213,7 +213,7 @@ diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 744e4812d..ab2bcf968 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -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 { diff --git a/Habitica/res/layout/activity_about.xml b/Habitica/res/layout/activity_about.xml index 660f0f113..42a3d25ee 100644 --- a/Habitica/res/layout/activity_about.xml +++ b/Habitica/res/layout/activity_about.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" tools:context=".ui.activities.AboutActivity"> - - - - - - - - + - - + - - + + \ No newline at end of file diff --git a/Habitica/res/layout/activity_class_selection.xml b/Habitica/res/layout/activity_class_selection.xml index 38940b7fa..c3ff4e937 100644 --- a/Habitica/res/layout/activity_class_selection.xml +++ b/Habitica/res/layout/activity_class_selection.xml @@ -8,7 +8,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - - - + - - + - - + - - + - + \ No newline at end of file diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml index 1f1a091b5..3fc64b936 100644 --- a/Habitica/res/layout/activity_create_challenge.xml +++ b/Habitica/res/layout/activity_create_challenge.xml @@ -1,5 +1,5 @@ - - - + - - + @@ -175,7 +175,7 @@ android:text="@string/short_name" android:textColor="#cc000000" /> - - + - - + - + diff --git a/Habitica/res/layout/activity_fixcharacter.xml b/Habitica/res/layout/activity_fixcharacter.xml index 9df314257..aed1c692f 100644 --- a/Habitica/res/layout/activity_fixcharacter.xml +++ b/Habitica/res/layout/activity_fixcharacter.xml @@ -7,11 +7,11 @@ android:orientation="vertical" tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity" android:background="@color/white"> - - - + - @@ -179,9 +179,9 @@ tools:text="100"/> - + - @@ -216,10 +216,10 @@ android:visibility="gone" android:id="@+id/copy_username" /> - + - @@ -243,9 +243,9 @@ android:shrinkColumns="1" android:stretchColumns="0" /> - + - - + - - - + - @@ -408,10 +408,10 @@ - + - - + diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml index b85ada1cc..98744addc 100644 --- a/Habitica/res/layout/activity_gem_purchase.xml +++ b/Habitica/res/layout/activity_gem_purchase.xml @@ -5,34 +5,34 @@ android:layout_height="match_parent" tools:context=".ui.activities.MainActivity" android:id="@+id/overlayFrameLayout"> - - - - - - - + - - + - - + + \ No newline at end of file diff --git a/Habitica/res/layout/activity_group_form.xml b/Habitica/res/layout/activity_group_form.xml index 4d7637ca9..517c53e16 100644 --- a/Habitica/res/layout/activity_group_form.xml +++ b/Habitica/res/layout/activity_group_form.xml @@ -8,7 +8,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content"> - @@ -20,7 +20,7 @@ android:hint="@string/name" android:textColor="@android:color/black" android:inputType="textCapSentences" /> - + - @@ -50,7 +50,7 @@ android:hint="@string/description" android:textColor="@android:color/black" android:inputType="textCapSentences|textMultiLine" /> - + - diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml index 7b8c4d449..0e8111ab1 100644 --- a/Habitica/res/layout/activity_main.xml +++ b/Habitica/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - - - - - + + - - + - - + - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/layout/activity_party_invite.xml b/Habitica/res/layout/activity_party_invite.xml index 2ad554b42..703069afb 100644 --- a/Habitica/res/layout/activity_party_invite.xml +++ b/Habitica/res/layout/activity_party_invite.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - + - - - - @@ -46,7 +46,7 @@ android:textColor="@android:color/black" android:inputType="textCapSentences|textMultiLine" android:maxLines="3"/> - + - @@ -74,10 +74,10 @@ android:hint="@string/notes" android:textColor="@android:color/black" android:inputType="textCapSentences|textMultiLine" /> - + - - + - @@ -398,7 +398,7 @@ android:text="@string/reminders" android:textAppearance="?android:attr/textAppearanceLarge" /> - diff --git a/Habitica/res/layout/animal_overview_item.xml b/Habitica/res/layout/animal_overview_item.xml index 2ede10ee8..7ef273cbd 100644 --- a/Habitica/res/layout/animal_overview_item.xml +++ b/Habitica/res/layout/animal_overview_item.xml @@ -1,5 +1,5 @@ - @@ -29,4 +29,4 @@ android:id="@+id/ownedTextView" style="@style/RowText"/> - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/layout/avatar_setup_drawer.xml b/Habitica/res/layout/avatar_setup_drawer.xml index d9fe03066..17c206b01 100644 --- a/Habitica/res/layout/avatar_setup_drawer.xml +++ b/Habitica/res/layout/avatar_setup_drawer.xml @@ -13,7 +13,7 @@ android:background="@drawable/avatar_customization_subcategory_bg" android:layout_alignParentTop="true"> - - - @@ -34,4 +34,4 @@ android:layout_centerHorizontal="true" /> - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/layout/customization_grid_item.xml b/Habitica/res/layout/customization_grid_item.xml index 0ac646eb3..c37ca4360 100644 --- a/Habitica/res/layout/customization_grid_item.xml +++ b/Habitica/res/layout/customization_grid_item.xml @@ -1,5 +1,5 @@ - @@ -34,4 +34,4 @@ android:layout_centerHorizontal="true" /> - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/layout/dialog_challenge_filter.xml b/Habitica/res/layout/dialog_challenge_filter.xml index fc1e607c6..6a4d6ecf2 100644 --- a/Habitica/res/layout/dialog_challenge_filter.xml +++ b/Habitica/res/layout/dialog_challenge_filter.xml @@ -62,7 +62,7 @@ android:padding="0dp"/> - - diff --git a/Habitica/res/layout/fixvalues_edittext.xml b/Habitica/res/layout/fixvalues_edittext.xml index 8ac7d5b3f..f593f8e74 100644 --- a/Habitica/res/layout/fixvalues_edittext.xml +++ b/Habitica/res/layout/fixvalues_edittext.xml @@ -17,7 +17,7 @@ - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml index 396edd01e..9a7123402 100644 --- a/Habitica/res/layout/fragment_avatar_overview.xml +++ b/Habitica/res/layout/fragment_avatar_overview.xml @@ -1,5 +1,5 @@ - - @@ -74,7 +74,7 @@ android:id="@+id/avatarChairView" app:equipmentTitle="@string/avatar_wheelchair"/> - + - @@ -123,7 +123,7 @@ android:id="@+id/avatarHairMustacheView" app:equipmentTitle="@string/avatar_mustache" /> - + - @@ -146,6 +146,6 @@ android:id="@+id/avatarBackgroundView" app:equipmentTitle="@string/avatar_background" /> - + - + diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml index f3023afee..c25c53fb5 100644 --- a/Habitica/res/layout/fragment_challenge_detail.xml +++ b/Habitica/res/layout/fragment_challenge_detail.xml @@ -1,5 +1,5 @@ - - + diff --git a/Habitica/res/layout/fragment_challengeslist.xml b/Habitica/res/layout/fragment_challengeslist.xml index a8d5469e0..9f355ef17 100644 --- a/Habitica/res/layout/fragment_challengeslist.xml +++ b/Habitica/res/layout/fragment_challengeslist.xml @@ -1,4 +1,4 @@ - - + diff --git a/Habitica/res/layout/fragment_chat.xml b/Habitica/res/layout/fragment_chat.xml index 018ff4e31..8e8f53a3f 100644 --- a/Habitica/res/layout/fragment_chat.xml +++ b/Habitica/res/layout/fragment_chat.xml @@ -3,7 +3,7 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - - + - - @@ -71,7 +71,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent"/> - + - @@ -144,6 +144,6 @@ android:layout_height="wrap_content" android:layout_width="match_parent"/> - + - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/layout/fragment_faq_detail.xml b/Habitica/res/layout/fragment_faq_detail.xml index 10e6b0c58..154794348 100644 --- a/Habitica/res/layout/fragment_faq_detail.xml +++ b/Habitica/res/layout/fragment_faq_detail.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml index 9ee7e862a..32fdace00 100644 --- a/Habitica/res/layout/fragment_gem_purchase.xml +++ b/Habitica/res/layout/fragment_gem_purchase.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/Habitica/res/layout/fragment_group_info.xml b/Habitica/res/layout/fragment_group_info.xml index 24837d5d0..2699df21d 100644 --- a/Habitica/res/layout/fragment_group_info.xml +++ b/Habitica/res/layout/fragment_group_info.xml @@ -1,9 +1,9 @@ - - - - + - - + - - \ No newline at end of file + + \ No newline at end of file diff --git a/Habitica/res/layout/fragment_guilds_overview.xml b/Habitica/res/layout/fragment_guilds_overview.xml index 05e6c44c5..bd6c86864 100644 --- a/Habitica/res/layout/fragment_guilds_overview.xml +++ b/Habitica/res/layout/fragment_guilds_overview.xml @@ -1,12 +1,12 @@ - - - @@ -34,7 +34,7 @@ android:divider="?android:listDivider" android:showDividers="middle"> - +