Refactor String.format, update versionCode

AIDEA775 · Nov 8, 2018 · b15b896 · b15b896
1 parent 01b1e53
commit b15b896
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         applicationId "com.uncmorfi"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 8
+        versionCode 9
         versionName "v5.0 Espagueti"
         resValue "string", "app_name", "UNCmorfi"
     }

diff --git a/app/src/main/java/com/uncmorfi/balance/BalanceFragment.kt b/app/src/main/java/com/uncmorfi/balance/BalanceFragment.kt
@@ -247,7 +247,7 @@ class BalanceFragment : Fragment(), LoaderManager.LoaderCallbacks<Cursor> {
     }
 
     private fun getNewUserMsg(card: String): String {
-        return String.format(Locale.US, getString(R.string.balance_new_user_adding), card)
+        return getString(R.string.balance_new_user_adding).format(card)
     }
 
     private fun updateBalance(vararg users: User) {

diff --git a/app/src/main/java/com/uncmorfi/balance/UserCursorAdapter.kt b/app/src/main/java/com/uncmorfi/balance/UserCursorAdapter.kt
@@ -52,16 +52,14 @@ internal class UserCursorAdapter(private val mContext: Context,
             itemView.userBalance.setTextColor(mContext.colorOf(
                     if (user.balance < WARNING_USER_BALANCE) R.color.accent else R.color.primary_dark))
 
-            itemView.userExpiration.text = String.format(
-                    mContext.getString(R.string.balance_expiration),
-                    textExpiration(user.expiration))
+            itemView.userExpiration.text = mContext.getString(R.string.balance_expiration)
+                            .format(textExpiration(user.expiration))
 
             itemView.userExpiration.setTextColor(mContext.colorOf(
                     if (warningExpiration(user.expiration)) R.color.accent else R.color.secondary_text))
 
-            itemView.userLastUpdate.text = String.format(
-                    mContext.getString(R.string.balance_last_update),
-                    DateUtils.getRelativeTimeSpanString(user.lastUpdate).toString().toLowerCase())
+            itemView.userLastUpdate.text = mContext.getString(R.string.balance_last_update)
+                    .format(DateUtils.getRelativeTimeSpanString(user.lastUpdate).toString().toLowerCase())
         }
 
         private fun textExpiration(expiration: Long): String {

diff --git a/app/src/main/java/com/uncmorfi/balance/dialogs/DeleteUserDialog.kt b/app/src/main/java/com/uncmorfi/balance/dialogs/DeleteUserDialog.kt
@@ -18,7 +18,7 @@ class DeleteUserDialog : BaseDialogHelper() {
         }
         val negativeListener = DialogInterface.OnClickListener { _, _ -> dismiss() }
 
-        builder.setMessage(String.format(getString(R.string.balance_delete_user_title), user.name))
+        builder.setMessage(getString(R.string.balance_delete_user_title).format(user.name))
                 .setPositiveButton(getString(R.string.balance_delete_user_positive), positiveListener)
                 .setNegativeButton(getString(android.R.string.cancel), negativeListener)
 

diff --git a/app/src/main/java/com/uncmorfi/counter/CounterFragment.kt b/app/src/main/java/com/uncmorfi/counter/CounterFragment.kt
@@ -108,7 +108,7 @@ class CounterFragment : Fragment(), SeekBar.OnSeekBarChangeListener {
     override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
         if (fromUser) {
             val windows = progress + 3 // Mínimo 3 ventanas
-            counterDistance.text = String.format(getString(R.string.counter_distance), windows)
+            counterDistance.text = getString(R.string.counter_distance).format(windows)
         }
     }
 
@@ -162,7 +162,7 @@ class CounterFragment : Fragment(), SeekBar.OnSeekBarChangeListener {
      */
     private fun generatePieChartText(total: Int, percent: Float) : SpannableString {
         val pText = "%.2f%%".format(percent)
-        val tText = String.format(getString(R.string.counter_rations_title), total, FOOD_RATIONS)
+        val tText = getString(R.string.counter_rations_title).format(total, FOOD_RATIONS)
         val s = SpannableString("$pText\n$tText")
 
         s.setSpan(RelativeSizeSpan(3f), 0, pText.length, 0)