Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/HabitRPG/habitica-android
Browse files Browse the repository at this point in the history 
# Conflicts:
#	.github/prepare-workflow
#	.github/workflows/android.yml
#	Gemfile.lock
#	Habitica/build.gradle
#	Habitica/res/values/strings.xml
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/HabiticaTestCase.kt
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/ActivityTestCase.kt
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/MainActivityTest.kt
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivityTest.kt
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/FragmentTestCase.kt
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragmentTest.kt
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/PartyDetailFragmentTest.kt
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/StatsFragmentTest.kt
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.kt
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragmentTest.kt
#	Habitica/src/androidTest/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragmentTest.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/components/UserComponent.java
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/TaskRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/InventoryRepositoryImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/SocialRepositoryImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmUserLocalRepository.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/extensions/Date-Extensions.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/DeviceName.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/NotificationsManager.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/PurchaseHandler.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskFilterHelper.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/interactors/HatchPetUseCase.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/interactors/ScoreTaskLocallyInteractor.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/members/Member.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/social/Challenge.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/tasks/Task.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/models/user/User.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/modules/AppModule.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/modules/UserRepositoryModule.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AddTaskWidgetActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/AdventureGuideActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FixCharacterValuesActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GuidelinesActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/BaseRecyclerViewAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/PetDetailRecyclerAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RealmBaseTasksRecyclerViewAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/NavigationDrawerFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/StatsFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemDialogFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountPreferenceFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/DayStartPreferenceDialogFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/GemsPurchaseFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/purchases/SubscriptionFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/NoPartyFragmentFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TeamBoardFragment.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/AutocompleteAdapter.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/BottomSheetMenu.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/MountViewHolder.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/PetViewHolder.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/AuthenticationViewModel.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/GroupViewModel.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainActivityViewModel.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/MainUserViewModel.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewmodels/NotificationsViewModel.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/dialogs/HabiticaAlertDialog.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/insufficientCurrency/InsufficientGemsDialog.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/social/QuestMenuView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/subscriptions/SubscriptionDetailsView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ChecklistItemFormView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderContainer.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/ReminderItemFormView.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/BaseWidgetProvider.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesListFactory.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetService.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/TaskListFactory.kt
#	Habitica/src/main/java/com/habitrpg/android/habitica/widget/TodoListFactory.kt
#	Habitica/src/test/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImplTest.kt
#	build.gradle
#	common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
#	common/src/main/java/com/habitrpg/common/habitica/helpers/MarkdownParser.kt
#	common/src/main/java/com/habitrpg/common/habitica/models/Notification.kt
#	common/src/main/java/com/habitrpg/common/habitica/views/AvatarView.kt
#	detekt_baseline.xml
#	fastlane/Pluginfile
#	fastlane/changelog.txt
  • Loading branch information
@phillipthelen
phillipthelen committed Aug 2, 2022
2 parents e7329d6 + 42b4570 commit 58700c5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Habitica/res/values-ceb/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
</resources>
2 changes: 0 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Habitica for Android

[![Join the chat at https://gitter.im/HabitRPG/habitrpg-android](https://badges.gitter.im/HabitRPG/habitrpg-android.svg)](https://gitter.im/HabitRPG/habitrpg-android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

[Habitica](https://habitica.com) is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor. This repository is related to the Android Native Application.

It's also on Google Play:
Expand Down

0 comments on commit 58700c5

Please sign in to comment.