Improved the drone's nickname design

Author: rocboronat

app/src/main/java/com/fewlaps/flone/view/dialog/ChooseDeviceNickNameDialog.java

@@ -8,6 +8,7 @@
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 import android.view.LayoutInflater;
+import android.view.View;
 import android.widget.EditText;
 
 import com.fewlaps.flone.R;
@@ -23,20 +24,19 @@ public static void showDialog(FragmentActivity a) {
         new ChooseDeviceNickNameDialog().show(a.getSupportFragmentManager(), "ChooseDeviceNickNameDialog");
     }
 
-    EditText etNickName = null;
-    OnDeviceNickNameSetListener listener = null;
+    private OnDeviceNickNameSetListener listener = null;
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         LayoutInflater inflater = getActivity().getLayoutInflater();
 
-        etNickName = (EditText) inflater.inflate(R.layout.dialog_choose_nick, null);
-
-        builder.setView(etNickName).setPositiveButton(R.string.action_ok, new DialogInterface.OnClickListener() {
+        final View root = inflater.inflate(R.layout.dialog_choose_nick, null);
+        builder.setView(root).setPositiveButton(R.string.action_ok, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int id) {
-                listener.onDeviceNickNameSetListener(etNickName.getText().toString());
+                EditText nickNameET = (EditText) root.findViewById(R.id.et_nickname);
+                listener.onDeviceNickNameSetListener(nickNameET.getText().toString());
             }
         });
         return builder.create();

app/src/main/res/layout/dialog_choose_nick.xml

@@ -1,8 +1,12 @@
-<EditText xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/et_nickname"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/gapMedium"
-    android:hint="@string/add_drone_nickname_hint"
-    android:padding="@dimen/gapMedium"
-    android:singleLine="true" />
+    android:padding="@dimen/gapMedium">
+
+    <EditText
+        android:id="@+id/et_nickname"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/add_drone_nickname_hint"
+        android:singleLine="true" />
+</FrameLayout>

app/src/main/res/values/strings.xml

@@ -22,7 +22,7 @@
     <string name="add_drone_launch_bt_screen">Pair the drone with the phone</string>
     <string name="add_drone_zero1">There isn\'t any paired bluetooth device</string>
     <string name="add_drone_zero2">Did you tried to switch on the drone?</string>
-    <string name="add_drone_nickname_hint">Write a friendly name for this drone...</string>
+    <string name="add_drone_nickname_hint">Drone\'s nickname</string>
 
     <!-- Remove a drone -->
     <string name="remove_drone_confirmation">Are you sure you want to remove the drone %1$s?</string>