Safemobile/safedispatch-mobile
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: Safemobile:3f96055a6e4cee36a5844536c81aa930b9203985
Branches Tags
Safemobile:develop Safemobile:convert_to_mph Safemobile:SD_256_incorect_timestamp_in_buble_live_tab Safemobile:SD-230 Safemobile:show_notifications Safemobile:refresh_list_after_on_item_click Safemobile:SD-222 Safemobile:SD-219 Safemobile:SD-224 Safemobile:SD-217 Safemobile:SD-225 Safemobile:feature/notifications Safemobile:features/SD-203-add-dialogs-for-history-tab Safemobile:fix/SD-216-back-navigation-broken Safemobile:features/SD-211-recordings-tab Safemobile:feature/allow_server_reconnection_on_mobile_data Safemobile:feature/icon_and_background Safemobile:features/SD-188-Create_Permission_module_and_request_audio Safemobile:feature/new_signature Safemobile:feature/apk_versioning_mechanism Safemobile:features/SD-207-get_alarms_and_send_ack Safemobile:features/SD-185-update-app-to_support-new-message-parsing Safemobile:features/SD-199-livetab-check Safemobile:initial-commit Safemobile:master
Safemobile:8.0
...
compare: Safemobile:fix/SD-216-back-navigation-broken
Branches Tags
Safemobile:develop Safemobile:convert_to_mph Safemobile:SD_256_incorect_timestamp_in_buble_live_tab Safemobile:SD-230 Safemobile:show_notifications Safemobile:refresh_list_after_on_item_click Safemobile:SD-222 Safemobile:SD-219 Safemobile:SD-224 Safemobile:SD-217 Safemobile:SD-225 Safemobile:feature/notifications Safemobile:features/SD-203-add-dialogs-for-history-tab Safemobile:fix/SD-216-back-navigation-broken Safemobile:features/SD-211-recordings-tab Safemobile:feature/allow_server_reconnection_on_mobile_data Safemobile:feature/icon_and_background Safemobile:features/SD-188-Create_Permission_module_and_request_audio Safemobile:feature/new_signature Safemobile:feature/apk_versioning_mechanism Safemobile:features/SD-207-get_alarms_and_send_ack Safemobile:features/SD-185-update-app-to_support-new-message-parsing Safemobile:features/SD-199-livetab-check Safemobile:initial-commit Safemobile:master
Safemobile:8.0

12 Commits
3f96055a6e ... fix/SD-216

Author SHA1 Message Date
Bogdan
3a0fe96708 SD-216 - fix back button functionality for recordings and history tabs 2022-03-31 07:19:40 +03:00
Bogdan Ungureanu
5cd598bec9 Merge pull request 'features/SD-211-recordings-tab' (#14) from features/SD-211-recordings-tab into develop 
Reviewed-on: #14
 2022-03-30 11:26:25 +00:00
Bogdan
79234c9830 Merge branch 'develop' into features/SD-211-recordings-tab 2022-03-30 14:22:20 +03:00
CiufudeanDani
cbeb912820 Merge pull request 'allow server to reconnect on mobile data' (#15) from feature/allow_server_reconnection_on_mobile_data into develop 
Reviewed-on: #15
 2022-03-30 08:52:35 +00:00
CiufudeanDani
f15688b9a1 allow server to reconnect on mobile data 2022-03-30 11:50:48 +03:00
Bogdan
3935b3ad0b SD-211 - fix file rename issue after merge 2022-03-30 11:19:33 +03:00
Bogdan
e59b522ccb Merge branch 'develop' into features/SD-211-recordings-tab 
# Conflicts:
#	libSafeMobile/src/main/java/com/safemobile/services/TCPhandler.java
#	safeDispatch/src/main/res/layout/dialog_login.xml
 2022-03-30 10:38:47 +03:00
CiufudeanDani
94091a9a31 Merge pull request 'text color on radio' (#13) from feature/icon_and_background into develop 
Reviewed-on: #13
 2022-03-28 13:38:39 +00:00
CiufudeanDani
d9d325b18b text color on radio 2022-03-28 16:34:53 +03:00
CiufudeanDani
f4c6b8163d Merge pull request 'change text color + small changes' (#12) from feature/icon_and_background into develop 
Reviewed-on: #12
 2022-03-28 11:09:20 +00:00
CiufudeanDani
17a7e1711e merge with develop 2022-03-28 14:06:36 +03:00
CiufudeanDani
9b302d0461 change text color + small changes 2022-03-28 14:02:10 +03:00
23 changed files with 938 additions and 1002 deletions
Expand all files Collapse all files

6
libSafeMobile/src/main/java/com/safemobile/services/TCPService.java
View File

@ -28,13 +28,11 @@ public class TCPService extends Service {
int port = 13589; int port = 13589;
try { try {
port = Integer.parseInt(AppParams.PORT); port = Integer.parseInt(AppParams.PORT);
} } catch(Exception ex) { }
catch(Exception ex) { }
tcpParser = new TCPmsgParser(); 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); tcp = new TCPhandler(getApplicationContext(), AppParams.IP, port);
} }

184
libSafeMobile/src/main/java/com/safemobile/services/TCPhandler.java
View File

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

BIN
safeDispatch/release/SafeDispatchMobile_v.8.0.49-release.aab Normal file
View File

Binary file not shown.

0
safeDispatch/src/main/java/com/safemobile/lib/sound/TCPaudioClient.java → safeDispatch/src/main/java/com/safemobile/lib/sound/TcpAudioClient.java
View File

13
safeDispatch/src/main/java/com/safemobile/safedispatch/HistoryActivity.java
View File

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

11
safeDispatch/src/main/java/com/safemobile/safedispatch/RecordingsActivity.java
View File

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

16
safeDispatch/src/main/java/com/safemobile/safedispatch/SDMobileActivity.java
View File

@ -233,10 +233,10 @@ public class SDMobileActivity extends Activity {
etPassword.setText(AppParams.PASSWORD.equalsIgnoreCase("n/a") ? "" : AppParams.PASSWORD); 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 // enable ui after the language is changed and tcp connection is on
if (tcp != null && tcp.isConnectionUP) { if (tcp != null && tcp.isConnectionUP) {
@ -663,7 +663,7 @@ public class SDMobileActivity extends Activity {
// get default password // get default password
AppParams.PASSWORD = AppParams.prefs.getString(PASSWORD, "n/a"); AppParams.PASSWORD = AppParams.prefs.getString(PASSWORD, "n/a");
// get default IP // 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 // get Radio ID & IP
AppParams.RADIOID = AppParams.prefs.getInt("radioId", 100); AppParams.RADIOID = AppParams.prefs.getInt("radioId", 100);
@ -737,10 +737,10 @@ public class SDMobileActivity extends Activity {
Dialog dialogInfo = new Dialog(context); Dialog dialogInfo = new Dialog(context);
dialogInfo.requestWindowFeature(Window.FEATURE_NO_TITLE); dialogInfo.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialogInfo.setContentView(R.layout.dialog_login); 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)); textTitle.setText(getString(R.string.connectionError));
image.setImageResource(R.drawable.error); image.setImageResource(R.drawable.error);

12
safeDispatch/src/main/res/layout-large/row_livevehicle.xml
View File

@ -31,10 +31,10 @@
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:layout_weight="1"/> android:layout_weight="1"/>
<LinearLayout <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> </LinearLayout>

4
safeDispatch/src/main/res/layout-large/tabsetup.xml
View File

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

10
safeDispatch/src/main/res/layout/balloonname_overlay.xml
View File

@ -7,9 +7,9 @@
android:padding="2dp" android:padding="2dp"
android:background="@drawable/style_nameoverlay"> 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> </LinearLayout>

71
safeDispatch/src/main/res/layout/dialog.xml
View File

@ -1,37 +1,38 @@
<?xml version="1.0" encoding="utf-8"?> <?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="@color/black" 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="@color/black" android:paddingTop="8dp"
/> android:textSize="18dp"
</LinearLayout> />
</LinearLayout>
</LinearLayout> </LinearLayout>

2
safeDispatch/src/main/res/layout/dialog_login.xml
View File

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

16
safeDispatch/src/main/res/layout/login_h.xml
View File

@ -217,13 +217,13 @@
<ImageView <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> </RelativeLayout>

24
safeDispatch/src/main/res/layout/main_before.xml
View File

@ -210,8 +210,6 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/frameLayoutLanguage" android:id="@+id/frameLayoutLanguage"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -221,20 +219,16 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_gravity="right" android:layout_gravity="right"
android:paddingBottom="6dp" android:paddingBottom="6dp"
android:layout_toLeftOf="@+id/frameLayout13"> android:layout_toLeftOf="@+id/frameLayout13" />
</RelativeLayout>
<ImageView <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> </RelativeLayout>

12
safeDispatch/src/main/res/layout/row_livevehicle.xml
View File

@ -31,10 +31,10 @@
android:paddingLeft="3dp" android:paddingLeft="3dp"
android:layout_weight="1"/> android:layout_weight="1"/>
<LinearLayout <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> </LinearLayout>

46
safeDispatch/src/main/res/layout/spinner.xml
View File

@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?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: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: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_width="wrap_content"
android:layout_height="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> </LinearLayout>

16
safeDispatch/src/main/res/layout/style_header_alarm.xml
View File

@ -10,14 +10,14 @@
android:gravity="center_vertical" > android:gravity="center_vertical" >
<ImageButton <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 <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

17
safeDispatch/src/main/res/layout/style_header_units.xml
View File

@ -9,7 +9,6 @@
style="?header" style="?header"
android:gravity="center_vertical" > android:gravity="center_vertical" >
<TextView <TextView
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -21,13 +20,13 @@
android:gravity="left|center_vertical" android:gravity="left|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" /> 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>
</LinearLayout> </LinearLayout>

145
safeDispatch/src/main/res/layout/tabalarm.xml
View File

@ -5,85 +5,84 @@
android:orientation="vertical" android:orientation="vertical"
style="?bg"> style="?bg">
<LinearLayout <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 <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>
</LinearLayout> </LinearLayout>

852
safeDispatch/src/main/res/layout/tabradio.xml
View File

@ -7,356 +7,352 @@
style="?bg"> style="?bg">
<LinearLayout <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 <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>
<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 <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 <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 <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -366,104 +362,104 @@
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android: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> </LinearLayout>
</LinearLayout> </LinearLayout>

27
safeDispatch/src/main/res/layout/tabrecordings.xml
View File

@ -123,19 +123,18 @@
android:visibility="gone" android:visibility="gone"
android:background="@drawable/recycle"/> 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> </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> </LinearLayout>

426
safeDispatch/src/main/res/layout/tabsetup.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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:id="@+id/layoutMain"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
@ -10,246 +11,237 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_weight="80"> 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 <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 <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> </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:id="@+id/layoutPath"> android:id="@+id/layoutPath">
<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: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> </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 <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>
</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> </LinearLayout>