diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt index 7b7b2d95..66dc2765 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Player.kt @@ -78,4 +78,11 @@ open class Player : RealmObject(), NameManageable, Deletable, StaticRowRepresent } } + /** + * Return if the player has a picture + */ + fun hasPicture() : Boolean { + return picture != null && picture?.isNotEmpty() == true + } + } \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt index fe825e84..8f6940bc 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/PlayerDataFragment.kt @@ -48,7 +48,6 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou player.updateValue(picture.absolutePath, PlayerRow.PLAYER_IMAGE) rowRepresentableAdapter.refreshRow(PlayerRow.PLAYER_IMAGE) } - } override fun getDataSource(): RowRepresentableDataSource { @@ -127,17 +126,20 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou placesArray.add(getString(R.string.library)) placesArray.add(getString(R.string.select_a_color)) - if (player.picture != null) { + if (player.hasPicture()) { placesArray.add(getString(R.string.remove_picture)) } - builder.setItems(placesArray.toTypedArray()) { dialog, which -> + builder.setItems(placesArray.toTypedArray()) { _, which -> when (which) { 0 -> mediaActivity?.openImageCaptureIntent(false) 1 -> mediaActivity?.openImageGalleryIntent(false) 2 -> { } - 3 -> player.updateValue(null, PlayerRow.PLAYER_IMAGE) + 3 -> { + player.updateValue(null, PlayerRow.PLAYER_IMAGE) + rowRepresentableAdapter.refreshRow(PlayerRow.PLAYER_IMAGE) + } } } builder.show() diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt index 5f73df53..8f8f40de 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/view/PlayerImageView.kt @@ -72,7 +72,7 @@ class PlayerImageView : FrameLayout { playerImageView.playerInitial.text = playerInitial // Picture - if (player.picture != null && player.picture?.isNotEmpty() == true) { + if (player.hasPicture()) { playerImageView.playerStroke.background = null Glide.with(this)