SD-216 - fix back button functionality for recordings and history tabs

Reviewed-on: #14

libSafeMobile/src/main/java/com/safemobile/services/TCPService.java

@@ -28,13 +28,11 @@ public class TCPService extends Service {
     	int port = 13589;
     	try {
     		port = Integer.parseInt(AppParams.PORT);
-    	}
-    	catch(Exception ex) { }
+    	} catch(Exception ex) { }
     	
     	tcpParser = new TCPmsgParser();
     	
-    	if(tcp == null && !AppParams.IP.equalsIgnoreCase("n/a"))
-    	{
+    	if(tcp == null && !AppParams.IP.equalsIgnoreCase("n/a")) {
     		tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port);
     	}
     	

libSafeMobile/src/main/java/com/safemobile/services/TCPhandler.java

@@ -5,7 +5,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 import android.net.wifi.WifiManager;
 
 import com.safemobile.lib.AppParams;
@@ -38,21 +37,19 @@ public class TCPhandler implements Runnable {
 	private String leftOver = "";
 
 	public static LinkedList<TCPmsg> msgList;
-	private volatile int n = 0;
 
 	public Boolean isConnectionUP = false;
 	public Boolean previousConnectionWasUP = false;
-
-	private Context context;
-	private boolean isWiFiOn = true;
+	
+	private final Context context;
+	private boolean isWiFiOn;
 
 	public TCPhandler(Context context, String hostName, int p) {
-
 		this.context = context;
 		serverHostname = hostName;
 		port = p;
 
-		msgList = new LinkedList<TCPmsg>();
+		msgList = new LinkedList<>();
 		SM.Debug("---TCPhandler constructor [" + hostName + "," + p + "] ---");
 		listenThread = new Thread(this, "TCPlisten");
 		listenThread.start(); // (2) Start the thread.
@@ -64,7 +61,6 @@ public class TCPhandler implements Runnable {
 			public void run() {
 				try {
 					previousConnectionWasUP = isConnectionUP;
-
 					// try to send something
 					TCPmsgParser._fireonTCPConnectionStatusEvent(isConnectionUP, previousConnectionWasUP);
 				} catch (Exception e) {
@@ -72,18 +68,20 @@ public class TCPhandler implements Runnable {
 				}
 			}
 		}, 0, 3000);
-
-		// get WiFi state 
-		ConnectivityManager connManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-		NetworkInfo mWifi = connManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-		if (mWifi.isConnectedOrConnecting())
-			isWiFiOn = true;
-
+		
+		// get WiFi state
+		isWiFiOn = isNetworkConnected();
+		
 		IntentFilter intentFilter = new IntentFilter();
 		intentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
 		context.registerReceiver(mReceived, intentFilter);
 	}
 
+	private boolean isNetworkConnected() {
+		ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+		return cm.getActiveNetworkInfo() != null && cm.getActiveNetworkInfo().isConnected();
+	}
+
 	@Override
 	public void run() {
 		try {
@@ -100,20 +98,19 @@ public class TCPhandler implements Runnable {
 				isConnectionUP = true;
 				triggerTCPConnectionStateEvent();
 			}
-
 		} catch (UnknownHostException e) {
-			SM.Debug("UnknownHostException", "TCPhandler break:" + e.toString());
+			SM.Debug("UnknownHostException", "TCPhandler break:"+ e);
 		} catch (IllegalArgumentException e) {
-			SM.Debug("IllegalArgumentException", "TCPhandler break:" + e.toString());
+			SM.Debug("IllegalArgumentException", "TCPhandler break:"+ e);
 		} catch (IOException e) {
-			SM.Debug("IOException", "TCPhandler break:" + e.toString());
+			SM.Debug("IOException", "TCPhandler break:"+ e);
 		}
 
 		while (alive) {
 			try {
 				Thread.sleep(3000);
 			} catch (InterruptedException e) {
-				SM.Debug("TCPhandler Crash1 on sleep:" + e.toString());
+				SM.Debug("TCPhandler Crash1 on sleep:"+ e);
 			}
 
 			while (Boolean.TRUE.equals(isConnectionUP)) {
@@ -166,7 +163,7 @@ public class TCPhandler implements Runnable {
 					//end process leftover
 
 					String data = "";
-					n = 0;
+					int n = 0;
 
 					byte[] buf = new byte[1024];
 					// read data into buffer
@@ -181,7 +178,6 @@ public class TCPhandler implements Runnable {
 						break;
 					}
 
-
 					byte[] temp = new byte[n];
 					if (n >= 0) System.arraycopy(buf, 0, temp, 0, n);
 
@@ -190,77 +186,72 @@ public class TCPhandler implements Runnable {
 
 					data = new String(temp);
 
-					//if we have any leftovers from previous message add them
-					if (leftOver.length() > 1) // avoid case with only one #
-					{
-						data = leftOver + data;
-						leftOver = "";
-					}
+			        //if we have any leftovers from previous message add them
+			    	if(leftOver.length() > 1) { // avoid case with only one #
+			    		data = leftOver+data;
+			    		leftOver = "";
+			    	}
 
-					//search for overflow message
-					String[] tempArr = data.split("#");
-					if ((tempArr.length == 0) || (tempArr.length == 1)) {
-						SM.Debug("TCP Client", "incorect messagebuss message=" + data);
-						continue;
-					}
-					//get msg len
-					int messLen;
+			    	//search for overflow message
+			    	String[] tempArr = data.split("#");
+			        if ((tempArr.length == 0) || (tempArr.length == 1)) {
+			            SM.Debug("TCP Client", "incorect messagebuss message=" + data);
+			            continue;
+			        }
+			        //get msg len
+			        int messLen;
 					try {
 						messLen = Integer.parseInt(tempArr[1]);
 					} catch (Exception e) {
 						SM.Debug("TCP Client", "incorect msg len =" + tempArr[1]);
 						continue;
-					}
-					//messLen not int
-					if (messLen == -1) {
-						continue;
-					}
-					char[] temMSG = data.toCharArray();
-					if (data.length() != messLen) {
-						if (messLen > data.length()) {
-							leftOver = data; // Add by bigu
-							continue;
-						}
-						//perform cut
-						temMSG = data.substring(0, messLen).toCharArray();
-						leftOver = data.substring(messLen, data.length());
-					}
+					} 					
+			        //messLen not int
+			        if (messLen == -1) {
+		        		continue;
+		        	}
+			        char[] temMSG = data.toCharArray();
+			        if (data.length() != messLen) {
+			        	//if expected string message is smaller then actual string then exit processing;
+			        	if (messLen > data.length()) {
+			        		leftOver = data; // Add by bigu
+		        			continue;
+		        		}
+			        	//perform cut
+			        	temMSG = data.substring(0,messLen).toCharArray();
+			        	leftOver = data.substring(messLen);
+			        }
 					//decode TCP msg
 					TCPmsg msg = new TCPmsg(temMSG);
 
 					SM.Debug("<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> RX <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", msg.allData);
-
+					
 					if (msg.allData.contains("#92#"))
 						prioritizePongReceived();
 
 					msgList.add(msg);
-
-				} catch (Exception ex) {
-					SM.Debug("TCPHandler", "TCPhandler/run/break:" + ex.toString());
+				} catch(Exception ex) {
+					SM.Debug("TCPHandler", "TCPhandler/run/break:"+ ex);
 					isConnectionUP = false;
 					triggerTCPConnectionStateEvent();
 				}
 			}
-
-
+			
 			//
 			try {
 				Thread.sleep(1000);
 			} catch (InterruptedException e) {
-				SM.Debug("TCPhandler Crash2 on sleep:" + e.toString());
+				SM.Debug("TCPhandler Crash2 on sleep:"+ e);
 			}
-
 			//try to restart connection
 			if (alive && isWiFiOn)
 				restartTCP();
-
 		}
 		SM.Debug("==================================");
 		SM.Debug("TCP listenThread stoped!! alive = false");
 		SM.Debug("==================================");
 	}
 
-
 	/**
 	 * Create a bypass in order to trigger the ping received event
 	 */
@@ -268,33 +259,26 @@ public class TCPhandler implements Runnable {
 		TCPmsgParser._firePONGReceivedEvent();
 	}
 
-
 	/* Broadcast Received for WiFi Connect/Disconnect */
 	public BroadcastReceiver mReceived = new BroadcastReceiver() {
 
 		@Override
 		public void onReceive(Context context, Intent intent) {
-			final String action = intent.getAction();
-			SM.Debug("WIFI STATE", action);
-
-			if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
-				NetworkInfo info = intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
-				// close socket if the wifi is disconnecting or disconnected
-				if (!info.isConnectedOrConnecting()) {
+		    final String action = intent.getAction();
+		    SM.Debug("WIFI STATE", action);
+		    
+		    if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)){
+		        // close socket if the wifi is disconnecting or disconnected
+				isWiFiOn = isNetworkConnected();
+				if (!isWiFiOn)
 					closeSocket();
-					isWiFiOn = false;
-				} else
-					isWiFiOn = true;
-			}
+		    }      
 		}
 	};
-
-
-	/**
-	 * Send a message through the TCP Socket
-	 *
-	 * @param seqID The messages's sequence id (a number of order)
-	 * @param msg   The messages which will be sent
+	
+	/** Send a message through the TCP Socket
+	 * @param seqID The messages's sequence ID (a number of order)
+	 * @param msg The messages which will be sent
 	 * @return True if the message was sent
 	 */
 	public boolean Write(String seqID, String msg) {
@@ -338,52 +322,29 @@ public class TCPhandler implements Runnable {
 		}
 		return false;
 	}
-
-
-
-
-	public void setConnectionIsDown() {
-		if (input != null) {
-			try {
-				input.close();
-			} catch (IOException e) {
-			} finally {
-				input = null;
-			}
-		}
-
-		isConnectionUP = false;
-	}
-
+	
 	/* Encrypt a string using an encryption algorithm,
 	 * in this case TEA */
 	public static byte[] encryptTEA(String toEncryptData) {
-		byte[] encryptedByteArray = new byte[]{};
-
 		// no encryption
-		encryptedByteArray = toEncryptData.getBytes();
-
-		return encryptedByteArray;
+		return toEncryptData.getBytes();
 	}
 
 	/* Decrypt a string using an encryption algorithm,
 	 * in this case TEA */
 	public static byte[] decryptTEA(byte[] toDecryptData) {
-		byte[] decryptedByteArray = new byte[]{};
-
+		byte[] decryptedByteArray;
+		
 		// no decryption
 		decryptedByteArray = toDecryptData;
-
 		return decryptedByteArray;
 	}
 
-
 	public int getPort() {
 		return port;
 	}
-
+	
 	public void updateTCPparameters(String ip, String _port) {
-
 		// stop socket
 		try {
 			if (soc != null)
@@ -395,9 +356,8 @@ public class TCPhandler implements Runnable {
 		serverHostname = ip;
 		try {
 			port = Integer.parseInt(_port);
-		} catch (Exception e) {
-
-		} finally {
+		} catch (Exception ignored) { }
+		finally {
 			port = 13589;
 		}
 	}
@@ -438,23 +398,11 @@ public class TCPhandler implements Runnable {
 			SM.Exception("restartTCP break:" + e.toString());
 			isConnectionUP = false;
 		}
-
 		triggerTCPConnectionStateEvent();
 	}
 
-	public boolean isAlive() {
-		return alive;
-	}
-
-	public void setAlive(boolean alive) {
-		this.alive = alive;
-	}
-
-	/**
-	 * close Socket when unReachable
-	 */
+	/** close Socket when unReachable */
 	public void closeSocket() {
-
 		try {
 			input = null;
 			output = null;
@@ -465,17 +413,15 @@ public class TCPhandler implements Runnable {
 			e.printStackTrace();
 		}
 	}
-
+	
 	public void Stop() {
 		SM.Debug("Stopping TCP", "TCP Connection is stopping on " + AppParams.IP + ":" + port);
 		alive = false;
-
-
-		if (mReceived != null)
+		
+		if (mReceived!= null)
 			try {
 				context.unregisterReceiver(mReceived);
-			} catch (Exception ex) {/* receiver not registered  //*/}
-		;
+			} catch(Exception ex) {/* receiver not registered  //*/}
 
 		// stop thread
 		if (listenThread != null) {
@@ -484,7 +430,6 @@ public class TCPhandler implements Runnable {
 			moribund.interrupt();
 		}
 
-
 		if (input != null) {
 			try {
 				input.close();
@@ -493,7 +438,7 @@ public class TCPhandler implements Runnable {
 				e.printStackTrace();
 			}
 		}
-
+		
 		if (output != null) {
 			try {
 				output.close();
@@ -502,15 +447,14 @@ public class TCPhandler implements Runnable {
 				e.printStackTrace();
 			}
 		}
-
-		if (soc != null) {
+		
+		if (soc !=null) {
 			try {
 				soc.close();
 				soc = null;
 			} catch (IOException e) {
-				SM.Exception("TCPClient[STOP]", "Stop break:" + e.toString());
+				SM.Exception("TCPClient[STOP]", "Stop break:"+ e);
 			}
 		}
 	}
-
-}
+}

safeDispatch/src/main/java/com/safemobile/safedispatch/HistoryActivity.java

@@ -3,6 +3,7 @@ package com.safemobile.safedispatch;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
+import android.app.AlertDialog;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
 import android.graphics.Color;
@@ -124,6 +125,18 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
             googleMap.moveCamera(CameraUpdateFactory.newLatLngZoom(latLng, 14));
     }
 
+    @Override
+    public void onBackPressed() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setMessage(getString(R.string.exit))
+                .setCancelable(false)
+                .setNeutralButton(getString(R.string.logout), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.logout))
+                .setPositiveButton(getString(R.string.ext), (dialog, id) -> parentTab.whenBackPressed(AppParams.ActivityResult.exit))
+                .setNegativeButton(getString(R.string.cancel), (dialog, id) -> dialog.cancel());
+        AlertDialog alert = builder.create();
+        alert.show();
+    }
+
     private void setDate() {
         Calendar calendar = Calendar.getInstance();
         endDate = calendar.getTime();

safeDispatch/src/main/java/com/safemobile/safedispatch/RecordingsActivity.java

@@ -42,6 +42,7 @@ public class RecordingsActivity extends Activity {
 	private GridView gridView;
 	private RecordingsGridViewAdapter adapter;
 	private View convertViewRecording;
+	private boolean isRecordingPlaying = false;
 
 	private int playingPosition = -1;
 
@@ -89,6 +90,7 @@ public class RecordingsActivity extends Activity {
 		gridView.setAdapter(adapter);
 
 		gridView.setOnItemClickListener(onItemClickListener);
+		gridView.setOnTouchListener((v, event) -> isRecordingPlaying);
 
 		if (recHandle == null && !AppParams.DEMO)
 			recHandle = new RecordingHandle(AppParams.IP);
@@ -171,12 +173,17 @@ public class RecordingsActivity extends Activity {
 		SM.Debug("onResume");
 	}
 
+
+
 	private final OnItemClickListener onItemClickListener = new OnItemClickListener() {
 		@Override
 		public void onItemClick(AdapterView<?> arg0, View view, int position, long arg3) {
 
-			// disable grid scrolling and item click 
-			gridView.setEnabled(false);
+			// disable grid scrolling and item click
+			if (isRecordingPlaying)
+				return;
+
+			isRecordingPlaying = true;
 			setConvertViewRecording(view);
 
 			// change background to playing
@@ -262,7 +269,7 @@ public class RecordingsActivity extends Activity {
 		adapter.changePlaying(getPlayingPosition(), false);
 
 		// enable grid
-		gridView.setEnabled(true);
+		isRecordingPlaying = false;
 
 		// set playing Recording position to -1
 		setPlayingPosition(-1);

safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity.java

@@ -233,10 +233,10 @@ public class SDMobileActivity extends Activity {
 			etPassword.setText(AppParams.PASSWORD.equalsIgnoreCase("n/a") ? "" : AppParams.PASSWORD);
 		}
 
-		layoutTCP = (RelativeLayout) findViewById(R.id.layoutTCP);
+		layoutTCP = findViewById(R.id.layoutTCP);
 
-		llUsername = (LinearLayout) findViewById(R.id.llUsername);
-		llPassword = (LinearLayout) findViewById(R.id.llPassword);
+		llUsername = findViewById(R.id.llUsername);
+		llPassword = findViewById(R.id.llPassword);
 
 		// enable ui after the language is changed and tcp connection is on
 		if (tcp != null && tcp.isConnectionUP) {
@@ -663,7 +663,7 @@ public class SDMobileActivity extends Activity {
 			// get default password
 			AppParams.PASSWORD = AppParams.prefs.getString(PASSWORD, "n/a");
 			// get default IP
-			AppParams.IP = AppParams.prefs.getString("ip", "192.168.2.100");
+			AppParams.IP = AppParams.prefs.getString("ip", "185.8.154.190");
 
 			// get Radio ID & IP
 			AppParams.RADIOID = AppParams.prefs.getInt("radioId", 100);
@@ -737,10 +737,10 @@ public class SDMobileActivity extends Activity {
 		Dialog dialogInfo = new Dialog(context);
 		dialogInfo.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		dialogInfo.setContentView(R.layout.dialog_login);
-		TextView textTitle = (TextView) dialogInfo.findViewById(R.id.textTitle);
-		TextView text = (TextView) dialogInfo.findViewById(R.id.text);
-		TextView text2 = (TextView) dialogInfo.findViewById(R.id.text2);
-		ImageView image = (ImageView) dialogInfo.findViewById(R.id.image);
+		TextView textTitle = dialogInfo.findViewById(R.id.textTitle);
+		TextView text = dialogInfo.findViewById(R.id.text);
+		TextView text2 = dialogInfo.findViewById(R.id.text2);
+		ImageView image = dialogInfo.findViewById(R.id.image);
 
 		textTitle.setText(getString(R.string.connectionError));
 		image.setImageResource(R.drawable.error);

safeDispatch/src/main/res/layout-large/row_livevehicle.xml

@@ -31,10 +31,10 @@
         android:paddingLeft="3dp"
 		android:layout_weight="1"/>
     <LinearLayout 
-        	android:id="@+id/linearLayoutChecked"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0"
-		    android:background="@drawable/checked">
-    </LinearLayout>
+		android:id="@+id/linearLayoutChecked"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:background="@drawable/checked"
+		android:orientation="horizontal" />
 </LinearLayout>

safeDispatch/src/main/res/layout-large/tabsetup.xml

@@ -32,7 +32,6 @@
 			                android:layout_height="wrap_content"
 			                android:text="@string/serverIP"
 			                android:textAppearance="?android:attr/textAppearanceMedium"
-			                android:textColor="#FFFFFF"
 			                android:textStyle="bold"
 			                android:layout_gravity="center_vertical"
 			                android:gravity="center_vertical|right"
@@ -67,7 +66,6 @@
 			                android:layout_height="wrap_content"
 			                android:text="@string/serverPort"
 			                android:textAppearance="?android:attr/textAppearanceMedium"
-			                android:textColor="#FFFFFF"
 			                android:textStyle="bold"
 			                android:gravity="center_vertical|right"
 			                android:layout_gravity="center_vertical|right"
@@ -112,7 +110,6 @@
 				                android:layout_height="wrap_content"
 				                android:text="@string/configName"
 				                android:textAppearance="?android:attr/textAppearanceMedium"
-				                android:textColor="#FFFFFF"
 				                android:textStyle="bold"
 				                android:gravity="center_vertical|right"
 				                android:layout_gravity="center_vertical"/>
@@ -181,7 +178,6 @@
 			            android:text="@string/language"
 			            android:textAppearance="?android:attr/textAppearanceMedium"
 			            android:textStyle="bold"
-			            android:textColor="#FFFFFF"
 			            android:gravity="right"
 			            android:layout_gravity="center_vertical"/>
 					<LinearLayout

safeDispatch/src/main/res/layout/balloonname_overlay.xml

@@ -7,9 +7,9 @@
 	android:padding="2dp"
 	android:background="@drawable/style_nameoverlay">
 
-						<TextView android:layout_height="wrap_content"
-							android:layout_width="fill_parent" 
-							android:id="@+id/balloon_vehicle_name"
-							android:textSize="12dip"
-							android:textColor="#FF000000"></TextView>
+	<TextView android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:id="@+id/balloon_vehicle_name"
+		android:textSize="12dip"
+		android:textColor="#FF000000" />
 </LinearLayout>

safeDispatch/src/main/res/layout/dialog.xml

@@ -1,37 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/layout_root"
-              android:orientation="horizontal"
-              android:layout_width="fill_parent"
-              android:layout_height="fill_parent"
-              android:padding="10dp"
-              >
-    <ImageView android:id="@+id/image"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:layout_marginRight="10dp"
-               android:layout_gravity="center_vertical"
-               android:src="@mipmap/ic_launcher"
-               />
-   <LinearLayout 
-   			  android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:orientation="vertical"
-              android:layout_gravity="center_vertical"
-              android:gravity="center_vertical">
-		    <TextView android:id="@+id/text"
-		              android:layout_width="wrap_content"
-		              android:layout_height="wrap_content"
-		              android:paddingTop="8dp"
-		              android:textSize="18dp"
-		              android:textColor="@color/black"
-		              />
-		    <TextView android:id="@+id/text2"
-		              android:layout_width="wrap_content"
-		              android:layout_height="wrap_content"
-		              android:paddingTop="8dp"
-		              android:textSize="18dp"
-		              android:textColor="@color/black"
-		              />
-     </LinearLayout>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/layout_root"
+	android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:padding="10dp" >
+    <ImageView
+		android:id="@+id/image"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginRight="10dp"
+		android:layout_gravity="center_vertical"
+		android:src="@mipmap/ic_launcher"
+		/>
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:layout_gravity="center_vertical"
+		android:gravity="center_vertical">
+		<TextView
+			android:id="@+id/text"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingTop="8dp"
+			android:textSize="18dp"
+			/>
+		<TextView
+			android:id="@+id/text2"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:paddingTop="8dp"
+			android:textSize="18dp"
+			/>
+	</LinearLayout>
 </LinearLayout>

safeDispatch/src/main/res/layout/dialog_login.xml

@@ -40,7 +40,6 @@
 			              android:paddingTop="8dp"
 			              android:text="Row1"
 			              android:textAppearance="?android:attr/textAppearanceLarge" 
-			              android:textColor="@color/black"
 			              />
 			    <TextView android:id="@+id/text2"
 			              android:layout_width="wrap_content"
@@ -48,7 +47,6 @@
 			              android:paddingTop="8dp"
 			              android:textAppearance="?android:attr/textAppearanceMedium" 
 			              android:text="Row2"
-			              android:textColor="@color/black"
 			              />
 	     </LinearLayout>
 	</LinearLayout>

safeDispatch/src/main/res/layout/dialogdatepicker.xml

@@ -61,4 +61,4 @@
 		        android:textSize="16dp" />
 		    
      </LinearLayout>
-</LinearLayout>
+</LinearLayout>

safeDispatch/src/main/res/layout/login_h.xml

@@ -217,13 +217,13 @@
 	
 	
 	<ImageView 
-		 	    	android:id="@+id/imageLoading"
-			        android:layout_width="64dp"
-			        android:layout_height="64dp"
-			        android:layout_gravity="center_vertical"
-			        android:layout_weight="0"
-			        android:visibility="gone"
-			        android:layout_alignParentTop="true"
-			        android:layout_alignParentLeft="true" />
+		android:id="@+id/imageLoading"
+		android:layout_width="64dp"
+		android:layout_height="64dp"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="0"
+		android:visibility="gone"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentLeft="true" />
 	
 </RelativeLayout>

safeDispatch/src/main/res/layout/main_before.xml

@@ -209,8 +209,6 @@
 			</LinearLayout>
 		</LinearLayout>
     </LinearLayout>
-    
-   
 
      <RelativeLayout
 		        android:id="@+id/frameLayoutLanguage"
@@ -221,20 +219,16 @@
 		        android:layout_alignParentBottom="true"
 		        android:layout_gravity="right" 
 		        android:paddingBottom="6dp"
-		        android:layout_toLeftOf="@+id/frameLayout13">
-	</RelativeLayout>
+		        android:layout_toLeftOf="@+id/frameLayout13" />
 
-	
-	
-	
 	<ImageView 
-		 	    	android:id="@+id/imageLoading"
-			        android:layout_width="64dp"
-			        android:layout_height="64dp"
-			        android:layout_gravity="center_vertical"
-			        android:layout_weight="0"
-			        android:visibility="gone"
-			        android:layout_alignParentTop="true"
-			        android:layout_alignParentLeft="true" />
+		android:id="@+id/imageLoading"
+		android:layout_width="64dp"
+		android:layout_height="64dp"
+		android:layout_gravity="center_vertical"
+		android:layout_weight="0"
+		android:visibility="gone"
+		android:layout_alignParentTop="true"
+		android:layout_alignParentLeft="true" />
 	
 </RelativeLayout>

safeDispatch/src/main/res/layout/row_livevehicle.xml

@@ -31,10 +31,10 @@
         android:paddingLeft="3dp"
 		android:layout_weight="1"/>
     <LinearLayout 
-        	android:id="@+id/linearLayoutChecked"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="0"
-		    android:background="@drawable/checked">
-    </LinearLayout>
+		android:id="@+id/linearLayoutChecked"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_weight="0"
+		android:background="@drawable/checked"
+		android:orientation="horizontal" />
 </LinearLayout>

safeDispatch/src/main/res/layout/spinner.xml

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-		android:layout_width="fill_parent"
+	android:layout_width="fill_parent"
+	android:layout_height="wrap_content"
+	android:orientation="horizontal">
+	<ImageView
+		android:id="@+id/icon"
+		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:orientation="horizontal">
-		<ImageView
-			android:id="@+id/icon"
+		android:src="@mipmap/ic_launcher"
+		android:paddingLeft="5dp"
+		android:paddingRight="5dp"
+		android:paddingTop="5dp"
+		android:paddingBottom="5dp"/>
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="fill_parent"
+		android:orientation="horizontal"
+		android:gravity="center_vertical">
+		<TextView
+			android:id="@+id/language"
+			android:textSize="20dp"
+			android:textColor="#000000"
+			android:textStyle="bold"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:src="@mipmap/ic_launcher"
-			android:paddingLeft="5dp"
-			android:paddingRight="5dp"
-			android:paddingTop="5dp"
-			android:paddingBottom="5dp"/>
-		<LinearLayout 
-		    android:layout_width="wrap_content"
-			android:layout_height="fill_parent"
-			android:orientation="horizontal"
-			android:gravity="center_vertical">
-				<TextView
-					android:id="@+id/language"
-					android:textSize="20dp"
-					android:textColor="#000000"
-					android:textStyle="bold"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:gravity="center_vertical"/>
-				
-		</LinearLayout>
+			android:gravity="center_vertical"/>
+
+	</LinearLayout>
 </LinearLayout>

safeDispatch/src/main/res/layout/style_header_alarm.xml

@@ -10,14 +10,14 @@
 	    android:gravity="center_vertical" >
 	    
 	    <ImageButton
-    			    android:id="@+id/imageButtonAdd"
-    			    android:layout_width="1dp"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="0"
-    			    android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
-    			    android:visibility="invisible"
-    			    android:background="@drawable/addmessage_selector"/>
+			android:id="@+id/imageButtonAdd"
+			android:layout_width="1dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="0"
+			android:layout_marginRight="5dp"
+			android:paddingLeft="2dp"
+			android:visibility="invisible"
+			android:background="@drawable/addmessage_selector"/>
 	    <TextView
 	        android:layout_width="fill_parent"
 	        android:layout_height="wrap_content"

safeDispatch/src/main/res/layout/style_header_units.xml

@@ -8,7 +8,6 @@
 	    android:layout_height="fill_parent"
 	    style="?header"
 	    android:gravity="center_vertical" >
-	    
 	   
 	    <TextView
 	        android:layout_width="fill_parent"
@@ -21,13 +20,13 @@
 	        android:gravity="left|center_vertical"
 	        android:textAppearance="?android:attr/textAppearanceMedium" />
 
-		 <ImageButton
-    			    android:id="@+id/imageCheckAll"
-    			    android:layout_width="wrap_content"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="0"
-    			    android:layout_marginRight="1dp"
-    			    android:paddingLeft="2dp"
-    			    android:background="@drawable/uncheck_all"/>
+		<ImageButton
+			android:id="@+id/imageCheckAll"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="0"
+			android:layout_marginRight="1dp"
+			android:paddingLeft="2dp"
+			android:background="@drawable/uncheck_all"/>
 	</LinearLayout>
 </LinearLayout>

safeDispatch/src/main/res/layout/tabalarm.xml

@@ -4,86 +4,85 @@
     android:layout_height="fill_parent"
     android:orientation="vertical"
     style="?bg">
-    <LinearLayout 
-	        android:layout_width="fill_parent" 
-	        android:layout_height="wrap_content"
-	        android:gravity="left"
-	        android:layout_weight="0"
-	        android:orientation="horizontal"
-	        style="?header"
-	        android:id="@+id/layoutHeader">
+    <LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:gravity="left"
+		android:layout_weight="0"
+		android:orientation="horizontal"
+		style="?header"
+		android:id="@+id/layoutHeader">
 
-    		    <ImageView
-			        android:id="@+id/imageViewMsg"
-			        android:layout_width="wrap_content"
-			        android:layout_height="fill_parent"
-			        android:src="@drawable/alert"
-			        android:paddingLeft="0dp"
-			        android:layout_margin="3dp"
-			        android:layout_weight="0" />
-    			<TextView
-    			    android:id="@+id/textView1"
-    			    android:layout_width="wrap_content"
-    			    android:layout_height="fill_parent"
-    			    android:gravity="center_vertical"
-    			    android:text="@string/alarms"
-    			    android:layout_marginLeft="5dp"
-    			    android:textStyle="bold"
-    			    android:paddingTop="7dp"
-    			    android:textColor="#FFFFFF"
-    			    android:textAppearance="?android:attr/textAppearanceMedium" 
-    			    android:layout_weight="0"/>
+		<ImageView
+			android:id="@+id/imageViewMsg"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:src="@drawable/alert"
+			android:paddingLeft="0dp"
+			android:layout_margin="3dp"
+			android:layout_weight="0" />
+		<TextView
+			android:id="@+id/textView1"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:gravity="center_vertical"
+			android:text="@string/alarms"
+			android:layout_marginLeft="5dp"
+			android:textStyle="bold"
+			android:paddingTop="7dp"
+			android:textColor="#FFFFFF"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:layout_weight="0"/>
 
-    			 <ImageView
-			        android:id="@+id/imageViewSeparator"
-			        android:layout_width="wrap_content"
-			        android:layout_height="fill_parent"
-			        android:layout_gravity="center_vertical"
-			        android:src="@drawable/separator_white"
-			        android:layout_margin="2dp"
-			        android:layout_weight="0"
-			        android:visibility="invisible"
-			        android:focusable="false" />
+		<ImageView
+			android:id="@+id/imageViewSeparator"
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:src="@drawable/separator_white"
+			android:layout_margin="2dp"
+			android:layout_weight="0"
+			android:visibility="invisible"
+			android:focusable="false" />
 
-				<ImageView
-				    android:id="@+id/imageViewDown"
-				    android:layout_width="20dp"
-				    android:layout_height="fill_parent"
-				    android:layout_gravity="center_vertical"
-				    android:layout_marginBottom="2dp"
-				    android:layout_marginTop="2dp"
-				    android:focusable="false"
-				    android:visibility="invisible"
-				    android:src="@drawable/arrow_menu_down" />
+		<ImageView
+			android:id="@+id/imageViewDown"
+			android:layout_width="20dp"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:layout_marginBottom="2dp"
+			android:layout_marginTop="2dp"
+			android:focusable="false"
+			android:visibility="invisible"
+			android:src="@drawable/arrow_menu_down" />
     			
-				<ImageButton
-    			    android:id="@+id/imageButtonAdd2"
-    			    android:layout_width="fill_parent"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="1"
-    			    android:scaleType="centerInside"
-    			    android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
-    			    android:visibility="invisible"
-    			    android:background="@drawable/addmessage_selector"/>
+		<ImageButton
+			android:id="@+id/imageButtonAdd2"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:scaleType="centerInside"
+			android:layout_marginRight="5dp"
+			android:paddingLeft="2dp"
+			android:visibility="invisible"
+			android:background="@drawable/addmessage_selector"/>
 
-	        	<!--  android:background="@drawable/addmessage_selector"  -->
-	        </LinearLayout>	
+	</LinearLayout>
     <LinearLayout 
-        	android:layout_width="fill_parent"
-        	android:layout_height="wrap_content"
-        	android:layout_weight="1">
-		    <GridView
-		        android:id="@+id/gridViewAlarms"
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:background="#999999"
-		        android:drawSelectorOnTop="false"
-		        android:horizontalSpacing="0dp"
-		        android:listSelector="@drawable/gridalarm_selector"
-		        android:numColumns="1"
-		        android:verticalSpacing="1dp"
-		        android:padding="5dp"/>
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:layout_weight="1">
+		<GridView
+			android:id="@+id/gridViewAlarms"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:background="#999999"
+			android:drawSelectorOnTop="false"
+			android:horizontalSpacing="0dp"
+			android:listSelector="@drawable/gridalarm_selector"
+			android:numColumns="1"
+			android:verticalSpacing="1dp"
+			android:padding="5dp"/>
 
     </LinearLayout>
 </LinearLayout>

safeDispatch/src/main/res/layout/tabradio.xml

@@ -7,356 +7,352 @@
     style="?bg">
 	    
     <LinearLayout 
-        	android:id="@+id/layoutGateway"
-        	    android:layout_height="wrap_content"
-	    	    android:layout_width="fill_parent"
-	    	    android:weightSum="100"
-	    	    android:orientation="horizontal"
-	    	    style="?header">
+		android:id="@+id/layoutGateway"
+		android:layout_height="wrap_content"
+		android:layout_width="fill_parent"
+		android:weightSum="100"
+		android:orientation="horizontal"
+		style="?header">
 
-			    	    <LinearLayout
-			    	        android:layout_width="wrap_content"
-			    	        android:layout_height="wrap_content"
-			    	        android:orientation="horizontal" >
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal" >
 
-			    	         <ImageView
-							        android:id="@+id/imageViewRadioStation"
-							        android:layout_width="wrap_content"
-							        android:layout_height="fill_parent"
-							        android:src="@drawable/enable"
-							        android:layout_weight="0" />
+			<ImageView
+				android:id="@+id/imageViewRadioStation"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:src="@drawable/enable"
+				android:layout_weight="0" />
 			    	         		
-						  			<TextView
-						  			    android:layout_width="wrap_content"
-						  			    android:layout_height="fill_parent"
-						  			    android:gravity="center_vertical"
-						  			    android:id="@+id/textViewGateway"
-						  			    android:text="n/a"
-						  			    android:layout_marginLeft="5dp"
-						  			    android:textStyle="bold"
-						  			    android:paddingTop="7dp"
-						  			    android:textColor="#FFFFFF"
-						  			    android:textAppearance="?android:attr/textAppearanceMedium" 
-						  			    android:layout_weight="1"/>
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:gravity="center_vertical"
+				android:id="@+id/textViewGateway"
+				android:text="n/a"
+				android:layout_marginLeft="5dp"
+				android:textStyle="bold"
+				android:paddingTop="7dp"
+				android:textColor="#FFFFFF"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:layout_weight="1"/>
 
 									
-						  			<TextView
-						  			    android:layout_width="wrap_content"
-						  			    android:layout_height="fill_parent"
-						  			    android:gravity="center_vertical"
-						  			    android:id="@+id/textViewIP"
-						  			    android:text="[192.168.2.100]"
-						  			    android:paddingLeft="4dp"
-						  			    android:paddingTop="17dp"
-						  			    android:textColor="#FFFFFF"
-						  			    android:visibility="gone"
-						  			    android:textAppearance="?android:attr/textAppearanceMedium" 
-						  			    android:layout_weight="1"/>
+			<TextView
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:gravity="center_vertical"
+				android:id="@+id/textViewIP"
+				android:text="[192.168.2.100]"
+				android:paddingLeft="4dp"
+				android:paddingTop="17dp"
+				android:textColor="#FFFFFF"
+				android:visibility="gone"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:layout_weight="1"/>
 						  			
-						  			<ImageView
-								        android:id="@+id/imageViewSeparator"
-								        android:layout_width="wrap_content"
-								        android:layout_height="fill_parent"
-								        android:layout_gravity="center_vertical"
-								        android:src="@drawable/separator_white"
-								        android:layout_margin="2dp"
-								        android:layout_weight="0"
-								        android:visibility="invisible"
-								        android:focusable="false" />
+			<ImageView
+				android:id="@+id/imageViewSeparator"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:src="@drawable/separator_white"
+				android:layout_margin="2dp"
+				android:layout_weight="0"
+				android:visibility="invisible"
+				android:focusable="false" />
 					
-									<ImageView
-									    android:id="@+id/imageViewDown"
-									    android:layout_width="20dp"
-									    android:layout_height="fill_parent"
-									    android:layout_gravity="center_vertical"
-									    android:layout_marginBottom="2dp"
-									    android:layout_marginTop="2dp"
-									    android:focusable="false"
-									    android:visibility="visible"
-									    android:src="@drawable/arrow_menu_down" />
+			<ImageView
+				android:id="@+id/imageViewDown"
+				android:layout_width="20dp"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:layout_marginBottom="2dp"
+				android:layout_marginTop="2dp"
+				android:focusable="false"
+				android:visibility="visible"
+				android:src="@drawable/arrow_menu_down" />
 									
-									<ImageView
-						  			     android:id="@+id/imageViewStatus"
-						  			     android:layout_width="wrap_content"
-						  			     android:layout_height="fill_parent"
-						  			     android:gravity="center_vertical"
-						  			     android:scaleType="fitCenter"
-						  			     android:src="@drawable/status_offline" />
+			<ImageView
+				 android:id="@+id/imageViewStatus"
+				 android:layout_width="wrap_content"
+				 android:layout_height="fill_parent"
+				 android:gravity="center_vertical"
+				 android:scaleType="fitCenter"
+				 android:src="@drawable/status_offline" />
 									
-			    	    </LinearLayout>
+		</LinearLayout>
 
-        	    		<LinearLayout
-        	    		    android:layout_width="fill_parent"
-        	    		    android:layout_height="wrap_content"
-        	    		    android:orientation="horizontal"
-        	    		    android:gravity="right"
-        	    		    android:layout_marginRight="8dp"
-							android:visibility="gone">
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:gravity="right"
+			android:layout_marginRight="8dp"
+			android:visibility="gone">
 				
 				  			
-				  			<ImageButton
-				  			    android:id="@+id/imageButtonAdd"
-				  			    android:layout_width="1dp"
-				  			    android:layout_height="wrap_content"
-				  			    android:layout_weight="0"
-				  			    android:layout_marginRight="2dp"
-				  			    android:paddingLeft="2dp"
-				  			    android:background="@drawable/addmessage_selector"
-				  			    android:visibility="invisible"/>
-				  			 <ImageView
-					    		    android:id="@+id/imageViewGreen"
-					    		    android:layout_width="wrap_content"
-					    		    android:layout_height="wrap_content"
-					    		    android:scaleType="fitCenter"
-					    		    android:paddingTop="4dp"
-					    		    android:src="@drawable/call_private_green_small"
-					    		    android:layout_gravity="center_vertical" />
+			<ImageButton
+				android:id="@+id/imageButtonAdd"
+				android:layout_width="1dp"
+				android:layout_height="wrap_content"
+				android:layout_weight="0"
+				android:layout_marginRight="2dp"
+				android:paddingLeft="2dp"
+				android:background="@drawable/addmessage_selector"
+				android:visibility="invisible"/>
+			<ImageView
+				android:id="@+id/imageViewGreen"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:scaleType="fitCenter"
+				android:paddingTop="4dp"
+				android:src="@drawable/call_private_green_small"
+				android:layout_gravity="center_vertical" />
 				  			 
-				  			 <TextView
-				        	        android:id="@+id/textViewLoggedIn"
-				        	        android:layout_width="wrap_content"
-				        	        android:layout_height="fill_parent"
-				        	        android:gravity="center_vertical"
-				        	        android:layout_gravity="center_vertical"
-				        	        android:text="@string/login"
-				        	        android:textColor="#FFFFFF"
-				        	        android:textSize="16dp"
-					  			    android:paddingTop="7dp" />
-				  			  </LinearLayout>
-				       	<!--  android:background="@drawable/addmessage_selector"  -->
-        	</LinearLayout>
-    
-    	<LinearLayout 
-    	    	android:layout_width="fill_parent"
-    	    	android:layout_height="wrap_content"
-    	    	android:background="@drawable/style_bluebutton"
-    	    	android:paddingLeft="5dp"
-    	    	android:paddingTop="2dp"
-    	    	android:paddingBottom="2dp"
-    	    	android:visibility="gone"
-    	    	android:orientation="horizontal">
-			<LinearLayout 
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_weight="1"
-			    android:layout_gravity="center_vertical"
-			    android:orientation="horizontal">
-	    		<TextView
-	    		    android:id="@+id/textView1"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:layout_gravity="center_vertical"
-	    		    android:text="@string/IP"
-	    		    android:textColor="#FFFFFF"
-	    		    android:textSize="17dp" />
-	    	    <TextView
-	    		    android:id="@+id/textViewIP2"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:layout_gravity="center_vertical"
-	    		    android:text="@string/emptyIP"
-	    		    android:textColor="#FFFFFF"
-	    		    android:textSize="17dp" />
-    	    </LinearLayout>
-    	    <LinearLayout 
-			    android:layout_width="wrap_content"
-			    android:layout_height="wrap_content"
-			    android:layout_weight="1"
-			    android:id="@+id/layoutGateway2">
-	    		<ImageView
-	    		    android:id="@+id/imageView1"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:src="@drawable/enable" />
-
-	    		<LinearLayout 
-			        android:layout_width="wrap_content"
-			        android:layout_height="wrap_content">
-			    	    <TextView
-			    		    android:id="@+id/textViewGateway2"
-			    		    android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
-			    		    android:text=""
-			    		    android:textColor="#FFFFFF"
-			    		    android:textSize="17dp"
-			    		    android:paddingRight="2dp"/>
-			    	    <ImageView
-			    		    android:id="@+id/imageViewGateway"
-			    		    android:layout_width="wrap_content"
-			    		    android:layout_height="fill_parent"
-			    		    android:src="@drawable/arrow_down" />
-			   	</LinearLayout>
-    	    </LinearLayout>
-    	    <LinearLayout 
-			    android:layout_width="wrap_content"
-			    android:layout_height="fill_parent"
-			    android:layout_gravity="center_vertical"
-			    android:layout_weight="6">
-	    	    <TextView
-	    		    android:id="@+id/textView3"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:layout_gravity="center_vertical"
-	    		    android:text="@string/Status"
-	    		    android:textColor="#FFFFFF"
-	    		    android:textSize="17dp" />
-	    	    <ImageView
-	    		    android:id="@+id/imageViewStatus2"
-	    		    android:layout_width="wrap_content"
-	    		    android:layout_height="fill_parent"
-	    		    android:src="@drawable/status_offline"
-	    		     />
-    	    </LinearLayout>			
-    	</LinearLayout>
-
-		<LinearLayout 
-    	    android:layout_width="fill_parent"
-    	    android:layout_height="wrap_content"
-    	    android:orientation="vertical"
-    	    android:paddingTop="2dp">
+			<TextView
+				android:id="@+id/textViewLoggedIn"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:gravity="center_vertical"
+				android:layout_gravity="center_vertical"
+				android:text="@string/login"
+				android:textColor="#FFFFFF"
+				android:textSize="16dp"
+				android:paddingTop="7dp" />
 		</LinearLayout>
+	</LinearLayout>
+    
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:background="@drawable/style_bluebutton"
+		android:paddingLeft="5dp"
+		android:paddingTop="2dp"
+		android:paddingBottom="2dp"
+		android:visibility="gone"
+		android:orientation="horizontal">
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:layout_gravity="center_vertical"
+			android:orientation="horizontal">
+			<TextView
+				android:id="@+id/textView1"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:text="@string/IP"
+				android:textColor="#FFFFFF"
+				android:textSize="17dp" />
+			<TextView
+				android:id="@+id/textViewIP2"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:text="@string/emptyIP"
+				android:textColor="#FFFFFF"
+				android:textSize="17dp" />
+		</LinearLayout>
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+			android:id="@+id/layoutGateway2">
+			<ImageView
+				android:id="@+id/imageView1"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:src="@drawable/enable" />
+
+			<LinearLayout
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content">
+				<TextView
+					android:id="@+id/textViewGateway2"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text=""
+					android:textColor="#FFFFFF"
+					android:textSize="17dp"
+					android:paddingRight="2dp"/>
+				<ImageView
+					android:id="@+id/imageViewGateway"
+					android:layout_width="wrap_content"
+					android:layout_height="fill_parent"
+					android:src="@drawable/arrow_down" />
+			</LinearLayout>
+		</LinearLayout>
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="fill_parent"
+			android:layout_gravity="center_vertical"
+			android:layout_weight="6">
+			<TextView
+				android:id="@+id/textView3"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:layout_gravity="center_vertical"
+				android:text="@string/Status"
+				android:textColor="#FFFFFF"
+				android:textSize="17dp" />
+			<ImageView
+				android:id="@+id/imageViewStatus2"
+				android:layout_width="wrap_content"
+				android:layout_height="fill_parent"
+				android:src="@drawable/status_offline" />
+		</LinearLayout>
+	</LinearLayout>
+
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		android:paddingTop="2dp">
+	</LinearLayout>
 		
-		<LinearLayout 
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
-		    android:orientation="vertical"
-		    android:layout_gravity="center"
-		    android:gravity="center">
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="fill_parent"
+		android:orientation="vertical"
+		android:layout_gravity="center"
+		android:gravity="center">
 
 		<LinearLayout 
-    			    android:layout_width="fill_parent"
-    	    		android:layout_height="wrap_content"
-    	    		android:orientation="horizontal"
-    	    		android:paddingRight="10dp"
-    	    		android:layout_gravity="center_vertical">
-    	    		<LinearLayout 
-    	    		    android:layout_weight="1"
-    	    		    android:layout_height="wrap_content"
-    	    		    android:layout_width="fill_parent"
-    	    		    android:gravity="center">
-			    		<TextView
-			    		    android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
-			    		    android:text="@string/Zone"
-			    		    android:textStyle="bold"
-			    		    android:textColor="#ffffffff"
-			    		    android:textAppearance="?android:attr/textAppearanceMedium"/>
-			    		<LinearLayout
-						    android:id="@+id/layoutSpinnerZone"
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-						    android:background="@drawable/style_spinner"
-						    android:gravity="right"
-						    android:minWidth="150dp"
-						    android:orientation="horizontal"
-						    android:paddingBottom="4dp"
-						    android:paddingLeft="3dp"
-						    android:paddingRight="3dp"
-						    android:paddingTop="4dp" >
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:paddingRight="10dp"
+			android:layout_gravity="center_vertical">
+			<LinearLayout
+				android:layout_weight="1"
+				android:layout_height="wrap_content"
+				android:layout_width="fill_parent"
+				android:gravity="center">
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/Zone"
+					android:textStyle="bold"
+					android:textAppearance="?android:attr/textAppearanceMedium"/>
+				<LinearLayout
+					android:id="@+id/layoutSpinnerZone"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:background="@drawable/style_spinner"
+					android:gravity="right"
+					android:minWidth="150dp"
+					android:orientation="horizontal"
+					android:paddingBottom="4dp"
+					android:paddingLeft="3dp"
+					android:paddingRight="3dp"
+					android:paddingTop="4dp" >
 
-						    <TextView
-						        android:id="@+id/textViewZone"
-				    		    android:layout_width="wrap_content"
-				    		    android:layout_height="wrap_content"
-				    		    android:layout_gravity="center_vertical"
-				    		    android:text=""
-				    		    android:textColor="#000000"
-				    		    android:textStyle="bold"
-				    		    android:textSize="20dp"/>
-						    <ImageView 
-						        android:src="@drawable/arrow_spinner"
-						        android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
-						        android:layout_gravity="center_vertical" />
-						</LinearLayout>
-			    	</LinearLayout>
-    	    		<LinearLayout 
-    	    		    android:layout_weight="1"
-    	    		    android:layout_height="wrap_content"
-    	    		    android:layout_width="fill_parent"
-    	    		    android:gravity="center">
-			    		<TextView
-			    		    android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
-			    		    android:text="@string/Channel"
-			    		    android:textColor="#ffffffff"
-			    		    android:textStyle="bold"
-			    		    android:textAppearance="?android:attr/textAppearanceMedium"/>
+					<TextView
+						android:id="@+id/textViewZone"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:text=""
+						android:textColor="#000000"
+						android:textStyle="bold"
+						android:textSize="20dp"/>
+					<ImageView
+						android:src="@drawable/arrow_spinner"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical" />
+				</LinearLayout>
+			</LinearLayout>
+			<LinearLayout
+				android:layout_weight="1"
+				android:layout_height="wrap_content"
+				android:layout_width="fill_parent"
+				android:gravity="center">
+				<TextView
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:text="@string/Channel"
+					android:textStyle="bold"
+					android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-						<LinearLayout
-						    android:id="@+id/layoutSpinnerChannel"
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-						    android:background="@drawable/style_spinner"
-						    android:gravity="right"
-						    android:minWidth="150dp"
-						    android:orientation="horizontal"
-						    android:paddingBottom="4dp"
-						    android:paddingLeft="3dp"
-						    android:paddingRight="3dp"
-						    android:paddingTop="4dp" >
+				<LinearLayout
+					android:id="@+id/layoutSpinnerChannel"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:background="@drawable/style_spinner"
+					android:gravity="right"
+					android:minWidth="150dp"
+					android:orientation="horizontal"
+					android:paddingBottom="4dp"
+					android:paddingLeft="3dp"
+					android:paddingRight="3dp"
+					android:paddingTop="4dp" >
 
-						    <TextView
-						        android:id="@+id/textViewChannel"
-				    		    android:layout_width="wrap_content"
-				    		    android:layout_height="wrap_content"
-				    		    android:layout_gravity="center_vertical"
-				    		    android:text=""
-				    		    android:textColor="#000000"
-				    		    android:textStyle="bold"
-				    		    android:textSize="20dp"/>
-						    <ImageView 
-						        android:src="@drawable/arrow_spinner"
-						        android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
-						        android:layout_gravity="center_vertical" />
-						</LinearLayout>
-					</LinearLayout>
-    			</LinearLayout>
+					<TextView
+						android:id="@+id/textViewChannel"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:text=""
+						android:textColor="#000000"
+						android:textStyle="bold"
+						android:textSize="20dp"/>
+					<ImageView
+						android:src="@drawable/arrow_spinner"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical" />
+				</LinearLayout>
+			</LinearLayout>
+		</LinearLayout>
 
 		<LinearLayout 
-			    	android:layout_width="fill_parent"
-			    	android:layout_height="wrap_content"
-			    	android:orientation="horizontal"
-			    	android:gravity="center"
-			    	android:layout_gravity="center_horizontal">
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			android:gravity="center"
+			android:layout_gravity="center_horizontal">
     	    		
-					<LinearLayout 
-	    	    	    android:layout_weight="1"
-	    	    	    android:layout_width="fill_parent"
-	    	    	    android:layout_height="fill_parent"
-	    	    	    android:gravity="center"
-	    	    	    android:paddingTop="3dp">
-				    	    	<LinearLayout
-				    	    	    android:layout_width="276dp"
-				    	    	    android:layout_height="93dp"
-				    	    	    android:layout_gravity="center"
-				    	    	    android:background="@drawable/screen"
-				    	    	    android:gravity="center"
-				    	    	    android:orientation="vertical"
-				    	    	    android:paddingBottom="0dp"
-				    	    	    android:paddingTop="7dp">
+			<LinearLayout
+				android:layout_weight="1"
+				android:layout_width="fill_parent"
+				android:layout_height="fill_parent"
+				android:gravity="center"
+				android:paddingTop="3dp">
+				<LinearLayout
+					android:layout_width="276dp"
+					android:layout_height="93dp"
+					android:layout_gravity="center"
+					android:background="@drawable/screen"
+					android:gravity="center"
+					android:orientation="vertical"
+					android:paddingBottom="0dp"
+					android:paddingTop="7dp">
 				
-							    		<TextView
-							    		    android:id="@+id/textViewMessageChannel"
-							    		    android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_horizontal"
-							    		    android:paddingBottom="7dp"
-							    		    android:textColor="#000000"
-							    		    android:textSize="20dp"
-							    		    android:textStyle="bold"/>
-							    		<TextView
-							    		    android:id="@+id/textViewMessageStatus"
-							    		    android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_horizontal"
-							    		    android:textColor="#000000"
-							    		    android:textSize="20dp"
-							    		    android:textStyle="bold"/>
-							    </LinearLayout>
-				    </LinearLayout>
-			    </LinearLayout>
+					<TextView
+						android:id="@+id/textViewMessageChannel"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_horizontal"
+						android:paddingBottom="7dp"
+						android:textColor="#000000"
+						android:textSize="20dp"
+						android:textStyle="bold"/>
+					<TextView
+						android:id="@+id/textViewMessageStatus"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_horizontal"
+						android:textColor="#000000"
+						android:textSize="20dp"
+						android:textStyle="bold"/>
+				</LinearLayout>
+			</LinearLayout>
+		</LinearLayout>
 		
 		<LinearLayout 
     	    android:layout_width="fill_parent"
@@ -366,104 +362,104 @@
     	    android:layout_gravity="center_horizontal"
     	    android:gravity="center_horizontal">
 
-    			<LinearLayout 
-    			    android:layout_width="fill_parent"
-    	    		android:layout_height="wrap_content"
-    	    		android:orientation="vertical"
-    	    		android:gravity="center_horizontal"
-    	    		android:layout_weight="1">
-				    	<LinearLayout 
-				    	    	android:layout_width="wrap_content"
-				    	    	android:layout_height="wrap_content"
-				    	    	android:orientation="vertical">
-		    			    	<RadioGroup android:id="@+id/radioGroupCallType" 
-		    			    	    	android:layout_width="wrap_content" 
-		    			    	    	android:layout_height="wrap_content"
-		    			    	    	android:layout_marginBottom="3sp">
+			<LinearLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="vertical"
+				android:gravity="center_horizontal"
+				android:layout_weight="1">
+				<LinearLayout
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:orientation="vertical">
+					<RadioGroup
+						android:id="@+id/radioGroupCallType"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginBottom="3sp">
 		
-					    			<RadioButton
-					    			    android:id="@+id/radioAll"
-					    			    android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
-					    			    android:checked="true"
-					    			    android:text="@string/AllCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+						<RadioButton
+							android:id="@+id/radioAll"
+							android:layout_width="wrap_content"
+							android:layout_height="30dp"
+							android:checked="true"
+							android:text="@string/AllCall"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							/>
 		
-					    			<RadioButton
-					    			    android:id="@+id/radioGroup"
-					    			    android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
-					    			    android:text="@string/GroupCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+						<RadioButton
+							android:id="@+id/radioGroup"
+							android:layout_width="wrap_content"
+							android:layout_height="30dp"
+							android:text="@string/GroupCall"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							/>
 		
-					    			<RadioButton
-					    			    android:id="@+id/radioPrivate"
-					    			    android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
-					    			    android:text="@string/PrivateCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+						<RadioButton
+							android:id="@+id/radioPrivate"
+							android:layout_width="wrap_content"
+							android:layout_height="30dp"
+							android:text="@string/PrivateCall"
+							android:textAppearance="?android:attr/textAppearanceMedium"
+							/>
 		
-					    		</RadioGroup>
-					    		 <LinearLayout
-									    android:id="@+id/layoutSpinnerCallType"
-									    android:layout_width="wrap_content"
-									    android:layout_height="wrap_content"
-									    android:background="@drawable/style_spinner"
-									    android:gravity="right"
-									    android:minWidth="150dp"
-									    android:orientation="horizontal"
-									    android:paddingBottom="4dp"
-									    android:paddingLeft="3dp"
-									    android:paddingRight="3dp"
-									    android:paddingTop="4dp"
-									    android:visibility="invisible" >
+					</RadioGroup>
+					<LinearLayout
+						android:id="@+id/layoutSpinnerCallType"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:background="@drawable/style_spinner"
+						android:gravity="right"
+						android:minWidth="150dp"
+						android:orientation="horizontal"
+						android:paddingBottom="4dp"
+						android:paddingLeft="3dp"
+						android:paddingRight="3dp"
+						android:paddingTop="4dp"
+						android:visibility="invisible" >
 			
-									    <TextView
-									        android:id="@+id/textViewCallType"
-							    		    android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_vertical"
-							    		    android:text=""
-							    		    android:textColor="#000000"
-							    		    android:textStyle="bold"
-							    		    android:textSize="20dp"/>
-									    <ImageView 
-									        android:src="@drawable/arrow_spinner"
-									        android:layout_width="wrap_content"
-									        android:layout_height="wrap_content"
-									        android:layout_gravity="center_vertical" />
-								</LinearLayout>
-			    		 </LinearLayout>
-    			</LinearLayout>
-
-    			<LinearLayout
-    			    android:layout_width="fill_parent"
-    			    android:layout_height="wrap_content"
-    			    android:layout_weight="1"
-    			    android:gravity="center_vertical|center_horizontal"
-    			    android:orientation="vertical" >
-				    	<Button
-	    			        android:id="@+id/buttonPTT"
-	    			        style="@style/ButtonPTT"
-	    			        android:layout_width="135dp"
-	    			        android:layout_height="88dp"
-	    			        android:background="@drawable/style_buttonptt"
-	    			        android:gravity="center"
-	    			        android:paddingBottom="20dp"
-	    			        android:text="@string/PTT" />
-	    			    <Button
-	    			        android:id="@+id/buttonDKey"
-	    			        style="@style/ButtonText"
-	    			        android:layout_width="135dp"
-	    			        android:layout_height="wrap_content"
-	    			        android:background="@drawable/style_bluebutton"
-	    			        android:text="@string/DeKey"
-	    			        android:textSize="18dp" />
-    			</LinearLayout>
+						<TextView
+							android:id="@+id/textViewCallType"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_gravity="center_vertical"
+							android:text=""
+							android:textColor="#000000"
+							android:textStyle="bold"
+							android:textSize="20dp"/>
+						<ImageView
+							android:src="@drawable/arrow_spinner"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_gravity="center_vertical" />
+					</LinearLayout>
+				 </LinearLayout>
+			</LinearLayout>
 
+			<LinearLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				android:gravity="center_vertical|center_horizontal"
+				android:orientation="vertical" >
+				<Button
+					android:id="@+id/buttonPTT"
+					style="@style/ButtonPTT"
+					android:layout_width="135dp"
+					android:layout_height="88dp"
+					android:background="@drawable/style_buttonptt"
+					android:gravity="center"
+					android:paddingBottom="20dp"
+					android:text="@string/PTT" />
+				<Button
+					android:id="@+id/buttonDKey"
+					style="@style/ButtonText"
+					android:layout_width="135dp"
+					android:layout_height="wrap_content"
+					android:background="@drawable/style_bluebutton"
+					android:text="@string/DeKey"
+					android:textSize="18dp" />
+			</LinearLayout>
     	</LinearLayout>
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>

safeDispatch/src/main/res/layout/tabrecordings.xml

@@ -123,19 +123,18 @@
     			    android:visibility="gone"
     			    android:background="@drawable/recycle"/>
     			
-	        	<!--  android:background="@drawable/addmessage_selector"  -->
-   </LinearLayout>
-		    
-			<GridView 
-			    	android:id="@+id/gridViewRecordings" 
-			    	android:layout_width="fill_parent" 
-			    	android:layout_height="fill_parent"
-			    	android:verticalSpacing="1dp"
-			    	android:horizontalSpacing="0dp"
-			    	android:background="#999999"
-			    	android:drawSelectorOnTop="false"
-			    	android:listSelector="@drawable/gridalarm_selector"
-			    	android:numColumns="1"
-			    	android:padding="5dp"></GridView>
 		</LinearLayout>
+		    
+		<GridView
+				android:id="@+id/gridViewRecordings"
+				android:layout_width="fill_parent"
+				android:layout_height="fill_parent"
+				android:verticalSpacing="1dp"
+				android:horizontalSpacing="0dp"
+				android:background="#999999"
+				android:drawSelectorOnTop="false"
+				android:listSelector="@drawable/gridalarm_selector"
+				android:numColumns="1"
+				android:padding="5dp"></GridView>
+	</LinearLayout>
 </LinearLayout>

safeDispatch/src/main/res/layout/tabsetup.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layoutMain"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -10,246 +11,237 @@
 	    android:layout_height="fill_parent"
 	    android:layout_width="fill_parent"
 	    android:layout_weight="80">
-		    <LinearLayout
-		        android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
-		        android:orientation="vertical"
-		        android:layout_gravity="center"
-		        android:paddingLeft="5dp"
-		        android:paddingBottom="50dp" >
-				<LinearLayout 
-				    android:layout_width="fill_parent"
-				    android:layout_height="wrap_content"
-				    android:orientation="horizontal">
-				 <LinearLayout 
-			         	 android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
-			           	 android:gravity="left"
-			           	 android:paddingTop="10dp"
-			           	 android:paddingLeft="7dp"
-			           	 android:layout_weight="0.4">
-			            <TextView
-			                android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
-			                android:text="@string/serverIP"
-			                android:textSize="14dp"
-			                android:textColor="#FFFFFF"
-			                android:textStyle="bold"
-			                android:layout_gravity="center_vertical"
-			                android:gravity="center_vertical|right"
-			                android:layout_weight="2"/>
+		<LinearLayout
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:layout_gravity="center"
+			android:paddingLeft="5dp"
+			android:paddingBottom="50dp" >
+			<LinearLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal">
+				<LinearLayout
+					 android:layout_width="fill_parent"
+					 android:layout_height="wrap_content"
+					 android:orientation="horizontal"
+					 android:gravity="left"
+					 android:paddingTop="10dp"
+					 android:paddingLeft="7dp"
+					 android:layout_weight="0.4">
+					<TextView
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:text="@string/serverIP"
+						android:textSize="14dp"
+						android:textStyle="bold"
+						android:layout_gravity="center_vertical"
+						android:gravity="center_vertical|right"
+						android:layout_weight="2"/>
 		
-			            <LinearLayout
-			                android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
-			                android:layout_weight="1" 
-			                android:paddingTop="3dp">
-			                <EditText
-			                    android:id="@+id/appServerIP"
-			                    android:layout_width="wrap_content"
-			                    android:layout_height="wrap_content"
-			                    android:gravity="center"
-			                    android:minWidth="200dp"
-			                    android:singleLine="true"
-			                    android:imeOptions="actionDone" >
-			                </EditText>
-			            </LinearLayout>
+					<LinearLayout
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:paddingTop="3dp">
+						<EditText
+							android:id="@+id/appServerIP"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:gravity="center"
+							android:minWidth="200dp"
+							android:singleLine="true"
+							android:imeOptions="actionDone" >
+						</EditText>
+					</LinearLayout>
 		
 				</LinearLayout>
-				 <LinearLayout 
-			         	 android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
-			           	 android:gravity="left"
-			           	 android:paddingTop="10dp"
-			           	 android:layout_weight="0.6">
-			            <TextView
-			                android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
-			                android:text="@string/serverPort"
-			                android:textSize="14dp"
-			                android:textColor="#FFFFFF"
-			                android:textStyle="bold"
-			                android:gravity="center_vertical|right"
-			                android:layout_gravity="center_vertical|right"
-			                android:layout_weight="1.4"/>
-			            <LinearLayout 
-			                	android:layout_width="fill_parent"
-			                	android:layout_height="wrap_content"
-			                	android:layout_weight="1"
-			                	android:paddingTop="3dp">
-					            <EditText 
-					           			android:layout_height="wrap_content" 
-					           			android:id="@+id/appServerPort" 
-					           			android:maxLength="5"
-					           			android:minWidth="73dp"
-					           			android:gravity="center"
-					           			android:layout_width="wrap_content"
-					           			android:layout_gravity="center_vertical|right"
-					           			android:inputType="number"
-					           			android:imeOptions="actionDone">
-								</EditText>
-						</LinearLayout>
+			 	<LinearLayout
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content"
+					android:orientation="horizontal"
+					android:gravity="left"
+					android:paddingTop="10dp"
+					android:layout_weight="0.6">
+					<TextView
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:text="@string/serverPort"
+						android:textSize="14dp"
+						android:textStyle="bold"
+						android:gravity="center_vertical|right"
+						android:layout_gravity="center_vertical|right"
+						android:layout_weight="1.4"/>
+					<LinearLayout
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_weight="1"
+						android:paddingTop="3dp">
+						<EditText
+							android:layout_height="wrap_content"
+							android:id="@+id/appServerPort"
+							android:maxLength="5"
+							android:minWidth="73dp"
+							android:gravity="center"
+							android:layout_width="wrap_content"
+							android:layout_gravity="center_vertical|right"
+							android:inputType="number"
+							android:imeOptions="actionDone" />
+					</LinearLayout>
 				</LinearLayout>
 			</LinearLayout>
-			
-			
+
 			<LinearLayout 
 			    android:layout_width="fill_parent"
 			    android:layout_height="wrap_content"
 			    android:orientation="horizontal"
 			    android:id="@+id/layoutPath">
 			    <LinearLayout 
-			         	 android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
-			           	 android:paddingTop="0dp"
-			           	 android:gravity="center_vertical|left">
-					    <LinearLayout 
-			                	android:layout_height="wrap_content"
-			                	android:layout_width="95dp"
-			                	android:layout_weight="0">
-				            <TextView
-				                android:layout_width="fill_parent"
-				                android:layout_height="wrap_content"
-				                android:text="@string/configName"
-				                android:textSize="14dp"
-				                android:textColor="#FFFFFF"
-				                android:textStyle="bold"
-				                android:gravity="center_vertical|right"
-				                android:layout_gravity="center_vertical"/>
-			            </LinearLayout>
-			            <LinearLayout 
-			                	android:layout_height="wrap_content"
-			                	android:layout_width="0dp"
-			                	android:layout_weight="1"
-			                	android:paddingTop="3dp">
+					 android:layout_width="fill_parent"
+					 android:layout_height="wrap_content"
+					 android:orientation="horizontal"
+					 android:paddingTop="0dp"
+					 android:gravity="center_vertical|left">
+					<LinearLayout
+						android:layout_height="wrap_content"
+						android:layout_width="95dp"
+						android:layout_weight="0">
+						<TextView
+							android:layout_width="fill_parent"
+							android:layout_height="wrap_content"
+							android:text="@string/configName"
+							android:textSize="14dp"
+							android:textStyle="bold"
+							android:gravity="center_vertical|right"
+							android:layout_gravity="center_vertical"/>
+					</LinearLayout>
+					<LinearLayout
+						android:layout_height="wrap_content"
+						android:layout_width="0dp"
+						android:layout_weight="1"
+						android:paddingTop="3dp">
 		
-			                <EditText
-			                    android:id="@+id/editTextPath"
-			                    android:layout_width="fill_parent"
-			                    android:layout_height="wrap_content"
-			                    android:gravity="right|center_vertical"
-			                    android:text="serial"
-			                    android:imeOptions="actionDone"
-			                    android:minWidth="73dp"
-			                    
-			                    android:singleLine="true" >
-			                    <requestFocus />
-			                </EditText>
+						<EditText
+							android:id="@+id/editTextPath"
+							android:layout_width="fill_parent"
+							android:layout_height="wrap_content"
+							android:gravity="right|center_vertical"
+							android:text="serial"
+							android:imeOptions="actionDone"
+							android:minWidth="73dp"
+
+							android:singleLine="true" >
+							<requestFocus />
+						</EditText>
+					</LinearLayout>
+					<LinearLayout
+						android:layout_height="wrap_content"
+						android:layout_width="wrap_content"
+						android:layout_weight="0"
+						android:paddingTop="3dp">
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:id="@+id/btn_browse"
+							android:text="@string/load"
+							style="@style/ButtonText"
+							android:textColor="#000"
+							android:textSize="18dp"/>
+					</LinearLayout>
+					<LinearLayout
+						android:layout_height="wrap_content"
+						android:layout_width="wrap_content"
+						android:layout_weight="0"
+						android:paddingTop="3dp"
+						android:paddingRight="3dp">
 		
-						</LinearLayout>
-			            <LinearLayout 
-			                	android:layout_height="wrap_content"
-			                	android:layout_width="wrap_content"
-			                	android:layout_weight="0"
-			                	android:paddingTop="3dp">
-					            <Button
-									android:layout_width="wrap_content"
-									android:layout_height="wrap_content"
-									android:id="@+id/btn_browse"
-									android:text="@string/load"
-									style="@style/ButtonText"
-									android:textColor="#000"
-									android:textSize="18dp"/>
-						</LinearLayout>
-						<LinearLayout 
-			                	android:layout_height="wrap_content"
-			                	android:layout_width="wrap_content"
-			                	android:layout_weight="0"
-			                	android:paddingTop="3dp"
-			                	android:paddingRight="3dp">
-		
-							<ImageView
-							    android:id="@+id/imageViewQuestionMark"
-							    android:layout_width="wrap_content"
-							    android:layout_height="wrap_content"
-							    android:src="@drawable/questionmark_small" />
-						</LinearLayout>
+						<ImageView
+							android:id="@+id/imageViewQuestionMark"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:src="@drawable/questionmark_small" />
+					</LinearLayout>
 				</LinearLayout>
-			    
 			</LinearLayout>
 			
 			<LinearLayout
-			        android:id="@+id/frameLayout11"
-			        android:layout_width="fill_parent"
-			        android:layout_height="wrap_content"
-			        android:orientation="horizontal"
-			        android:gravity="left" >
+				android:id="@+id/frameLayout11"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal"
+				android:gravity="left" >
 			
-			        <TextView
-			            android:layout_width="95dp"
-			            android:layout_height="wrap_content"
-			            android:text="@string/language"
-			            android:textSize="14dp"
-						android:layout_marginRight="2dp"
-			            android:textColor="#FFFFFF"
-			            android:textStyle="bold"
-			            android:gravity="right"
-			            android:layout_gravity="center_vertical"/>
-					<LinearLayout
-						    android:id="@+id/layoutSpinnerLanguage"
-						    android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
-						    android:background="@drawable/style_spinner"
-						    android:gravity="left|center_vertical"
-						    android:minWidth="223dp"
-						    android:orientation="horizontal"
-						    android:paddingBottom="4dp"
-						    android:paddingLeft="3dp"
-						    android:paddingRight="3dp"
-						    android:paddingTop="4dp" >
-					    	 <ImageView 
-					    	    android:id="@+id/imageLanguage"
-						        android:src="@drawable/de"
-						        android:layout_width="wrap_content"
-						        android:layout_height="fill_parent"
-						        android:layout_gravity="center_vertical"
-						        android:layout_weight="0" />
-						    <TextView
-						        android:id="@+id/textViewSpinnerLanguage"
-				    		    android:layout_width="fill_parent"
-				    		    android:layout_height="wrap_content"
-				    		    android:layout_gravity="center_vertical"
-				    		    android:gravity="left"
-				    		    android:text="Germany"
-				    		    android:textColor="#000000"
-				    		    android:textSize="17dp"
-				    		    android:layout_weight="1"
-				    		    android:paddingBottom="2dp"
-				    		    android:paddingLeft="3dp">
-				    		    	<requestFocus />
-				    		    </TextView>
-						    <ImageView 
-						        android:src="@drawable/arrow_spinner"
-						        android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
-						        android:layout_gravity="center_vertical"
-						        android:layout_weight="0" />
-						</LinearLayout>
+				<TextView
+					android:layout_width="95dp"
+					android:layout_height="wrap_content"
+					android:text="@string/language"
+					android:textSize="14dp"
+					android:layout_marginRight="2dp"
+					android:textStyle="bold"
+					android:gravity="right"
+					android:layout_gravity="center_vertical"/>
+				<LinearLayout
+					android:id="@+id/layoutSpinnerLanguage"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:background="@drawable/style_spinner"
+					android:gravity="left|center_vertical"
+					android:minWidth="223dp"
+					android:orientation="horizontal"
+					android:paddingBottom="4dp"
+					android:paddingLeft="3dp"
+					android:paddingRight="3dp"
+					android:paddingTop="4dp" >
+					<ImageView
+						android:id="@+id/imageLanguage"
+						android:src="@drawable/de"
+						android:layout_width="wrap_content"
+						android:layout_height="fill_parent"
+						android:layout_gravity="center_vertical"
+						android:layout_weight="0" />
+					<TextView
+						android:id="@+id/textViewSpinnerLanguage"
+						android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:gravity="left"
+						android:text="Germany"
+						android:textColor="#000000"
+						android:textSize="17dp"
+						android:layout_weight="1"
+						android:paddingBottom="2dp"
+						android:paddingLeft="3dp">
+						<requestFocus />
+					</TextView>
+					<ImageView
+						android:src="@drawable/arrow_spinner"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
+						android:layout_weight="0" />
+				</LinearLayout>
 			</LinearLayout>
 			
-				<LinearLayout 
-			         	 android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
-			           	 android:gravity="center_horizontal"
-			           	 android:layout_marginTop="20dp">
-			            <Button
-							android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
-							android:id="@+id/btn_save"
-							android:text="@string/save"
-							style="@style/ButtonText"
-							android:textSize="22dp"
-		    			    android:background="@drawable/style_bluebutton"/>
-				</LinearLayout>
+			<LinearLayout
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal"
+				android:gravity="center_horizontal"
+				android:layout_marginTop="20dp">
+				<Button
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:id="@+id/btn_save"
+					android:text="@string/save"
+					style="@style/ButtonText"
+					android:textSize="22dp"
+					android:background="@drawable/style_bluebutton"/>
+			</LinearLayout>
 		</LinearLayout>
 	</LinearLayout>
-<RelativeLayout 
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+	<RelativeLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"/>
     
-</RelativeLayout> 
 </LinearLayout>