sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update dependencies

Browse source
This commit is contained in:
Phillip Thelen 2019-09-18 17:19:05 +02:00
parent 74c1397987
commit 90f792804d
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Habitica/build.gradle
View file

@ -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 {

10
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AchievementsFragment.kt
View file

@ -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()
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt
View file

@ -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() {

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
View file

@ -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
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.kt
View file

@ -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) {