Rename package com.eddy.atomrelay -> nl.eddydevink.sylda, Dutch translations, UI cleanup
- Package renamed to nl.eddydevink.sylda (matches eddydevink.nl domain + Sylda app name) - All status texts translated to Dutch (Niet verbonden, Verbonden, Zoeken, etc.) - Removed exchange key button, build number, and success toasts - Button text: Firmware bijwerken, instruction text shortened - App title changed to Sylda, 'instellingen' label next to settings gear - ON/HOLD changed to AAN/VAST
This commit is contained in:
parent
d6d6f6674a
commit
4c022b8259
13 changed files with 48 additions and 65 deletions
|
|
@ -4,14 +4,14 @@ plugins {
|
|||
}
|
||||
|
||||
android {
|
||||
namespace 'com.eddy.atomrelay'
|
||||
namespace 'nl.eddydevink.sylda'
|
||||
// compileSdk/targetSdk stays on 34 (Android 14) by deliberate choice. The target audience
|
||||
// consists of physically disabled users who are very reluctant to update their phones. Staying
|
||||
// on API 34 maximises device compatibility. Re-evaluate when the user base has migrated.
|
||||
compileSdk 34
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.eddy.atomrelay"
|
||||
applicationId "nl.eddydevink.sylda"
|
||||
minSdk 26
|
||||
targetSdk 34
|
||||
versionCode 1
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
<application
|
||||
android:allowBackup="false"
|
||||
android:label="Atom Relay"
|
||||
android:label="@string/app_name"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/AppTheme">
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
package com.eddy.atomrelay
|
||||
package nl.eddydevink.sylda
|
||||
|
||||
import android.Manifest
|
||||
import android.annotation.SuppressLint
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
package com.eddy.atomrelay
|
||||
package nl.eddydevink.sylda
|
||||
|
||||
enum class BleStatus {
|
||||
Scanning,
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
package com.eddy.atomrelay
|
||||
package nl.eddydevink.sylda
|
||||
|
||||
import android.content.Context
|
||||
import android.hardware.usb.UsbConstants
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
package com.eddy.atomrelay
|
||||
package nl.eddydevink.sylda
|
||||
|
||||
import android.content.Intent
|
||||
import android.content.pm.PackageManager
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
package com.eddy.atomrelay
|
||||
package nl.eddydevink.sylda
|
||||
|
||||
import android.content.Context
|
||||
import android.content.SharedPreferences
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
package com.eddy.atomrelay
|
||||
package nl.eddydevink.sylda
|
||||
|
||||
import android.app.AlertDialog
|
||||
import android.app.PendingIntent
|
||||
|
|
@ -52,7 +52,7 @@ class SettingsActivity : AppCompatActivity() {
|
|||
private const val FLUSH_TIMEOUT_MS = 100
|
||||
private const val READ_CHUNK_TIMEOUT_MS = 500
|
||||
private const val CDC_CONTROL_TIMEOUT_MS = 500
|
||||
private const val ACTION_USB_PERMISSION = "com.eddy.atomrelay.USB_PERMISSION"
|
||||
private const val ACTION_USB_PERMISSION = "nl.eddydevink.sylda.USB_PERMISSION"
|
||||
private const val STYLE_SPINNER = 0
|
||||
private const val STYLE_HORIZONTAL = 1
|
||||
private const val USB_READ_BUF_SIZE = 512
|
||||
|
|
@ -136,16 +136,10 @@ class SettingsActivity : AppCompatActivity() {
|
|||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||
supportActionBar?.title = getString(R.string.title_settings)
|
||||
|
||||
findViewById<Button>(R.id.exchangeKeyButton).setOnClickListener {
|
||||
startKeyExchange()
|
||||
}
|
||||
|
||||
findViewById<Button>(R.id.flashFirmwareButton).setOnClickListener {
|
||||
startFlashing()
|
||||
}
|
||||
|
||||
findViewById<TextView>(R.id.buildNumber).text = getString(R.string.build_number, BuildConfig.BUILD_NUMBER)
|
||||
|
||||
registerReceiver(usbAttachedReceiver, IntentFilter(UsbManager.ACTION_USB_DEVICE_ATTACHED), Context.RECEIVER_EXPORTED)
|
||||
registerReceiver(usbPermissionReceiver, IntentFilter(ACTION_USB_PERMISSION), Context.RECEIVER_NOT_EXPORTED)
|
||||
registerReceiver(usbDetachedReceiver, IntentFilter(UsbManager.ACTION_USB_DEVICE_DETACHED), Context.RECEIVER_EXPORTED)
|
||||
|
|
@ -288,7 +282,6 @@ class SettingsActivity : AppCompatActivity() {
|
|||
.putString(PrefsHelper.PREF_UUID, result.deviceUuid)
|
||||
.putString(PrefsHelper.PREF_KEY, result.hexKey)
|
||||
.apply()
|
||||
Toast.makeText(this@SettingsActivity, getString(R.string.key_read_success), Toast.LENGTH_LONG).show()
|
||||
cleanupAction()
|
||||
setResult(RESULT_SCAN)
|
||||
finish()
|
||||
|
|
@ -697,7 +690,6 @@ class SettingsActivity : AppCompatActivity() {
|
|||
.putString(PrefsHelper.PREF_UUID, espUuid)
|
||||
.putString(PrefsHelper.PREF_KEY, espKey)
|
||||
.apply()
|
||||
Toast.makeText(this, getString(R.string.key_read_success), Toast.LENGTH_LONG).show()
|
||||
cleanupAction()
|
||||
setResult(RESULT_SCAN)
|
||||
finish()
|
||||
|
|
@ -746,7 +738,6 @@ class SettingsActivity : AppCompatActivity() {
|
|||
progressDialog = null
|
||||
when (result) {
|
||||
is KeyResult.Success -> {
|
||||
Toast.makeText(this@SettingsActivity, getString(R.string.key_read_success), Toast.LENGTH_LONG).show()
|
||||
cleanupAction()
|
||||
setResult(RESULT_SCAN)
|
||||
finish()
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
package com.eddy.atomrelay
|
||||
package nl.eddydevink.sylda
|
||||
|
||||
import android.hardware.usb.UsbConstants
|
||||
import android.hardware.usb.UsbDeviceConnection
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||
package com.eddy.atomrelay
|
||||
package nl.eddydevink.sylda
|
||||
|
||||
import android.hardware.usb.UsbConstants
|
||||
import android.hardware.usb.UsbDevice
|
||||
|
|
@ -4,14 +4,28 @@
|
|||
android:layout_height="match_parent"
|
||||
android:padding="16dp">
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/settingsButton"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="end|top"
|
||||
android:src="@drawable/ic_settings"
|
||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
||||
android:contentDescription="@string/cd_settings" />
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/settings_label"
|
||||
android:textSize="14sp"
|
||||
android:layout_marginEnd="4dp" />
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/settingsButton"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:src="@drawable/ic_settings"
|
||||
android:background="?android:attr/selectableItemBackgroundBorderless"
|
||||
android:contentDescription="@string/cd_settings" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
|
|
|
|||
|
|
@ -12,19 +12,6 @@
|
|||
android:textSize="16sp"
|
||||
android:layout_marginBottom="24dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/exchangeKeyButton"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/button_key_exchange" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="?android:attr/listDivider"
|
||||
android:layout_marginTop="24dp"
|
||||
android:layout_marginBottom="24dp" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -139,12 +126,4 @@
|
|||
android:layout_height="0dp"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/buildNumber"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="12sp"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:gravity="center" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -1,36 +1,35 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Atom Relay</string>
|
||||
<string name="app_name">Sylda</string>
|
||||
<string name="settings">Instellingen</string>
|
||||
|
||||
<!-- MainActivity status -->
|
||||
<string name="status_default">Disconnected</string>
|
||||
<string name="status_default">Niet verbonden</string>
|
||||
<string name="status_discovering_services">Verbonden, services zoeken…</string>
|
||||
<string name="status_connecting">Verbinden…</string>
|
||||
<string name="status_connected">Connected</string>
|
||||
<string name="status_connected">Verbonden</string>
|
||||
<string name="status_service_error">Servicefout</string>
|
||||
<string name="status_service_not_found">Service not found</string>
|
||||
<string name="status_service_not_found">Service niet gevonden</string>
|
||||
<string name="status_comm_error">Communicatiefout</string>
|
||||
<string name="status_no_key">Geen HMAC sleutel - open Instellingen</string>
|
||||
<string name="status_no_key">Geen sleutel — open Instellingen</string>
|
||||
<string name="status_permissions_denied">Tik hier om Bluetooth-toegang in te stellen</string>
|
||||
<string name="status_bluetooth_disabled">Bluetooth not enabled</string>
|
||||
<string name="status_scanning">Scanning…</string>
|
||||
<string name="status_device_not_found">Device not found</string>
|
||||
<string name="status_wrong_device">Verkeerd apparaat — opnieuw scannen…</string>
|
||||
<string name="button_retry_scan">Opnieuw scannen</string>
|
||||
<string name="status_bluetooth_disabled">Bluetooth uitgeschakeld</string>
|
||||
<string name="status_wrong_device">Verkeerd apparaat — opnieuw zoeken…</string>
|
||||
<string name="status_scanning">Zoeken…</string>
|
||||
<string name="status_device_not_found">Apparaat niet gevonden</string>
|
||||
<string name="button_retry_scan">Opnieuw zoeken</string>
|
||||
|
||||
<!-- MainActivity UI -->
|
||||
<string name="cd_settings">Instellingen</string>
|
||||
<string name="button_on">ON</string>
|
||||
<string name="button_hold">HOLD</string>
|
||||
<string name="settings_label">instellingen</string>
|
||||
<string name="button_on">AAN</string>
|
||||
<string name="button_hold">VAST</string>
|
||||
|
||||
<!-- SettingsActivity -->
|
||||
<string name="title_settings">Instellingen</string>
|
||||
<string name="msg_settings_intro">Sluit de ESP aan op USB en kies een actie.</string>
|
||||
<string name="button_key_exchange">Sleutel Uitwisselen</string>
|
||||
<string name="msg_flash_mode_help">Sluit de ESP aan via USB. De app reset de ESP automatisch naar download-modus.</string>
|
||||
<string name="button_firmware_flash">Firmware Flashen</string>
|
||||
<string name="build_number">Buildnummer: %s</string>
|
||||
<string name="msg_flash_mode_help">Sluit de module aan op de USB-poort.</string>
|
||||
<string name="button_firmware_flash">Firmware bijwerken</string>
|
||||
<string name="usb_access_denied">USB-toegang geweigerd</string>
|
||||
<string name="key_read_success">Beveiligingssleutel gelezen</string>
|
||||
<string name="key_exchange_failed">Sleutel uitwisselen mislukt - probeer opnieuw</string>
|
||||
|
|
|
|||
Loading…
Reference in a new issue