text color on radio

Reviewed-on: #11
Reviewed-by: Adriana <adriana.epure@safemobile.com>

libSafeMobile/src/main/java/com/safemobile/enums/AuthorizationCode.java

@@ -0,0 +1,10 @@
+package com.safemobile.enums;
+
+public enum AuthorizationCode {
+    UNKNOWN,
+    RECORD_AUDIO,
+    CAMERA,
+    GEOLOCATION,
+    READ_EXTERNAL_STORAGE,
+    WRITE_EXTERNAL_STORAGE
+}

libSafeMobile/src/main/java/com/safemobile/enums/AuthorizationStatus.java

@@ -0,0 +1,7 @@
+package com.safemobile.enums;
+
+public enum AuthorizationStatus {
+    AUTHORIZE,
+    DENIED,
+    NOT_DETERMINED
+}

libSafeMobile/src/main/java/com/safemobile/enums/ProviderSettingsStatus.java

@@ -0,0 +1,6 @@
+package com.safemobile.enums;
+
+public enum ProviderSettingsStatus {
+    APPLICATION_DETAILS,
+    SETTINGS
+}

libSafeMobile/src/main/java/com/safemobile/helpers/ProviderSettingsHelper.java

@@ -0,0 +1,37 @@
+package com.safemobile.helpers;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.Settings;
+
+import com.safemobile.enums.ProviderSettingsStatus;
+
+public class ProviderSettingsHelper {
+    public static final String PACKAGE = "package";
+    public static final String ACTION_APPLICATION_DETAILS_SETTINGS = Settings.ACTION_APPLICATION_DETAILS_SETTINGS;
+    public static final String ACTION_SETTINGS = Settings.ACTION_SETTINGS;
+
+    private ProviderSettingsHelper() {
+
+    }
+
+    public static String getAction(ProviderSettingsStatus providerSettingsStatus) {
+        switch (providerSettingsStatus) {
+            case APPLICATION_DETAILS:
+                return ACTION_APPLICATION_DETAILS_SETTINGS;
+            case SETTINGS:
+            default:
+                return ACTION_SETTINGS;
+        }
+    }
+
+    public static boolean canHandleAction(Context context, String action) {
+        Intent intent = new Intent(action);
+        Uri uri = Uri.fromParts(PACKAGE, context.getPackageName(), null);
+
+        intent.setData(uri);
+
+        return context.getPackageManager() != null && intent.resolveActivity(context.getPackageManager()) != null;
+    }
+}

libSafeMobile/src/main/java/com/safemobile/interfaces/IDialogService.java

@@ -0,0 +1,12 @@
+package com.safemobile.interfaces;
+
+import android.app.Activity;
+
+import com.google.android.gms.tasks.Task;
+
+public interface IDialogService {
+    Task<Boolean> showDialog(Activity activity, String title, String message, String cancel, String ok);
+    Task<Boolean> showPermissionRequestDialog(Activity activity, String message, String cancel);
+
+    void showError(Activity activity, String message);
+}

libSafeMobile/src/main/java/com/safemobile/interfaces/IPermissionModule.java

@@ -0,0 +1,11 @@
+package com.safemobile.interfaces;
+
+import android.app.Activity;
+
+import com.safemobile.enums.AuthorizationCode;
+import com.safemobile.enums.AuthorizationStatus;
+
+public interface IPermissionModule {
+  AuthorizationStatus getAuthorizationStatus(Activity activity, AuthorizationCode authorizationCode);
+  void requestAuthorization(Activity activity, AuthorizationCode authorizationCode);
+}

libSafeMobile/src/main/java/com/safemobile/interfaces/ITCPListener.java

@@ -16,7 +16,7 @@ public interface ITCPListener {
 	public void onHistoryPositionsCountReceived( TCPEvent event );
 	public void onAlarmsReceived( TCPEvent event );
 	public void onAlarmAckReceived(TCPEvent event);
-	public void alarmLiveRecv(TCPEvent event);
+	public void alarmLiveReceived(TCPEvent event);
 	
 	public void onRecordingPlayReceived(TCPEvent event);
 	public void onPollReceived(TCPEvent event);
@@ -27,7 +27,7 @@ public interface ITCPListener {
 	public void onRecordingsListReceived(TCPEvent event);
 
 	public void onPONGReceived();
-	public void onTCPConnectionDown(boolean previuosWasConnectionUp);
+	public void onTCPConnectionDown(boolean previousWasConnectionUp);
-	public void onTCPConnectionUp(boolean previuosWasConnectionUp);
+	public void onTCPConnectionUp(boolean previousWasConnectionUp);
-	public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previuosWasConnectionUp);
+	public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previousWasConnectionUp);
 }

libSafeMobile/src/main/java/com/safemobile/lib/AppParams.java

@@ -27,7 +27,7 @@ public class AppParams {
 	
 	/* SafeMobile Dispatch */
 	public static ArrayList<User> allUsers = new ArrayList<User>();
-	public static Theme theme = Theme.SAFENET;			// the Theme type
+	public static Theme theme = Theme.SAFEDISPATCH;			// the Theme type
 	
 	
 	/* ***************************************** */

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

@@ -25,7 +25,7 @@ public class TCPhandler implements Runnable
 	private boolean alive = true;
 	
 	public String serverHostname = new String ("10.120.1.114");//
-	private int port = 13579;
+	private int port;
 	private Thread listenThread;
 	private Socket soc =null;
 	

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

@@ -10,7 +10,6 @@ import com.safemobile.interfaces.TCPEvent;
 import com.safemobile.lib.OperationCodes;
 import com.safemobile.lib.SM;
 import com.safemobile.lib.TCPmsg;
-import com.safemobile.services.TCPhandler;
 
 
 public class TCPmsgParser implements Runnable{
@@ -150,7 +149,7 @@ public class TCPmsgParser implements Runnable{
         TCPEvent event = new TCPEvent( this, _msg );
         Iterator<ITCPListener> listeners = _listeners.iterator();
         while( listeners.hasNext() ) {
-            ( (ITCPListener) listeners.next() ).alarmLiveRecv(event);
+            ( (ITCPListener) listeners.next() ).alarmLiveReceived(event);
         }
     }
     

safeDispatch/src/main/AndroidManifest.xml

@@ -7,13 +7,15 @@
         android:glEsVersion="0x00020000"
         android:required="true" />
 
-    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.CAMERA" android:required="false"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.READ_GSERVICES" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature

safeDispatch/src/main/java/com/safemobile/lib/DialogService.java

@@ -0,0 +1,50 @@
+package com.safemobile.lib;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+
+import com.google.android.gms.tasks.Task;
+import com.google.android.gms.tasks.TaskCompletionSource;
+import com.safemobile.safedispatch.R;
+import com.safemobile.interfaces.IDialogService;
+
+public class DialogService implements IDialogService {
+    @Override
+    public Task<Boolean> showDialog(Activity activity, String title, String message, String cancel, String ok) {
+        TaskCompletionSource<Boolean> taskCompletionSource = new TaskCompletionSource<>();
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity)
+                .setTitle(title)
+                .setMessage(message)
+                .setCancelable(false)
+                .setNegativeButton(cancel, (dialog, which) -> {
+                    taskCompletionSource.trySetResult(false);
+                    dialog.dismiss();
+                })
+                .setPositiveButton(ok, (dialog, which) -> taskCompletionSource.trySetResult(true));
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+
+        return taskCompletionSource.getTask();
+    }
+
+    @Override
+    public Task<Boolean> showPermissionRequestDialog(Activity activity, String message, String cancel) {
+        return showDialog(
+                activity,
+                activity.getString(R.string.permission_denied),
+                message,
+                cancel,
+                activity.getString(R.string.go_to_settings));
+    }
+
+    @Override
+    public void showError(Activity activity, String message) {
+        showDialog(
+                activity,
+                activity.getString(R.string.DialogService_Info_ErrorMessage),
+                message,
+                null,
+                activity.getString(R.string.ok));
+    }
+}

safeDispatch/src/main/java/com/safemobile/lib/PermissionModule.java

@@ -0,0 +1,97 @@
+package com.safemobile.lib;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.pm.PackageManager;
+
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import com.safemobile.enums.AuthorizationCode;
+import com.safemobile.enums.AuthorizationStatus;
+import com.safemobile.interfaces.IPermissionModule;
+
+import java.security.InvalidParameterException;
+
+public class PermissionModule implements IPermissionModule {
+    private static final String[] AUDIO_PERMISSIONS = {Manifest.permission.RECORD_AUDIO};
+    private static final String[] LOCATION_PERMISSIONS = {
+            Manifest.permission.ACCESS_COARSE_LOCATION,
+            Manifest.permission.ACCESS_FINE_LOCATION
+    };
+    private static final String[] CAMERA_PERMISSIONS = {Manifest.permission.CAMERA};
+    private static final String[] READ_EXTERNAL_STORAGE_PERMISSIONS = {Manifest.permission.READ_EXTERNAL_STORAGE};
+    private static final String[] WRITE_EXTERNAL_STORAGE_PERMISSIONS = {Manifest.permission.WRITE_EXTERNAL_STORAGE};
+
+    public static final int RECORD_AUDIO_PERMISSION_REQUEST_CODE = 13042022;
+    public static final int LOCATION_PERMISSION_REQUEST_CODE = 12021990;
+    public static final int CAMERA_PERMISSION_REQUEST_CODE = 16031989;
+    public static final int READ_STORAGE_PERMISSION_REQUEST_CODE = 30062018;
+    public static final int WRITE_STORAGE_PERMISSION_REQUEST_CODE = 13122012;
+
+    private boolean permissionPrompShowed;
+
+
+    @Override
+    public AuthorizationStatus getAuthorizationStatus(Activity activity, AuthorizationCode authorizationCode) {
+        switch (authorizationCode) {
+            case RECORD_AUDIO:
+                return getPermissionAuthorizationStatus(activity, Manifest.permission.RECORD_AUDIO);
+            case CAMERA:
+                return getPermissionAuthorizationStatus(activity, Manifest.permission.CAMERA);
+            case GEOLOCATION:
+                return getPermissionAuthorizationStatus(activity, Manifest.permission.ACCESS_COARSE_LOCATION);
+            case READ_EXTERNAL_STORAGE:
+                return getPermissionAuthorizationStatus(activity, Manifest.permission.READ_EXTERNAL_STORAGE);
+            case WRITE_EXTERNAL_STORAGE:
+                return getPermissionAuthorizationStatus(activity, Manifest.permission.WRITE_EXTERNAL_STORAGE);
+            case UNKNOWN:
+                throw new InvalidParameterException(authorizationCode.name());
+            default:
+                throw new IllegalArgumentException(authorizationCode.name());
+        }
+    }
+
+    @Override
+    public void requestAuthorization(Activity activity, AuthorizationCode authorizationCode) {
+        switch (authorizationCode) {
+            case RECORD_AUDIO:
+                ActivityCompat.requestPermissions(activity, AUDIO_PERMISSIONS, RECORD_AUDIO_PERMISSION_REQUEST_CODE);
+                break;
+            case CAMERA:
+                ActivityCompat.requestPermissions(activity, CAMERA_PERMISSIONS, CAMERA_PERMISSION_REQUEST_CODE);
+                break;
+            case GEOLOCATION:
+                ActivityCompat.requestPermissions(activity, LOCATION_PERMISSIONS, LOCATION_PERMISSION_REQUEST_CODE);
+                break;
+            case READ_EXTERNAL_STORAGE:
+                ActivityCompat.requestPermissions(activity, READ_EXTERNAL_STORAGE_PERMISSIONS, READ_STORAGE_PERMISSION_REQUEST_CODE);
+                break;
+            case WRITE_EXTERNAL_STORAGE:
+                ActivityCompat.requestPermissions(activity, WRITE_EXTERNAL_STORAGE_PERMISSIONS, WRITE_STORAGE_PERMISSION_REQUEST_CODE);
+                break;
+            case UNKNOWN:
+                throw new InvalidParameterException(authorizationCode.name());
+            default:
+                throw new IllegalArgumentException(authorizationCode.name());
+        }
+        permissionPrompShowed = true;
+    }
+
+    private AuthorizationStatus getPermissionAuthorizationStatus(Activity activity, String permission) {
+        int permissionState = ContextCompat.checkSelfPermission(activity.getApplicationContext(), permission);
+
+        return authorizationStatus(activity, permissionState);
+    }
+
+    private AuthorizationStatus authorizationStatus(Activity activity, int permissionState) {
+        if (permissionState == PackageManager.PERMISSION_GRANTED)
+            return AuthorizationStatus.AUTHORIZE;
+        if (!permissionPrompShowed)
+            return AuthorizationStatus.NOT_DETERMINED;
+
+        boolean shouldShowPermissionPrompt = ActivityCompat.shouldShowRequestPermissionRationale(activity, Manifest.permission.ACCESS_COARSE_LOCATION);
+
+        return shouldShowPermissionPrompt ? AuthorizationStatus.NOT_DETERMINED : AuthorizationStatus.DENIED;
+    }
+}

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

@@ -76,7 +76,7 @@ public class AlarmActivity extends Activity {
 		textView1.setTypeface(Typeface.createFromAsset(getAssets(), "Sketch_Block.ttf"));
 		textView1.setTextSize(24);
 
-		getParentTab().alarmActivity = this;
+		getParentTab().setAlarmActivity(this);
 	}
 
 	@Override

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

@@ -60,7 +60,7 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
         setContentView(R.layout.tabhistory);
 
         parentTab = (TabLayoutActivity) getParent();
-        parentTab.historyActivity = this;
+        parentTab.setHistoryActivity(this);
 
         Locale locale = new Locale(AppParams.LANGUAGETMP);
         Locale.setDefault(locale);
@@ -85,17 +85,17 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
         displayButton.setOnClickListener(view -> {
             googleMap.clear();
             if (!AppParams.DEMO) {
-                parentTab.dropAllData =false;
+                parentTab.setDropAllData(false);
-                parentTab.firstHistData = true;
+                parentTab.setFirstHistoryData(true);
-                parentTab.HistMsgList.clear();
+                parentTab.clearHistoryMessageList();
-                parentTab.HistPosList.clear();
+                parentTab.clearHistoryPositionList();
 
 //                request history
                 parentTab.executeNetworkStuff(new String[] {OperationCodes.GetHistoryPositions + "", allVehicle.get(spinnerVehicle.getSelectedItemPosition()).sc_id + "",
                         (startDate.getTime()/ 1000L) + "", (endDate.getTime()/ 1000L) + ""});
             } else {
                 parentTab.demoPositionsList();
-                displayHistory(parentTab.demoPositions);
+                displayHistory(parentTab.getDemoPositions());
             }
         });
 
@@ -204,10 +204,10 @@ public class HistoryActivity extends AppCompatActivity implements OnMapReadyCall
 
     final Runnable UpdateMapResults = new Runnable() {
         public void run() {
-            Log.v("updateMap", parentTab.HistPosList.toString());
+            Log.v("updateMap", parentTab.getHistoryPositionList().toString());
             SM.Debug("Do the Display");
-            infoBubble.setHistoryPositions(parentTab.HistPosList);
+            infoBubble.setHistoryPositions(parentTab.getHistoryPositionList());
-            displayHistory(parentTab.HistPosList);
+            displayHistory(parentTab.getHistoryPositionList());
         }
     };
 

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

@@ -112,7 +112,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
         // get parentTab
         setParentTab((AbstractSDParentActivity) getParent());
         try {
-            ((TabLayoutActivity) getParentTab()).liveActivity = this;
+            ((TabLayoutActivity) getParentTab()).setLiveActivity(this);
         } catch (Exception ignored) {
             // ignored
         }

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

@@ -215,7 +215,7 @@ public class MessagesActivity extends Activity {
 
 		gridView.setId(1);    // id needed for IconContextMenu
 		registerForContextMenu(gridView);
-		parentTab.messageActivity = this;
+		parentTab.setMessageActivity(this);
 	}
 
 	// Create runnable for posting

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

@@ -236,7 +236,7 @@ public class RadioActivity extends Activity {
 			}
 			
 			// send current activity to parrent
-			parentTab.radioActivity = this;
+			parentTab.setRadioActivity(this);
 			
 			// register to be notified when an event is triggered
 	    	registerBroadcastIntents();
@@ -315,10 +315,10 @@ public class RadioActivity extends Activity {
 			if(!pttONoff)
 			{
 				String chanMsg = "", statMsg = "";
-				if(parentTab.crtRadio!= null)
+				if(parentTab.getCrtRadio() != null)
-					SendPTT(selectedCallType, selectedID,parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID,AppParams.USERID);
+					SendPTT(selectedCallType, selectedID, parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID,AppParams.USERID);
 				// flag in Call
-				parentTab.inCall = true;
+				parentTab.setInCall(true);
 				pttONoff= true;
 				if(audioH!=null)
 					audioH.soundNeeded = true;
@@ -381,7 +381,7 @@ public class RadioActivity extends Activity {
 	{
 		String chanMsg = "", statMsg = "";
 		if(!AppParams.DEMO)
-			SendPTT(selectedCallType+10, 1,parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID,AppParams.USERID);
+			SendPTT(selectedCallType+10, 1, parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID,AppParams.USERID);
 		pttONoff= false;
 		if(audioH!=null)
 			audioH.soundNeeded = false;
@@ -417,7 +417,7 @@ public class RadioActivity extends Activity {
 		
 		@Override
 		public void onClick(View v) {
-			if(parentTab.crtRadio!=null)
+			if(parentTab.getCrtRadio() !=null)
 			{
 				// display dialog with adapter
 				ArrayList<String> tmp = new ArrayList<String>();
@@ -438,7 +438,7 @@ public class RadioActivity extends Activity {
 						//textViewChannel.setText(crtChannels.get(which).chName);
 						
 						// send change to App
-						onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, getNR4Zone(textViewZone.getText().toString()), getNR4CH(crtChannels.get(which).chName));
+						onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, getNR4Zone(textViewZone.getText().toString()), getNR4CH(crtChannels.get(which).chName));
 					}
 				});
 				
@@ -492,7 +492,7 @@ public class RadioActivity extends Activity {
 		
 		@Override
 		public void onClick(View v) {
-			if(parentTab.crtRadio!=null)
+			if(parentTab.getCrtRadio() !=null)
 			{
 				// display dialog with adapter
 				ArrayList<String> tmp = new ArrayList<String>();
@@ -511,7 +511,7 @@ public class RadioActivity extends Activity {
 						
 						// send change to App
 						//onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, getNR4Zone(crtZones.get(which).ZoneName), getNR4CH(textViewChannel.getText().toString()));
-						onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, getNR4Zone(crtZones.get(which).ZoneName), 1);
+						onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, getNR4Zone(crtZones.get(which).ZoneName), 1);
 					}
 				});
 				
@@ -560,7 +560,7 @@ public class RadioActivity extends Activity {
 		
 		@Override
 		public void onClick(View v) {
-			if(parentTab.crtRadio!=null)
+			if(parentTab.getCrtRadio() !=null)
 			{
 				// create spinner selected
 				AlertDialog.Builder builder = new AlertDialog.Builder(context);
@@ -686,17 +686,17 @@ public class RadioActivity extends Activity {
 	{
 		// save radios
 		AppParams.listRadios = radios;
-		if(parentTab.crtRadio == null)
+		if(parentTab.getCrtRadio() == null)
-			parentTab.crtRadio = AppParams.listRadios.get(0);
+			parentTab.setCrtRadio(AppParams.listRadios.get(0));
 		// if crtRadio not exists anymore
-		if(!AppParams.listRadios.contains(parentTab.crtRadio))
+		if(!AppParams.listRadios.contains(parentTab.getCrtRadio()))
-			parentTab.crtRadio = AppParams.listRadios.get(0);
+			parentTab.setCrtRadio(AppParams.listRadios.get(0));
 
-		SM.Debug(parentTab.crtRadio.toString());
+		SM.Debug(parentTab.getCrtRadio().toString());
 		// get status for selected Radio
-		ReqRadioStatus(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID);
+		ReqRadioStatus(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID);
 		// get selected Zone and CH
-		onZoneCHChange(parentTab.crtRadio.ID, parentTab.crtRadio.GW_ID, 0,0);
+		onZoneCHChange(parentTab.getCrtRadio().ID, parentTab.getCrtRadio().GW_ID, 0,0);
 		
 		myHandler.post(updateGatewaysRUN);
 	}
@@ -716,7 +716,7 @@ public class RadioActivity extends Activity {
 		allGWsIP.clear();
 		for(RadioGW radio: AppParams.listRadios)
 			allGWsIP.add(radio.IP);
-		textViewGateway.setText(parentTab.crtRadio.IP);
+		textViewGateway.setText(parentTab.getCrtRadio().IP);
     }
     
 	
@@ -743,20 +743,20 @@ public class RadioActivity extends Activity {
     	
     	SM.Debug("am primit: " + _radioID + "," + _GWID + "," + _zoneNR + "," + _chNR);
     	
-    	if ((parentTab.crtRadio == null)||((parentTab.crtRadio.GW_ID == _GWID)&&(parentTab.crtRadio.ID == _radioID)))
+    	if ((parentTab.getCrtRadio() == null)||((parentTab.getCrtRadio().GW_ID == _GWID)&&(parentTab.getCrtRadio().ID == _radioID)))
     	{
 	    	// update crtRadios, crtZones, and crtChannel
 	    	for(RadioGW radio: AppParams.listRadios)
 	    		if(radio.GW_ID == _GWID && radio.ID == _radioID)
 	    		{
-	    			parentTab.crtRadio = radio;
+	    			parentTab.setCrtRadio(radio);
 	    			crtZones = radio.zoneList;
 	    			cmdForMe = true;
 	    		}
     	}    	 
         if (cmdForMe)
         {
-	    	for(Zone zone: parentTab.crtRadio.zoneList)
+	    	for(Zone zone: parentTab.getCrtRadio().zoneList)
 	    		if(zone.id == _zoneNR)
 	    			crtChannels = zone.channelList;
 	    	// update UI
@@ -776,7 +776,7 @@ public class RadioActivity extends Activity {
 
 		if(AppParams.listRadios.size()>0)
 		{
-			textViewGateway.setText(parentTab.crtRadio.IP);
+			textViewGateway.setText(parentTab.getCrtRadio().IP);
 			
 			// get all radio IP
 			allGWsIP.clear();
@@ -784,13 +784,13 @@ public class RadioActivity extends Activity {
 				allGWsIP.add(radio.IP);
 			
 			// set spinners and text
-			if(parentTab.crtRadio == null)		
+			if(parentTab.getCrtRadio() == null)
 			{
-				parentTab.crtRadio = AppParams.listRadios.get(0);
+				parentTab.setCrtRadio(AppParams.listRadios.get(0));
 				textViewGateway.setText(allGWsIP.get(0));
 				// set zone
 				ArrayList<String> zones = new ArrayList<String>();
-				crtZones = parentTab.crtRadio.zoneList;
+				crtZones = parentTab.getCrtRadio().zoneList;
 				for(Zone zone: crtZones)
 					zones.add(zone.ZoneName);
 				
@@ -799,7 +799,7 @@ public class RadioActivity extends Activity {
 				//spinnerZone.setSelection(0);
 				// set channel
 				ArrayList<String> channel = new ArrayList<String>();
-				crtChannels = parentTab.crtRadio.zoneList.get(0).channelList;
+				crtChannels = parentTab.getCrtRadio().zoneList.get(0).channelList;
 				for(Channel ch: crtChannels)
 					channel.add(ch.chName);
 				textViewChannel.setText(channel.get(0).toString());
@@ -811,10 +811,10 @@ public class RadioActivity extends Activity {
 			{
 				for(RadioGW radio: AppParams.listRadios)
 					if(radio.ID == radioID && radio.GW_ID == GWID)
-						parentTab.crtRadio = radio;
+						parentTab.setCrtRadio(radio);
 				// get zones for adapter
 				ArrayList<String> zones = new ArrayList<String>();
-				crtZones = parentTab.crtRadio.zoneList;
+				crtZones = parentTab.getCrtRadio().zoneList;
 				int position = 0;
 				// get selected Zone
 				for(int i=0; i< crtZones.size(); i++)
@@ -828,7 +828,7 @@ public class RadioActivity extends Activity {
 
 				// set channel
 				ArrayList<String> channel = new ArrayList<String>();
-				crtChannels =  parentTab.crtRadio.zoneList.get(position).channelList;
+				crtChannels =  parentTab.getCrtRadio().zoneList.get(position).channelList;
 				position = 0;
 				// get current channel
 				for(int i=0; i< crtChannels.size(); i++)
@@ -856,7 +856,7 @@ public class RadioActivity extends Activity {
 			{
 				UpdateEnableDisableButtons("offline");
 				onZoneCHChange(radio.ID, radio.GW_ID,0,0);		// get zone and channel for crt radio
-				parentTab.crtRadio = radio;
+				parentTab.setCrtRadio(radio);
 			}
 		textViewGateway.setText(newIP);
 		
@@ -957,10 +957,10 @@ public class RadioActivity extends Activity {
 	    		buttonPTT.setEnabled(true);
 	    		buttonDKey.setEnabled(false);
 	    	}
-	    	if(parentTab.crtActivity == parentTab.RADIO && selectedCallType == calltype)
+	    	if(parentTab.getCrtActivity() == parentTab.RADIO_TAB_ID && selectedCallType == calltype)
 	    		parentTab.enableMenuButtons(false);
 	    	if(selectedCallType == calltype)
-	    		parentTab.inCall = true;
+	    		parentTab.setInCall(true);
 	    	
     	}
     	else if (callstatus==3)
@@ -986,7 +986,7 @@ public class RadioActivity extends Activity {
 		    	  }
 		    	  parentTab.enableMenuButtons(true);
 		    	  
-		    	parentTab.inCall = false;
+		    	parentTab.setInCall(false);
     		}
     	}
      }
@@ -1182,8 +1182,8 @@ public class RadioActivity extends Activity {
     // send Dekey to AppServer
     private void SendDekey()
 	{
-    	if(parentTab.crtRadio != null)
+    	if(parentTab.getCrtRadio() != null)
-    		parentTab.sendDekey(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
+    		parentTab.sendDekey(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
 	}
     
     // send change Channel and Zone message to AppServer
@@ -1215,8 +1215,8 @@ public class RadioActivity extends Activity {
     	//113 -grpcall stop
     public void SendPTT(int callType, int id,int gwid, int rgwid,long userID)
     {    	
-	  	SM.Debug("SendPTT callType:"+callType);
+	  	SM.Debug("sendPTT callType:"+callType);
-	  	parentTab.SendPTT(callType, id,gwid,rgwid,userID);
+	  	parentTab.sendPTT(callType, id,gwid,rgwid,userID);
     }
     
     
@@ -1241,13 +1241,13 @@ public class RadioActivity extends Activity {
         		UpdateZoneCH(zc.rgwID, zc.gwID, zc.zoneNr, zc.channelNr);	
         	}
         	else if (action.equals(OperationCodes.RADIOID_CHANGED+"")) {
-        		textViewGateway.setText(parentTab.crtRadio.IP);
+        		textViewGateway.setText(parentTab.getCrtRadio().IP);
-        		textViewChannel.setText(parentTab.crtRadio.getChannelName());
+        		textViewChannel.setText(parentTab.getCrtRadio().getChannelName());
-        		textViewZone.setText(parentTab.crtRadio.getZoneName());
+        		textViewZone.setText(parentTab.getCrtRadio().getZoneName());
         		
         		// update UI
     			myHandler.post(UpdateResultsZoneChannelRUN);
-        		radioGWChanged(parentTab.crtRadio.IP);
+        		radioGWChanged(parentTab.getCrtRadio().IP);
         	}
         }
     };

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

@@ -127,7 +127,7 @@ public class RecordingsActivity extends Activity {
 								// change gateway
 								textViewGateway.setText(allGWsIP.get(which));
 								Toast.makeText(context, getString(R.string.loadingRecordings), Toast.LENGTH_SHORT).show();
-								GetRecordings(parentTab.allRadios.get(which).GW_ID, parentTab.allRadios.get(which).ID);
+								GetRecordings(parentTab.getAllRadios().get(which).GW_ID, parentTab.getAllRadios().get(which).ID);
 							}
 						});
 				AlertDialog alert = builder.create();
@@ -137,7 +137,7 @@ public class RecordingsActivity extends Activity {
 		textViewGateway.setVisibility(View.INVISIBLE);
 		
 		
-        parentTab.recordingsActivity = this;
+        parentTab.setRecordingsActivity(this);
         
         // register to receive broadcasts
         registerBroadcastIntents();
@@ -208,17 +208,17 @@ public class RecordingsActivity extends Activity {
     		
     		Toast.makeText(context, getString(R.string.moreRecordings), Toast.LENGTH_SHORT).show();
     		
-    		if(parentTab.crtRadio != null)
+    		if(parentTab.getCrtRadio() != null)
-    			textViewGateway.setText(parentTab.crtRadio.IP);
+    			textViewGateway.setText(parentTab.getCrtRadio().IP);
     		
     		/*
     		if(parentTab.allRadios == null)
     			GetGWRadios();
     		 */
-    		if(playingPosition < 0 && parentTab.crtRadio != null)
+    		if(playingPosition < 0 && parentTab.getCrtRadio() != null)
     		{
-    			SM.Debug("GetRecordings resume + crtRadio:"+parentTab.crtRadio.toString());
+    			SM.Debug("GetRecordings resume + crtRadio:"+ parentTab.getCrtRadio().toString());
-    			GetRecordings(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
+    			GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
     		}
     		
     	}
@@ -402,8 +402,8 @@ public class RecordingsActivity extends Activity {
         		updateNumberOfRecordings();
         	}
         	else if (action.equals(OperationCodes.RADIOID_CHANGED+"")) { 
-        		textViewGateway.setText(parentTab.crtRadio.IP);
+        		textViewGateway.setText(parentTab.getCrtRadio().IP);
-        		GetRecordings(parentTab.crtRadio.GW_ID, parentTab.crtRadio.ID);
+        		GetRecordings(parentTab.getCrtRadio().GW_ID, parentTab.getCrtRadio().ID);
         	}
         }
     };

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);
+		llUsername = findViewById(R.id.llUsername);
-		llPassword = (LinearLayout) findViewById(R.id.llPassword);
+		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 textTitle = dialogInfo.findViewById(R.id.textTitle);
-		TextView text = (TextView) dialogInfo.findViewById(R.id.text);
+		TextView text = dialogInfo.findViewById(R.id.text);
-		TextView text2 = (TextView) dialogInfo.findViewById(R.id.text2);
+		TextView text2 = dialogInfo.findViewById(R.id.text2);
-		ImageView image = (ImageView) dialogInfo.findViewById(R.id.image);
+		ImageView image = dialogInfo.findViewById(R.id.image);
 
 		textTitle.setText(getString(R.string.connectionError));
 		image.setImageResource(R.drawable.error);
@@ -965,7 +965,7 @@ public class SDMobileActivity extends Activity {
 					}
 
 					@Override
-					public void alarmLiveRecv(TCPEvent event) {
+					public void alarmLiveReceived(TCPEvent event) {
 					}
 
 					@Override
@@ -994,7 +994,7 @@ public class SDMobileActivity extends Activity {
 					}
 
 					@Override
-					public void onTCPConnectionDown(boolean previuosWasConnectionUp) {
+					public void onTCPConnectionDown(boolean previousWasConnectionUp) {
 						SM.Debug("TCP connection with:" + (tcp != null ? tcp.serverHostname : AppParams.RADIOIP) + ":"
 								+ (tcp != null ? tcp.getPort() : 0) + " is DOWN!!!");
 						// update ui only when a change happens with tcp connection
@@ -1034,7 +1034,7 @@ public class SDMobileActivity extends Activity {
 					}
 
 					@Override
-					public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previuosWasConnectionUp) {
+					public void onTCPConnectionStatusReceived(boolean isConnectionUp, boolean previousWasConnectionUp) {
 
 					}
 

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

@@ -1403,7 +1403,7 @@ public class SDMobileActivity_beforeMod extends Activity {
 					public void onAlarmAckReceived(TCPEvent event) { }
 	
 					@Override
-					public void alarmLiveRecv(TCPEvent event) { }
+					public void alarmLiveReceived(TCPEvent event) { }
 	
 			
 					@Override
@@ -1425,7 +1425,7 @@ public class SDMobileActivity_beforeMod extends Activity {
 					public void onRecordingsListReceived(TCPEvent event) { }
 
 					@Override
-					public void onTCPConnectionDown(boolean previousConnectionWasUP) {
+					public void onTCPConnectionDown(boolean previousWasConnectionUp) {
 						
 						SM.Debug("TCP Connection Down");
 						// set connection is down
@@ -1450,7 +1450,7 @@ public class SDMobileActivity_beforeMod extends Activity {
 					}
 
 					@Override
-					public void onTCPConnectionUp(boolean previousConnectionWasUP) { 
+					public void onTCPConnectionUp(boolean previousWasConnectionUp) {
 						
 						SM.Debug("TCP Connection UP");
 						// set connection is up
@@ -1505,7 +1505,7 @@ public class SDMobileActivity_beforeMod extends Activity {
 					}
 
 					@Override
-					public void onTCPConnectionStatusReceived(final boolean isConnectionUp, boolean previuosWasConnectionUp) {
+					public void onTCPConnectionStatusReceived(final boolean isConnectionUp, boolean previousWasConnectionUp) {
 						//SM.Debug("TCP STATUS", "ConnectionUP: " + isConnectionUp + " |  previous: " + previuosWasConnectionUp );
 						/*
 						if(!lastTCPstatus && isConnectionUp) {

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

@@ -199,7 +199,7 @@ public class SetupActivity extends Activity {
         	// get default com port
         	//COMPORT = prefs.getString("comport", "n/a");
         	// get Language
-        	AppParams.LANGUAGE = AppParams.prefs.getString("language", parentTab.databaseLanguage);
+        	AppParams.LANGUAGE = AppParams.prefs.getString("language", parentTab.DATABASE_LANGUAGE);
     	}
         catch(Exception ex)
         {
@@ -245,7 +245,7 @@ public class SetupActivity extends Activity {
 			parentTab.stopTCPParser();
 			// recreate TCP with new settings
 			parentTab.loadSettings();
-			parentTab.TCPinit();
+			parentTab.tcpInit();
 			*/
 			// start thread to add listener
 			/*

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:id="@+id/linearLayoutChecked"
-		    android:layout_width="wrap_content"
+		android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-		    android:layout_weight="0"
+		android:layout_weight="0"
-		    android:background="@drawable/checked">
+		android:background="@drawable/checked"
-    </LinearLayout>
+		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"
+	<TextView android:layout_height="wrap_content"
-							android:layout_width="fill_parent" 
+		android:layout_width="fill_parent"
-							android:id="@+id/balloon_vehicle_name"
+		android:id="@+id/balloon_vehicle_name"
-							android:textSize="12dip"
+		android:textSize="12dip"
-							android:textColor="#FF000000"></TextView>
+		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"
+<LinearLayout
-              android:id="@+id/layout_root"
+	xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="horizontal"
+	android:id="@+id/layout_root"
-              android:layout_width="fill_parent"
+	android:orientation="horizontal"
-              android:layout_height="fill_parent"
+	android:layout_width="fill_parent"
-              android:padding="10dp"
+	android:layout_height="fill_parent"
-              >
+	android:padding="10dp" >
-    <ImageView android:id="@+id/image"
+    <ImageView
-               android:layout_width="wrap_content"
+		android:id="@+id/image"
-               android:layout_height="wrap_content"
+		android:layout_width="wrap_content"
-               android:layout_marginRight="10dp"
+		android:layout_height="wrap_content"
-               android:layout_gravity="center_vertical"
+		android:layout_marginRight="10dp"
-               android:src="@mipmap/ic_launcher"
+		android:layout_gravity="center_vertical"
-               />
+		android:src="@mipmap/ic_launcher"
-   <LinearLayout 
+		/>
-   			  android:layout_width="wrap_content"
+	<LinearLayout
-              android:layout_height="wrap_content"
+		android:layout_width="wrap_content"
-              android:orientation="vertical"
+		android:layout_height="wrap_content"
-              android:layout_gravity="center_vertical"
+		android:orientation="vertical"
-              android:gravity="center_vertical">
+		android:layout_gravity="center_vertical"
-		    <TextView android:id="@+id/text"
+		android:gravity="center_vertical">
-		              android:layout_width="wrap_content"
+		<TextView
-		              android:layout_height="wrap_content"
+			android:id="@+id/text"
-		              android:paddingTop="8dp"
+			android:layout_width="wrap_content"
-		              android:textSize="18dp"
+			android:layout_height="wrap_content"
-		              android:textColor="#FFFFFF"
+			android:paddingTop="8dp"
-		              />
+			android:textSize="18dp"
-		    <TextView android:id="@+id/text2"
+			/>
-		              android:layout_width="wrap_content"
+		<TextView
-		              android:layout_height="wrap_content"
+			android:id="@+id/text2"
-		              android:paddingTop="8dp"
+			android:layout_width="wrap_content"
-		              android:textSize="18dp"
+			android:layout_height="wrap_content"
-		              android:textColor="#FFFFFF"
+			android:paddingTop="8dp"
-		              />
+			android:textSize="18dp"
-     </LinearLayout>
+			/>
+	</LinearLayout>
 </LinearLayout>

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

@@ -11,7 +11,7 @@
          android:paddingTop="2dp"
          android:text="TITLE"
          android:textAppearance="?android:attr/textAppearanceLarge" 
-         android:textColor="#FFFFFF"
+         android:textColor="@color/black"
          />
     <LinearLayout
               android:id="@+id/layout_horizontal"
@@ -40,7 +40,6 @@
 			              android:paddingTop="8dp"
 			              android:text="Row1"
 			              android:textAppearance="?android:attr/textAppearanceLarge" 
-			              android:textColor="#FFFFFF"
 			              />
 			    <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="#FFFFFF"
 			              />
 	     </LinearLayout>
 	</LinearLayout>

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

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

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

@@ -210,8 +210,6 @@
 		</LinearLayout>
     </LinearLayout>
 
-   
-
      <RelativeLayout
 		        android:id="@+id/frameLayoutLanguage"
 		        android:layout_width="wrap_content"
@@ -221,20 +219,16 @@
 		        android:layout_alignParentBottom="true"
 		        android:layout_gravity="right" 
 		        android:paddingBottom="6dp"
-		        android:layout_toLeftOf="@+id/frameLayout13">
+		        android:layout_toLeftOf="@+id/frameLayout13" />
-	</RelativeLayout>
-
-	
-	
 
 	<ImageView 
-		 	    	android:id="@+id/imageLoading"
+		android:id="@+id/imageLoading"
-			        android:layout_width="64dp"
+		android:layout_width="64dp"
-			        android:layout_height="64dp"
+		android:layout_height="64dp"
-			        android:layout_gravity="center_vertical"
+		android:layout_gravity="center_vertical"
-			        android:layout_weight="0"
+		android:layout_weight="0"
-			        android:visibility="gone"
+		android:visibility="gone"
-			        android:layout_alignParentTop="true"
+		android:layout_alignParentTop="true"
-			        android:layout_alignParentLeft="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:id="@+id/linearLayoutChecked"
-		    android:layout_width="wrap_content"
+		android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-		    android:layout_weight="0"
+		android:layout_weight="0"
-		    android:background="@drawable/checked">
+		android:background="@drawable/checked"
-    </LinearLayout>
+		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">
+		android:src="@mipmap/ic_launcher"
-		<ImageView
+		android:paddingLeft="5dp"
-			android:id="@+id/icon"
+		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:gravity="center_vertical"/>
-			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>
+	</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:id="@+id/imageButtonAdd"
-    			    android:layout_width="1dp"
+			android:layout_width="1dp"
-    			    android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-    			    android:layout_weight="0"
+			android:layout_weight="0"
-    			    android:layout_marginRight="5dp"
+			android:layout_marginRight="5dp"
-    			    android:paddingLeft="2dp"
+			android:paddingLeft="2dp"
-    			    android:visibility="invisible"
+			android:visibility="invisible"
-    			    android:background="@drawable/addmessage_selector"/>
+			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

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

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

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

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

@@ -7,356 +7,352 @@
     style="?bg">
 	    
     <LinearLayout 
-        	android:id="@+id/layoutGateway"
+		android:id="@+id/layoutGateway"
-        	    android:layout_height="wrap_content"
+		android:layout_height="wrap_content"
-	    	    android:layout_width="fill_parent"
+		android:layout_width="fill_parent"
-	    	    android:weightSum="100"
+		android:weightSum="100"
-	    	    android:orientation="horizontal"
+		android:orientation="horizontal"
-	    	    style="?header">
+		style="?header">
-
-			    	    <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" />
-			    	         		
-						  			<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"/>
-						  			
-						  			<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/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
-        	    		    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" />
-				  			 
-				  			 <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_width="wrap_content"
-    	    android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-    	    android:orientation="vertical"
+			android:orientation="horizontal" >
-    	    android:paddingTop="2dp">
+
+			<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/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/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" />
+									
 		</LinearLayout>
 
 		<LinearLayout
-		    android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-		    android:layout_height="fill_parent"
+			android:layout_height="wrap_content"
-		    android:orientation="vertical"
+			android:orientation="horizontal"
-		    android:layout_gravity="center"
+			android:gravity="right"
-		    android:gravity="center">
+			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" />
+				  			 
+			<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_width="fill_parent"
-    	    		android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-    	    		android:orientation="horizontal"
+			android:orientation="horizontal"
-    	    		android:paddingRight="10dp"
+			android:paddingRight="10dp"
-    	    		android:layout_gravity="center_vertical">
+			android:layout_gravity="center_vertical">
-    	    		<LinearLayout 
+			<LinearLayout
-    	    		    android:layout_weight="1"
+				android:layout_weight="1"
-    	    		    android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-    	    		    android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-    	    		    android:gravity="center">
+				android:gravity="center">
-			    		<TextView
+				<TextView
-			    		    android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-			    		    android:text="@string/Zone"
+					android:text="@string/Zone"
-			    		    android:textStyle="bold"
+					android:textStyle="bold"
-			    		    android:textColor="#ffffffff"
+					android:textAppearance="?android:attr/textAppearanceMedium"/>
-			    		    android:textAppearance="?android:attr/textAppearanceMedium"/>
+				<LinearLayout
-			    		<LinearLayout
+					android:id="@+id/layoutSpinnerZone"
-						    android:id="@+id/layoutSpinnerZone"
+					android:layout_width="wrap_content"
-						    android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
-						    android:layout_height="wrap_content"
+					android:background="@drawable/style_spinner"
-						    android:background="@drawable/style_spinner"
+					android:gravity="right"
-						    android:gravity="right"
+					android:minWidth="150dp"
-						    android:minWidth="150dp"
+					android:orientation="horizontal"
-						    android:orientation="horizontal"
+					android:paddingBottom="4dp"
-						    android:paddingBottom="4dp"
+					android:paddingLeft="3dp"
-						    android:paddingLeft="3dp"
+					android:paddingRight="3dp"
-						    android:paddingRight="3dp"
+					android:paddingTop="4dp" >
-						    android:paddingTop="4dp" >
 
-						    <TextView
+					<TextView
-						        android:id="@+id/textViewZone"
+						android:id="@+id/textViewZone"
-				    		    android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-				    		    android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-				    		    android:layout_gravity="center_vertical"
+						android:layout_gravity="center_vertical"
-				    		    android:text=""
+						android:text=""
-				    		    android:textColor="#000000"
+						android:textColor="#000000"
-				    		    android:textStyle="bold"
+						android:textStyle="bold"
-				    		    android:textSize="20dp"/>
+						android:textSize="20dp"/>
-						    <ImageView 
+					<ImageView
-						        android:src="@drawable/arrow_spinner"
+						android:src="@drawable/arrow_spinner"
-						        android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-						        android:layout_gravity="center_vertical" />
+						android:layout_gravity="center_vertical" />
-						</LinearLayout>
+				</LinearLayout>
-			    	</LinearLayout>
+			</LinearLayout>
-    	    		<LinearLayout 
+			<LinearLayout
-    	    		    android:layout_weight="1"
+				android:layout_weight="1"
-    	    		    android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-    	    		    android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-    	    		    android:gravity="center">
+				android:gravity="center">
-			    		<TextView
+				<TextView
-			    		    android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-			    		    android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-			    		    android:text="@string/Channel"
+					android:text="@string/Channel"
-			    		    android:textColor="#ffffffff"
+					android:textStyle="bold"
-			    		    android:textStyle="bold"
+					android:textAppearance="?android:attr/textAppearanceMedium"/>
-			    		    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-						<LinearLayout
+				<LinearLayout
-						    android:id="@+id/layoutSpinnerChannel"
+					android:id="@+id/layoutSpinnerChannel"
-						    android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-						    android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-						    android:background="@drawable/style_spinner"
+					android:background="@drawable/style_spinner"
-						    android:gravity="right"
+					android:gravity="right"
-						    android:minWidth="150dp"
+					android:minWidth="150dp"
-						    android:orientation="horizontal"
+					android:orientation="horizontal"
-						    android:paddingBottom="4dp"
+					android:paddingBottom="4dp"
-						    android:paddingLeft="3dp"
+					android:paddingLeft="3dp"
-						    android:paddingRight="3dp"
+					android:paddingRight="3dp"
-						    android:paddingTop="4dp" >
+					android:paddingTop="4dp" >
 
-						    <TextView
+					<TextView
-						        android:id="@+id/textViewChannel"
+						android:id="@+id/textViewChannel"
-				    		    android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-				    		    android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-				    		    android:layout_gravity="center_vertical"
+						android:layout_gravity="center_vertical"
-				    		    android:text=""
+						android:text=""
-				    		    android:textColor="#000000"
+						android:textColor="#000000"
-				    		    android:textStyle="bold"
+						android:textStyle="bold"
-				    		    android:textSize="20dp"/>
+						android:textSize="20dp"/>
-						    <ImageView 
+					<ImageView
-						        android:src="@drawable/arrow_spinner"
+						android:src="@drawable/arrow_spinner"
-						        android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-						        android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-						        android:layout_gravity="center_vertical" />
+						android:layout_gravity="center_vertical" />
-						</LinearLayout>
+				</LinearLayout>
-					</LinearLayout>
+			</LinearLayout>
-    			</LinearLayout>
+		</LinearLayout>
 
 		<LinearLayout 
-			    	android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-			    	android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-			    	android:orientation="horizontal"
+			android:orientation="horizontal"
-			    	android:gravity="center"
+			android:gravity="center"
-			    	android:layout_gravity="center_horizontal">
+			android:layout_gravity="center_horizontal">
     	    		
-					<LinearLayout 
+			<LinearLayout
-	    	    	    android:layout_weight="1"
+				android:layout_weight="1"
-	    	    	    android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-	    	    	    android:layout_height="fill_parent"
+				android:layout_height="fill_parent"
-	    	    	    android:gravity="center"
+				android:gravity="center"
-	    	    	    android:paddingTop="3dp">
+				android:paddingTop="3dp">
-				    	    	<LinearLayout
+				<LinearLayout
-				    	    	    android:layout_width="276dp"
+					android:layout_width="276dp"
-				    	    	    android:layout_height="93dp"
+					android:layout_height="93dp"
-				    	    	    android:layout_gravity="center"
+					android:layout_gravity="center"
-				    	    	    android:background="@drawable/screen"
+					android:background="@drawable/screen"
-				    	    	    android:gravity="center"
+					android:gravity="center"
-				    	    	    android:orientation="vertical"
+					android:orientation="vertical"
-				    	    	    android:paddingBottom="0dp"
+					android:paddingBottom="0dp"
-				    	    	    android:paddingTop="7dp">
+					android:paddingTop="7dp">
 				
-							    		<TextView
+					<TextView
-							    		    android:id="@+id/textViewMessageChannel"
+						android:id="@+id/textViewMessageChannel"
-							    		    android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_horizontal"
+						android:layout_gravity="center_horizontal"
-							    		    android:paddingBottom="7dp"
+						android:paddingBottom="7dp"
-							    		    android:textColor="#000000"
+						android:textColor="#000000"
-							    		    android:textSize="20dp"
+						android:textSize="20dp"
-							    		    android:textStyle="bold"/>
+						android:textStyle="bold"/>
-							    		<TextView
+					<TextView
-							    		    android:id="@+id/textViewMessageStatus"
+						android:id="@+id/textViewMessageStatus"
-							    		    android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_horizontal"
+						android:layout_gravity="center_horizontal"
-							    		    android:textColor="#000000"
+						android:textColor="#000000"
-							    		    android:textSize="20dp"
+						android:textSize="20dp"
-							    		    android:textStyle="bold"/>
+						android:textStyle="bold"/>
-							    </LinearLayout>
+				</LinearLayout>
-				    </LinearLayout>
+			</LinearLayout>
-			    </LinearLayout>
+		</LinearLayout>
 		
 		<LinearLayout 
     	    android:layout_width="fill_parent"
@@ -366,104 +362,104 @@
     	    android:layout_gravity="center_horizontal"
     	    android:gravity="center_horizontal">
 
-    			<LinearLayout 
+			<LinearLayout
-    			    android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-    	    		android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-    	    		android:orientation="vertical"
+				android:orientation="vertical"
-    	    		android:gravity="center_horizontal"
+				android:gravity="center_horizontal"
-    	    		android:layout_weight="1">
+				android:layout_weight="1">
-				    	<LinearLayout 
+				<LinearLayout
-				    	    	android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-				    	    	android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-				    	    	android:orientation="vertical">
+					android:orientation="vertical">
-		    			    	<RadioGroup android:id="@+id/radioGroupCallType" 
+					<RadioGroup
-		    			    	    	android:layout_width="wrap_content" 
+						android:id="@+id/radioGroupCallType"
-		    			    	    	android:layout_height="wrap_content"
+						android:layout_width="wrap_content"
-		    			    	    	android:layout_marginBottom="3sp">
+						android:layout_height="wrap_content"
+						android:layout_marginBottom="3sp">
 		
-					    			<RadioButton
+						<RadioButton
-					    			    android:id="@+id/radioAll"
+							android:id="@+id/radioAll"
-					    			    android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
+							android:layout_height="30dp"
-					    			    android:checked="true"
+							android:checked="true"
-					    			    android:text="@string/AllCall"
+							android:text="@string/AllCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+							/>
 		
-					    			<RadioButton
+						<RadioButton
-					    			    android:id="@+id/radioGroup"
+							android:id="@+id/radioGroup"
-					    			    android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
+							android:layout_height="30dp"
-					    			    android:text="@string/GroupCall"
+							android:text="@string/GroupCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+							/>
 		
-					    			<RadioButton
+						<RadioButton
-					    			    android:id="@+id/radioPrivate"
+							android:id="@+id/radioPrivate"
-					    			    android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-					    			    android:layout_height="30dp"
+							android:layout_height="30dp"
-					    			    android:text="@string/PrivateCall"
+							android:text="@string/PrivateCall"
-					    			    android:textAppearance="?android:attr/textAppearanceMedium"
+							android:textAppearance="?android:attr/textAppearanceMedium"
-					    			    android:textColor="#ffffffff" />
+							/>
 		
-					    		</RadioGroup>
+					</RadioGroup>
-					    		 <LinearLayout
+					<LinearLayout
-									    android:id="@+id/layoutSpinnerCallType"
+						android:id="@+id/layoutSpinnerCallType"
-									    android:layout_width="wrap_content"
+						android:layout_width="wrap_content"
-									    android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-									    android:background="@drawable/style_spinner"
+						android:background="@drawable/style_spinner"
-									    android:gravity="right"
+						android:gravity="right"
-									    android:minWidth="150dp"
+						android:minWidth="150dp"
-									    android:orientation="horizontal"
+						android:orientation="horizontal"
-									    android:paddingBottom="4dp"
+						android:paddingBottom="4dp"
-									    android:paddingLeft="3dp"
+						android:paddingLeft="3dp"
-									    android:paddingRight="3dp"
+						android:paddingRight="3dp"
-									    android:paddingTop="4dp"
+						android:paddingTop="4dp"
-									    android:visibility="invisible" >
+						android:visibility="invisible" >
 			
-									    <TextView
+						<TextView
-									        android:id="@+id/textViewCallType"
+							android:id="@+id/textViewCallType"
-							    		    android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-							    		    android:layout_height="wrap_content"
+							android:layout_height="wrap_content"
-							    		    android:layout_gravity="center_vertical"
+							android:layout_gravity="center_vertical"
-							    		    android:text=""
+							android:text=""
-							    		    android:textColor="#000000"
+							android:textColor="#000000"
-							    		    android:textStyle="bold"
+							android:textStyle="bold"
-							    		    android:textSize="20dp"/>
+							android:textSize="20dp"/>
-									    <ImageView 
+						<ImageView
-									        android:src="@drawable/arrow_spinner"
+							android:src="@drawable/arrow_spinner"
-									        android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-									        android:layout_height="wrap_content"
+							android:layout_height="wrap_content"
-									        android:layout_gravity="center_vertical" />
+							android:layout_gravity="center_vertical" />
-								</LinearLayout>
+					</LinearLayout>
-			    		 </LinearLayout>
+				 </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
+				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>

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
+		<LinearLayout
-		        android:layout_width="fill_parent"
+			android:layout_width="fill_parent"
-		        android:layout_height="wrap_content"
+			android:layout_height="wrap_content"
-		        android:orientation="vertical"
+			android:orientation="vertical"
-		        android:layout_gravity="center"
+			android:layout_gravity="center"
-		        android:paddingLeft="5dp"
+			android:paddingLeft="5dp"
-		        android:paddingBottom="50dp" >
+			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_width="fill_parent"
-				    android:layout_height="wrap_content"
+					 android:layout_height="wrap_content"
-				    android:orientation="horizontal">
+					 android:orientation="horizontal"
-				 <LinearLayout 
+					 android:gravity="left"
-			         	 android:layout_width="fill_parent"
+					 android:paddingTop="10dp"
-			           	 android:layout_height="wrap_content"
+					 android:paddingLeft="7dp"
-			           	 android:orientation="horizontal"
+					 android:layout_weight="0.4">
-			           	 android:gravity="left"
+					<TextView
-			           	 android:paddingTop="10dp"
+						android:layout_width="fill_parent"
-			           	 android:paddingLeft="7dp"
+						android:layout_height="wrap_content"
-			           	 android:layout_weight="0.4">
+						android:text="@string/serverIP"
-			            <TextView
+						android:textSize="14dp"
-			                android:layout_width="fill_parent"
+						android:textStyle="bold"
-			                android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
-			                android:text="@string/serverIP"
+						android:gravity="center_vertical|right"
-			                android:textSize="14dp"
+						android:layout_weight="2"/>
-			                android:textColor="#FFFFFF"
-			                android:textStyle="bold"
-			                android:layout_gravity="center_vertical"
-			                android:gravity="center_vertical|right"
-			                android:layout_weight="2"/>
 		
-			            <LinearLayout
+					<LinearLayout
-			                android:layout_width="fill_parent"
+						android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-			                android:layout_weight="1" 
+						android:layout_weight="1"
-			                android:paddingTop="3dp">
+						android:paddingTop="3dp">
-			                <EditText
+						<EditText
-			                    android:id="@+id/appServerIP"
+							android:id="@+id/appServerIP"
-			                    android:layout_width="wrap_content"
+							android:layout_width="wrap_content"
-			                    android:layout_height="wrap_content"
+							android:layout_height="wrap_content"
-			                    android:gravity="center"
+							android:gravity="center"
-			                    android:minWidth="200dp"
+							android:minWidth="200dp"
-			                    android:singleLine="true"
+							android:singleLine="true"
-			                    android:imeOptions="actionDone" >
+							android:imeOptions="actionDone" >
-			                </EditText>
+						</EditText>
-			            </LinearLayout>
+					</LinearLayout>
 		
 				</LinearLayout>
-				 <LinearLayout 
+			 	<LinearLayout
-			         	 android:layout_width="fill_parent"
+					android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
+					android:orientation="horizontal"
-			           	 android:gravity="left"
+					android:gravity="left"
-			           	 android:paddingTop="10dp"
+					android:paddingTop="10dp"
-			           	 android:layout_weight="0.6">
+					android:layout_weight="0.6">
-			            <TextView
+					<TextView
-			                android:layout_width="fill_parent"
+						android:layout_width="fill_parent"
-			                android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-			                android:text="@string/serverPort"
+						android:text="@string/serverPort"
-			                android:textSize="14dp"
+						android:textSize="14dp"
-			                android:textColor="#FFFFFF"
+						android:textStyle="bold"
-			                android:textStyle="bold"
+						android:gravity="center_vertical|right"
-			                android:gravity="center_vertical|right"
+						android:layout_gravity="center_vertical|right"
-			                android:layout_gravity="center_vertical|right"
+						android:layout_weight="1.4"/>
-			                android:layout_weight="1.4"/>
+					<LinearLayout
-			            <LinearLayout 
+						android:layout_width="fill_parent"
-			                	android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
-			                	android:layout_height="wrap_content"
+						android:layout_weight="1"
-			                	android:layout_weight="1"
+						android:paddingTop="3dp">
-			                	android:paddingTop="3dp">
+						<EditText
-					            <EditText 
+							android:layout_height="wrap_content"
-					           			android:layout_height="wrap_content" 
+							android:id="@+id/appServerPort"
-					           			android:id="@+id/appServerPort" 
+							android:maxLength="5"
-					           			android:maxLength="5"
+							android:minWidth="73dp"
-					           			android:minWidth="73dp"
+							android:gravity="center"
-					           			android:gravity="center"
+							android:layout_width="wrap_content"
-					           			android:layout_width="wrap_content"
+							android:layout_gravity="center_vertical|right"
-					           			android:layout_gravity="center_vertical|right"
+							android:inputType="number"
-					           			android:inputType="number"
+							android:imeOptions="actionDone" />
-					           			android:imeOptions="actionDone">
+					</LinearLayout>
-								</EditText>
-						</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_width="fill_parent"
-			           	 android:layout_height="wrap_content"
+					 android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
+					 android:orientation="horizontal"
-			           	 android:paddingTop="0dp"
+					 android:paddingTop="0dp"
-			           	 android:gravity="center_vertical|left">
+					 android:gravity="center_vertical|left">
-					    <LinearLayout 
+					<LinearLayout
-			                	android:layout_height="wrap_content"
+						android:layout_height="wrap_content"
-			                	android:layout_width="95dp"
+						android:layout_width="95dp"
-			                	android:layout_weight="0">
+						android:layout_weight="0">
-				            <TextView
+						<TextView
-				                android:layout_width="fill_parent"
+							android:layout_width="fill_parent"
-				                android:layout_height="wrap_content"
+							android:layout_height="wrap_content"
-				                android:text="@string/configName"
+							android:text="@string/configName"
-				                android:textSize="14dp"
+							android:textSize="14dp"
-				                android:textColor="#FFFFFF"
+							android:textStyle="bold"
-				                android:textStyle="bold"
+							android:gravity="center_vertical|right"
-				                android:gravity="center_vertical|right"
+							android:layout_gravity="center_vertical"/>
-				                android:layout_gravity="center_vertical"/>
+					</LinearLayout>
-			            </LinearLayout>
+					<LinearLayout
-			            <LinearLayout 
+						android:layout_height="wrap_content"
-			                	android:layout_height="wrap_content"
+						android:layout_width="0dp"
-			                	android:layout_width="0dp"
+						android:layout_weight="1"
-			                	android:layout_weight="1"
+						android:paddingTop="3dp">
-			                	android:paddingTop="3dp">
 		
-			                <EditText
+						<EditText
-			                    android:id="@+id/editTextPath"
+							android:id="@+id/editTextPath"
-			                    android:layout_width="fill_parent"
+							android:layout_width="fill_parent"
-			                    android:layout_height="wrap_content"
+							android:layout_height="wrap_content"
-			                    android:gravity="right|center_vertical"
+							android:gravity="right|center_vertical"
-			                    android:text="serial"
+							android:text="serial"
-			                    android:imeOptions="actionDone"
+							android:imeOptions="actionDone"
-			                    android:minWidth="73dp"
+							android:minWidth="73dp"
 
-			                    android:singleLine="true" >
+							android:singleLine="true" >
-			                    <requestFocus />
+							<requestFocus />
-			                </EditText>
+						</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>
+						<ImageView
-			            <LinearLayout 
+							android:id="@+id/imageViewQuestionMark"
-			                	android:layout_height="wrap_content"
+							android:layout_width="wrap_content"
-			                	android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
-			                	android:layout_weight="0"
+							android:src="@drawable/questionmark_small" />
-			                	android:paddingTop="3dp">
+					</LinearLayout>
-					            <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>
 				</LinearLayout>
-			    
 			</LinearLayout>
 			
 			<LinearLayout
-			        android:id="@+id/frameLayout11"
+				android:id="@+id/frameLayout11"
-			        android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-			        android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-			        android:orientation="horizontal"
+				android:orientation="horizontal"
-			        android:gravity="left" >
+				android:gravity="left" >
 			
-			        <TextView
+				<TextView
-			            android:layout_width="95dp"
+					android:layout_width="95dp"
-			            android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-			            android:text="@string/language"
+					android:text="@string/language"
-			            android:textSize="14dp"
+					android:textSize="14dp"
-						android:layout_marginRight="2dp"
+					android:layout_marginRight="2dp"
-			            android:textColor="#FFFFFF"
+					android:textStyle="bold"
-			            android:textStyle="bold"
+					android:gravity="right"
-			            android:gravity="right"
+					android:layout_gravity="center_vertical"/>
-			            android:layout_gravity="center_vertical"/>
+				<LinearLayout
-					<LinearLayout
+					android:id="@+id/layoutSpinnerLanguage"
-						    android:id="@+id/layoutSpinnerLanguage"
+					android:layout_width="wrap_content"
-						    android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
-						    android:layout_height="wrap_content"
+					android:background="@drawable/style_spinner"
-						    android:background="@drawable/style_spinner"
+					android:gravity="left|center_vertical"
-						    android:gravity="left|center_vertical"
+					android:minWidth="223dp"
-						    android:minWidth="223dp"
+					android:orientation="horizontal"
-						    android:orientation="horizontal"
+					android:paddingBottom="4dp"
-						    android:paddingBottom="4dp"
+					android:paddingLeft="3dp"
-						    android:paddingLeft="3dp"
+					android:paddingRight="3dp"
-						    android:paddingRight="3dp"
+					android:paddingTop="4dp" >
-						    android:paddingTop="4dp" >
+					<ImageView
-					    	 <ImageView 
+						android:id="@+id/imageLanguage"
-					    	    android:id="@+id/imageLanguage"
+						android:src="@drawable/de"
-						        android:src="@drawable/de"
+						android:layout_width="wrap_content"
-						        android:layout_width="wrap_content"
+						android:layout_height="fill_parent"
-						        android:layout_height="fill_parent"
+						android:layout_gravity="center_vertical"
-						        android:layout_gravity="center_vertical"
+						android:layout_weight="0" />
-						        android:layout_weight="0" />
+					<TextView
-						    <TextView
+						android:id="@+id/textViewSpinnerLanguage"
-						        android:id="@+id/textViewSpinnerLanguage"
+						android:layout_width="fill_parent"
-				    		    android:layout_width="fill_parent"
+						android:layout_height="wrap_content"
-				    		    android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
-				    		    android:layout_gravity="center_vertical"
+						android:gravity="left"
-				    		    android:gravity="left"
+						android:text="Germany"
-				    		    android:text="Germany"
+						android:textColor="#000000"
-				    		    android:textColor="#000000"
+						android:textSize="17dp"
-				    		    android:textSize="17dp"
+						android:layout_weight="1"
-				    		    android:layout_weight="1"
+						android:paddingBottom="2dp"
-				    		    android:paddingBottom="2dp"
+						android:paddingLeft="3dp">
-				    		    android:paddingLeft="3dp">
+						<requestFocus />
-				    		    	<requestFocus />
+					</TextView>
-				    		    </TextView>
+					<ImageView
-						    <ImageView 
+						android:src="@drawable/arrow_spinner"
-						        android:src="@drawable/arrow_spinner"
+						android:layout_width="wrap_content"
-						        android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
-						        android:layout_height="wrap_content"
+						android:layout_gravity="center_vertical"
-						        android:layout_gravity="center_vertical"
+						android:layout_weight="0" />
-						        android:layout_weight="0" />
+				</LinearLayout>
-						</LinearLayout>
 			</LinearLayout>
 			
-				<LinearLayout 
+			<LinearLayout
-			         	 android:layout_width="fill_parent"
+				android:layout_width="fill_parent"
-			           	 android:layout_height="wrap_content"
+				android:layout_height="wrap_content"
-			           	 android:orientation="horizontal"
+				android:orientation="horizontal"
-			           	 android:gravity="center_horizontal"
+				android:gravity="center_horizontal"
-			           	 android:layout_marginTop="20dp">
+				android:layout_marginTop="20dp">
-			            <Button
+				<Button
-							android:layout_width="wrap_content"
+					android:layout_width="wrap_content"
-							android:layout_height="wrap_content"
+					android:layout_height="wrap_content"
-							android:id="@+id/btn_save"
+					android:id="@+id/btn_save"
-							android:text="@string/save"
+					android:text="@string/save"
-							style="@style/ButtonText"
+					style="@style/ButtonText"
-							android:textSize="22dp"
+					android:textSize="22dp"
-		    			    android:background="@drawable/style_bluebutton"/>
+					android:background="@drawable/style_bluebutton"/>
-				</LinearLayout>
+			</LinearLayout>
 		</LinearLayout>
 	</LinearLayout>
-<RelativeLayout 
+	<RelativeLayout
-    android:layout_width="wrap_content"
+		android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+		android:layout_height="wrap_content"/>
     
-</RelativeLayout> 
 </LinearLayout>

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

@@ -257,5 +257,11 @@
 
 
     <string name="speedMph">%1$d mph</string>
+    <string name="DialogService_Info_ErrorMessage">Oops, something happened</string>
+    <string name="go_to_settings">Go to settings</string>
+    <string name="permission_denied">Permission Denied</string>
+    <string name="permissionBlocked">%1$s permission was not accepted. To be able to use the %2$s, please open application settings and grant the %3$s permission</string>
+    <string name="microphone">Microphone</string>
+    <string name="radio_tab">Radio Tab</string>
 
 </resources>