Skip to content

Commit b76b944

Browse files
committed
feat: render cash bills programmatically
Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
1 parent c56f616 commit b76b944

13 files changed

Lines changed: 432 additions & 160 deletions

File tree

app/src/main/java/com/getcode/App.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatDelegate
55
import com.bugsnag.android.Bugsnag
66
import com.getcode.manager.AuthManager
77
import com.getcode.utils.ErrorUtils
8+
import com.getcode.view.main.bill.CashBillAssets
89
import dagger.hilt.android.HiltAndroidApp
910
import io.reactivex.rxjava3.plugins.RxJavaPlugins
1011
import timber.log.Timber
@@ -20,6 +21,8 @@ class App : Application() {
2021
super.onCreate()
2122
instance = this
2223

24+
CashBillAssets.load(this)
25+
2326
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
2427

2528
RxJavaPlugins.setErrorHandler {

app/src/main/java/com/getcode/util/ModifierExt.kt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import androidx.compose.foundation.clickable
99
import androidx.compose.foundation.combinedClickable
1010
import androidx.compose.foundation.interaction.MutableInteractionSource
1111
import androidx.compose.material.ripple.rememberRipple
12+
import androidx.compose.runtime.Composable
1213
import androidx.compose.runtime.remember
1314
import androidx.compose.ui.ExperimentalComposeUiApi
1415
import androidx.compose.ui.Modifier
@@ -27,11 +28,13 @@ import androidx.compose.ui.unit.dp
2728

2829
inline fun Modifier.addIf(
2930
predicate: Boolean,
30-
crossinline whenTrue: () -> Modifier,
31-
): Modifier = if (predicate) {
32-
this.then(whenTrue())
33-
} else {
34-
this
31+
crossinline whenTrue: @Composable () -> Modifier,
32+
): Modifier = composed {
33+
if (predicate) {
34+
this.then(whenTrue())
35+
} else {
36+
this
37+
}
3538
}
3639

3740
fun Modifier.unboundedClickable(

app/src/main/java/com/getcode/view/main/bill/Bill.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ fun Bill(
2222
) {
2323
when (bill) {
2424
is Bill.Cash -> CashBill(
25-
modifier = Modifier
26-
.padding(bottom = CodeTheme.dimens.inset)
27-
.then(modifier),
25+
modifier = modifier,
2826
payloadData = bill.data,
2927
amount = bill.amount
3028
)

0 commit comments

Comments
 (0)