diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 91e2eee..007c21c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -44,6 +44,7 @@ @@ -56,6 +57,7 @@ @@ -68,6 +70,7 @@ diff --git a/app/src/main/java/com/ganjoor/android/ProcessTextActivity.kt b/app/src/main/java/com/ganjoor/android/ProcessTextActivity.kt index 4b678ee..a06a54e 100644 --- a/app/src/main/java/com/ganjoor/android/ProcessTextActivity.kt +++ b/app/src/main/java/com/ganjoor/android/ProcessTextActivity.kt @@ -12,7 +12,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Close -import androidx.compose.material.icons.filled.Search +import androidx.compose.material.icons.automirrored.filled.Send import androidx.compose.material.icons.filled.Share import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon @@ -165,7 +165,7 @@ private fun SelectionScreen(selected: String, action: SelectionAction, onClose: actions = { // The dictionary knows single words; a whole line is better asked about. IconButton(onClick = { context.shareText("$prompt\n\n$selected") }) { - Icon(Icons.Default.Search, stringResource(R.string.assistant_ask)) + Icon(Icons.AutoMirrored.Filled.Send, stringResource(R.string.assistant_ask)) } IconButton(onClick = { context.shareText(selected) }) { Icon(Icons.Default.Share, stringResource(R.string.share)) diff --git a/app/src/main/java/com/ganjoor/android/ui/AssistantResultSheet.kt b/app/src/main/java/com/ganjoor/android/ui/AssistantResultSheet.kt index d912b29..c1479f5 100644 --- a/app/src/main/java/com/ganjoor/android/ui/AssistantResultSheet.kt +++ b/app/src/main/java/com/ganjoor/android/ui/AssistantResultSheet.kt @@ -6,7 +6,11 @@ import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.foundation.layout.size +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Share import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.Icon import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet @@ -116,6 +120,11 @@ fun AssistantAnswer(text: String, prompt: String = "translate") { Text(reply, style = MaterialTheme.typography.bodyLarge) } TextButton(onClick = { context.shareText(reply) }) { + Icon( + imageVector = Icons.Default.Share, + contentDescription = null, + modifier = Modifier.size(18.dp).padding(end = 4.dp), + ) Text(stringResource(R.string.share)) } } diff --git a/app/src/main/java/com/ganjoor/android/ui/PoemScreen.kt b/app/src/main/java/com/ganjoor/android/ui/PoemScreen.kt index 187e0d0..b6fd91f 100644 --- a/app/src/main/java/com/ganjoor/android/ui/PoemScreen.kt +++ b/app/src/main/java/com/ganjoor/android/ui/PoemScreen.kt @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.text.selection.SelectionContainer @@ -385,6 +386,13 @@ private fun PassageActions(passage: Bookmark) { subject = passage.title, ) }) { + // The same glyph as the top bar and as every other Android app: share is a shape + // people recognise before they read the word next to it. + Icon( + imageVector = Icons.Default.Share, + contentDescription = null, + modifier = Modifier.size(18.dp).padding(end = 4.dp), + ) Text(stringResource(R.string.share)) } AssistantAction( diff --git a/app/src/main/res/drawable/ic_ask.xml b/app/src/main/res/drawable/ic_ask.xml new file mode 100644 index 0000000..fb7c1c9 --- /dev/null +++ b/app/src/main/res/drawable/ic_ask.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_lookup.xml b/app/src/main/res/drawable/ic_lookup.xml new file mode 100644 index 0000000..5997537 --- /dev/null +++ b/app/src/main/res/drawable/ic_lookup.xml @@ -0,0 +1,11 @@ + + + + diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml new file mode 100644 index 0000000..0069e35 --- /dev/null +++ b/app/src/main/res/drawable/ic_share.xml @@ -0,0 +1,11 @@ + + + +