Write out aligned postings according to a user preference (#218)

chvp · web-flow · commit 5ba94e3b8fd2 · 2024-12-16T21:45:00.000+01:00
Fixes #15.
diff --git a/app/src/main/java/be/chvp/nanoledger/data/PreferencesDataSource.kt b/app/src/main/java/be/chvp/nanoledger/data/PreferencesDataSource.kt
@@ -11,6 +11,7 @@ const val FILE_URI_KEY = "file_uri"
 const val DEFAULT_CURRENCY_KEY = "default_currency"
 const val DEFAULT_STATUS_KEY = "default_status"
 const val CURRENCY_BEFORE_AMOUNT_KEY = "currency_before_amount"
+const val POSTING_WIDTH_KEY = "posting_width"
 
 class PreferencesDataSource
     @Inject
@@ -80,4 +81,10 @@ class PreferencesDataSource
                 CURRENCY_BEFORE_AMOUNT_KEY,
                 currencyBeforeAmount,
             ).apply()
+
+        val postingWidth: LiveData<Int> = sharedPreferences.intLiveData(POSTING_WIDTH_KEY, 72).map { it!! }
+
+        fun getPostingWidth(): Int = sharedPreferences.getInt(POSTING_WIDTH_KEY, 72)!!
+
+        fun setPostingWidth(width: Int) = sharedPreferences.edit().putInt(POSTING_WIDTH_KEY, width).apply()
     }
diff --git a/app/src/main/java/be/chvp/nanoledger/data/Util.kt b/app/src/main/java/be/chvp/nanoledger/data/Util.kt
@@ -71,3 +71,23 @@ fun SharedPreferences.booleanLiveData(
 ): SharedPreferenceLiveData<Boolean> {
     return SharedPreferenceBooleanLiveData(this, key, default)
 }
+
+class SharedPreferenceIntLiveData(
+    sharedPrefs: SharedPreferences,
+    key: String,
+    private val default: Int,
+) :
+    SharedPreferenceLiveData<Int>(sharedPrefs, key) {
+    init {
+        value = this.getValueFromPreferences(key)
+    }
+
+    override fun getValueFromPreferences(key: String): Int = if (sharedPrefs.contains(key)) sharedPrefs.getInt(key, default) else default
+}
+
+fun SharedPreferences.intLiveData(
+    key: String,
+    default: Int = 0,
+): SharedPreferenceLiveData<Int> {
+    return SharedPreferenceIntLiveData(this, key, default)
+}
diff --git a/app/src/main/java/be/chvp/nanoledger/ui/common/TransactionFormViewModel.kt b/app/src/main/java/be/chvp/nanoledger/ui/common/TransactionFormViewModel.kt
@@ -134,19 +134,22 @@ abstract class TransactionFormViewModel
                 transaction.append(" | ${note.value}")
             }
             transaction.append('\n')
-            // Drop last element, it should always be an empty posting
+            // Drop last element, it should always be an empty posting (and the only empty posting)
             for (posting in postings.value!!.dropLast(1)) {
+                val usedLength = 7 + posting.first.length + posting.second.length + posting.third.length
+                val numberOfSpaces = preferencesDataSource.getPostingWidth() - usedLength
+                val spaces = " ".repeat(maxOf(0, numberOfSpaces))
                 if (posting.third == "") {
                     transaction.append(
                         "    ${posting.first}\n",
                     )
                 } else if (preferencesDataSource.getCurrencyBeforeAmount()) {
                     transaction.append(
-                        "    ${posting.first}      ${posting.second} ${posting.third}\n",
+                        "    ${posting.first}  ${spaces}${posting.second} ${posting.third}\n",
                     )
                 } else {
                     transaction.append(
-                        "    ${posting.first}      ${posting.third} ${posting.second}\n",
+                        "    ${posting.first}  ${spaces}${posting.third} ${posting.second}\n",
                     )
                 }
             }
diff --git a/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt b/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesActivity.kt
@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
@@ -43,6 +44,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import be.chvp.nanoledger.R
 import be.chvp.nanoledger.ui.theme.NanoLedgerTheme
@@ -112,6 +114,26 @@ class PreferencesActivity() : ComponentActivity() {
                             OutlinedTextField(newDefaultCurrency, { newDefaultCurrency = it })
                         }
                         HorizontalDivider()
+                        val postingWidth by preferencesViewModel.postingWidth.observeAsState()
+                        var newPostingWidth by remember { mutableStateOf("${postingWidth ?: 72}") }
+                        var postingWidthOpen by remember { mutableStateOf(false) }
+                        Setting(stringResource(R.string.posting_width), "${postingWidth ?: 72}") {
+                            postingWidthOpen = true
+                        }
+                        SettingDialog(postingWidthOpen, stringResource(R.string.change_posting_width), true, {
+                            preferencesViewModel.storePostingWidth(Integer.parseInt(newPostingWidth))
+                        }, { postingWidthOpen = false }) {
+                            OutlinedTextField(
+                                newPostingWidth,
+                                {
+                                    if (it.isEmpty() || it.matches(Regex("^\\d+$"))) {
+                                        newPostingWidth = it
+                                    }
+                                },
+                                keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                            )
+                        }
+                        HorizontalDivider()
                         val defaultStatus by preferencesViewModel.defaultStatus.observeAsState()
                         var expandedStatus by rememberSaveable { mutableStateOf(false) }
                         ExposedDropdownMenuBox(
diff --git a/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesViewModel.kt b/app/src/main/java/be/chvp/nanoledger/ui/preferences/PreferencesViewModel.kt
@@ -19,6 +19,7 @@ class PreferencesViewModel
         val defaultCurrency: LiveData<String> = preferencesDataSource.defaultCurrency
         val defaultStatus: LiveData<String> = preferencesDataSource.defaultStatus
         val currencyBeforeAmount: LiveData<Boolean> = preferencesDataSource.currencyBeforeAmount
+        val postingWidth: LiveData<Int> = preferencesDataSource.postingWidth
 
         fun storeFileUri(uri: Uri) = preferencesDataSource.setFileUri(uri)
 
@@ -30,4 +31,6 @@ class PreferencesViewModel
             preferencesDataSource.setCurrencyBeforeAmount(
                 enable,
             )
+
+        fun storePostingWidth(width: Int) = preferencesDataSource.setPostingWidth(width)
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -6,6 +6,7 @@
     <string name="back">Back</string>
     <string name="cancel">Cancel</string>
     <string name="change_default_currency">Change default currency</string>
+    <string name="change_posting_width">Change posting width</string>
     <string name="copy">Copy</string>
     <string name="copy_and_edit">Copy and edit</string>
     <string name="currency_amount_order">Order of currency and amount</string>
@@ -27,6 +28,7 @@
     <string name="note">Note</string>
     <string name="ok">OK</string>
     <string name="payee">Payee</string>
+    <string name="posting_width">Width of postings written to file</string>
     <string name="save">Save</string>
     <string name="select_file">Select file&hellip;</string>
     <string name="settings">Settings</string>

Original file line number	Diff line number	Diff line change
`@@ -134,19 +134,22 @@ abstract class TransactionFormViewModel`
`134`	`134`	`transaction.append(" \| ${note.value}")`
`135`	`135`	`}`
`136`	`136`	`transaction.append('\n')`
`137`		`- // Drop last element, it should always be an empty posting`
	`137`	`+ // Drop last element, it should always be an empty posting (and the only empty posting)`
`138`	`138`	`for (posting in postings.value!!.dropLast(1)) {`
	`139`	`+ val usedLength = 7 + posting.first.length + posting.second.length + posting.third.length`
	`140`	`+ val numberOfSpaces = preferencesDataSource.getPostingWidth() - usedLength`
	`141`	`+ val spaces = " ".repeat(maxOf(0, numberOfSpaces))`
`139`	`142`	`if (posting.third == "") {`
`140`	`143`	`transaction.append(`
`141`	`144`	`" ${posting.first}\n",`
`142`	`145`	`)`
`143`	`146`	`} else if (preferencesDataSource.getCurrencyBeforeAmount()) {`
`144`	`147`	`transaction.append(`
`145`		`- " ${posting.first} ${posting.second} ${posting.third}\n",`
	`148`	`+ " ${posting.first} ${spaces}${posting.second} ${posting.third}\n",`
`146`	`149`	`)`
`147`	`150`	`} else {`
`148`	`151`	`transaction.append(`
`149`		`- " ${posting.first} ${posting.third} ${posting.second}\n",`
	`152`	`+ " ${posting.first} ${spaces}${posting.third} ${posting.second}\n",`
`150`	`153`	`)`
`151`	`154`	`}`
`152`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ class PreferencesViewModel`
`19`	`19`	`val defaultCurrency: LiveData<String> = preferencesDataSource.defaultCurrency`
`20`	`20`	`val defaultStatus: LiveData<String> = preferencesDataSource.defaultStatus`
`21`	`21`	`val currencyBeforeAmount: LiveData<Boolean> = preferencesDataSource.currencyBeforeAmount`
	`22`	`+ val postingWidth: LiveData<Int> = preferencesDataSource.postingWidth`
`22`	`23`
`23`	`24`	`fun storeFileUri(uri: Uri) = preferencesDataSource.setFileUri(uri)`
`24`	`25`
`@@ -30,4 +31,6 @@ class PreferencesViewModel`
`30`	`31`	`preferencesDataSource.setCurrencyBeforeAmount(`
`31`	`32`	`enable,`
`32`	`33`	`)`
	`34`	`+`
	`35`	`+ fun storePostingWidth(width: Int) = preferencesDataSource.setPostingWidth(width)`
`33`	`36`	`}`