From 0728eed1af55ed6efe8777ab1c6c6573c722e884 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 4 Sep 2020 18:17:34 +0200 Subject: [PATCH] Begin implementing dark mode --- Habitica/AndroidManifest.xml | 2 - Habitica/AndroidManifestTesting.xml | 4 - Habitica/build.gradle | 4 +- .../drawable-mdpi/layout_rounded_bg_gray.xml | 2 +- .../drawable/achievement_section_badge_bg.xml | 2 +- .../drawable/adventure_guide_menu_card_bg.xml | 2 +- .../adventure_guide_menu_card_gray.xml | 2 +- Habitica/res/drawable/badge_gray.xml | 2 +- .../res/drawable/border_1f000000_white.xml | 2 +- .../drawable/button_background_gray_700.xml | 2 +- ...y_600.xml => button_background_offset.xml} | 2 +- Habitica/res/drawable/button_gray_100.xml | 6 +- Habitica/res/drawable/circle_gray300.xml | 2 +- .../{circle_gray600.xml => circle_offset.xml} | 2 +- Habitica/res/drawable/daily_checked.xml | 2 +- Habitica/res/drawable/edittext.xml | 4 +- Habitica/res/drawable/gradient_white.xml | 4 +- .../res/drawable/habit_circle_disabled.xml | 2 +- .../res/drawable/habit_scoring_circle.xml | 2 +- ...rder.xml => layout_rounded_bg_content.xml} | 3 +- ...5.xml => layout_rounded_bg_content_15.xml} | 2 +- .../drawable/layout_rounded_bg_gray_50.xml | 2 +- .../drawable/layout_rounded_bg_light_gray.xml | 2 +- ...y_700.xml => layout_rounded_bg_offset.xml} | 2 +- .../drawable/layout_rounded_bg_shopitem.xml | 2 +- .../layout_rounded_bg_shopitem_price.xml | 2 +- .../res/drawable/layout_rounded_bg_white.xml | 2 +- ...y_600.xml => layout_rounded_bg_window.xml} | 2 +- ... layout_rounded_bg_window_blue_border.xml} | 2 +- ...layout_rounded_bg_window_brand_border.xml} | 2 +- ...> layout_rounded_bg_window_red_border.xml} | 2 +- .../layout_rounded_bg_window_tint_border.xml | 7 + ...ayout_rounded_bg_window_yellow_border.xml} | 2 +- .../res/drawable/layout_top_rounded_bg.xml | 2 +- .../res/drawable/nav_item_color_state.xml | 4 +- Habitica/res/drawable/pill_bg.xml | 2 +- ...{pill_bg_white.xml => pill_bg_content.xml} | 2 +- Habitica/res/drawable/pill_bg_gray.xml | 2 +- Habitica/res/drawable/pill_bg_gray_100.xml | 2 +- Habitica/res/drawable/pill_bg_purple_400.xml | 2 +- .../res/drawable/pill_bg_radio_unselected.xml | 4 +- ...ill_bg_gray_700.xml => pill_bg_window.xml} | 2 +- Habitica/res/drawable/progressbar_red.xml | 2 +- .../drawable/purchase_button_background.xml | 4 +- Habitica/res/drawable/quest_difficulty_bg.xml | 2 +- Habitica/res/drawable/rounded_border.xml | 2 +- ...r_white.xml => rounded_border_content.xml} | 4 +- .../res/drawable/rounded_purple_square.xml | 13 +- Habitica/res/drawable/seekbar_thumb.xml | 4 +- Habitica/res/drawable/subscription_box_bg.xml | 2 +- .../drawable/subscription_box_bg_selected.xml | 4 +- .../res/drawable/system_chat_background.xml | 2 +- Habitica/res/drawable/task_background.xml | 2 +- .../res/drawable/task_form_control_bg.xml | 4 +- Habitica/res/drawable/todo_checked.xml | 2 +- Habitica/res/drawable/vertical_divider.xml | 2 +- Habitica/res/layout/achievement_grid_item.xml | 8 +- Habitica/res/layout/achievement_list_item.xml | 4 +- .../res/layout/achievement_quest_item.xml | 6 +- .../res/layout/achievement_section_header.xml | 2 +- Habitica/res/layout/activity_about.xml | 47 --- .../res/layout/activity_adventure_guide.xml | 167 +++++---- .../res/layout/activity_class_selection.xml | 6 +- .../res/layout/activity_create_challenge.xml | 4 +- Habitica/res/layout/activity_fixcharacter.xml | 28 +- Habitica/res/layout/activity_full_profile.xml | 2 +- Habitica/res/layout/activity_gem_purchase.xml | 4 +- .../res/layout/activity_gift1get1_info.xml | 8 +- Habitica/res/layout/activity_gift_gems.xml | 6 +- .../res/layout/activity_gift_subscription.xml | 6 +- Habitica/res/layout/activity_group_form.xml | 16 +- Habitica/res/layout/activity_guidelines.xml | 2 +- Habitica/res/layout/activity_main.xml | 10 +- .../res/layout/activity_notifications.xml | 2 +- Habitica/res/layout/activity_party_invite.xml | 8 +- Habitica/res/layout/activity_prefs.xml | 2 +- .../res/layout/activity_report_message.xml | 16 +- .../res/layout/activity_skill_members.xml | 2 +- Habitica/res/layout/activity_skill_tasks.xml | 4 +- Habitica/res/layout/activity_task_form.xml | 6 +- .../res/layout/activity_verify_username.xml | 22 +- .../layout/adventure_guide_menu_banner.xml | 6 +- Habitica/res/layout/avatar_with_bars.xml | 9 +- Habitica/res/layout/challenge_item.xml | 2 +- .../res/layout/challenge_task_divider.xml | 3 +- ...t_new_entry_item.xml => chat_bar_view.xml} | 8 +- .../{tavern_chat_item.xml => chat_item.xml} | 16 +- .../res/layout/customization_grid_item.xml | 4 +- .../layout/customization_section_header.xml | 8 +- Habitica/res/layout/daily_item_card.xml | 2 +- .../res/layout/dialog_achievement_detail.xml | 2 +- Habitica/res/layout/dialog_bulk_allocate.xml | 10 +- .../layout/dialog_challenge_detail_habit.xml | 4 +- .../layout/dialog_challenge_detail_reward.xml | 2 - .../dialog_challenge_detail_task_group.xml | 4 +- .../dialog_choose_message_recipient.xml | 2 +- Habitica/res/layout/dialog_first_drop.xml | 8 +- Habitica/res/layout/dialog_habitica_base.xml | 8 +- Habitica/res/layout/dialog_levelup.xml | 2 +- Habitica/res/layout/dialog_levelup_10.xml | 4 +- .../res/layout/dialog_login_incentive.xml | 2 +- .../res/layout/dialog_pet_suggest_hatch.xml | 10 +- .../layout/dialog_purchase_content_gear.xml | 2 +- .../layout/dialog_purchase_content_item.xml | 5 +- .../layout/dialog_purchase_content_quest.xml | 4 +- .../layout/dialog_purchase_customization.xml | 2 +- Habitica/res/layout/dialog_purchase_gems.xml | 4 +- .../dialog_purchase_shopitem_button.xml | 2 +- .../dialog_purchase_shopitem_header.xml | 4 +- Habitica/res/layout/dialog_task_filter.xml | 8 +- Habitica/res/layout/dialog_yesterdaily.xml | 2 +- .../res/layout/dialog_yesterdaily_task.xml | 7 +- Habitica/res/layout/drawer_main.xml | 2 +- Habitica/res/layout/drawer_main_item.xml | 2 +- .../res/layout/drawer_main_section_header.xml | 15 +- .../res/layout/empty_view_seasonal_shop.xml | 4 +- .../res/layout/empty_view_timetravelers.xml | 4 +- .../res/layout/equipment_overview_item.xml | 4 +- Habitica/res/layout/fixvalues_edittext.xml | 6 +- Habitica/res/layout/form_stepper_value.xml | 10 +- Habitica/res/layout/fragment_about.xml | 19 +- .../res/layout/fragment_challenge_detail.xml | 16 +- Habitica/res/layout/fragment_faq_detail.xml | 4 +- Habitica/res/layout/fragment_faq_overview.xml | 8 +- Habitica/res/layout/fragment_gem_purchase.xml | 8 +- .../res/layout/fragment_gift_gem_balance.xml | 4 +- .../res/layout/fragment_gift_gem_purchase.xml | 4 +- Habitica/res/layout/fragment_guild_detail.xml | 18 +- Habitica/res/layout/fragment_inbox.xml | 2 +- Habitica/res/layout/fragment_items.xml | 2 +- Habitica/res/layout/fragment_no_party.xml | 16 +- Habitica/res/layout/fragment_party_detail.xml | 8 +- Habitica/res/layout/fragment_promo_info.xml | 8 +- Habitica/res/layout/fragment_quest_detail.xml | 8 +- Habitica/res/layout/fragment_recyclerview.xml | 6 +- .../layout/fragment_recyclerview_stable.xml | 2 +- .../layout/fragment_refresh_recyclerview.xml | 6 +- Habitica/res/layout/fragment_skills.xml | 2 +- Habitica/res/layout/fragment_stats.xml | 18 +- Habitica/res/layout/fragment_subscription.xml | 28 +- .../res/layout/fragment_support_bug_fix.xml | 16 +- Habitica/res/layout/fragment_support_main.xml | 28 +- .../res/layout/fragment_tavern_detail.xml | 4 +- Habitica/res/layout/fragment_viewpager.xml | 2 +- Habitica/res/layout/fragment_welcome.xml | 10 +- Habitica/res/layout/gear_list_item.xml | 8 +- Habitica/res/layout/habit_item_card.xml | 2 +- Habitica/res/layout/help_header.xml | 2 +- Habitica/res/layout/item_inbox_overview.xml | 2 +- Habitica/res/layout/item_item.xml | 2 + Habitica/res/layout/main_navigation_view.xml | 16 +- Habitica/res/layout/menu_bottom_sheet.xml | 2 +- Habitica/res/layout/mount_overview_item.xml | 2 +- Habitica/res/layout/notification_item.xml | 2 +- .../layout/notification_item_actionable.xml | 2 +- Habitica/res/layout/notifications_header.xml | 6 +- Habitica/res/layout/party_member.xml | 12 +- Habitica/res/layout/pet_detail_item.xml | 4 +- Habitica/res/layout/pet_overview_item.xml | 4 +- Habitica/res/layout/preference_category.xml | 2 +- .../res/layout/preference_child_summary.xml | 2 +- .../layout/preference_child_summary_error.xml | 2 +- .../res/layout/profile_new_message_dialog.xml | 2 +- Habitica/res/layout/progress_bar.xml | 2 - .../res/layout/promo_gift_one_get_one.xml | 2 +- Habitica/res/layout/promo_menu.xml | 6 +- .../layout/promo_subscription_buy_gems.xml | 6 +- .../res/layout/purchase_subscription_view.xml | 2 +- Habitica/res/layout/quest_menu_view.xml | 6 +- Habitica/res/layout/quest_progress.xml | 14 +- Habitica/res/layout/reward_item_card.xml | 2 +- Habitica/res/layout/row_quest_reward.xml | 2 +- .../res/layout/row_quest_reward_imageview.xml | 2 +- Habitica/res/layout/row_shopitem.xml | 6 +- Habitica/res/layout/shop_section_header.xml | 2 +- Habitica/res/layout/skill_list_item.xml | 2 +- Habitica/res/layout/skill_task_item_card.xml | 2 +- Habitica/res/layout/speechbubble.xml | 2 +- Habitica/res/layout/stats_slider_view.xml | 12 +- Habitica/res/layout/stats_view.xml | 10 +- Habitica/res/layout/subscription_details.xml | 4 +- .../layout/support_collapsible_section.xml | 2 +- Habitica/res/layout/support_faq_item.xml | 2 +- Habitica/res/layout/system_chat_message.xml | 2 +- .../res/layout/task_form_task_scheduling.xml | 12 +- Habitica/res/layout/task_main_content.xml | 3 +- Habitica/res/layout/todo_item_card.xml | 2 +- .../res/layout/view_collapsible_section.xml | 4 +- Habitica/res/values-night/colors.xml | 39 ++ Habitica/res/values/colors.xml | 57 ++- Habitica/res/values/strings.xml | 3 + Habitica/res/values/styles.xml | 149 +++++--- Habitica/res/values/values.xml | 12 + Habitica/res/xml/preferences_fragment.xml | 7 +- .../habitica/HabiticaBaseApplication.kt | 2 +- .../habitica/components/UserComponent.java | 6 - .../data/implementation/ApiClientImpl.kt | 2 +- .../implementation/InventoryRepositoryImpl.kt | 6 +- .../implementation/SocialRepositoryImpl.kt | 4 +- .../data/implementation/TagRepositoryImpl.kt | 2 +- .../data/implementation/TaskRepositoryImpl.kt | 4 +- .../data/implementation/UserRepositoryImpl.kt | 4 +- .../RealmInventoryLocalRepository.kt | 2 +- .../RealmSocialLocalRepository.kt | 8 +- .../habitica/extensions/Context-Extensions.kt | 11 + .../habitica/helpers/AppConfigManager.kt | 4 - .../habitica/helpers/NotificationsManager.kt | 4 +- .../android/habitica/helpers/SoundManager.kt | 2 +- .../habitica/helpers/TaskAlarmManager.kt | 4 +- .../notifications/PushNotificationManager.kt | 4 +- .../habitica/interactors/LevelUpUseCase.kt | 4 +- .../android/habitica/models/tasks/Task.kt | 4 +- .../habitica/models/user/ContributorInfo.java | 3 +- .../android/habitica/models/user/User.kt | 5 +- .../LocalNotificationActionReceiver.kt | 18 +- .../receivers/NotificationPublisher.kt | 2 +- .../android/habitica/ui/AvatarView.kt | 9 +- .../habitica/ui/AvatarWithBarsViewModel.kt | 11 - .../habitica/ui/activities/AboutActivity.kt | 111 ------ .../ui/activities/AdventureGuideActivity.kt | 10 +- .../habitica/ui/activities/BaseActivity.kt | 82 +++-- .../ui/activities/ChallengeFormActivity.kt | 12 +- .../ui/activities/ClassSelectionActivity.kt | 16 +- .../activities/FixCharacterValuesActivity.kt | 6 +- .../ui/activities/FullProfileActivity.kt | 18 +- .../ui/activities/GemPurchaseActivity.kt | 2 +- .../ui/activities/GiftGemsActivity.kt | 2 +- .../ui/activities/GiftSubscriptionActivity.kt | 10 +- .../ui/activities/GroupInviteActivity.kt | 2 +- .../activities/HabitButtonWidgetActivity.kt | 4 +- .../habitica/ui/activities/IntroActivity.kt | 2 +- .../habitica/ui/activities/LoginActivity.kt | 12 +- .../habitica/ui/activities/MainActivity.kt | 73 ++-- .../ui/activities/MaintenanceActivity.kt | 2 +- .../ui/activities/NotificationsActivity.kt | 6 +- .../ui/activities/ReportMessageActivity.kt | 6 +- .../habitica/ui/activities/SetupActivity.kt | 12 +- .../ui/activities/SkillMemberActivity.kt | 4 +- .../ui/activities/SkillTasksActivity.kt | 4 +- .../ui/activities/TaskFormActivity.kt | 20 +- .../ui/activities/VerifyUsernameActivity.kt | 6 +- ...stomizationEquipmentRecyclerViewAdapter.kt | 5 +- .../CustomizationRecyclerViewAdapter.kt | 5 +- .../ui/adapter/NavigationDrawerAdapter.kt | 6 +- .../ui/adapter/SkillsRecyclerViewAdapter.kt | 16 +- .../inventory/EquipmentRecyclerViewAdapter.kt | 4 +- .../adapter/inventory/ItemRecyclerAdapter.kt | 4 +- .../inventory/PetDetailRecyclerAdapter.kt | 5 - .../inventory/StableRecyclerAdapter.kt | 8 +- .../adapter/social/ChatRecyclerViewAdapter.kt | 2 +- .../ui/adapter/social/InboxAdapter.kt | 2 +- .../social/PublicGuildsRecyclerViewAdapter.kt | 4 +- .../ChallengeTasksRecyclerViewAdapter.kt | 2 +- .../tasks/BaseTasksRecyclerViewAdapter.kt | 2 +- .../ui/fragments/AchievementsFragment.kt | 10 +- .../habitica/ui/fragments/BaseMainFragment.kt | 2 +- .../ui/fragments/NavigationDrawerFragment.kt | 49 ++- .../habitica/ui/fragments/NewsFragment.kt | 2 +- .../habitica/ui/fragments/StatsFragment.kt | 10 +- .../AvatarCustomizationFragment.kt | 12 +- .../customization/AvatarEquipmentFragment.kt | 10 +- .../customization/AvatarOverviewFragment.kt | 4 +- .../equipment/EquipmentDetailFragment.kt | 4 +- .../equipment/EquipmentOverviewFragment.kt | 8 +- .../inventory/items/ItemRecyclerFragment.kt | 18 +- .../fragments/inventory/shops/ShopFragment.kt | 14 +- .../inventory/shops/ShopsFragment.kt | 3 +- .../stable/MountDetailRecyclerFragment.kt | 6 +- .../stable/PetDetailRecyclerFragment.kt | 10 +- .../stable/StableRecyclerFragment.kt | 10 +- .../AuthenticationPreferenceFragment.kt | 10 +- .../preferences/BasePreferencesFragment.kt | 2 +- .../EmailNotificationsPreferencesFragment.kt | 2 +- .../preferences/PreferencesFragment.kt | 17 +- .../preferences/ProfilePreferencesFragment.kt | 2 +- .../PushNotificationsPreferencesFragment.kt | 2 +- .../purchases/GemsPurchaseFragment.kt | 10 +- .../purchases/GiftBalanceGemsFragment.kt | 2 +- .../purchases/GiftPurchaseGemsFragment.kt | 8 +- .../purchases/SubscriptionFragment.kt | 18 +- .../ui/fragments/setup/AvatarSetupFragment.kt | 6 +- .../ui/fragments/setup/WelcomeFragment.kt | 4 +- .../skills/SkillTasksRecyclerViewFragment.kt | 6 +- .../ui/fragments/skills/SkillsFragment.kt | 8 +- .../ui/fragments/social/ChatFragment.kt | 77 ++-- .../ui/fragments/social/ChatListFragment.kt | 286 --------------- .../fragments/social/GuildDetailFragment.kt | 6 +- .../ui/fragments/social/GuildFragment.kt | 8 +- .../social/GuildsOverviewFragment.kt | 4 +- .../social/InboxMessageListFragment.kt | 59 ++- .../fragments/social/InboxOverviewFragment.kt | 6 +- .../social/NoPartyFragmentFragment.kt | 12 +- .../fragments/social/PublicGuildsFragment.kt | 6 +- .../fragments/social/QuestDetailFragment.kt | 22 +- .../fragments/social/TavernDetailFragment.kt | 10 +- .../ui/fragments/social/TavernFragment.kt | 24 +- .../challenges/ChallengeDetailFragment.kt | 21 +- .../challenges/ChallengeListFragment.kt | 8 +- .../social/party/PartyDetailFragment.kt | 22 +- .../fragments/social/party/PartyFragment.kt | 2 +- .../ui/fragments/support/FAQDetailFragment.kt | 2 +- .../tasks/RewardsRecyclerviewFragment.kt | 10 +- .../tasks/TaskRecyclerViewFragment.kt | 32 +- .../ui/fragments/tasks/TasksFragment.kt | 6 +- .../habitica/ui/helpers/MarginDecoration.kt | 4 +- .../ui/helpers/SafeDefaultItemAnimator.kt | 14 +- .../ui/viewHolders/MountViewHolder.kt | 2 +- .../habitica/ui/viewHolders/PetViewHolder.kt | 6 +- .../ui/viewHolders/ShopItemViewHolder.kt | 29 +- .../viewHolders/tasks/BaseTaskViewHolder.kt | 9 +- .../tasks/ChecklistedViewHolder.kt | 30 +- .../ui/viewHolders/tasks/HabitViewHolder.kt | 22 +- .../ui/viewHolders/tasks/RewardViewHolder.kt | 6 +- .../habitica/ui/viewmodels/BaseViewModel.kt | 4 +- .../habitica/ui/viewmodels/GroupViewModel.kt | 28 +- .../habitica/ui/viewmodels/InboxViewModel.kt | 8 +- .../ui/viewmodels/NotificationsViewModel.kt | 16 +- .../habitica/ui/viewmodels/PartyViewModel.kt | 8 +- .../android/habitica/ui/views/CurrencyView.kt | 5 +- .../habitica/ui/views/CurrencyViews.kt | 4 +- .../habitica/ui/views/DragLinearLayout.kt | 22 +- .../habitica/ui/views/HabiticaIcons.java | 339 ++++++++++-------- .../ui/views/HabiticaIconsHelper.java | 27 ++ .../habitica/ui/views/HabiticaProgressBar.kt | 1 - .../habitica/ui/views/NPCBannerView.kt | 4 +- .../ui/views/SupportCollapsibleSection.kt | 4 +- .../android/habitica/ui/views/Typewriter.kt | 2 +- .../android/habitica/ui/views/ValueBar.kt | 5 +- .../ui/views/dialogs/HabiticaAlertDialog.kt | 6 +- .../ui/views/dialogs/PetSuggestHatchDialog.kt | 4 +- .../views/equipment/EquipmentOverviewItem.kt | 4 +- .../views/equipment/EquipmentOverviewView.kt | 3 +- .../HabiticaBottomNavigationView.kt | 15 +- .../habitica/ui/views/promo/PromoMenuView.kt | 2 +- .../promo/SubscriptionBuyGemsPromoView.kt | 2 +- .../habitica/ui/views/shops/PurchaseDialog.kt | 44 ++- .../views/shops/PurchaseDialogGearContent.kt | 4 +- .../habitica/ui/views/social/ChatBarView.kt | 82 +++-- .../ui/views/social/OldQuestProgressView.kt | 6 +- .../ui/views/social/QuestProgressView.kt | 2 +- .../ui/views/stats/BulkAllocateStatsDialog.kt | 4 +- .../habitica/ui/views/stats/StatsView.kt | 12 +- .../subscriptions/SubscriptionOptionView.kt | 12 +- .../ui/views/tasks/TaskFilterDialog.kt | 6 +- .../views/tasks/form/ChecklistItemFormView.kt | 2 +- .../tasks/form/HabitResetStreakButtons.kt | 6 +- .../tasks/form/HabitScoringButtonsView.kt | 6 +- .../views/tasks/form/ReminderItemFormView.kt | 2 +- .../views/tasks/form/TaskDifficultyButtons.kt | 6 +- .../tasks/form/TaskSchedulingControls.kt | 8 +- .../views/yesterdailies/YesterdailyDialog.kt | 8 +- .../widget/AvatarStatsWidgetProvider.kt | 4 +- .../widget/HabitButtonWidgetProvider.kt | 2 +- .../widget/HabitButtonWidgetService.kt | 2 +- .../habitica/widget/TaskListFactory.kt | 2 +- .../habitica/widget/TaskListWidgetProvider.kt | 2 +- .../habitica/models/inventory/MountTest.kt | 2 +- .../habitica/models/inventory/PetTest.kt | 2 +- build.gradle | 4 +- 359 files changed, 1810 insertions(+), 2004 deletions(-) rename Habitica/res/drawable/{button_background_gray_600.xml => button_background_offset.xml} (81%) rename Habitica/res/drawable/{circle_gray600.xml => circle_offset.xml} (71%) rename Habitica/res/drawable/{layout_rounded_bg_gray_700_brand_border.xml => layout_rounded_bg_content.xml} (70%) rename Habitica/res/drawable/{layout_rounded_bg_white_15.xml => layout_rounded_bg_content_15.xml} (83%) rename Habitica/res/drawable/{layout_rounded_bg_gray_700.xml => layout_rounded_bg_offset.xml} (83%) rename Habitica/res/drawable/{layout_rounded_bg_gray_600.xml => layout_rounded_bg_window.xml} (83%) rename Habitica/res/drawable/{layout_rounded_bg_brand_700_blue_border.xml => layout_rounded_bg_window_blue_border.xml} (85%) rename Habitica/res/drawable/{layout_rounded_bg_brand_700_brand_border.xml => layout_rounded_bg_window_brand_border.xml} (85%) rename Habitica/res/drawable/{layout_rounded_bg_brand_700_red_border.xml => layout_rounded_bg_window_red_border.xml} (85%) create mode 100644 Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml rename Habitica/res/drawable/{layout_rounded_bg_brand_700_yellow_border.xml => layout_rounded_bg_window_yellow_border.xml} (85%) rename Habitica/res/drawable/{pill_bg_white.xml => pill_bg_content.xml} (81%) rename Habitica/res/drawable/{pill_bg_gray_700.xml => pill_bg_window.xml} (82%) rename Habitica/res/drawable/{rounded_border_white.xml => rounded_border_content.xml} (63%) delete mode 100644 Habitica/res/layout/activity_about.xml rename Habitica/res/layout/{tavern_chat_new_entry_item.xml => chat_bar_view.xml} (95%) rename Habitica/res/layout/{tavern_chat_item.xml => chat_item.xml} (93%) create mode 100644 Habitica/res/values-night/colors.xml delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AboutActivity.kt delete mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.kt diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index a36049ec9..bf458dd69 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -128,8 +128,6 @@ - - - + \ No newline at end of file diff --git a/Habitica/res/drawable/achievement_section_badge_bg.xml b/Habitica/res/drawable/achievement_section_badge_bg.xml index ae119c105..d71c5e6da 100644 --- a/Habitica/res/drawable/achievement_section_badge_bg.xml +++ b/Habitica/res/drawable/achievement_section_badge_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/adventure_guide_menu_card_bg.xml b/Habitica/res/drawable/adventure_guide_menu_card_bg.xml index be6da8b36..e0ff6fc6e 100644 --- a/Habitica/res/drawable/adventure_guide_menu_card_bg.xml +++ b/Habitica/res/drawable/adventure_guide_menu_card_bg.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/adventure_guide_menu_card_gray.xml b/Habitica/res/drawable/adventure_guide_menu_card_gray.xml index 4a16d5346..264f19e60 100644 --- a/Habitica/res/drawable/adventure_guide_menu_card_gray.xml +++ b/Habitica/res/drawable/adventure_guide_menu_card_gray.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/badge_gray.xml b/Habitica/res/drawable/badge_gray.xml index 206ef9eac..eb5012f9f 100644 --- a/Habitica/res/drawable/badge_gray.xml +++ b/Habitica/res/drawable/badge_gray.xml @@ -4,7 +4,7 @@ + android:color="@color/offset_background" /> diff --git a/Habitica/res/drawable/border_1f000000_white.xml b/Habitica/res/drawable/border_1f000000_white.xml index d873a2142..feea4b815 100644 --- a/Habitica/res/drawable/border_1f000000_white.xml +++ b/Habitica/res/drawable/border_1f000000_white.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/Habitica/res/drawable/button_background_gray_600.xml b/Habitica/res/drawable/button_background_offset.xml similarity index 81% rename from Habitica/res/drawable/button_background_gray_600.xml rename to Habitica/res/drawable/button_background_offset.xml index 9d6ccf7a2..f2b1e94c5 100644 --- a/Habitica/res/drawable/button_background_gray_600.xml +++ b/Habitica/res/drawable/button_background_offset.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/button_gray_100.xml b/Habitica/res/drawable/button_gray_100.xml index cb6e59ecd..eb34b9075 100644 --- a/Habitica/res/drawable/button_gray_100.xml +++ b/Habitica/res/drawable/button_gray_100.xml @@ -5,7 +5,7 @@ + android:color="@color/inverted_background_offset"/> @@ -34,7 +34,7 @@ diff --git a/Habitica/res/drawable/circle_gray300.xml b/Habitica/res/drawable/circle_gray300.xml index ba3d669da..771682691 100644 --- a/Habitica/res/drawable/circle_gray300.xml +++ b/Habitica/res/drawable/circle_gray300.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/circle_gray600.xml b/Habitica/res/drawable/circle_offset.xml similarity index 71% rename from Habitica/res/drawable/circle_gray600.xml rename to Habitica/res/drawable/circle_offset.xml index e2ac51390..736390730 100644 --- a/Habitica/res/drawable/circle_gray600.xml +++ b/Habitica/res/drawable/circle_offset.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/daily_checked.xml b/Habitica/res/drawable/daily_checked.xml index 4791df6b4..a4e22f21e 100644 --- a/Habitica/res/drawable/daily_checked.xml +++ b/Habitica/res/drawable/daily_checked.xml @@ -4,7 +4,7 @@ - + diff --git a/Habitica/res/drawable/edittext.xml b/Habitica/res/drawable/edittext.xml index d396af7fa..c6d6d5cff 100644 --- a/Habitica/res/drawable/edittext.xml +++ b/Habitica/res/drawable/edittext.xml @@ -2,14 +2,14 @@ - + - + diff --git a/Habitica/res/drawable/gradient_white.xml b/Habitica/res/drawable/gradient_white.xml index bb76b3c28..23d57b8da 100644 --- a/Habitica/res/drawable/gradient_white.xml +++ b/Habitica/res/drawable/gradient_white.xml @@ -2,7 +2,7 @@ \ No newline at end of file diff --git a/Habitica/res/drawable/habit_circle_disabled.xml b/Habitica/res/drawable/habit_circle_disabled.xml index a28001791..02b91d8f0 100644 --- a/Habitica/res/drawable/habit_circle_disabled.xml +++ b/Habitica/res/drawable/habit_circle_disabled.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/habit_scoring_circle.xml b/Habitica/res/drawable/habit_scoring_circle.xml index 92011318e..170bb9a37 100644 --- a/Habitica/res/drawable/habit_scoring_circle.xml +++ b/Habitica/res/drawable/habit_scoring_circle.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml b/Habitica/res/drawable/layout_rounded_bg_content.xml similarity index 70% rename from Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml rename to Habitica/res/drawable/layout_rounded_bg_content.xml index 995c49409..9f6e1d1b0 100644 --- a/Habitica/res/drawable/layout_rounded_bg_gray_700_brand_border.xml +++ b/Habitica/res/drawable/layout_rounded_bg_content.xml @@ -1,7 +1,6 @@ - + - \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_white_15.xml b/Habitica/res/drawable/layout_rounded_bg_content_15.xml similarity index 83% rename from Habitica/res/drawable/layout_rounded_bg_white_15.xml rename to Habitica/res/drawable/layout_rounded_bg_content_15.xml index 105d509bf..857440121 100644 --- a/Habitica/res/drawable/layout_rounded_bg_white_15.xml +++ b/Habitica/res/drawable/layout_rounded_bg_content_15.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_gray_50.xml b/Habitica/res/drawable/layout_rounded_bg_gray_50.xml index 5956941ef..3ee982385 100644 --- a/Habitica/res/drawable/layout_rounded_bg_gray_50.xml +++ b/Habitica/res/drawable/layout_rounded_bg_gray_50.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_light_gray.xml b/Habitica/res/drawable/layout_rounded_bg_light_gray.xml index cfa64aed6..051bbab11 100644 --- a/Habitica/res/drawable/layout_rounded_bg_light_gray.xml +++ b/Habitica/res/drawable/layout_rounded_bg_light_gray.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_gray_700.xml b/Habitica/res/drawable/layout_rounded_bg_offset.xml similarity index 83% rename from Habitica/res/drawable/layout_rounded_bg_gray_700.xml rename to Habitica/res/drawable/layout_rounded_bg_offset.xml index a5b041924..e2b945656 100644 --- a/Habitica/res/drawable/layout_rounded_bg_gray_700.xml +++ b/Habitica/res/drawable/layout_rounded_bg_offset.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_shopitem.xml b/Habitica/res/drawable/layout_rounded_bg_shopitem.xml index cff7a3e3c..026862756 100644 --- a/Habitica/res/drawable/layout_rounded_bg_shopitem.xml +++ b/Habitica/res/drawable/layout_rounded_bg_shopitem.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml b/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml index d6f0b7a0c..fb3137234 100644 --- a/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml +++ b/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_white.xml b/Habitica/res/drawable/layout_rounded_bg_white.xml index 7afab5887..9f6e1d1b0 100644 --- a/Habitica/res/drawable/layout_rounded_bg_white.xml +++ b/Habitica/res/drawable/layout_rounded_bg_white.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_gray_600.xml b/Habitica/res/drawable/layout_rounded_bg_window.xml similarity index 83% rename from Habitica/res/drawable/layout_rounded_bg_gray_600.xml rename to Habitica/res/drawable/layout_rounded_bg_window.xml index 30464dd0d..f3645d99d 100644 --- a/Habitica/res/drawable/layout_rounded_bg_gray_600.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_700_blue_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml similarity index 85% rename from Habitica/res/drawable/layout_rounded_bg_brand_700_blue_border.xml rename to Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml index dc327ae97..8046a6e8e 100644 --- a/Habitica/res/drawable/layout_rounded_bg_brand_700_blue_border.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_700_brand_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml similarity index 85% rename from Habitica/res/drawable/layout_rounded_bg_brand_700_brand_border.xml rename to Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml index 5f9772be1..d178b01ac 100644 --- a/Habitica/res/drawable/layout_rounded_bg_brand_700_brand_border.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_700_red_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_red_border.xml similarity index 85% rename from Habitica/res/drawable/layout_rounded_bg_brand_700_red_border.xml rename to Habitica/res/drawable/layout_rounded_bg_window_red_border.xml index 122801662..2a67aca44 100644 --- a/Habitica/res/drawable/layout_rounded_bg_brand_700_red_border.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window_red_border.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml new file mode 100644 index 000000000..d896b0dc6 --- /dev/null +++ b/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml similarity index 85% rename from Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml rename to Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml index dfb258934..984a3d92f 100644 --- a/Habitica/res/drawable/layout_rounded_bg_brand_700_yellow_border.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/layout_top_rounded_bg.xml b/Habitica/res/drawable/layout_top_rounded_bg.xml index dc5b74047..bc5828111 100644 --- a/Habitica/res/drawable/layout_top_rounded_bg.xml +++ b/Habitica/res/drawable/layout_top_rounded_bg.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/nav_item_color_state.xml b/Habitica/res/drawable/nav_item_color_state.xml index 0f4955173..c9ab128ae 100644 --- a/Habitica/res/drawable/nav_item_color_state.xml +++ b/Habitica/res/drawable/nav_item_color_state.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg.xml b/Habitica/res/drawable/pill_bg.xml index c5f636827..70382d6db 100644 --- a/Habitica/res/drawable/pill_bg.xml +++ b/Habitica/res/drawable/pill_bg.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_white.xml b/Habitica/res/drawable/pill_bg_content.xml similarity index 81% rename from Habitica/res/drawable/pill_bg_white.xml rename to Habitica/res/drawable/pill_bg_content.xml index f90c324d3..34654a9f6 100644 --- a/Habitica/res/drawable/pill_bg_white.xml +++ b/Habitica/res/drawable/pill_bg_content.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_gray.xml b/Habitica/res/drawable/pill_bg_gray.xml index 37fceb493..04853c7e8 100644 --- a/Habitica/res/drawable/pill_bg_gray.xml +++ b/Habitica/res/drawable/pill_bg_gray.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_gray_100.xml b/Habitica/res/drawable/pill_bg_gray_100.xml index d4d0a7406..83a555366 100644 --- a/Habitica/res/drawable/pill_bg_gray_100.xml +++ b/Habitica/res/drawable/pill_bg_gray_100.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_purple_400.xml b/Habitica/res/drawable/pill_bg_purple_400.xml index 6d8163ecf..a97045794 100644 --- a/Habitica/res/drawable/pill_bg_purple_400.xml +++ b/Habitica/res/drawable/pill_bg_purple_400.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_radio_unselected.xml b/Habitica/res/drawable/pill_bg_radio_unselected.xml index d115dede9..3c7f7ed72 100644 --- a/Habitica/res/drawable/pill_bg_radio_unselected.xml +++ b/Habitica/res/drawable/pill_bg_radio_unselected.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_gray_700.xml b/Habitica/res/drawable/pill_bg_window.xml similarity index 82% rename from Habitica/res/drawable/pill_bg_gray_700.xml rename to Habitica/res/drawable/pill_bg_window.xml index fc8626c84..70382d6db 100644 --- a/Habitica/res/drawable/pill_bg_gray_700.xml +++ b/Habitica/res/drawable/pill_bg_window.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/progressbar_red.xml b/Habitica/res/drawable/progressbar_red.xml index 07df2d1a5..2a756725a 100644 --- a/Habitica/res/drawable/progressbar_red.xml +++ b/Habitica/res/drawable/progressbar_red.xml @@ -4,7 +4,7 @@ diff --git a/Habitica/res/drawable/purchase_button_background.xml b/Habitica/res/drawable/purchase_button_background.xml index 34ccf9ad2..0937d0259 100644 --- a/Habitica/res/drawable/purchase_button_background.xml +++ b/Habitica/res/drawable/purchase_button_background.xml @@ -26,7 +26,7 @@ + android:color="@color/inverted_background_offset"> @@ -36,7 +36,7 @@ + android:color="@color/color_accent"> diff --git a/Habitica/res/drawable/quest_difficulty_bg.xml b/Habitica/res/drawable/quest_difficulty_bg.xml index 96c52e317..7bcd3ecde 100644 --- a/Habitica/res/drawable/quest_difficulty_bg.xml +++ b/Habitica/res/drawable/quest_difficulty_bg.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/rounded_border.xml b/Habitica/res/drawable/rounded_border.xml index 8ceff4312..d239815b8 100644 --- a/Habitica/res/drawable/rounded_border.xml +++ b/Habitica/res/drawable/rounded_border.xml @@ -3,6 +3,6 @@ + android:color="@color/offset_background"/> diff --git a/Habitica/res/drawable/rounded_border_white.xml b/Habitica/res/drawable/rounded_border_content.xml similarity index 63% rename from Habitica/res/drawable/rounded_border_white.xml rename to Habitica/res/drawable/rounded_border_content.xml index b1e7cce44..c768d51cf 100644 --- a/Habitica/res/drawable/rounded_border_white.xml +++ b/Habitica/res/drawable/rounded_border_content.xml @@ -1,8 +1,8 @@ - + + android:color="@color/offset_background"/> diff --git a/Habitica/res/drawable/rounded_purple_square.xml b/Habitica/res/drawable/rounded_purple_square.xml index 0dc0c7e65..043026ceb 100644 --- a/Habitica/res/drawable/rounded_purple_square.xml +++ b/Habitica/res/drawable/rounded_purple_square.xml @@ -2,15 +2,6 @@ - - - - - - - - - + + \ No newline at end of file diff --git a/Habitica/res/drawable/seekbar_thumb.xml b/Habitica/res/drawable/seekbar_thumb.xml index 9babaf6f2..74a3d4b0a 100644 --- a/Habitica/res/drawable/seekbar_thumb.xml +++ b/Habitica/res/drawable/seekbar_thumb.xml @@ -10,10 +10,10 @@ - + + android:color="@color/content_background_offset" /> diff --git a/Habitica/res/drawable/subscription_box_bg.xml b/Habitica/res/drawable/subscription_box_bg.xml index cc3311445..bc7b82302 100644 --- a/Habitica/res/drawable/subscription_box_bg.xml +++ b/Habitica/res/drawable/subscription_box_bg.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/subscription_box_bg_selected.xml b/Habitica/res/drawable/subscription_box_bg_selected.xml index 3c5034039..3051368c3 100644 --- a/Habitica/res/drawable/subscription_box_bg_selected.xml +++ b/Habitica/res/drawable/subscription_box_bg_selected.xml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/Habitica/res/drawable/system_chat_background.xml b/Habitica/res/drawable/system_chat_background.xml index 13de39f8d..ca5a8cd52 100644 --- a/Habitica/res/drawable/system_chat_background.xml +++ b/Habitica/res/drawable/system_chat_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/task_background.xml b/Habitica/res/drawable/task_background.xml index b803f0bfa..f4d0bf2b5 100644 --- a/Habitica/res/drawable/task_background.xml +++ b/Habitica/res/drawable/task_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/task_form_control_bg.xml b/Habitica/res/drawable/task_form_control_bg.xml index 64cd42452..4e8a5ba4f 100644 --- a/Habitica/res/drawable/task_form_control_bg.xml +++ b/Habitica/res/drawable/task_form_control_bg.xml @@ -2,14 +2,14 @@ - + - + diff --git a/Habitica/res/drawable/todo_checked.xml b/Habitica/res/drawable/todo_checked.xml index 35960c7b5..bbf9ee7d8 100644 --- a/Habitica/res/drawable/todo_checked.xml +++ b/Habitica/res/drawable/todo_checked.xml @@ -4,7 +4,7 @@ - + diff --git a/Habitica/res/drawable/vertical_divider.xml b/Habitica/res/drawable/vertical_divider.xml index bbf847fc5..8f0c41fc4 100644 --- a/Habitica/res/drawable/vertical_divider.xml +++ b/Habitica/res/drawable/vertical_divider.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/layout/achievement_grid_item.xml b/Habitica/res/layout/achievement_grid_item.xml index acf0fb446..cb586e0f6 100644 --- a/Habitica/res/layout/achievement_grid_item.xml +++ b/Habitica/res/layout/achievement_grid_item.xml @@ -8,13 +8,13 @@ android:gravity="center_vertical" android:paddingTop="13dp" android:paddingBottom="13dp" - tools:background="@color/white"> + tools:background="?attr/colorContentBackground"> + android:textColor="@color/text_primary"/> + android:textColor="@color/text_secondary"/> \ No newline at end of file diff --git a/Habitica/res/layout/achievement_quest_item.xml b/Habitica/res/layout/achievement_quest_item.xml index e02d3234a..16ca8fd0e 100644 --- a/Habitica/res/layout/achievement_quest_item.xml +++ b/Habitica/res/layout/achievement_quest_item.xml @@ -12,9 +12,9 @@ android:layout_width="40dp" android:layout_height="40dp" android:gravity="center" - android:textColor="@color/gray_200" + android:textColor="@color/text_ternary" style="@style/Body1" - android:background="@drawable/circle_gray600" + android:background="@drawable/circle_offset" tools:text="12" android:layout_marginStart="35dp" android:layout_marginEnd="25dp"/> @@ -23,6 +23,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" style="@style/Body1" - android:textColor="@color/gray_100" + android:textColor="@color/text_secondary" tools:text="This is the quest title"/> \ No newline at end of file diff --git a/Habitica/res/layout/achievement_section_header.xml b/Habitica/res/layout/achievement_section_header.xml index 3701fd96a..a89675365 100644 --- a/Habitica/res/layout/achievement_section_header.xml +++ b/Habitica/res/layout/achievement_section_header.xml @@ -24,7 +24,7 @@ android:background="@drawable/achievement_section_badge_bg" android:paddingStart="2dp" android:paddingEnd="2dp" - android:textColor="@color/gray_200" + android:textColor="@color/text_ternary" style="@style/Overline" tools:text="1"/> \ No newline at end of file diff --git a/Habitica/res/layout/activity_about.xml b/Habitica/res/layout/activity_about.xml deleted file mode 100644 index 0329f6e21..000000000 --- a/Habitica/res/layout/activity_about.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Habitica/res/layout/activity_adventure_guide.xml b/Habitica/res/layout/activity_adventure_guide.xml index 5feab0ad1..bee332101 100644 --- a/Habitica/res/layout/activity_adventure_guide.xml +++ b/Habitica/res/layout/activity_adventure_guide.xml @@ -4,9 +4,9 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.activities.PrefsActivity" + android:background="?attr/colorContentBackground" android:orientation="vertical" - android:background="@color/white"> + tools:context=".ui.activities.PrefsActivity"> + app:popupTheme="@style/Theme.AppCompat.Light" /> - - - - - - - - - - - - - - + android:layout_height="match_parent" + android:scrollbarSize="3dp" + android:scrollbarThumbVertical="@color/scrollbarThumb" + android:scrollbars="vertical"> + + + + + + + + + + + + + + + + + + + + + + + \ 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 c27526a99..b267aa597 100644 --- a/Habitica/res/layout/activity_class_selection.xml +++ b/Habitica/res/layout/activity_class_selection.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:background="@color/white"> + android:background="@color/content_background"> @@ -16,10 +16,10 @@ android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" android:theme="@style/Toolbar" - android:background="@color/white" + android:background="@color/content_background" app:layout_scrollFlags="scroll|enterAlways" app:title="@string/choose_class" - app:titleTextColor="@color/gray_50" + app:titleTextColor="@color/text_primary" app:theme="@style/ToolbarDarkBackArrow" app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/> diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml index 9c5cab514..1bca0492d 100644 --- a/Habitica/res/layout/activity_create_challenge.xml +++ b/Habitica/res/layout/activity_create_challenge.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" tools:context=".ui.activities.PrefsActivity" android:orientation="vertical" - android:background="@color/white"> + android:background="?attr/colorContentBackground"> diff --git a/Habitica/res/layout/activity_fixcharacter.xml b/Habitica/res/layout/activity_fixcharacter.xml index 7dce1e80b..38a142606 100644 --- a/Habitica/res/layout/activity_fixcharacter.xml +++ b/Habitica/res/layout/activity_fixcharacter.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical" tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity" - android:background="@color/white"> + android:background="?attr/colorContentBackground"> @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:padding="@dimen/outer_inset" android:text="@string/fix_character_description" - android:background="@color/gray_700" + android:background="@color/window_background" android:layout_marginBottom="16dp" /> @@ -76,7 +76,7 @@ android:layout_width="match_parent" android:layout_height="2dp" android:layout_gravity="bottom" - android:background="@color/gray_500" + android:background="@color/content_background_offset" android:layout_marginEnd="56dp"/> @@ -119,7 +119,7 @@ android:layout_width="match_parent" android:layout_height="2dp" android:layout_gravity="bottom" - android:background="@color/gray_500" + android:background="@color/content_background_offset" android:layout_marginEnd="56dp"/> @@ -162,7 +162,7 @@ android:layout_width="match_parent" android:layout_height="2dp" android:layout_gravity="bottom" - android:background="@color/gray_500" + android:background="@color/content_background_offset" android:layout_marginEnd="56dp"/> @@ -205,7 +205,7 @@ android:layout_width="match_parent" android:layout_height="2dp" android:layout_gravity="bottom" - android:background="@color/gray_500" + android:background="@color/content_background_offset" android:layout_marginEnd="56dp"/> @@ -248,7 +248,7 @@ android:layout_width="match_parent" android:layout_height="2dp" android:layout_gravity="bottom" - android:background="@color/gray_500" + android:background="@color/content_background_offset" android:layout_marginEnd="56dp"/> @@ -292,7 +292,7 @@ android:layout_width="match_parent" android:layout_height="2dp" android:layout_gravity="bottom" - android:background="@color/gray_500" + android:background="@color/content_background_offset" android:layout_marginEnd="56dp"/> diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml index e5b00b214..4bc855e1a 100644 --- a/Habitica/res/layout/activity_full_profile.xml +++ b/Habitica/res/layout/activity_full_profile.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:orientation="vertical" tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity" - android:background="@color/white"> + android:background="?attr/colorContentBackground"> diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml index aa1383e4c..1dea4dc04 100644 --- a/Habitica/res/layout/activity_gem_purchase.xml +++ b/Habitica/res/layout/activity_gem_purchase.xml @@ -21,7 +21,7 @@ android:id="@+id/fragment_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/white" + android:background="@color/content_background" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> diff --git a/Habitica/res/layout/activity_gift1get1_info.xml b/Habitica/res/layout/activity_gift1get1_info.xml index 7834af30f..304d8cfc0 100644 --- a/Habitica/res/layout/activity_gift1get1_info.xml +++ b/Habitica/res/layout/activity_gift1get1_info.xml @@ -4,14 +4,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools" - android:background="@color/white"> + android:background="@color/content_background"> + android:background="@color/content_background"> diff --git a/Habitica/res/layout/activity_gift_gems.xml b/Habitica/res/layout/activity_gift_gems.xml index faa1191b7..4fe107bcd 100644 --- a/Habitica/res/layout/activity_gift_gems.xml +++ b/Habitica/res/layout/activity_gift_gems.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@color/content_background"> + android:background="@color/content_background"> + android:background="@color/content_background" /> diff --git a/Habitica/res/layout/activity_gift_subscription.xml b/Habitica/res/layout/activity_gift_subscription.xml index 6a1cea61e..ef143df9f 100644 --- a/Habitica/res/layout/activity_gift_subscription.xml +++ b/Habitica/res/layout/activity_gift_subscription.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:orientation="vertical" tools:context="com.habitrpg.android.habitica.ui.activities.FixCharacterValuesActivity" - android:background="@color/white"> + android:background="@color/content_background"> @@ -49,7 +49,7 @@ android:id="@+id/username_textview" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/gray_300" + android:textColor="@color/text_quad" android:textSize="12sp" android:layout_gravity="center_horizontal" android:layout_marginBottom="@dimen/spacing_large"/> @@ -59,7 +59,7 @@ android:layout_gravity="center_horizontal" android:gravity="center_horizontal" android:text="@string/gift_subscription_subtitle" - android:textColor="@color/gray_300" + android:textColor="@color/text_quad" android:layout_marginLeft="@dimen/spacing_large" android:layout_marginRight="@dimen/spacing_large"/> + android:background="@color/window_background"> + android:background="?attr/colorContentBackground"> + android:textColorHint="@color/text_primary"> @@ -72,7 +72,7 @@ android:layout_marginLeft="@dimen/spacing_large" android:layout_marginRight="@dimen/spacing_large" android:background="@drawable/edittext" - android:textColorHint="@color/gray_50"> + android:textColorHint="@color/text_primary"> diff --git a/Habitica/res/layout/activity_guidelines.xml b/Habitica/res/layout/activity_guidelines.xml index e22db839a..87588e8ec 100644 --- a/Habitica/res/layout/activity_guidelines.xml +++ b/Habitica/res/layout/activity_guidelines.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" tools:context=".ui.activities.PrefsActivity" android:orientation="vertical" - android:background="@color/white"> + android:background="@color/content_background"> + android:background="@color/content_background"> @@ -53,10 +53,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" - android:theme="@style/Toolbar.Modern" + style="@style/Toolbar.Modern" android:background="?attr/headerBackgroundColor" app:layout_collapseMode="pin" - app:popupTheme="@style/Theme.AppCompat.Light"> + app:popupTheme="@style/Theme.AppCompat.DayNight"> + android:background="?attr/colorContentBackground"> + android:background="@color/content_background"> + android:background="@color/content_background"> + android:background="@color/content_background" /> diff --git a/Habitica/res/layout/activity_prefs.xml b/Habitica/res/layout/activity_prefs.xml index 2139a4a7f..8667bdae2 100644 --- a/Habitica/res/layout/activity_prefs.xml +++ b/Habitica/res/layout/activity_prefs.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" tools:context=".ui.activities.PrefsActivity" android:orientation="vertical" - android:background="@color/white"> + android:background="?attr/colorContentBackground">