Ask for rate when changing main currency

app/src/main/java/net/pokeranalytics/android/api/CurrencyConverterApi.kt

@@ -14,10 +14,12 @@ data class RateResponse(var info: RateInfo)
 @Serializable
 data class RateInfo(var rate: Double)
 
-class FreeConverterApi {
+class CurrencyConverterApi {
 
 	companion object {
 
+		val json = Json { ignoreUnknownKeys = true }
+
 		fun currencyRate(fromCurrency: String, toCurrency: String, context: Context, callback: (Double?, VolleyError?) -> (Unit)) {
 
 			val queue = Volley.newRequestQueue(context)
@@ -33,12 +35,14 @@ class FreeConverterApi {
 			val stringRequest = object : StringRequest(
 				Method.GET, url,
 				{ response ->
-					val o = Json.decodeFromString<RateResponse>(response)
+
+					val o = json.decodeFromString<RateResponse>(response)
+					Timber.d("rate = ${o.info.rate}")
 					callback(o.info.rate, null)
 				},
 				{
-					callback(null, it)
 					Timber.d("Api call failed: ${it.message}")
+					callback(null, it)
 				}) {
 
 				override fun getHeaders(): MutableMap<String, String> {

app/src/main/java/net/pokeranalytics/android/ui/extensions/UIExtensions.kt

@@ -9,13 +9,11 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Color
 import android.net.Uri
+import android.text.SpannableStringBuilder
 import android.util.TypedValue
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import android.widget.ImageView
+import android.widget.*
-import android.widget.LinearLayout
-import android.widget.TextView
-import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
@@ -84,7 +82,11 @@ fun BaseActivity.openContactMail(subjectStringRes: Int, filePath: String? = null
 
     filePath?.let {
         val databaseFile = File(it)
-		val contentUri = FileProvider.getUriForFile(this, "net.pokeranalytics.android.fileprovider", databaseFile)
+        val contentUri = FileProvider.getUriForFile(
+            this,
+            "net.pokeranalytics.android.fileprovider",
+            databaseFile
+        )
         if (contentUri != null) {
             emailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
             emailIntent.setDataAndType(contentUri, contentResolver.getType(contentUri))
@@ -107,7 +109,12 @@ fun Context.openUrl(url: String) {
 }
 
 // Open custom tab
-fun Context.areYouSure(title: Int? = null, message: Int? = null, positiveTitle: Int? = null, proceed: () -> Unit) {
+fun Context.areYouSure(
+    title: Int? = null,
+    message: Int? = null,
+    positiveTitle: Int? = null,
+    proceed: () -> Unit
+) {
 
     val builder: android.app.AlertDialog.Builder = android.app.AlertDialog.Builder(this)
 
@@ -123,22 +130,7 @@ fun Context.areYouSure(title: Int? = null, message: Int? = null, positiveTitle:
     builder.setNegativeButton(R.string.cancel) { _, _ ->
         // nothing
     }
-
-//	builder.setItems(
-//		arrayOf<CharSequence>(
-//			getString(R.string.yes),
-//			getString(R.string.cancel)
-//		)
-//	) { _, index ->
-//		// The 'which' argument contains the index position
-//		// of the selected item
-//		when (index) {
-//			0 -> proceed()
-//			1 -> {} // nothing
-//		}
-//	}
     builder.create().show()
-
 }
 
 // Display Alert Dialog
@@ -146,17 +138,52 @@ fun Activity.showAlertDialog(title: Int? = null, message: Int? = null) {
     showAlertDialog(this, title, message)
 }
 
-fun Fragment.showAlertDialog(title: Int? = null, messageResId: Int? = null, message: String? = null) {
+fun Fragment.showAlertDialog(
+    title: Int? = null,
+    messageResId: Int? = null,
+    message: String? = null
+) {
     context?.let {
         showAlertDialog(it, title, messageResId, message)
     }
 }
 
+fun showEditTextAlertDialog(
+    context: Context, inputType: Int, title: Int? = null, messageResId: Int? = null, message: String? = null,
+    editTextText: String? = null, positiveAction: ((String) -> Unit)? = null
+) {
+    val builder = AlertDialog.Builder(context)
+    title?.let {
+        builder.setTitle(title)
+    }
+    messageResId?.let {
+        builder.setMessage(messageResId)
+    }
+    message?.let {
+        builder.setMessage(it)
+    }
+
+    val editText = EditText(context)
+    editTextText?.let {
+        editText.text = SpannableStringBuilder(it)
+    }
+    editText.setTextColor(ContextCompat.getColor(context, R.color.white))
+    editText.inputType = inputType
+
+    builder.setView(editText)
+
+    builder.setPositiveButton(net.pokeranalytics.android.R.string.ok) { _, _ ->
+        positiveAction?.invoke(editText.text.toString())
+    }
+    builder.show()
+}
+
 /**
  * Create and show an alert dialog
  */
 fun showAlertDialog(
-	context: Context, title: Int? = null, messageResId: Int? = null, message: String? = null, cancelButtonTitle: Int? = null, showCancelButton: Boolean = false,
+    context: Context, title: Int? = null, messageResId: Int? = null, message: String? = null,
+    cancelButtonTitle: Int? = null, showCancelButton: Boolean = false,
     positiveAction: (() -> Unit)? = null, negativeAction: (() -> Unit)? = null
 ) {
     val builder = AlertDialog.Builder(context)

app/src/main/java/net/pokeranalytics/android/ui/fragment/CurrenciesFragment.kt

@@ -65,8 +65,8 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row
 		}
 
 		var currencyCode: String = currency.currencyCode
-		var currencySymbole: String = currency.getSymbol(Locale.getDefault())
+		var currencySymbol: String = currency.getSymbol(Locale.getDefault())
-		var currencyCodeAndSymbol: String = "${this.currencyCode} (${this.currencySymbole})"
+		var currencyCodeAndSymbol: String = "${this.currencyCode} (${this.currencySymbol})"
 
 		override val viewType: Int = RowViewType.TITLE_VALUE.ordinal
 	}
@@ -110,6 +110,9 @@ class CurrenciesFragment : BaseFragment(), StaticRowRepresentableDataSource, Row
 
 	// RowRepresentableDelegate
 	override fun onRowSelected(position: Int, row: RowRepresentable, tag: Int) {
+
+
+
 		val intent = Intent()
 		intent.putExtra(INTENT_CURRENCY_CODE, (row as CurrencyRow).currency.currencyCode)
 		this.activity?.setResult(Activity.RESULT_OK, intent)

app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +18,7 @@ import com.google.android.play.core.review.ReviewManagerFactory
 import io.realm.Realm
 import net.pokeranalytics.android.BuildConfig
 import net.pokeranalytics.android.R
+import net.pokeranalytics.android.api.CurrencyConverterApi
 import net.pokeranalytics.android.databinding.FragmentSettingsBinding
 import net.pokeranalytics.android.exceptions.PAIllegalStateException
 import net.pokeranalytics.android.model.LiveData
@@ -33,6 +35,7 @@ import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.extensions.openContactMail
 import net.pokeranalytics.android.ui.extensions.openUrl
+import net.pokeranalytics.android.ui.extensions.showEditTextAlertDialog
 import net.pokeranalytics.android.ui.fragment.components.RealmFragment
 import net.pokeranalytics.android.ui.modules.bankroll.BankrollActivity
 import net.pokeranalytics.android.ui.modules.datalist.DataListActivity
@@ -141,27 +144,59 @@ class SettingsFragment : RealmFragment(), RowRepresentableDelegate, StaticRowRep
 				if (resultCode == Activity.RESULT_OK) {
 					data?.let {
 						val currencyCode = data.getStringExtra(CurrenciesFragment.INTENT_CURRENCY_CODE) ?: throw PAIllegalStateException("Missing currency code")
+						updateMainCurrency(currencyCode)
+					}
+				}
+			}
+			RequestCode.SUBSCRIPTION.value -> {
+				settingsAdapterRow.refreshRow(SettingsRow.SUBSCRIPTION)
+			}
+		}
+	}
+
+	private fun updateMainCurrency(currencyCode: String) {
+
+		Preferences.getDefaultCurrency(requireContext())?.currencyCode?.let { mainCurrencyCode ->
+
+			if (mainCurrencyCode == currencyCode) {
+				return
+			}
+			showLoader(R.string.please_wait)
+
+			CurrencyConverterApi.currencyRate(mainCurrencyCode, currencyCode, requireContext()) { apiRate, _ ->
+				hideLoader()
+
+				val message = requireContext().getString(R.string.currency_rate_confirmation, mainCurrencyCode, currencyCode)
+
+
+//				val message = "Please enter the $mainCurrencyCode to $currencyCode rate to apply to all your bankrolls"
+				showEditTextAlertDialog(requireContext(), InputType.TYPE_CLASS_NUMBER or InputType.TYPE_NUMBER_FLAG_DECIMAL,
+					message = message, editTextText = apiRate?.toString()) { value ->
+					value.toDoubleOrNull()?.let { rate ->
+						updateMainCurrency(currencyCode, rate)
+					}
+				}
+			}
+		}
+
+	}
+
+	private fun updateMainCurrency(currencyCode: String, rate: Double) {
+
 		Preferences.setCurrencyCode(currencyCode, requireContext())
 		val realm = Realm.getDefaultInstance()
 		realm.executeTransaction {
-                            realm.where(Currency::class.java).isNull("code").or().equalTo("code", UserDefaults.currency.currencyCode).findAll().forEach { currency ->
+			realm.where(Currency::class.java).findAll().forEach { currency ->
-                                currency.rate = Currency.DEFAULT_RATE
+				currency.rate = (currency.rate ?: 1.0) * rate
 			}
 
-                            realm.where(Session::class.java).isNull("bankroll.currency.code").findAll().forEach { session ->
+			realm.where(Session::class.java).findAll().forEach { session ->
 				session.bankrollHasBeenUpdated()
 			}
 		}
 		realm.close()
 		settingsAdapterRow.refreshRow(SettingsRow.CURRENCY)
 	}
-				}
-			}
-			RequestCode.SUBSCRIPTION.value -> {
-				settingsAdapterRow.refreshRow(SettingsRow.SUBSCRIPTION)
-			}
-		}
-	}
 
 	override fun adapterRows(): List<RowRepresentable> {
 		return rowRepresentation

app/src/main/java/net/pokeranalytics/android/ui/fragment/report/AbstractReportFragment.kt

@@ -68,9 +68,9 @@ abstract class AbstractReportFragment : DataManagerFragment() {
 
 			// Inflate and set the layout for the dialog
 			// Pass null as the parent view because its going in the dialog layout
-			val view = inflater.inflate(net.pokeranalytics.android.R.layout.dialog_edit_text, null)
+			val view = inflater.inflate(R.layout.dialog_edit_text, null)
 			val nameEditText =
-				view.findViewById<EditText>(net.pokeranalytics.android.R.id.reportName)
+				view.findViewById<EditText>(R.id.reportName)
 			nameEditText.inputType = InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
 
 			this.model.primaryKey?.let { id ->
@@ -81,7 +81,7 @@ abstract class AbstractReportFragment : DataManagerFragment() {
 
 			builder.setView(view)
 				// Add action buttons
-				.setPositiveButton(net.pokeranalytics.android.R.string.save) { dialog, _ ->
+				.setPositiveButton(R.string.save) { dialog, _ ->
 					try {
 						saveReport(nameEditText.text.toString())
 						dialog.dismiss()
@@ -89,7 +89,7 @@ abstract class AbstractReportFragment : DataManagerFragment() {
 						Toast.makeText(requireContext(), e.localizedMessage, Toast.LENGTH_SHORT).show()
 					}
 				}
-				.setNegativeButton(net.pokeranalytics.android.R.string.cancel) { dialog, _ ->
+				.setNegativeButton(R.string.cancel) { dialog, _ ->
 					dialog.cancel()
 				}
 

app/src/main/java/net/pokeranalytics/android/ui/modules/data/BankrollDataFragment.kt

@@ -8,7 +8,7 @@ import android.view.View
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModelProvider
 import net.pokeranalytics.android.R
-import net.pokeranalytics.android.api.FreeConverterApi
+import net.pokeranalytics.android.api.CurrencyConverterApi
 import net.pokeranalytics.android.model.realm.Bankroll
 import net.pokeranalytics.android.model.realm.ResultCaptureType
 import net.pokeranalytics.android.ui.activity.CurrenciesActivity
@@ -268,7 +268,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 
 		bankroll.currency?.code?.let { from ->
 			val to = defaultCurrency.currencyCode
-			FreeConverterApi.currencyRate(from, to, requireContext()) { rate, error ->
+			CurrencyConverterApi.currencyRate(from, to, requireContext()) { rate, error ->
 
 				rate?.let {
 					onRowValueChanged(rate, BankrollPropertiesRow.RATE)

app/src/main/res/values-de/strings.xml

@@ -779,5 +779,7 @@
 	<string name="more_sign"><![CDATA[>]]></string>
 	<string name="less_or_equal_sign"><![CDATA[≤]]></string>
 	<string name="less_sign"><![CDATA[<]]></string>
+    <string name="please_wait">Please wait…</string>
+	<string name="currency_rate_confirmation">Please enter the %1$s to %2$s rate to apply to all your bankrolls</string>
 
 </resources>

app/src/main/res/values-es/strings.xml

@@ -783,6 +783,8 @@ La aplicación funciona con una suscripción anual para uso ilimitado, pero obti
 	<string name="more_sign"><![CDATA[>]]></string>
 	<string name="less_or_equal_sign"><![CDATA[≤]]></string>
 	<string name="less_sign"><![CDATA[<]]></string>
+    <string name="please_wait">Please wait…</string>
+	<string name="currency_rate_confirmation">Please enter the %1$s to %2$s rate to apply to all your bankrolls</string>
 
 
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -788,5 +788,7 @@
 	<string name="less_or_equal_sign"><![CDATA[≤]]></string>
 	<string name="less_sign"><![CDATA[<]]></string>
 	<string name="transaction_filter">Filtre de transactions</string>
+	<string name="please_wait">Veuillez patienter…</string>
+	<string name="currency_rate_confirmation">Veuillez entrer le taux de %1$s vers %2$s pour l\'appliquer à toutes vos bankrolls</string>
 
 </resources>

app/src/main/res/values-hi/strings.xml

@@ -778,5 +778,7 @@
 	<string name="more_sign"><![CDATA[>]]></string>
 	<string name="less_or_equal_sign"><![CDATA[≤]]></string>
 	<string name="less_sign"><![CDATA[<]]></string>
+    <string name="please_wait">Please wait…</string>
+	<string name="currency_rate_confirmation">Please enter the %1$s to %2$s rate to apply to all your bankrolls</string>
 
 </resources>

app/src/main/res/values-it/strings.xml

@@ -778,5 +778,7 @@
 	<string name="more_sign"><![CDATA[>]]></string>
 	<string name="less_or_equal_sign"><![CDATA[≤]]></string>
 	<string name="less_sign"><![CDATA[<]]></string>
+    <string name="please_wait">Please wait…</string>
+	<string name="currency_rate_confirmation">Please enter the %1$s to %2$s rate to apply to all your bankrolls</string>
 
 </resources>

app/src/main/res/values-ja/strings.xml

@@ -782,5 +782,7 @@
 	<string name="more_sign"><![CDATA[>]]></string>
 	<string name="less_or_equal_sign"><![CDATA[≤]]></string>
 	<string name="less_sign"><![CDATA[<]]></string>
+    <string name="please_wait">Please wait…...</string>
+	<string name="currency_rate_confirmation">Please enter the %1$s to %2$s rate to apply to all your bankrolls</string>
 
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -777,5 +777,7 @@
 	<string name="more_sign"><![CDATA[>]]></string>
 	<string name="less_or_equal_sign"><![CDATA[≤]]></string>
 	<string name="less_sign"><![CDATA[<]]></string>
+    <string name="please_wait">Please wait…</string>
+	<string name="currency_rate_confirmation">Please enter the %1$s to %2$s rate to apply to all your bankrolls</string>
 
 </resources>

app/src/main/res/values-ru/strings.xml

@@ -779,5 +779,7 @@
 	<string name="more_sign"><![CDATA[>]]></string>
 	<string name="less_or_equal_sign"><![CDATA[≤]]></string>
 	<string name="less_sign"><![CDATA[<]]></string>
+    <string name="please_wait">Please wait…</string>
+	<string name="currency_rate_confirmation">Please enter the %1$s to %2$s rate to apply to all your bankrolls</string>
 
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -772,5 +772,7 @@
 	<string name="more_sign"><![CDATA[>]]></string>
 	<string name="less_or_equal_sign"><![CDATA[≤]]></string>
 	<string name="less_sign"><![CDATA[<]]></string>
+    <string name="please_wait">Please wait…</string>
+	<string name="currency_rate_confirmation">Please enter the %1$s to %2$s rate to apply to all your bankrolls</string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -832,5 +832,7 @@
     <string name="less_sign"><![CDATA[<]]></string>
     <string name="empty_reports_screen">This screen will show where you perform the best when you\'ll have more data. You also can create custom reports using the top right button.</string>
     <string name="transaction_filter">Transaction Filter</string>
+    <string name="please_wait">Please wait…</string>
+    <string name="currency_rate_confirmation">Please enter the %1$s to %2$s rate to apply to all your bankrolls</string>
 
 </resources>