Skip to content

Commit

Permalink
Use resource strings instead of static strings and add a second langu…
Browse files Browse the repository at this point in the history 
…age (DE) for demo purposes.

Signed-off-by: ingonoka <ingonoka@icloud.com>
  • Loading branch information
@ingonoka
ingonoka committed Jan 2, 2023
1 parent 41fe791 commit 1ef87e7
Show file tree
Hide file tree
Showing 5 changed files with 133 additions and 9 deletions.
1 change: 1 addition & 0 deletions cba9driverdemo/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ android {
targetSdkVersion android_target_sdk_version.toInteger()
versionCode = getVersionCode()
versionName = version
resConfigs 'en','de'

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
104 changes: 98 additions & 6 deletions cba9driverdemo/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,105 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity">
<TextView
<Button
android:text="@string/rejectBanknoteButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/buttonRejectBanknote"
app:layout_constraintBottom_toBottomOf="parent" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:insetBottom="0dp" android:insetTop="0dp" android:insetLeft="0dp" android:layout_marginBottom="8dp"
app:layout_constraintEnd_toStartOf="@+id/buttonAcceptBanknote" android:layout_marginEnd="8dp"/>
<Button
android:text="@string/acceptBanknoteButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
android:layout_height="wrap_content" android:id="@+id/buttonAcceptBanknote"
app:layout_constraintBottom_toBottomOf="parent"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:insetBottom="0dp" android:insetTop="0dp" android:insetLeft="0dp"
android:layout_marginBottom="8dp" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"/>
<androidx.constraintlayout.widget.Guideline
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content" app:layout_constraintGuide_begin="137dp" android:id="@+id/guideline2"/>
<TextView
android:text="@string/cba9StateLabel"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/textViewCba9StateLabel"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>

app:layout_constraintEnd_toStartOf="@+id/guideline2" android:layout_marginStart="8dp" app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="8dp"/>
<TextView
android:text="@string/fillLevelLabel"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/textViewFillLevelLabel"
app:layout_constraintTop_toBottomOf="@+id/textViewCba9StateLabel" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2" android:layout_marginStart="8dp"
app:layout_constraintHorizontal_bias="0.0" android:layout_marginTop="8dp"/>
<TextView
android:text="@string/serialNumberLabel"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/textViewSerialNumberLabel"
app:layout_constraintTop_toBottomOf="@+id/textViewFillLevelLabel" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2" android:layout_marginStart="8dp"
app:layout_constraintHorizontal_bias="0.0" android:layout_marginTop="8dp"/>
<TextView
android:text="@string/datasetVersionLabel"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/textViewDataSetVersionLabel"
app:layout_constraintTop_toBottomOf="@+id/textViewSerialNumberLabel" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2" android:layout_marginStart="8dp"
app:layout_constraintHorizontal_bias="0.0" android:layout_marginTop="8dp"/>
<TextView
android:text="@string/protocolVersionLabel"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/textViewProtocolVersionLabel"
app:layout_constraintTop_toBottomOf="@+id/textViewDataSetVersionLabel" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/guideline2" android:layout_marginStart="8dp"
app:layout_constraintHorizontal_bias="0.0" android:layout_marginTop="8dp"/>
<TextView
android:text="@string/na"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/textViewCba9StateValue"
app:layout_constraintStart_toStartOf="@+id/guideline2"
android:layout_marginStart="8dp" app:layout_constraintEnd_toStartOf="@+id/guideline3" app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="8dp"/>
<TextView
android:text="@string/na"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/textViewFillLevelValue"
app:layout_constraintTop_toBottomOf="@+id/textViewCba9StateValue" app:layout_constraintStart_toStartOf="@+id/guideline2"
android:layout_marginStart="8dp"
app:layout_constraintHorizontal_bias="0.0" android:layout_marginTop="8dp" app:layout_constraintEnd_toStartOf="@+id/guideline3"/>
<TextView
android:text="@string/na"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/textViewSerialNumberValue"
app:layout_constraintTop_toBottomOf="@+id/textViewFillLevelValue" app:layout_constraintStart_toStartOf="@+id/guideline2"
android:layout_marginStart="8dp"
app:layout_constraintHorizontal_bias="0.0" android:layout_marginTop="8dp" app:layout_constraintEnd_toStartOf="@+id/guideline3"/>
<TextView
android:text="@string/na"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/textViewDataSetVersionValue"
app:layout_constraintTop_toBottomOf="@+id/textViewSerialNumberValue" app:layout_constraintStart_toStartOf="@+id/guideline2"
android:layout_marginStart="8dp"
app:layout_constraintHorizontal_bias="0.0" android:layout_marginTop="8dp" app:layout_constraintEnd_toStartOf="@+id/guideline3"/>
<TextView
android:text="@string/na"
android:layout_width="0dp"
android:layout_height="wrap_content" android:id="@+id/textViewProtocolVersionValue"
app:layout_constraintTop_toBottomOf="@+id/textViewDataSetVersionValue" app:layout_constraintStart_toStartOf="@+id/guideline2"
android:layout_marginStart="8dp"
app:layout_constraintHorizontal_bias="0.0" android:layout_marginTop="8dp" app:layout_constraintEnd_toStartOf="@+id/guideline3"/>
<TextView
android:text="@string/na"
android:layout_width="0dp"
android:layout_height="0dp" android:id="@+id/textViewBanknote"
app:layout_constraintStart_toStartOf="@+id/guideline3" app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="8dp"
android:isScrollContainer="false" app:layout_constraintBottom_toTopOf="@+id/buttonAcceptBanknote" android:layout_marginStart="8dp"
android:layout_marginBottom="8dp" app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="8dp" android:textSize="96sp"
android:textAlignment="center" android:autoSizeMaxTextSize="96sp" android:autoSizeMinTextSize="12sp" android:autoSizeTextType="uniform"/>
<androidx.constraintlayout.widget.Guideline
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content" app:layout_constraintGuide_begin="242dp" android:id="@+id/guideline3"/>
</androidx.constraintlayout.widget.ConstraintLayout>
21 changes: 21 additions & 0 deletions cba9driverdemo/src/main/res/values-de/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2022. Ingo Noka
~ This file belongs to project cba9-driver.
~ This work is licensed under the Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported License.
~ To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-nd/3.0/ or send a letter to
~ Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
~
-->

<resources>
<string name="app_name">CBA9 Driver Demo</string>
<string name="cba9StateLabel">CBA9 Status</string>
<string name="fillLevelLabel">Füllstand</string>
<string name="serialNumberLabel">Seriennummer</string>
<string name="datasetVersionLabel">Data Set Version</string>
<string name="protocolVersionLabel">Protokollversion</string>
<string name="rejectBanknoteButton">Ablehnen</string>
<string name="acceptBanknoteButton">Aktzeptieren</string>
<string name="na">N/A</string>
</resources>
9 changes: 9 additions & 0 deletions cba9driverdemo/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,13 @@

<resources>
<string name="app_name">CBA9 Driver Demo</string>
<string name="cba9StateLabel">CBA9 State</string>
<string name="fillLevelLabel">Fill Level</string>
<string name="serialNumberLabel">Serial Number</string>
<string name="datasetVersionLabel">Data Set Version</string>
<string name="protocolVersionLabel">Protocol Version</string>
<string name="rejectBanknoteButton">Reject</string>
<string name="acceptBanknoteButton">Accept</string>
<string name="na">N/A</string>
<string name="fillLevel" translatable="false">%1$s %2$d / (%3$d)</string>
</resources>
7 changes: 4 additions & 3 deletions lib/src/main/kotlin/com/ingonoka/cba9driver/command/SspCommand.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@ import com.ingonoka.cba9driver.util.WriteIntBuffer
import com.ingonoka.usbmanager.IUsbTransceiver
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.sync.withLock
import org.slf4j.Logger
import org.slf4j.LoggerFactory

/**
* The SSP command always has a command code [sspCommandCode] and some commands have extra [data].
*
*/
sealed class SspCommand(
val sspCommandCode: SspCommandCode,
private val sspCommandCode: SspCommandCode,
val data: List<Int> = listOf()
) : Stringifiable {

val logger = LoggerFactory.getLogger(this::class.java.name)
val logger: Logger? = LoggerFactory.getLogger(this::class.java.name)

companion object {
/**
Expand Down Expand Up @@ -83,7 +84,7 @@ sealed class SspCommand(

}.onSuccess {

logger.trace("Run ${this.stringify()} -> ${it.stringify()}")
logger?.trace("Run ${this.stringify()} -> ${it.stringify()}")
}

} catch (e: Exception) {
Expand Down

0 comments on commit 1ef87e7

Please sign in to comment.