Fix logic for inport and output button label

HiddenRamblings · Sep 25, 2024 · c736af8 · c736af8
1 parent 956c148
commit c736af8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/app/src/main/java/com/hiddenramblings/tagmo/amiibo/tagdata/TagDataEditor.kt b/app/src/main/java/com/hiddenramblings/tagmo/amiibo/tagdata/TagDataEditor.kt
@@ -309,18 +309,20 @@ class TagDataEditor : AppCompatActivity() {
             }
         }
         appDataTransfer = findViewById<AppCompatButton>(R.id.transfer_app_data).apply {
-            text = getString(R.string.import_app_data)
+            text = getString(
+                if (null != AppData.transferData) R.string.import_app_data else R.string.export_app_data
+            )
             setOnClickListener {
+                val button = it as AppCompatButton
                 if (null != AppData.transferData) {
                     transferData()
-                    val button = it as AppCompatButton
                     button.text = getString(R.string.export_app_data)
-                    button.isEnabled = false
                 } else {
                     AppData.apply {
                         transferId = amiiboData.appId
                         transferData = amiiboData.appData
                     }
+                    button.text = getString(R.string.import_app_data)
                     finish()
                 }
             }
@@ -1689,7 +1691,7 @@ class TagDataEditor : AppCompatActivity() {
             }
             try {
                 val hearts1 = txtHearts1?.text.toString().toInt()
-                txtHearts2?.selectedItemPosition?.let { this.hearts = hearts1 * 4 + it }
+                txtHearts2?.selectedItemPosition?.let { this.hearts = (hearts1 * 4) + it }
             } catch (e: NumberFormatException) {
                 txtHearts1?.requestFocus()
                 throw e

diff --git a/app/src/main/res/layout/active_card_layout.xml b/app/src/main/res/layout/active_card_layout.xml
@@ -191,7 +191,8 @@
                             android:layout_height="wrap_content"
                             android:textColor="@color/tag_text"
                             android:textSize="12sp"
-                            android:layout_marginVertical="8dp"
+                            android:layout_marginTop="6dp"
+                            android:layout_marginBottom="4dp"
                             android:text="@string/game_titles_view"
                             android:gravity="center"
                             tools:ignore="SmallSp"/>
@@ -202,7 +203,8 @@
                             android:layout_height="wrap_content"
                             android:textColor="@color/tag_text"
                             android:textSize="10sp"
-                            android:layout_marginBottom="-8dp"
+                            android:layout_marginTop="4dp"
+                            android:layout_marginBottom="-6dp"
                             tools:ignore="SmallSp"/>
                     </LinearLayout>
                 </LinearLayout>
@@ -227,4 +229,4 @@
             </LinearLayout>
         </ScrollView>
     </androidx.cardview.widget.CardView>
-</merge>
+</merge>