Skip to content

Add missing string resources for remote listeners #536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mgdx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add missing string resources for remote listeners #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/java/com/afkanerd/deku/RemoteListeners/RMQ/RMQLongRunningConnectionWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,16 @@ class RMQLongRunningConnectionWorker(context: Context, parameters: WorkerParamet
notificationIntent,
PendingIntent.FLAG_IMMUTABLE)

val title = "Long running..."
val title = applicationContext
.getString(R.string.remote_listeners_long_running_notification_title)
val description = ""

val notification =
NotificationCompat.Builder( applicationContext,
applicationContext.getString(R.string.running_gateway_clients_channel_id))
.setContentTitle(title)
.setContentText("Status")
.setContentText(applicationContext
.getString(R.string.remote_listeners_notification_status))
.setSmallIcon(R.drawable.ic_stat_name)
.setPriority(NotificationCompat.PRIORITY_LOW)
.setSilent(true)
Expand Down
23 changes: 12 additions & 11 deletions app/src/main/java/com/afkanerd/deku/RemoteListeners/RemoteListenerConnectionService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,23 +225,24 @@ class RemoteListenerConnectionService : Service() {
notificationIntent,
PendingIntent.FLAG_IMMUTABLE)

val title = "$numberOfActiveRemoteListeners Active..."
val description = ""
.plus("# Failed to start: ")
.plus("$numberFailedToStart\n")
.plus("# Waiting to start: ")
.plus("$numberWaitingToStart\n")
.plus("# Starting: ")
.plus("$numberStarting\n")
.plus("# Connected: ")
.plus(numberStarted)
val title = getString(
R.string.remote_listeners_active_notification_title,
numberOfActiveRemoteListeners
)
val description = getString(
R.string.remote_listeners_notification_body,
numberFailedToStart,
numberWaitingToStart,
numberStarting,
numberStarted
)

val notification =
NotificationCompat.Builder(
applicationContext,
getString(R.string.running_gateway_clients_channel_id))
.setContentTitle(title)
.setContentText("Status")
.setContentText(getString(R.string.remote_listeners_notification_status))
.setSmallIcon(R.drawable.ic_stat_name)
.setPriority(NotificationCompat.PRIORITY_LOW)
.setSilent(true)
Expand Down
35 changes: 21 additions & 14 deletions app/src/main/java/com/afkanerd/deku/RemoteListeners/components/Permissions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import com.afkanerd.deku.DefaultSMS.R
import com.afkanerd.deku.RemoteListeners.ui.requiredNotificationsPermissions
import com.afkanerd.deku.RemoteListeners.ui.requiredReadPhoneStatePermissions
import com.afkanerd.deku.RemoteListeners.ui.requiredReceiveSMSPermission
Expand All @@ -39,10 +41,11 @@ fun NotificationPermissionComposable() {
rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) {
isGranted ->
if(isGranted) {
Toast.makeText(context, "Well done!", Toast.LENGTH_LONG).show()
Toast.makeText(context, R.string.permission_notification_granted_toast,
Toast.LENGTH_LONG).show()
} else {
Toast.makeText(context, "We cannot do without this one...", Toast.LENGTH_LONG)
.show()
Toast.makeText(context, R.string.permission_notification_denied_toast,
Toast.LENGTH_LONG).show()
}
}

Expand All @@ -63,7 +66,7 @@ fun NotificationPermissionComposable() {
) {
Icon(imageVector = Icons.Outlined.Info, "", tint=MaterialTheme.colorScheme.secondary)
Text(
"When not default SMS app, you need to grant permissions for listeners to show notifications when changing.",
stringResource(R.string.permission_notification_rationale),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onTertiaryContainer,
modifier = Modifier.padding(start=16.dp, end=16.dp, top=8.dp)
Expand All @@ -78,7 +81,7 @@ fun NotificationPermissionComposable() {
TextButton(onClick = {
getNotificationsPermissionsLauncher.launch(requiredNotificationsPermissions)
}) {
Text("Grant notification permission")
Text(stringResource(R.string.permission_grant_notification))
}
}
}
Expand All @@ -93,9 +96,11 @@ fun PhoneStatePermissionComposable() {
rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) {
isGranted ->
if(isGranted) {
Toast.makeText(context, "Well done, carry on!", Toast.LENGTH_LONG).show()
Toast.makeText(context, R.string.permission_phone_state_granted_toast,
Toast.LENGTH_LONG).show()
} else {
Toast.makeText(context, "You can at anytime...", Toast.LENGTH_LONG).show()
Toast.makeText(context, R.string.permission_phone_state_denied_toast,
Toast.LENGTH_LONG).show()
}
}

Expand All @@ -116,7 +121,7 @@ fun PhoneStatePermissionComposable() {
) {
Icon(imageVector = Icons.Outlined.Info, "", tint=MaterialTheme.colorScheme.secondary)
Text(
"When not default SMS app, you need to grant permissions for listeners to check for sim status and dual sim information.",
stringResource(R.string.permission_phone_state_rationale),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onTertiaryContainer,
modifier = Modifier.padding(start=16.dp, end=16.dp, top=8.dp)
Expand All @@ -132,7 +137,7 @@ fun PhoneStatePermissionComposable() {
getReadPhoneStatePermissionsLauncher
.launch(requiredReadPhoneStatePermissions)
}) {
Text("Grant phone state permission")
Text(stringResource(R.string.permission_grant_phone_state))
}
}
}
Expand All @@ -148,9 +153,11 @@ fun SMSPermissionComposable() {
rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) {
isGranted ->
if(isGranted) {
Toast.makeText(context, "Carry on activating...", Toast.LENGTH_LONG).show()
Toast.makeText(context, R.string.permission_sms_granted_toast,
Toast.LENGTH_LONG).show()
} else {
Toast.makeText(context, "I'd be back!", Toast.LENGTH_LONG).show()
Toast.makeText(context, R.string.permission_sms_denied_toast,
Toast.LENGTH_LONG).show()
}
}

Expand All @@ -174,7 +181,7 @@ fun SMSPermissionComposable() {
) {
Icon(imageVector = Icons.Outlined.Info, "", tint=MaterialTheme.colorScheme.secondary)
Text(
"When not default SMS app, you need to grant permissions for listeners to send and receive delivery reports.",
stringResource(R.string.permission_sms_rationale),
style = MaterialTheme.typography.bodySmall,
color = MaterialTheme.colorScheme.onTertiaryContainer,
modifier = Modifier.padding(start=16.dp, end=16.dp, top=8.dp)
Expand All @@ -190,14 +197,14 @@ fun SMSPermissionComposable() {
TextButton(onClick = {
getSMSPermissionLauncher.launch(requiredSendSMSPermission)
}) {
Text("Grant send sms permission")
Text(stringResource(R.string.permission_grant_send_sms))
}
}
if(!smsReadSMSState.status.isGranted || LocalInspectionMode.current) {
TextButton(onClick = {
getSMSPermissionLauncher.launch(requiredReceiveSMSPermission)
}) {
Text("Grant read sms permission")
Text(stringResource(R.string.permission_grant_read_sms))
}
}
}
Expand Down
20 changes: 13 additions & 7 deletions app/src/main/java/com/afkanerd/deku/RemoteListeners/modals/RemoteListenerModal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.afkanerd.deku.DefaultSMS.BuildConfig
import com.afkanerd.deku.DefaultSMS.R
import com.example.compose.AppTheme
import androidx.compose.runtime.getValue
import androidx.compose.runtime.setValue
Expand Down Expand Up @@ -57,30 +59,34 @@ fun RemoteListenerModal(
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
Text("Configure Remote listener",
Text(stringResource(R.string.remote_listener_configure_title),
style = MaterialTheme.typography.titleMedium)

Spacer(modifier = Modifier.padding(8.dp))

Button(onClick = connectionCallback, modifier = Modifier.fillMaxWidth()) {
Text(if(activated) "Deactivate" else "Activate")
Text(stringResource(
if(activated) R.string.gateway_client_customization_deactivate
else R.string.gateway_client_customization_activate
))
}
Text(
if(activated)
"Deactivating stops the remote listener and tries to kill all remote connections."
else "Activating begins the service that tries to connect this remote listener",
stringResource(
if(activated) R.string.remote_listener_deactivate_description
else R.string.remote_listener_activate_description
),
style = MaterialTheme.typography.labelSmall,
textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.secondary
)
Spacer(modifier = Modifier.padding(16.dp))

Button(onClick = editCallback, modifier = Modifier.fillMaxWidth()) {
Text("Edit" )
Text(stringResource(R.string.edit))
}

TextButton(onClick = deleteCallback) {
Text("Delete", color = MaterialTheme.colorScheme.error)
Text(stringResource(R.string.delete), color = MaterialTheme.colorScheme.error)
}
}
}
Expand Down
10 changes: 6 additions & 4 deletions ...a/com/afkanerd/deku/RemoteListeners/modals/RemoteListenerReadPhoneStatePermissionModal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.afkanerd.deku.DefaultSMS.BuildConfig
import com.afkanerd.deku.DefaultSMS.R
import com.example.compose.AppTheme

@OptIn(ExperimentalMaterial3Api::class)
Expand Down Expand Up @@ -55,28 +57,28 @@ fun RemoteListenersReadPhoneStatePermissionModal(
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
"Permission required!",
stringResource(R.string.permission_required_title),
style = MaterialTheme.typography.titleMedium
)

Spacer(Modifier.padding(16.dp))

Text(
"Grant permission to detect how many SIM cards you have on your device",
stringResource(R.string.remote_listener_phone_state_permission_description),
textAlign = TextAlign.Center
)

Spacer(Modifier.padding(8.dp))
Text(
"This would also auto fill useful information which can help you identify your various queues.",
stringResource(R.string.remote_listener_phone_state_permission_hint),
style = MaterialTheme.typography.labelMedium,
textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.secondary
)

Spacer(Modifier.padding(12.dp))
Button(onClick = grantPermissionsCallback) {
Text("Grant permission")
Text(stringResource(R.string.permission_grant))
}
}
}
Expand Down
10 changes: 6 additions & 4 deletions ...c/main/java/com/afkanerd/deku/RemoteListeners/modals/RemoteListenerSMSPermissionsModal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.afkanerd.deku.DefaultSMS.BuildConfig
import com.afkanerd.deku.DefaultSMS.R
import com.example.compose.AppTheme

@OptIn(ExperimentalMaterial3Api::class)
Expand Down Expand Up @@ -55,28 +57,28 @@ fun RemoteListenerSMSPermissionsModal(
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
"Permission required!",
stringResource(R.string.permission_required_title),
style = MaterialTheme.typography.titleMedium
)

Spacer(Modifier.padding(16.dp))

Text(
"Remote listeners sends messages and listen for delivery reports. This requires permission to read and write SMS messages.",
stringResource(R.string.remote_listener_sms_permission_description),
textAlign = TextAlign.Center
)

Spacer(Modifier.padding(8.dp))
Text(
"You can make the app your default SMS app, or choose to grant the necessary permissions",
stringResource(R.string.remote_listener_sms_permission_hint),
style = MaterialTheme.typography.labelMedium,
textAlign = TextAlign.Center,
color = MaterialTheme.colorScheme.secondary
)

Spacer(Modifier.padding(16.dp))
Button(onClick = makeDefaultCallback) {
Text("Make default")
Text(stringResource(R.string.remote_listener_make_default))
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/afkanerd/deku/Router/ui/GatewayClientsMainView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ fun GatewayClientsMainView(
DropdownMenuItem(
text = {
Text(
text = "Add SMTP forwarder",
text = stringResource(R.string.add_smtp_forwarders),
color = MaterialTheme.colorScheme.onBackground
)
},
Expand All @@ -113,7 +113,7 @@ fun GatewayClientsMainView(
IconButton(onClick = { navController.popBackStack() }) {
Icon(
Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = "go back"
contentDescription = stringResource(R.string.go_back)
)
}
},
Expand Down
36 changes: 36 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,4 +456,40 @@
<string name="secure_message_accepted">Secure message accepted</string>
<string name="enter_subject">Enter subject</string>

<!-- Remote listeners: permissions -->
<string name="permission_required_title">Permission required!</string>
<string name="permission_grant">Grant permission</string>
<string name="permission_grant_notification">Grant notification permission</string>
<string name="permission_grant_phone_state">Grant phone state permission</string>
<string name="permission_grant_send_sms">Grant send sms permission</string>
<string name="permission_grant_read_sms">Grant read sms permission</string>
<string name="permission_notification_rationale">When not default SMS app, you need to grant permissions for listeners to show notifications when changing.</string>
<string name="permission_phone_state_rationale">When not default SMS app, you need to grant permissions for listeners to check for sim status and dual sim information.</string>
<string name="permission_sms_rationale">When not default SMS app, you need to grant permissions for listeners to send and receive delivery reports.</string>
<string name="permission_notification_granted_toast">Well done!</string>
<string name="permission_notification_denied_toast">We cannot do without this one…</string>
<string name="permission_phone_state_granted_toast">Well done, carry on!</string>
<string name="permission_phone_state_denied_toast">You can at anytime…</string>
<string name="permission_sms_granted_toast">Carry on activating…</string>
<string name="permission_sms_denied_toast">I\'d be back!</string>

<!-- Remote listeners: modals -->
<string name="remote_listener_sms_permission_description">Remote listeners sends messages and listen for delivery reports. This requires permission to read and write SMS messages.</string>
<string name="remote_listener_sms_permission_hint">You can make the app your default SMS app, or choose to grant the necessary permissions</string>
<string name="remote_listener_make_default">Make default</string>
<string name="remote_listener_phone_state_permission_description">Grant permission to detect how many SIM cards you have on your device</string>
<string name="remote_listener_phone_state_permission_hint">This would also auto fill useful information which can help you identify your various queues.</string>
<string name="remote_listener_configure_title">Configure Remote listener</string>
<string name="remote_listener_activate_description">Activating begins the service that tries to connect this remote listener</string>
<string name="remote_listener_deactivate_description">Deactivating stops the remote listener and tries to kill all remote connections.</string>

<!-- Remote listeners: notifications -->
<string name="remote_listeners_active_notification_title">%1$d active…</string>
<string name="remote_listeners_long_running_notification_title">Long running…</string>
<string name="remote_listeners_notification_status">Status</string>
<string name="remote_listeners_notification_body"># Failed to start: %1$d\n# Waiting to start: %2$d\n# Starting: %3$d\n# Connected: %4$d</string>

<!-- Router -->
<string name="add_smtp_forwarders">Add SMTP forwarder</string>

</resources>