From d10bedd9901a231d30c27d2f75ac139115ebf089 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 6 Nov 2018 16:11:02 +0100 Subject: [PATCH] Update to AndroidX --- Habitica/AndroidManifest.xml | 2 +- Habitica/build.gradle | 15 +++++--- Habitica/res/layout/activity_about.xml | 4 +-- .../res/layout/activity_challenge_detail.xml | 20 +++++------ .../res/layout/activity_class_selection.xml | 20 +++++------ .../res/layout/activity_create_challenge.xml | 20 +++++------ Habitica/res/layout/activity_fixcharacter.xml | 6 ++-- Habitica/res/layout/activity_full_profile.xml | 30 ++++++++-------- Habitica/res/layout/activity_gem_purchase.xml | 22 ++++++------ Habitica/res/layout/activity_group_form.xml | 8 ++--- Habitica/res/layout/activity_intro.xml | 2 +- Habitica/res/layout/activity_main.xml | 24 ++++++------- Habitica/res/layout/activity_party_invite.xml | 4 +-- Habitica/res/layout/activity_prefs.xml | 6 ++-- .../res/layout/activity_skill_members.xml | 2 +- Habitica/res/layout/activity_skill_tasks.xml | 4 +-- Habitica/res/layout/activity_task_form.xml | 16 ++++----- Habitica/res/layout/animal_overview_item.xml | 4 +-- Habitica/res/layout/avatar_setup_drawer.xml | 4 +-- .../customization_grid_background_item.xml | 4 +-- .../res/layout/customization_grid_item.xml | 4 +-- .../res/layout/dialog_challenge_filter.xml | 2 +- Habitica/res/layout/drawer_main.xml | 2 +- Habitica/res/layout/fixvalues_edittext.xml | 4 +-- Habitica/res/layout/fragment_about.xml | 4 +-- .../res/layout/fragment_avatar_overview.xml | 16 ++++----- .../res/layout/fragment_challenge_detail.xml | 4 +-- .../res/layout/fragment_challengeslist.xml | 4 +-- Habitica/res/layout/fragment_chat.xml | 4 +-- .../layout/fragment_equipment_overview.xml | 12 +++---- Habitica/res/layout/fragment_faq_detail.xml | 4 +-- Habitica/res/layout/fragment_gem_purchase.xml | 4 +-- Habitica/res/layout/fragment_group_info.xml | 16 ++++----- .../res/layout/fragment_guilds_overview.xml | 12 +++---- Habitica/res/layout/fragment_inbox.xml | 8 ++--- .../layout/fragment_inbox_message_list.xml | 4 +-- Habitica/res/layout/fragment_items.xml | 4 +-- Habitica/res/layout/fragment_party_detail.xml | 12 +++---- Habitica/res/layout/fragment_quest_detail.xml | 4 +-- Habitica/res/layout/fragment_recyclerview.xml | 4 +-- .../layout/fragment_refresh_recyclerview.xml | 4 +-- Habitica/res/layout/fragment_setup_tasks.xml | 2 +- Habitica/res/layout/fragment_shop.xml | 4 +-- Habitica/res/layout/fragment_skills.xml | 2 +- Habitica/res/layout/fragment_stats.xml | 4 +-- Habitica/res/layout/fragment_subscription.xml | 4 +-- .../res/layout/fragment_tavern_detail.xml | 4 +-- Habitica/res/layout/fragment_viewpager.xml | 2 +- Habitica/res/layout/material_drawer.xml | 2 +- Habitica/res/layout/pet_detail_item.xml | 4 +-- .../res/layout/profile_new_message_dialog.xml | 4 +-- Habitica/res/layout/stats_slider_view.xml | 2 +- .../res/layout/tavern_chat_new_entry_item.xml | 4 +-- .../layout/widget_configure_habit_button.xml | 4 +-- Habitica/res/menu/menu_public_guild.xml | 2 +- .../habitica/HabiticaBaseApplication.kt | 4 +-- .../habitica/HabiticaPurchaseVerifier.java | 2 +- .../data/implementation/ApiClientImpl.kt | 2 +- .../extensions/AlertDialog-Extensions.kt | 2 +- .../android/habitica/extensions/ViewExt.kt | 2 +- .../helpers/PopupNotificationsManager.java | 2 +- .../habitica/helpers/QrCodeManager.java | 4 +-- .../habitica/helpers/RemindersManager.java | 4 +-- .../habitica/helpers/RemoteConfigManager.java | 2 +- .../habitica/helpers/TaskAlarmManager.kt | 2 +- .../HabiticaLocalNotification.kt | 6 ++-- .../interactors/DisplayItemDropUseCase.java | 2 +- .../habitica/interactors/LevelUpUseCase.java | 4 +-- .../habitica/interactors/NotifyUserUseCase.kt | 6 ++-- .../android/habitica/models/Avatar.java | 2 +- .../models/inventory/Customization.java | 2 +- .../habitica/models/inventory/Mount.java | 2 +- .../habitica/models/members/PlayerTier.kt | 2 +- .../android/habitica/models/tasks/Task.kt | 2 +- .../models/user/SubscriptionPlan.java | 2 +- .../android/habitica/modules/AppModule.java | 2 +- .../habitica/prefs/TimePreference.java | 2 +- .../prefs/scanner/IntentIntegrator.java | 2 +- .../receivers/NotificationPublisher.kt | 6 ++-- .../habitica/receivers/TaskReceiver.kt | 2 +- .../android/habitica/ui/ItemDetailDialog.kt | 2 +- .../WrapContentRecyclerViewLayoutManager.java | 6 ++-- .../habitica/ui/activities/AboutActivity.kt | 16 ++++----- .../ui/activities/AddTaskWidgetActivity.kt | 4 +-- .../habitica/ui/activities/BaseActivity.kt | 6 ++-- .../ui/activities/ChallengeFormActivity.kt | 24 ++++++------- .../ui/activities/ClassSelectionActivity.kt | 2 +- .../activities/FixCharacterValuesActivity.kt | 2 +- .../ui/activities/FullProfileActivity.kt | 24 ++++++------- .../ui/activities/GemPurchaseActivity.kt | 16 ++++----- .../ui/activities/GroupFormActivity.kt | 2 +- .../activities/HabitButtonWidgetActivity.kt | 12 +++---- .../habitica/ui/activities/IntroActivity.kt | 20 +++++------ .../habitica/ui/activities/LoginActivity.kt | 10 +++--- .../habitica/ui/activities/MainActivity.kt | 20 +++++------ .../ui/activities/PartyInviteActivity.kt | 12 +++---- .../habitica/ui/activities/PrefsActivity.kt | 4 +-- .../habitica/ui/activities/SetupActivity.kt | 20 +++++------ .../ui/activities/SkillMemberActivity.kt | 8 ++--- .../ui/activities/SkillTasksActivity.kt | 12 +++---- .../ui/activities/TaskFormActivity.kt | 26 +++++++------- .../ui/activities/VerifyUsernameActivity.kt | 2 +- .../CustomizationRecyclerViewAdapter.kt | 20 +++++------ .../ui/adapter/FAQOverviewRecyclerAdapter.kt | 12 +++---- .../ui/adapter/NavigationDrawerAdapter.kt | 16 ++++----- .../adapter/SkillTasksRecyclerViewAdapter.kt | 4 +-- .../ui/adapter/SkillsRecyclerViewAdapter.kt | 8 ++--- .../inventory/EquipmentRecyclerViewAdapter.kt | 6 ++-- .../inventory/HabiticaClassArrayAdapter.kt | 2 +- .../adapter/inventory/ItemRecyclerAdapter.kt | 4 +-- .../inventory/MountDetailRecyclerAdapter.kt | 4 +-- .../inventory/PetDetailRecyclerAdapter.kt | 4 +-- .../adapter/inventory/ShopRecyclerAdapter.kt | 12 +++---- .../inventory/StableRecyclerAdapter.kt | 10 +++--- .../setup/CustomizationSetupAdapter.kt | 8 ++--- .../ui/adapter/setup/TaskSetupAdapter.kt | 10 +++--- .../ui/adapter/social/AchievementAdapter.kt | 12 +++---- .../social/ChallengesListViewAdapter.kt | 6 ++-- .../adapter/social/ChatRecyclerViewAdapter.kt | 14 ++++---- .../social/PartyMemberRecyclerViewAdapter.kt | 6 ++-- .../social/PublicGuildsRecyclerViewAdapter.kt | 4 +-- .../ChallengesFilterRecyclerViewAdapter.kt | 6 ++-- .../tasks/BaseTasksRecyclerViewAdapter.kt | 4 +-- .../ui/adapter/tasks/CheckListAdapter.kt | 6 ++-- .../RealmBaseTasksRecyclerViewAdapter.kt | 8 ++--- .../ui/adapter/tasks/RemindersAdapter.kt | 6 ++-- .../tasks/RewardsRecyclerViewAdapter.java | 5 ++- .../SortableTasksRecyclerViewAdapter.java | 2 +- .../habitica/ui/fragments/AboutFragment.kt | 2 +- .../habitica/ui/fragments/BaseFragment.kt | 2 +- .../habitica/ui/fragments/BaseMainFragment.kt | 6 ++-- .../ui/fragments/NavigationDrawerFragment.kt | 16 ++++----- .../habitica/ui/fragments/StatsFragment.kt | 2 +- .../ui/fragments/faq/FAQOverviewFragment.kt | 12 +++---- .../AvatarCustomizationFragment.kt | 8 ++--- .../equipment/EquipmentDetailFragment.kt | 8 ++--- .../inventory/items/ItemRecyclerFragment.kt | 12 +++---- .../inventory/items/ItemsFragment.kt | 12 +++---- .../fragments/inventory/shops/ShopFragment.kt | 8 ++--- .../inventory/shops/ShopsFragment.kt | 6 ++-- .../stable/MountDetailRecyclerFragment.kt | 10 +++--- .../stable/PetDetailRecyclerFragment.kt | 10 +++--- .../inventory/stable/StableFragment.kt | 10 +++--- .../stable/StableRecyclerFragment.kt | 8 ++--- .../preferences/APIPreferenceFragment.kt | 2 +- .../AuthenticationPreferenceFragment.kt | 6 ++-- .../preferences/BasePreferencesFragment.kt | 2 +- .../DayStartPreferenceDialogFragment.kt | 4 +-- .../preferences/PreferencesFragment.kt | 6 ++-- .../preferences/ProfilePreferencesFragment.kt | 6 ++-- .../TimePreferenceDialogFragment.kt | 4 +-- .../ui/fragments/setup/AvatarSetupFragment.kt | 14 ++++---- .../ui/fragments/setup/TaskSetupFragment.kt | 8 ++--- .../ui/fragments/setup/WelcomeFragment.kt | 2 +- .../skills/SkillTasksRecyclerViewFragment.kt | 12 +++---- .../ui/fragments/skills/SkillsFragment.kt | 10 +++--- .../ui/fragments/social/ChatListFragment.kt | 20 +++++------ .../ui/fragments/social/GuildFragment.kt | 14 ++++---- .../social/GuildsOverviewFragment.kt | 6 ++-- .../ui/fragments/social/InboxFragment.kt | 6 ++-- .../social/InboxMessageListFragment.kt | 10 +++--- .../fragments/social/PublicGuildsFragment.kt | 16 ++++----- .../fragments/social/QuestDetailFragment.kt | 2 +- .../fragments/social/TavernDetailFragment.kt | 4 +-- .../ui/fragments/social/TavernFragment.kt | 6 ++-- .../challenges/ChallengeDetailFragment.kt | 4 +-- .../challenges/ChallengeFilterDialogHolder.kt | 8 ++--- .../challenges/ChallengeListFragment.kt | 12 +++---- .../challenges/ChallengesOverviewFragment.kt | 12 +++---- .../social/party/PartyDetailFragment.kt | 4 +-- .../fragments/social/party/PartyFragment.kt | 16 ++++----- .../social/party/PartyMemberListFragment.kt | 12 +++---- .../tasks/RewardsRecyclerviewFragment.kt | 16 ++++----- .../tasks/TaskRecyclerViewFragment.kt | 34 +++++++++---------- .../ui/fragments/tasks/TasksFragment.kt | 12 +++---- .../habitica/ui/helpers/DataBindingUtils.kt | 4 +-- .../helpers/FloatingActionMenuBehavior.java | 8 ++--- .../ui/helpers/ItemTouchHelperAdapter.java | 4 +-- .../ui/helpers/ItemTouchHelperViewHolder.java | 4 +-- .../habitica/ui/helpers/Kotterknife.kt | 22 ++++++------ .../habitica/ui/helpers/MarginDecoration.java | 2 +- .../habitica/ui/helpers/NavbarUtils.kt | 2 +- .../ui/helpers/RecyclerViewEmptySupport.java | 2 +- .../ui/helpers/SafeDefaultItemAnimator.java | 8 ++--- .../SimpleItemTouchHelperCallback.java | 4 +-- .../habitica/ui/helpers/ViewHelper.java | 4 +-- .../habitica/ui/menu/BottomSheetMenu.java | 2 +- .../habitica/ui/menu/BottomSheetMenuItem.java | 2 +- .../ui/viewHolders/SectionViewHolder.kt | 4 +-- .../ui/viewHolders/ShopItemViewHolder.kt | 4 +-- .../viewHolders/tasks/BaseTaskViewHolder.kt | 4 +-- .../tasks/ChecklistedViewHolder.kt | 8 ++--- .../ui/viewHolders/tasks/RewardViewHolder.kt | 2 +- .../ui/views/CollapsibleSectionView.kt | 2 +- .../android/habitica/ui/views/CurrencyView.kt | 4 +-- .../habitica/ui/views/FadingViewPager.kt | 4 +-- .../habitica/ui/views/HabiticaAlertDialog.kt | 4 +-- .../ui/views/HabiticaIconsHelper.java | 4 +-- .../habitica/ui/views/HabiticaSnackbar.kt | 10 +++--- .../android/habitica/ui/views/Typewriter.kt | 4 +-- .../android/habitica/ui/views/ValueBar.kt | 2 +- .../InsufficientCurrencyDialog.kt | 2 +- .../InsufficientHourglassesDialog.kt | 2 +- .../habitica/ui/views/login/StarView.kt | 2 +- .../ui/views/settings/FixValuesEditText.kt | 4 +-- .../ui/views/setup/AvatarCategoryView.kt | 2 +- .../habitica/ui/views/shops/PurchaseDialog.kt | 2 +- .../views/shops/PurchaseDialogGearContent.kt | 2 +- .../habitica/ui/views/social/ChatBarView.kt | 4 +-- .../ui/views/social/OldQuestProgressView.kt | 2 +- .../habitica/ui/views/social/QuestMenuView.kt | 6 ++-- .../ui/views/social/QuestProgressView.kt | 4 +-- .../habitica/ui/views/social/UsernameLabel.kt | 4 +-- .../ui/views/stats/BulkAllocateStatsDialog.kt | 4 +-- .../ui/views/stats/StatsSliderView.kt | 2 +- .../habitica/ui/views/stats/StatsView.kt | 2 +- .../subscriptions/SubscriptionOptionView.kt | 2 +- .../ui/views/tasks/TaskFilterDialog.kt | 10 +++--- .../utils/CustomizationDeserializer.java | 2 +- .../widget/AvatarStatsWidgetProvider.java | 2 +- .../habitica/widget/BaseWidgetProvider.kt | 2 +- .../widget/HabitButtonWidgetService.java | 2 +- gradle.properties | 2 ++ seeds-sdk/build.gradle | 2 +- seeds-sdk/src/main/AndroidManifest.xml | 2 +- 225 files changed, 767 insertions(+), 761 deletions(-) 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"> - +