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

fix minor crashes

Browse source
This commit is contained in:
Phillip Thelen 2019-04-23 09:24:42 +02:00
parent 1b3a67ff5f
commit 749758ea0b
4 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/build.gradle
View file

@ -152,7 +152,7 @@ android {
buildConfigField "String", "STORE", "\"google\""
multiDexEnabled true
versionCode 2096
versionCode 2097
versionName "1.9"
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PublicGuildsRecyclerViewAdapter.kt
View file

@ -38,7 +38,7 @@ class PublicGuildsRecyclerViewAdapter(data: OrderedRealmCollection<Group>?, auto
val guildViewHolder = GuildViewHolder(parent.inflate(R.layout.item_public_guild))
guildViewHolder.itemView.setOnClickListener { v ->
val guild = v.tag as? Group ?: return@setOnClickListener
val directions =PublicGuildsFragmentDirections.openGuildDetail(guild.id)
val directions = PublicGuildsFragmentDirections.openGuildDetail(guild.id)
directions.isMember = isInGroup(guild)
MainNavigationController.navigate(directions)
}

12
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.kt
View file

@ -125,11 +125,13 @@ class GroupInformationFragment : BaseFragment() {
val width = Math.round(height * aspectRatio)
val drawable = BitmapDrawable(context.resources, Bitmap.createScaledBitmap(bitmap, width, height, false))
drawable.tileModeX = Shader.TileMode.REPEAT
Observable.just(drawable)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
no_party_background.background = it
}, RxErrorHandler.handleEmptyError())
if (drawable != null) {
Observable.just(drawable)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer {
no_party_background.background = it
}, RxErrorHandler.handleEmptyError())
}
}
}

7
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/form/TaskSchedulingControls.kt
View file

@ -18,6 +18,7 @@ import com.habitrpg.android.habitica.helpers.FirstDayOfTheWeekHelper
import com.habitrpg.android.habitica.models.tasks.Days
import com.habitrpg.android.habitica.models.tasks.Task
import com.habitrpg.android.habitica.ui.helpers.bindView
import java.lang.NumberFormatException
import java.text.DateFormat
import java.text.DateFormatSymbols
import java.util.*
@ -76,7 +77,11 @@ class TaskSchedulingControls @JvmOverloads constructor(
var everyX
get() = (repeatsEveryEdittext.text ?: "1").toString().toInt()
set(value) {
repeatsEveryEdittext.setText(value.toString())
try {
repeatsEveryEdittext.setText(value.toString())
} catch (e: NumberFormatException) {
repeatsEveryEdittext.setText("1")
}
}
var weeklyRepeat: Days = Days()
set(value) {