💄 ui: added icons in the dialog.

huangyz0918 · Aug 12, 2019 · a0a3445 · a0a3445
1 parent 0877e6d
commit a0a3445
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/skunkworks_crow/src/main/java/org/odk/share/utilities/DialogUtils.java b/skunkworks_crow/src/main/java/org/odk/share/utilities/DialogUtils.java
@@ -42,7 +42,6 @@ public static AlertDialog createSimpleDialog(Context context, String title, Stri
      */
     public static AlertDialog createMethodSwitchDialog(Activity targetActivity, DialogInterface.OnClickListener listener) {
         AlertDialog alertDialog = new AlertDialog.Builder(targetActivity).create();
-        alertDialog.setTitle(targetActivity.getString(R.string.switch_method_title));
         alertDialog.setCancelable(false);
         alertDialog.setButton(DialogInterface.BUTTON_POSITIVE, targetActivity.getString(R.string.cancel),
                 (dialog, i) -> {
@@ -52,8 +51,12 @@ public static AlertDialog createMethodSwitchDialog(Activity targetActivity, Dial
         alertDialog.setButton(DialogInterface.BUTTON_NEGATIVE, targetActivity.getString(R.string.switch_method), listener);
 
         if (targetActivity instanceof BtReceiverActivity || targetActivity instanceof BtSenderActivity) {
+            alertDialog.setIcon(R.drawable.ic_wifi_tethering_black_24dp);
+            alertDialog.setTitle(targetActivity.getString(R.string.switch_to_hotspot_title));
             alertDialog.setMessage(targetActivity.getString(R.string.hotspot_switch_method));
         } else if (targetActivity instanceof HpReceiverActivity || targetActivity instanceof HpSenderActivity) {
+            alertDialog.setIcon(R.drawable.ic_bluetooth_black_24dp);
+            alertDialog.setTitle(targetActivity.getString(R.string.switch_to_bluetooth_title));
             alertDialog.setMessage(targetActivity.getString(R.string.bluetooth_switch_method));
         } else {
             throw new IllegalArgumentException("Not a valid activity parameter");

diff --git a/skunkworks_crow/src/main/res/values/strings.xml b/skunkworks_crow/src/main/res/values/strings.xml
@@ -165,7 +165,8 @@
     <string name="preference_default_method_summary">Bluetooth</string>
     <string name="bluetooth_switch_method">Are you sure to stop and switch to bluetooth method?</string>
     <string name="hotspot_switch_method">Are you sure to stop and switch to hotspot method?</string>
-    <string name="switch_method_title">Switch Method</string>
+    <string name="switch_to_bluetooth_title">Switch to Bluetooth Method</string>
+    <string name="switch_to_hotspot_title">Switch to Hotspot Method</string>
     <string name="permission_location_denied">Location permission is required to send the forms using Bluetooth. Please allow it in the app settings.</string>
     <string name="permission_open_info">Skunkworks-crow app requires location permission to access your Bluetooth. Please allow location permission from your app settings.</string>
     <string name="permission_open_info_button">Open Settings</string>