fix: clean up modifier call sites

ben-kaufman · ben-kaufman · commit 9bdfc4f8aca6 · 2026-04-23T14:58:43.000-05:00
diff --git a/app/src/main/java/to/bitkit/ui/screens/contacts/ContactDetailScreen.kt b/app/src/main/java/to/bitkit/ui/screens/contacts/ContactDetailScreen.kt
@@ -174,27 +174,27 @@ private fun ContactBody(
 
         Row(
             horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterHorizontally),
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth()
         ) {
             ActionButton(
                 onClick = onClickCopy,
                 iconRes = R.drawable.ic_copy,
-                modifier = Modifier.testTag("ContactCopy"),
+                modifier = Modifier.testTag("ContactCopy")
             )
             ActionButton(
                 onClick = onClickShare,
                 iconRes = R.drawable.ic_share,
-                modifier = Modifier.testTag("ContactShare"),
+                modifier = Modifier.testTag("ContactShare")
             )
             ActionButton(
                 onClick = onClickEdit,
                 iconRes = R.drawable.ic_edit,
-                modifier = Modifier.testTag("ContactEdit"),
+                modifier = Modifier.testTag("ContactEdit")
             )
             ActionButton(
                 onClick = onClickDelete,
                 iconRes = R.drawable.ic_trash,
-                modifier = Modifier.testTag("ContactDelete"),
+                modifier = Modifier.testTag("ContactDelete")
             )
         }
 
@@ -210,13 +210,13 @@ private fun ContactBody(
             color = Colors.White64,
             modifier = Modifier
                 .fillMaxWidth()
-                .testTag("ContactViewTagsHeader"),
+                .testTag("ContactViewTagsHeader")
         )
         VerticalSpacer(8.dp)
         FlowRow(
             horizontalArrangement = Arrangement.spacedBy(8.dp),
             verticalArrangement = Arrangement.spacedBy(8.dp),
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier.fillMaxWidth()
         ) {
             tags.forEachIndexed { index, tag ->
                 TagButton(
@@ -233,7 +233,7 @@ private fun ContactBody(
                 onClick = onAddTag,
                 icon = painterResource(R.drawable.ic_tag),
                 displayIconClose = true,
-                modifier = Modifier.testTag("ContactAddTag"),
+                modifier = Modifier.testTag("ContactAddTag")
             )
         }
     }
@@ -263,7 +263,7 @@ private fun EmptyState(onClickRetry: () -> Unit) {
         SecondaryButton(
             text = stringResource(R.string.profile__retry_load),
             onClick = onClickRetry,
-            modifier = Modifier.testTag("ContactRetry"),
+            modifier = Modifier.testTag("ContactRetry")
         )
     }
 }
diff --git a/app/src/main/java/to/bitkit/ui/screens/contacts/ContactImportSelectScreen.kt b/app/src/main/java/to/bitkit/ui/screens/contacts/ContactImportSelectScreen.kt
@@ -171,7 +171,7 @@ private fun SelectableContactRow(
 
         Column(
             verticalArrangement = Arrangement.spacedBy(2.dp),
-            modifier = Modifier.weight(1f),
+            modifier = Modifier.weight(1f)
         ) {
             BodyS(
                 text = contact.profile.truncatedPublicKey,
@@ -193,7 +193,7 @@ private fun SelectableContactRow(
                 painter = painterResource(R.drawable.ic_check),
                 contentDescription = null,
                 tint = Colors.PubkyGreen,
-                modifier = Modifier.size(24.dp),
+                modifier = Modifier.size(24.dp)
             )
         }
     }
@@ -228,7 +228,7 @@ private fun FooterBar(
 ) {
     Row(
         verticalAlignment = Alignment.CenterVertically,
-        modifier = Modifier.fillMaxWidth(),
+        modifier = Modifier.fillMaxWidth()
     ) {
         BodyMSB(
             text = stringResource(R.string.contacts__import_selected_count, selectedCount),
diff --git a/app/src/main/java/to/bitkit/ui/screens/contacts/ContactsScreen.kt b/app/src/main/java/to/bitkit/ui/screens/contacts/ContactsScreen.kt
@@ -108,7 +108,7 @@ private fun Content(
                 ActionButton(
                     onClick = { showAddContactSheet = true },
                     iconRes = R.drawable.ic_plus,
-                    modifier = Modifier.testTag("ContactsAddButton"),
+                    modifier = Modifier.testTag("ContactsAddButton")
                 )
             }
             VerticalSpacer(8.dp)
@@ -165,8 +165,8 @@ private fun ContactsList(
                 )
                 ContactRow(
                     profile = myProfile,
-                    modifier = Modifier.testTag("ContactsMyProfile"),
                     onClick = onClickMyProfile,
+                    modifier = Modifier.testTag("ContactsMyProfile")
                 )
                 HorizontalDivider()
             }
@@ -185,8 +185,8 @@ private fun ContactsList(
             items(contacts, key = { it.publicKey }) { contact ->
                 ContactRow(
                     profile = contact,
-                    modifier = Modifier.testTag("Contact_${contact.publicKey}"),
                     onClick = { onClickContact(contact.publicKey) },
+                    modifier = Modifier.testTag("Contact_${contact.publicKey}")
                 )
                 HorizontalDivider()
             }
@@ -212,7 +212,7 @@ private fun ContactRow(
 
         Column(
             verticalArrangement = Arrangement.spacedBy(4.dp),
-            modifier = Modifier.weight(1f),
+            modifier = Modifier.weight(1f)
         ) {
             BodyS(
                 text = profile.truncatedPublicKey,
@@ -280,8 +280,8 @@ private fun EmptyState(
             )
             ContactRow(
                 profile = it,
-                modifier = Modifier.testTag("ContactsMyProfile"),
                 onClick = onClickMyProfile,
+                modifier = Modifier.testTag("ContactsMyProfile")
             )
             HorizontalDivider()
         }
@@ -297,7 +297,7 @@ private fun EmptyState(
             PrimaryButton(
                 text = stringResource(R.string.contacts__intro_add_contact),
                 onClick = onAddContact,
-                modifier = Modifier.testTag("ContactsEmptyAddButton"),
+                modifier = Modifier.testTag("ContactsEmptyAddButton")
             )
             BodyM(
                 text = stringResource(R.string.contacts__empty_state),
diff --git a/app/src/main/java/to/bitkit/ui/screens/profile/ProfileScreen.kt b/app/src/main/java/to/bitkit/ui/screens/profile/ProfileScreen.kt
@@ -161,8 +161,8 @@ private fun ProfileBody(
         ) {
             QrCodeImage(
                 content = profile.publicKey,
-                modifier = Modifier.fillMaxWidth(),
                 testTag = "QRCode",
+                modifier = Modifier.fillMaxWidth()
             )
             if (profile.imageUrl != null) {
                 Box(
@@ -263,12 +263,12 @@ private fun EmptyState(
         SecondaryButton(
             text = stringResource(R.string.profile__retry_load),
             onClick = onClickRetry,
-            modifier = Modifier.testTag("ProfileRetry"),
+            modifier = Modifier.testTag("ProfileRetry")
         )
         VerticalSpacer(8.dp)
         TextButton(
             onClick = rememberDebouncedClick(onClick = onClickSignOut),
-            modifier = Modifier.testTag("ProfileEmptySignOut"),
+            modifier = Modifier.testTag("ProfileEmptySignOut")
         ) {
             BodyS(text = stringResource(R.string.profile__sign_out), color = Colors.White64)
         }

Original file line number	Diff line number	Diff line change
`@@ -174,27 +174,27 @@ private fun ContactBody(`
`174`	`174`
`175`	`175`	`Row(`
`176`	`176`	`horizontalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterHorizontally),`
`177`		`- modifier = Modifier.fillMaxWidth(),`
	`177`	`+ modifier = Modifier.fillMaxWidth()`
`178`	`178`	`) {`
`179`	`179`	`ActionButton(`
`180`	`180`	`onClick = onClickCopy,`
`181`	`181`	`iconRes = R.drawable.ic_copy,`
`182`		`- modifier = Modifier.testTag("ContactCopy"),`
	`182`	`+ modifier = Modifier.testTag("ContactCopy")`
`183`	`183`	`)`
`184`	`184`	`ActionButton(`
`185`	`185`	`onClick = onClickShare,`
`186`	`186`	`iconRes = R.drawable.ic_share,`
`187`		`- modifier = Modifier.testTag("ContactShare"),`
	`187`	`+ modifier = Modifier.testTag("ContactShare")`
`188`	`188`	`)`
`189`	`189`	`ActionButton(`
`190`	`190`	`onClick = onClickEdit,`
`191`	`191`	`iconRes = R.drawable.ic_edit,`
`192`		`- modifier = Modifier.testTag("ContactEdit"),`
	`192`	`+ modifier = Modifier.testTag("ContactEdit")`
`193`	`193`	`)`
`194`	`194`	`ActionButton(`
`195`	`195`	`onClick = onClickDelete,`
`196`	`196`	`iconRes = R.drawable.ic_trash,`
`197`		`- modifier = Modifier.testTag("ContactDelete"),`
	`197`	`+ modifier = Modifier.testTag("ContactDelete")`
`198`	`198`	`)`
`199`	`199`	`}`
`200`	`200`
`@@ -210,13 +210,13 @@ private fun ContactBody(`
`210`	`210`	`color = Colors.White64,`
`211`	`211`	`modifier = Modifier`
`212`	`212`	`.fillMaxWidth()`
`213`		`- .testTag("ContactViewTagsHeader"),`
	`213`	`+ .testTag("ContactViewTagsHeader")`
`214`	`214`	`)`
`215`	`215`	`VerticalSpacer(8.dp)`
`216`	`216`	`FlowRow(`
`217`	`217`	`horizontalArrangement = Arrangement.spacedBy(8.dp),`
`218`	`218`	`verticalArrangement = Arrangement.spacedBy(8.dp),`
`219`		`- modifier = Modifier.fillMaxWidth(),`
	`219`	`+ modifier = Modifier.fillMaxWidth()`
`220`	`220`	`) {`
`221`	`221`	`tags.forEachIndexed { index, tag ->`
`222`	`222`	`TagButton(`
`@@ -233,7 +233,7 @@ private fun ContactBody(`
`233`	`233`	`onClick = onAddTag,`
`234`	`234`	`icon = painterResource(R.drawable.ic_tag),`
`235`	`235`	`displayIconClose = true,`
`236`		`- modifier = Modifier.testTag("ContactAddTag"),`
	`236`	`+ modifier = Modifier.testTag("ContactAddTag")`
`237`	`237`	`)`
`238`	`238`	`}`
`239`	`239`	`}`
`@@ -263,7 +263,7 @@ private fun EmptyState(onClickRetry: () -> Unit) {`
`263`	`263`	`SecondaryButton(`
`264`	`264`	`text = stringResource(R.string.profile__retry_load),`
`265`	`265`	`onClick = onClickRetry,`
`266`		`- modifier = Modifier.testTag("ContactRetry"),`
	`266`	`+ modifier = Modifier.testTag("ContactRetry")`
`267`	`267`	`)`
`268`	`268`	`}`
`269`	`269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private fun Content(`
`108`	`108`	`ActionButton(`
`109`	`109`	`onClick = { showAddContactSheet = true },`
`110`	`110`	`iconRes = R.drawable.ic_plus,`
`111`		`- modifier = Modifier.testTag("ContactsAddButton"),`
	`111`	`+ modifier = Modifier.testTag("ContactsAddButton")`
`112`	`112`	`)`
`113`	`113`	`}`
`114`	`114`	`VerticalSpacer(8.dp)`
`@@ -165,8 +165,8 @@ private fun ContactsList(`
`165`	`165`	`)`
`166`	`166`	`ContactRow(`
`167`	`167`	`profile = myProfile,`
`168`		`- modifier = Modifier.testTag("ContactsMyProfile"),`
`169`	`168`	`onClick = onClickMyProfile,`
	`169`	`+ modifier = Modifier.testTag("ContactsMyProfile")`
`170`	`170`	`)`
`171`	`171`	`HorizontalDivider()`
`172`	`172`	`}`
`@@ -185,8 +185,8 @@ private fun ContactsList(`
`185`	`185`	`items(contacts, key = { it.publicKey }) { contact ->`
`186`	`186`	`ContactRow(`
`187`	`187`	`profile = contact,`
`188`		`- modifier = Modifier.testTag("Contact_${contact.publicKey}"),`
`189`	`188`	`onClick = { onClickContact(contact.publicKey) },`
	`189`	`+ modifier = Modifier.testTag("Contact_${contact.publicKey}")`
`190`	`190`	`)`
`191`	`191`	`HorizontalDivider()`
`192`	`192`	`}`
`@@ -212,7 +212,7 @@ private fun ContactRow(`
`212`	`212`
`213`	`213`	`Column(`
`214`	`214`	`verticalArrangement = Arrangement.spacedBy(4.dp),`
`215`		`- modifier = Modifier.weight(1f),`
	`215`	`+ modifier = Modifier.weight(1f)`
`216`	`216`	`) {`
`217`	`217`	`BodyS(`
`218`	`218`	`text = profile.truncatedPublicKey,`
`@@ -280,8 +280,8 @@ private fun EmptyState(`
`280`	`280`	`)`
`281`	`281`	`ContactRow(`
`282`	`282`	`profile = it,`
`283`		`- modifier = Modifier.testTag("ContactsMyProfile"),`
`284`	`283`	`onClick = onClickMyProfile,`
	`284`	`+ modifier = Modifier.testTag("ContactsMyProfile")`
`285`	`285`	`)`
`286`	`286`	`HorizontalDivider()`
`287`	`287`	`}`
`@@ -297,7 +297,7 @@ private fun EmptyState(`
`297`	`297`	`PrimaryButton(`
`298`	`298`	`text = stringResource(R.string.contacts__intro_add_contact),`
`299`	`299`	`onClick = onAddContact,`
`300`		`- modifier = Modifier.testTag("ContactsEmptyAddButton"),`
	`300`	`+ modifier = Modifier.testTag("ContactsEmptyAddButton")`
`301`	`301`	`)`
`302`	`302`	`BodyM(`
`303`	`303`	`text = stringResource(R.string.contacts__empty_state),`