Skip to content

Commit 4dd04d8

Browse files
committed
Remove hardcoded strings from layout.
1 parent 9f131f9 commit 4dd04d8

3 files changed

Lines changed: 21 additions & 11 deletions

File tree

Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/WriteTag.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1330,7 +1330,11 @@ private void writeDump(
13301330
}).start();
13311331
}
13321332

1333-
public void onWriteValueTransferRestore(View view) {
1333+
/**
1334+
* TODO: Doc.
1335+
* @param view
1336+
*/
1337+
public void onWriteValueBlockTransferRestore(View view) {
13341338
// Validate staging
13351339
if (!checkSectorAndBlock(mVtrStageSector, mVtrStageBlock)) return;
13361340
int sSec = Integer.parseInt(mVtrStageSector.getText().toString());

Mifare Classic Tool/app/src/main/res/layout/activity_write_tag.xml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,6 @@
559559
android:layout_margin="10dp"
560560
android:background="@color/light_gray" />
561561

562-
<!-- TODO: remove hardcoded strings -->
563-
564562
<RadioButton
565563
android:id="@+id/radioButtonWriteTagTransferRestore"
566564
android:layout_width="match_parent"
@@ -569,7 +567,7 @@
569567
android:gravity="center_horizontal"
570568
android:onClick="onChangeWriteMode"
571569
android:tag="writetag_transfer_restore"
572-
android:text="Value Transfer and Restore"
570+
android:text="@string/text_transfer_restore_value_block"
573571
android:textAppearance="?android:attr/textAppearanceLarge"
574572
android:textColor="?attr/colorAccent" />
575573

@@ -597,7 +595,7 @@
597595
android:layout_alignParentLeft="true"
598596
android:layout_alignParentTop="true"
599597
android:padding="5dp"
600-
android:text="Set value of Value Block even if there are only decrement/transfer/restore permissions"
598+
android:text="@string/text_transfer_restore_value_block_info"
601599
android:textAppearance="?android:attr/textAppearanceMedium" />
602600

603601
<GridLayout
@@ -615,7 +613,7 @@
615613
android:layout_row="0"
616614
android:layout_column="0"
617615
android:padding="5dp"
618-
android:text="Staging"
616+
android:text="@string/text_staging"
619617
android:textAppearance="?android:attr/textAppearanceMedium"
620618
android:labelFor="@+id/editTextWriteTagTransferRestoreStagingSector" />
621619

@@ -661,7 +659,7 @@
661659
android:layout_row="1"
662660
android:layout_column="0"
663661
android:padding="5dp"
664-
android:text="Destination"
662+
android:text="@string/text_destination"
665663
android:textAppearance="?android:attr/textAppearanceMedium"
666664
android:labelFor="@+id/editTextWriteTagTransferRestoreDestinationSector" />
667665

@@ -709,7 +707,7 @@
709707
android:layout_below="@id/gridLayoutWriteTagTransferRestore"
710708
android:layout_alignBaseline="@id/editTextWriteTagTransferRestoreValue"
711709
android:padding="5dp"
712-
android:text="Value and Address"
710+
android:text="@string/text_value_and_address"
713711
android:textAppearance="?android:attr/textAppearanceMedium" />
714712

715713
<EditText
@@ -738,12 +736,12 @@
738736

739737
<Button
740738
android:id="@+id/buttonWriteTagTransferRestore"
741-
android:layout_width="wrap_content"
739+
android:layout_width="match_parent"
742740
android:layout_height="wrap_content"
743741
android:layout_below="@id/textViewWriteTagTransferRestoreValueAddress"
744742
android:layout_marginTop="10dp"
745-
android:onClick="onWriteValueTransferRestore"
746-
android:text="Create key map &amp; Transfer/Restore" />
743+
android:onClick="onWriteValueBlockTransferRestore"
744+
android:text="@string/action_write_value_block_transfer_restore" />
747745
</RelativeLayout>
748746

749747
</RadioGroup>

Mifare Classic Tool/app/src/main/res/values/strings.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,12 @@
212212
<string name="text_difference_between_dumps">Difference between dumps</string>
213213
<string name="text_choose_language">Choose custom app language</string>
214214
<string name="text_choose_theme">Choose custom theme</string>
215+
<string name="text_transfer_restore_value_block">Transfer &amp; Restore Value Block</string>
216+
<string name="text_transfer_restore_value_block_info">Set value of a Value Block even
217+
if there are only decrement/transfer/restore permissions</string>
218+
<string name="text_staging">Staging</string>
219+
<string name="text_destination">Destination</string>
220+
<string name="text_value_and_address">Value &amp; Address</string>
215221

216222
<!-- Actions (Buttons, Checkboxs, etc. -->
217223
<string name="action_read_tag">Read Tag</string>
@@ -328,6 +334,8 @@
328334
<item>Light</item>
329335
<item>Follow System (Android 10+)</item>
330336
</string-array>
337+
<string name="action_write_value_block_transfer_restore">Write Value Block
338+
with Transfer &amp; Restore</string>
331339

332340
<!-- Toast messages -->
333341
<string name="info_new_tag_found">New tag found</string>

0 commit comments

Comments
 (0)