Actually add pro controller instructions

timawesomeness · Jul 19, 2020 · cd6d329 · cd6d329
1 parent 29eee23
commit cd6d329
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.timawesomeness.pairwiimote"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 2
-        versionName "1.1"
+        versionCode 3
+        versionName "1.1.1"
         vectorDrawables.useSupportLibrary = true
     }
 

diff --git a/app/release/output.json b/app/release/output.json
diff --git a/app/release/pairwiimote-v1.0.apk b/app/release/pairwiimote-v1.0.apk
diff --git a/app/src/main/java/com/timawesomeness/pairwiimote/MainActivity.java b/app/src/main/java/com/timawesomeness/pairwiimote/MainActivity.java
@@ -16,6 +16,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
@@ -148,6 +149,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
                 break;
             case R.id.wiimote:
                 controllerType = ControllerType.WIIMOTE;
+                ((TextView) findViewById(R.id.instructions)).setText(R.string.wiimote_instructions);
                 break;
             case R.id.wiiupro:
                 final EditText input = new EditText(this);
@@ -172,6 +174,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
                             } else {
                                 localMAC = input.getText().toString();
                                 controllerType = ControllerType.WIIUPRO;
+                                ((TextView) findViewById(R.id.instructions)).setText(R.string.wiiupro_instructions);
                             }
                         })
                         .setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -9,7 +9,7 @@
     <string name="wiimote">Wii Remote</string>
     <string name="wiiupro">Wii U Pro Controller</string>
     <string name="local_mac_title">What is your device\'s Blueooth MAC address?</string>
-    <string name="local_mac_instructions">To see your device\'s Bluetooth MAC address, open Android settings > About phone</string>
+    <string name="local_mac_instructions">To see your device\'s Bluetooth MAC address, open Android settings > About device</string>
     <string name="local_mac_hint">aa:bb:cc:dd:ee:ff</string>
     <string name="local_mac_error">Please enter a valid MAC address</string>
-</resources>
+</resources>