From 071a39c2410a74a234de01c08bd4f420f0bbb519 Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Thu, 4 Jul 2019 16:52:21 +0200 Subject: [PATCH] Clean code --- .../android/ui/extensions/UIExtensions.kt | 4 ++-- .../ui/fragment/data/CustomFieldDataFragment.kt | 13 ------------- .../android/ui/fragment/data/PlayerDataFragment.kt | 4 ++++ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt b/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt index 525741b6..b5bb2f08 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt @@ -94,7 +94,7 @@ fun PokerAnalyticsActivity.openContactMail(subjectStringRes: Int, filePath: Stri // Open custom tab fun PokerAnalyticsActivity.openUrl(url: String) { val builder: CustomTabsIntent.Builder = CustomTabsIntent.Builder() - builder.setToolbarColor(ContextCompat.getColor(this, net.pokeranalytics.android.R.color.colorPrimary)) + builder.setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary)) val customTabsIntent = builder.build() customTabsIntent.launchUrl(this, Uri.parse(url)) } @@ -124,7 +124,7 @@ fun showAlertDialog( message?.let { builder.setMessage(message) } - builder.setPositiveButton(net.pokeranalytics.android.R.string.ok) { _, _ -> + builder.setPositiveButton(R.string.ok) { _, _ -> positiveAction?.invoke() } diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt index 1651bcb9..8fca331d 100644 --- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/data/CustomFieldDataFragment.kt @@ -139,16 +139,6 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa } } - /* - override fun editDescriptors(row: RowRepresentable): ArrayList? { - return when (row) { - SimpleRow.NAME -> row.editingDescriptors(mapOf("defaultValue" to this.customField.name)) - is CustomFieldEntry -> row.editingDescriptors(mapOf("defaultValue" to row.value)) - else -> null - } - } - */ - override fun onRowSelected(position: Int, row: RowRepresentable, fromAction: Boolean) { when (row) { is CustomFieldEntry -> row.startEditing(null, this) @@ -251,7 +241,6 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa } } - /** * Update UI */ @@ -269,9 +258,7 @@ class CustomFieldDataFragment : EditableDataFragment(), StaticRowRepresentableDa override fun onDataSaved() { super.onDataSaved() - this.customField.cleanupEntries() - } } \ 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 bfdce1ad..6bb53dd2 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 @@ -168,6 +168,10 @@ class PlayerDataFragment : EditableDataFragment(), StaticRowRepresentableDataSou * Open picture dialog */ private fun openPictureDialog() { + + + + val builder = AlertDialog.Builder(requireContext()) val placesArray = ArrayList()