From 90f792804d143e443058902f07232654af8d9480 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 18 Sep 2019 17:19:05 +0200 Subject: [PATCH] update dependencies --- Habitica/build.gradle | 14 +++++++------- .../habitica/ui/fragments/AchievementsFragment.kt | 10 +++++----- .../inventory/items/ItemRecyclerFragment.kt | 2 +- .../ui/fragments/tasks/TaskRecyclerViewFragment.kt | 2 +- .../ui/viewHolders/tasks/RewardViewHolder.kt | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index bea36c711..d4793b4e2 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -63,7 +63,7 @@ dependencies { kapt 'com.google.dagger:dagger-compiler:2.22.1' compileOnly 'javax.annotation:javax.annotation-api:1.3.2' //App Compatibility and Material Design - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.0.0' implementation 'androidx.legacy:legacy-preference-v14:1.0.0' @@ -115,7 +115,7 @@ dependencies { //Push Notifications implementation 'com.google.firebase:firebase-core:17.2.0' implementation 'com.google.firebase:firebase-messaging:20.0.0' - implementation 'com.google.firebase:firebase-config:19.0.0' + implementation 'com.google.firebase:firebase-config:19.0.1' implementation 'com.google.firebase:firebase-perf:19.0.0' implementation 'com.google.android.gms:play-services-auth:17.0.0' implementation 'io.realm:android-adapters:3.1.0' @@ -123,9 +123,9 @@ dependencies { implementation 'androidx.multidex:multidex:2.0.1' implementation 'com.nex3z:flow-layout:1.2.2' - implementation 'androidx.core:core-ktx:1.0.2' - implementation "androidx.lifecycle:lifecycle-extensions:2.0.0" - implementation "androidx.lifecycle:lifecycle-common-java8:2.0.0" + implementation 'androidx.core:core-ktx:1.1.0' + implementation "androidx.lifecycle:lifecycle-extensions:2.1.0" + implementation "androidx.lifecycle:lifecycle-common-java8:2.1.0" implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0' implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0' implementation "androidx.paging:paging-runtime-ktx:2.1.0" @@ -148,8 +148,8 @@ android { buildConfigField "String", "TESTING_LEVEL", "\"production\"" multiDexEnabled true - versionCode 2240 - versionName "2.1" + versionCode 2242 + versionName "2.1.1" } lintOptions { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt index 148d9c942..47cb45422 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt @@ -118,15 +118,15 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList })) } - override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) { + override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { if (useGridLayout) { - val menuItem = menu?.add(R.string.switch_to_list_view) + val menuItem = menu.add(R.string.switch_to_list_view) menuID = menuItem?.itemId ?: 0 menuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS) menuItem?.setIcon(R.drawable.ic_round_view_list_24px) } else { - val menuItem = menu?.add(R.string.switch_to_grid_view) + val menuItem = menu.add(R.string.switch_to_grid_view) menuID = menuItem?.itemId ?: 0 menuItem?.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS) menuItem?.setIcon(R.drawable.ic_round_view_module_24px) @@ -134,8 +134,8 @@ class AchievementsFragment: BaseMainFragment(), SwipeRefreshLayout.OnRefreshList super.onCreateOptionsMenu(menu, inflater) } - override fun onOptionsItemSelected(item: MenuItem?): Boolean { - if (item?.itemId == menuID) { + override fun onOptionsItemSelected(item: MenuItem): Boolean { + if (item.itemId == menuID) { useGridLayout = !useGridLayout activity?.invalidateOptionsMenu() } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt index 56e5ba09b..135f78ece 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt @@ -171,7 +171,7 @@ class ItemRecyclerFragment : BaseFragment() { } fragment.isHatching = true fragment.isFeeding = false - fragment.show(fragmentManager, "hatchingDialog") + fragmentManager?.let { fragment.show(it, "hatchingDialog") } } override fun onResume() { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt index 809fdb8b2..301f44e1a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt @@ -324,7 +324,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou } private fun openTaskForm(task: Task) { - if (Date().time - (TasksFragment.lastTaskFormOpen?.time ?: 0) < 2000) { + if (Date().time - (TasksFragment.lastTaskFormOpen?.time ?: 0) < 2000 || !task.isValid) { return } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt index 33154d94c..22a2216e1 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt @@ -36,7 +36,7 @@ class RewardViewHolder(itemView: View, scoreTaskFunc: ((Task, TaskDirection) -> } private fun buyReward() { - task?.let { scoreTaskFunc(it, TaskDirection.UP) } + task?.let { scoreTaskFunc(it, TaskDirection.DOWN) } } override fun onClick(v: View) {