Code clean-up, exception handling and layout trimming.

Author: alimoncul

.idea/caches/build_file_checksums.ser

@@ -25,7 +25,6 @@ dependencies {
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-
     implementation 'org.osmdroid:osmdroid-android:6.1.0'
     implementation 'com.github.MKergall:osmbonuspack:6.6.0'
 }

.idea/gradle.xml

@@ -122,13 +122,15 @@ public boolean longPressHelper(GeoPoint p) {
         btn_showCoordinates.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (mapLat.getText() != null && mapLon.getText() != null) {
+                try {
                     GeoPoint markerPoint = new GeoPoint(Double.parseDouble(mapLat.getText().toString()), Double.parseDouble(mapLon.getText().toString()));
                     startMarker.setPosition(markerPoint);
                     startMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM);
                     startMarker.setTitle("Target location");
                     map.getOverlays().add(startMarker);
                     map.invalidate();
+                } catch (NumberFormatException e) {
+                    e.printStackTrace();
                 }
             }
         });
@@ -165,12 +167,4 @@ public void onPause() {
         //Configuration.getInstance().save(this, prefs);
         map.onPause();  //needed for compass, my location overlays, v6.0.0 and up
     }
-
-    protected void onStop() {
-        super.onStop();
-        SharedPreferences.Editor editor = getSharedPreferences("IP", MODE_PRIVATE).edit();
-        editor.putString("IP", ipAddress.getText().toString());
-        editor.commit();
-    }
-
 }

.idea/misc.xml

@@ -21,7 +21,6 @@
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-
 public class MainActivity extends AppCompatActivity {
 
     Button btn_down, btn_up, btn_left, btn_right, btn_autodrive, btn_camera;
@@ -33,7 +32,6 @@ public class MainActivity extends AppCompatActivity {
     public static int CMD;
     public String newUrl;
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

app/build.gradle

@@ -8,7 +8,7 @@
 
     <EditText
         android:id="@+id/ipAddress"
-        android:layout_width="wrap_content"
+        android:layout_width="200dp"
         android:layout_height="50dp"
         android:ems="10"
         android:inputType="textPersonName"
@@ -31,8 +31,8 @@
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="75dp"
         android:layout_height="60dp"
-        android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
         android:backgroundTint="@color/colorSecondary"
         android:text="MANUAL DRIVE"
         android:textSize="12dp"
@@ -44,20 +44,22 @@
         style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="65dp"
         android:layout_height="60dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginTop="8dp"
         android:backgroundTint="@color/colorPrimary"
         android:text="CAMERA"
         android:textSize="10dp"
         app:layout_constraintEnd_toStartOf="@+id/btn_manualDrive"
-        app:layout_constraintTop_toTopOf="@+id/btn_manualDrive" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <WebView
         android:id="@+id/wb_liveFeed"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="4dp"
         app:layout_constraintBottom_toTopOf="@+id/guideline"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -74,9 +76,10 @@
         android:id="@+id/mapLat"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="2dp"
         android:layout_marginStart="8dp"
-        android:layout_marginEnd="4dp"
         android:hint="Latitude"
+        android:inputType="text"
         android:maxLines="1"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@id/mapLon"
@@ -87,40 +90,44 @@
         android:id="@+id/mapLon"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="4dp"
+        android:layout_marginStart="2dp"
+        android:hint="Longitude"
+        android:inputType="text"
         android:maxLines="1"
         android:textSize="12sp"
-        android:hint="Longitude"
         app:layout_constraintEnd_toStartOf="@+id/btn_ShowCoordinates"
         app:layout_constraintStart_toEndOf="@+id/mapLat"
         app:layout_constraintTop_toTopOf="@+id/mapLat" />
 
     <Button
         android:id="@+id/btn_ShowCoordinates"
+        style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
+        android:backgroundTint="@color/colorShow"
         android:text="Show"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/mapLat" />
 
     <org.osmdroid.views.MapView
         android:id="@+id/map"
         android:layout_width="wrap_content"
-        android:layout_height="305dp"
-        android:layout_marginTop="8dp"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/mapLat" />
+        app:layout_constraintTop_toBottomOf="@+id/btn_ShowCoordinates" />
 
     <Button
         android:id="@+id/btn_GPS"
+        style="@style/Widget.AppCompat.Button.Colored"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
         android:layout_marginBottom="8dp"
+        android:layout_marginStart="8dp"
+        android:backgroundTint="@color/colorGPS"
         android:text="GPS"
         app:layout_constraintBottom_toBottomOf="@+id/map"
         app:layout_constraintStart_toStartOf="parent" />

app/src/main/java/com/teamfire/picontroller/AutoDriveActivity.java

@@ -44,7 +44,7 @@
 
     <EditText
         android:id="@+id/ipAddress"
-        android:layout_width="wrap_content"
+        android:layout_width="200dp"
         android:layout_height="50dp"
         android:ems="10"
         android:inputType="textPersonName"

app/src/main/java/com/teamfire/picontroller/MainActivity.java

@@ -14,4 +14,6 @@
     <color name="safePressed">#5c5c5c</color>
     <color name="emergency">#740000</color>
     <color name="emergencyPressed">#b97373</color>
+    <color name="colorShow">#5caf76</color>
+    <color name="colorGPS">#4e72be</color>
 </resources>