sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-24 22:55:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Display back button on some pages

Browse source
This commit is contained in:
Phillip Thelen 2020-07-24 16:24:58 +02:00
parent 9bc66ac90b
commit 941f8b6a9d
11 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -313,6 +313,6 @@ class TaskRepositoryImpl(localRepository: TaskLocalRepository, apiClient: ApiCli
}
override fun getTasksForChallenge(challengeID: String?): Flowable<RealmResults<Task>> {
return localRepository.getTasksForChallenge(challengeID)
return localRepository.getTasksForChallenge(challengeID, userID)
}
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/TaskLocalRepository.kt
View file

@ -35,5 +35,5 @@ interface TaskLocalRepository : BaseLocalRepository {
fun saveCompletedTodos(userId: String, tasks: MutableCollection<Task>)
fun getErroredTasks(userID: String): Flowable<RealmResults<Task>>
fun getUser(userID: String): Flowable<User>
fun getTasksForChallenge(challengeID: String?): Flowable<RealmResults<Task>>
fun getTasksForChallenge(challengeID: String?, userID: String?): Flowable<RealmResults<Task>>
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmTaskLocalRepository.kt
View file

@ -237,9 +237,10 @@ class RealmTaskLocalRepository(realm: Realm) : RealmBaseLocalRepository(realm),
.map { users -> users.first() }
}
override fun getTasksForChallenge(challengeID: String?): Flowable<RealmResults<Task>> {
override fun getTasksForChallenge(challengeID: String?, userID: String?): Flowable<RealmResults<Task>> {
return realm.where(Task::class.java)
.equalTo("challengeID", challengeID)
.equalTo("userId", userID)
.findAll()
.asFlowable()
.filter { it.isLoaded }

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

@ -133,7 +133,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
private var sideAvatarView: AvatarView? = null
private var activeTutorialView: TutorialView? = null
private var drawerFragment: NavigationDrawerFragment? = null
private var drawerToggle: ActionBarDrawerToggle? = null
var drawerToggle: ActionBarDrawerToggle? = null
private var resumeFromActivity = false
private var userIsOnQuest = false
@ -231,6 +231,11 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
}
}
override fun onSupportNavigateUp(): Boolean {
onBackPressed()
return true
}
private fun setupNotifications() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channelId = "default"

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

@ -508,7 +508,7 @@ class TaskFormActivity : BaseActivity() {
}
private fun showChallengeDeleteTask() {
compositeSubscription.add(taskRepository.getTasksForChallenge(task?.challengeID).subscribe(Consumer { tasks ->
compositeSubscription.add(taskRepository.getTasksForChallenge(task?.challengeID).firstElement().subscribe(Consumer { tasks ->
val taskCount = tasks.size
val alert = HabiticaAlertDialog(this)
alert.setTitle(getString(R.string.delete_challenge_task_title))

11
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.kt
View file

@ -4,6 +4,7 @@ import android.content.Context
import android.graphics.drawable.ColorDrawable
import android.os.Bundle
import android.view.LayoutInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import androidx.core.content.ContextCompat
@ -28,6 +29,8 @@ abstract class BaseMainFragment : BaseFragment() {
@Inject
lateinit var soundManager: SoundManager
protected var showsBackButton: Boolean = false
open val activity get() = getActivity() as? MainActivity
val tabLayout get() = activity?.binding?.detailTabs
val collapsingToolbar get() = activity?.binding?.toolbar
@ -72,6 +75,14 @@ abstract class BaseMainFragment : BaseFragment() {
return null
}
override fun onResume() {
super.onResume()
activity?.drawerToggle?.isDrawerIndicatorEnabled = !showsBackButton
activity?.supportActionBar?.setDisplayHomeAsUpEnabled(true)
}
private fun updateTabLayoutVisibility() {
if (this.usesTabLayout) {
tabLayout?.removeAllTabs()

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarEquipmentFragment.kt
View file

@ -63,6 +63,7 @@ class AvatarEquipmentFragment : BaseMainFragment() {
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
showsBackButton = true
super.onViewCreated(view, savedInstanceState)
arguments?.let {
val args = AvatarEquipmentFragmentArgs.fromBundle(it)

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.kt
View file

@ -26,6 +26,7 @@ class AvatarOverviewFragment : BaseMainFragment(), AdapterView.OnItemSelectedLis
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
showsBackButton = true
super.onViewCreated(view, savedInstanceState)
binding.avatarSizeSpinner.onItemSelectedListener = this

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.kt
View file

@ -46,6 +46,7 @@ class EquipmentDetailFragment : BaseMainFragment() {
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
showsBackButton = true
super.onViewCreated(view, savedInstanceState)
arguments?.let {

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.kt
View file

@ -51,6 +51,7 @@ class MountDetailRecyclerFragment : BaseMainFragment() {
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
showsBackButton = true
super.onViewCreated(view, savedInstanceState)
arguments?.let {

1
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.kt
View file

@ -59,6 +59,7 @@ class PetDetailRecyclerFragment : BaseMainFragment() {
}
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
showsBackButton = true
super.onViewCreated(view, savedInstanceState)
arguments?.let {