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

Compare commits

base: Safemobile:4439687405f0d4a573b63719bae4e3c8282bd5b0
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:b91931e8330f092df1517ad583d10284039bead3
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

No commits in common. "4439687405f0d4a573b63719bae4e3c8282bd5b0" and "b91931e8330f092df1517ad583d10284039bead3" have entirely different histories.
4439687405 ... b91931e833

5 changed files with 546 additions and 502 deletions
Show Stats Expand all files Collapse all files

6
safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java
View File

@ -9,18 +9,12 @@ import com.safemobile.lib.SM;
public class HistoryActivity extends AppCompatActivity { public class HistoryActivity extends AppCompatActivity {
public Bundle savedInstanceState; public Bundle savedInstanceState;
private TabLayoutActivity parentTab;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
this.savedInstanceState = savedInstanceState; this.savedInstanceState = savedInstanceState;
setContentView(R.layout.tabhistory); setContentView(R.layout.tabhistory);
parentTab = (TabLayoutActivity) getParent();
parentTab.historyActivity = this;
} }
public void UpdateMap() { public void UpdateMap() {

19
safeDispatch/src/main/java/com/safemobile/dispatch/LiveActivity.java
View File

@ -32,13 +32,13 @@ import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap; import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.OnMapReadyCallback; import com.google.android.gms.maps.OnMapReadyCallback;
import com.google.android.gms.maps.SupportMapFragment; import com.google.android.gms.maps.SupportMapFragment;
import com.google.android.gms.maps.model.BitmapDescriptor; import com.google.android.gms.maps.model.BitmapDescriptor;
import com.google.android.gms.maps.model.BitmapDescriptorFactory; import com.google.android.gms.maps.model.BitmapDescriptorFactory;
import com.google.android.gms.maps.model.LatLng; import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Marker;
import com.google.android.gms.maps.model.MarkerOptions; import com.google.android.gms.maps.model.MarkerOptions;
import com.safemobile.activities.AbstractLiveActivity; import com.safemobile.activities.AbstractLiveActivity;
import com.safemobile.activities.AbstractSDParentActivity; import com.safemobile.activities.AbstractSDParentActivity;
@ -102,7 +102,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
//value poll //value poll
private double latPoll = 0; private double latPoll = 0;
private double lngPoll = 0; private double lngPoll = 0;
private ArrayList<Marker> markers = new ArrayList<>();
@Override @Override
@ -309,6 +308,10 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
this.googleMap = googleMap; this.googleMap = googleMap;
GoogleMapsInfoBubble infoBubble = new GoogleMapsInfoBubble(getLayoutInflater(), this, getParentTab().SuperVehHash); GoogleMapsInfoBubble infoBubble = new GoogleMapsInfoBubble(getLayoutInflater(), this, getParentTab().SuperVehHash);
this.googleMap.setInfoWindowAdapter(infoBubble); this.googleMap.setInfoWindowAdapter(infoBubble);
// Add a marker in Sydney and move the camera
LatLng sydney = new LatLng(-34, 151);
this.googleMap.addMarker(new MarkerOptions().position(sydney).title("Marker in Sydney"));
this.googleMap.moveCamera(CameraUpdateFactory.newLatLng(sydney));
} }
@ -442,12 +445,6 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
public void displayVehicle(boolean withZoom, double latZoom, double lngZoom) { public void displayVehicle(boolean withZoom, double latZoom, double lngZoom) {
if (googleMap != null) { if (googleMap != null) {
String openWindow = "";
for (Marker marker : markers) {
if (marker.isInfoWindowShown()) {
openWindow = marker.getTitle();
}
}
googleMap.clear(); googleMap.clear();
for (int i = 0; i < displayedVehicles.size(); i++) { for (int i = 0; i < displayedVehicles.size(); i++) {
@ -461,11 +458,7 @@ public class LiveActivity extends AbstractLiveActivity implements OnMapReadyCall
BitmapDescriptor markerIcon = getProperBitmap(tmpSuper.getLargeIcon(), tmpSuper.name); BitmapDescriptor markerIcon = getProperBitmap(tmpSuper.getLargeIcon(), tmpSuper.name);
markerOptions.icon(markerIcon); markerOptions.icon(markerIcon);
Marker marker = this.googleMap.addMarker(markerOptions); this.googleMap.addMarker(markerOptions);
if (openWindow.equals(marker.getTitle()))
marker.showInfoWindow();
markers.add(marker);
} }
} }
} }

203
safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java
View File

@ -12,6 +12,7 @@ import java.util.Locale;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
/** fix import */
import com.safemobile.activities.AbstractEmptyActivity; import com.safemobile.activities.AbstractEmptyActivity;
import com.safemobile.activities.AbstractLiveActivity; import com.safemobile.activities.AbstractLiveActivity;
import com.safemobile.activities.AbstractMessagesActivity; import com.safemobile.activities.AbstractMessagesActivity;
@ -266,11 +267,11 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
tabHost = getTabHost(); // The activity TabHost tabHost = getTabHost(); // The activity TabHost
tabHost.setTag("Tab Panel"); tabHost.setTag("Tab Panel");
tabWidget = findViewById(android.R.id.tabs); tabWidget = (TabWidget) findViewById(android.R.id.tabs);
tabWidget.setVisibility(View.GONE); tabWidget.setVisibility(View.GONE);
intent = new Intent[8]; intent = new Intent[7];
tabspecs = new TabSpec[8]; tabspecs = new TabSpec[7];
// add live tab // add live tab
try try
@ -289,6 +290,23 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
.setContent(intent[0]); .setContent(intent[0]);
} }
// add history tab
try
{
//intent[1] = new Intent(context, HistoryActivity.class);
//tabspecs[1] = tabHost.newTabSpec("History")
// .setIndicator("History", res.getDrawable(R.drawable.ic_tab_history_selected))
// .setContent(intent[1]);
}
catch(NoClassDefFoundError e)
{
// exception when GoogleApi not exists
//intent[1] = new Intent(context, AbstractEmptyActivity.class);
//tabspecs[1] = tabHost.newTabSpec("History")
// .setIndicator("History", res.getDrawable(R.drawable.ic_tab_history_selected))
// .setContent(intent[1]);
}
// add text tab // add text tab
intent[1] = new Intent(context, MessagesActivity.class); intent[1] = new Intent(context, MessagesActivity.class);
tabspecs[1] = tabHost.newTabSpec("Text") tabspecs[1] = tabHost.newTabSpec("Text")
@ -324,21 +342,6 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
tabspecs[6] = tabHost.newTabSpec("SafeMobile") tabspecs[6] = tabHost.newTabSpec("SafeMobile")
.setIndicator("SafeMobile", res.getDrawable(AppParams.DEMO ? R.drawable.icon_demo : R.drawable.ic_launcher)) .setIndicator("SafeMobile", res.getDrawable(AppParams.DEMO ? R.drawable.icon_demo : R.drawable.ic_launcher))
.setContent(intent[6]); .setContent(intent[6]);
// add history tab
try
{
intent[7] = new Intent(context, HistoryActivity.class);
tabspecs[7] = tabHost.newTabSpec("History")
.setIndicator("History", res.getDrawable(R.drawable.ic_tab_history_selected))
.setContent(intent[7]);
} catch(NoClassDefFoundError e) {
// exception when GoogleApi not exists
intent[7] = new Intent(context, AbstractEmptyActivity.class);
tabspecs[7] = tabHost.newTabSpec("History")
.setIndicator("History", res.getDrawable(R.drawable.ic_tab_history_selected))
.setContent(intent[1]);
}
// add tab in tabHost // add tab in tabHost
// for(int i=0;i<7;i++ // for(int i=0;i<7;i++
@ -352,64 +355,76 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
imageViewSlideMenu = (ImageView) findViewById(R.id.imageViewSlideMenu); imageViewSlideMenu = (ImageView) findViewById(R.id.imageViewSlideMenu);
// get Live Button // get Live Button
buttonLive = findViewById(R.id.buttonLive); buttonLive = (ImageButton) findViewById(R.id.buttonLive);
buttonLive.setOnClickListener(v -> { buttonLive.setOnClickListener(new OnClickListener() {
if (!buttonLive.isSelected()) { @Override
// select button public void onClick(View v) {
buttonLive.setSelected(true); if(!buttonLive.isSelected())
// deselect other buttons {
buttonAlarms.setSelected(false); // select button
buttonHistory.setSelected(false); buttonLive.setSelected(true);
buttonRadio.setSelected(false); // deselect other buttons
buttonRecordings.setSelected(false); buttonAlarms.setSelected(false);
buttonSetup.setSelected(false); buttonHistory.setSelected(false);
buttonText.setSelected(false); buttonRadio.setSelected(false);
// select tab buttonRecordings.setSelected(false);
tabHost.setCurrentTabByTag("Live"); buttonSetup.setSelected(false);
AppParams.crtTab = AppParams.Tabs.live; buttonText.setSelected(false);
// select tab
tabHost.setCurrentTabByTag("Live");
AppParams.crtTab = AppParams.Tabs.live;
}
} }
}); });
// get History Button // get History Button
buttonHistory = findViewById(R.id.buttonHistory); buttonHistory = (ImageButton) findViewById(R.id.buttonHistory);
buttonHistory.setOnClickListener(v -> { buttonHistory.setOnClickListener(new OnClickListener() {
if (!buttonHistory.isSelected()) { @Override
// select button public void onClick(View v) {
buttonHistory.setSelected(true); if(!buttonHistory.isSelected())
// deselect other buttons {
buttonAlarms.setSelected(false); // select button
buttonLive.setSelected(false); buttonHistory.setSelected(true);
buttonRadio.setSelected(false); // deselect other buttons
buttonRecordings.setSelected(false); buttonAlarms.setSelected(false);
buttonSetup.setSelected(false); buttonLive.setSelected(false);
buttonText.setSelected(false); buttonRadio.setSelected(false);
// select tab buttonRecordings.setSelected(false);
tabHost.setCurrentTabByTag("History"); buttonSetup.setSelected(false);
AppParams.crtTab = AppParams.Tabs.history; buttonText.setSelected(false);
// select tab
tabHost.setCurrentTabByTag("History");
AppParams.crtTab = AppParams.Tabs.history;
}
} }
}); });
// get Text Button // get Text Button
buttonText= findViewById(R.id.buttonText); buttonText= (ImageButton) findViewById(R.id.buttonText);
buttonText.setOnClickListener(v -> { buttonText.setOnClickListener(new OnClickListener() {
if (!buttonText.isSelected()) { @Override
// select button public void onClick(View v) {
buttonText.setSelected(true); if(!buttonText.isSelected())
// deselect other buttons
buttonAlarms.setSelected(false);
buttonLive.setSelected(false);
buttonRadio.setSelected(false);
buttonRecordings.setSelected(false);
buttonSetup.setSelected(false);
buttonHistory.setSelected(false);
// select tab
tabHost.setCurrentTabByTag("Text");
AppParams.crtTab = AppParams.Tabs.message;
if(AppParams.DEMO && messageActivity.allVehicle.size()== 0)
{ {
messageActivity.UpdateVehs(allVehicle); // select button
messageActivity.UpdateSMS(listSMS); buttonText.setSelected(true);
// deselect other buttons
buttonAlarms.setSelected(false);
buttonLive.setSelected(false);
buttonRadio.setSelected(false);
buttonRecordings.setSelected(false);
buttonSetup.setSelected(false);
buttonHistory.setSelected(false);
// select tab
tabHost.setCurrentTabByTag("Text");
AppParams.crtTab = AppParams.Tabs.message;
if(AppParams.DEMO && messageActivity.allVehicle.size()== 0)
{
messageActivity.UpdateVehs(allVehicle);
messageActivity.UpdateSMS(listSMS);
}
} }
} }
}); });
@ -596,21 +611,24 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
}); });
// get About Button // get About Button
buttonLogo = findViewById(R.id.buttonLogo); buttonLogo = (ImageButton) findViewById(R.id.buttonLogo);
buttonLogo.setOnClickListener(v -> { buttonLogo.setOnClickListener(new OnClickListener() {
// create dialog @Override
final Dialog dialog = new Dialog(context); public void onClick(View v) {
dialog.setTitle(AppParams.DEMO ? getString(R.string.app_name_demo) : getString(R.string.app_name)); // create dialog
dialog.setContentView(R.layout.dialog); final Dialog dialog = new Dialog(context);
ImageView image = dialog.findViewById(R.id.image); dialog.setTitle(AppParams.DEMO ? getString(R.string.app_name_demo) : getString(R.string.app_name));
image.setImageResource(AppParams.DEMO ? R.drawable.icon_demo : R.drawable.ic_launcher); dialog.setContentView(R.layout.dialog);
TextView text = dialog.findViewById(R.id.text); ImageView image = (ImageView) dialog.findViewById(R.id.image);
TextView text2 = dialog.findViewById(R.id.text2); image.setImageResource(AppParams.DEMO ? R.drawable.icon_demo : R.drawable.ic_launcher);
text.setText(getString(R.string.version) + "1.0.8"); TextView text = (TextView) dialog.findViewById(R.id.text);
text2.setText(getString(R.string.email) + ": support@safemobile.com"); TextView text2 = (TextView) dialog.findViewById(R.id.text2);
dialog.setCancelable(true); text.setText(getString(R.string.version) + "1.0.8");
dialog.setCanceledOnTouchOutside(true); text2.setText(getString(R.string.email) + ": support@safemobile.com");
dialog.show(); dialog.setCancelable(true);
dialog.setCanceledOnTouchOutside(true);
dialog.show();
}
}); });
imageViewClose.setOnTouchListener(new OnTouchListener() { imageViewClose.setOnTouchListener(new OnTouchListener() {
@ -1439,19 +1457,28 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
} }
// if tab is not TextTab // if tab is not TextTab
if(tabHost.getCurrentTab() != 2) { if(tabHost.getCurrentTab() != 2)
{
myHandler.post(UpdateResults); myHandler.post(UpdateResults);
//mHandler.dispatchMessage(new Message()); //mHandler.dispatchMessage(new Message());
} else }
myHandler.post(() -> { else
// create Notification myHandler.post(new Runnable() {
createNotification(AppParams.messageNotif);
@Override
public void run() {
// create Notification
createNotification(AppParams.messageNotif);
}
}); });
//list for SMS //list for SMS
if(AppParams.crtTab == AppParams.Tabs.message && messageActivity!= null) { if(AppParams.crtTab == AppParams.Tabs.message && messageActivity!= null)
{
SM.Debug("currentActivity instanceof MessagesActivity - NewSMS | " + tempArr[0] + " | " + tempArr[1]); SM.Debug("currentActivity instanceof MessagesActivity - NewSMS | " + tempArr[0] + " | " + tempArr[1]);
messageActivity.NewSMS(tempArr[0], tempArr[1], time); messageActivity.NewSMS(tempArr[0], tempArr[1], time);
} }
} }
@Override @Override

639
safeDispatch/src/main/res/layout/tabhistory.xml
View File

@ -5,328 +5,337 @@
android:id="@+id/tab1Layout" android:orientation="horizontal" android:id="@+id/tab1Layout" android:orientation="horizontal"
style="?bg"> style="?bg">
<RelativeLayout <RelativeLayout
android:id="@+id/relativeHeader" android:id="@+id/relativeHeader"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true"> android:layout_alignParentTop="true">
<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/calendar_48_red" android:src="@drawable/calendar_48_red"
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/history" android:text="@string/history"
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
android:id="@+id/imageViewDown"
android:layout_width="20dp"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:layout_marginBottom="2dp"
android:layout_marginTop="2dp"
android:focusable="false"
android:visibility="invisible"
android:src="@drawable/arrow_menu_down" />
<ImageButton
android:id="@+id/imageButtonAdd2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:scaleType="centerInside"
android:layout_marginRight="5dp"
android:paddingLeft="2dp"
android:visibility="invisible"
android:background="@drawable/addmessage_selector"/>
<ImageView
android:id="@+id/changeTraffic"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:padding="3dp"
android:layout_weight="0"
android:src="@drawable/traffic_off"
android:adjustViewBounds="true"/>
<ImageView
android:id="@+id/changeMapTypeHeader"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:padding="3dp"
android:layout_weight="0"
android:src="@drawable/satellite"
android:adjustViewBounds="true"/>
<TextView
android:id="@+id/textViewNew"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:text="New"
android:textStyle="bold"
android:paddingTop="7dp"
android:textColor="#FFFFFF"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_weight="0"
android:paddingRight="5dp"
android:visibility="gone"/>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_below="@+id/relativeHeader">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:weightSum="1">
<LinearLayout
android:layout_width="200dp"
android:layout_height="fill_parent"
android:id="@+id/layoutBig"
android:orientation="vertical"
android:visibility="visible">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/liveVehicle"
android:background="#ffffff"
android:orientation="vertical">
<LinearLayout
android:id="@+id/LayoutSpinner"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:paddingTop="10dp"
android:gravity="top"
android:layout_weight="1">
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/vehicle"
android:textSize="20dp"
android:paddingLeft="5dp"
android:textColor="#000000"
android:gravity="left"
android:id="@+id/labelVehicle"/>
<Spinner
android:id="@+id/spinnerVehicle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:entries="@array/arrayLanguages"
android:gravity="center_horizontal"
android:prompt="@string/selUsername"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/startDate"
android:textSize="22dp"
android:paddingLeft="5dp"
android:textColor="#000000"
android:gravity="left"
android:id="@+id/labelStartDate"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/layoutStartPicker"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_gravity="left"
android:gravity="right"
android:layout_marginLeft="2sp"
android:layout_marginRight="3sp"
android:orientation="horizontal"
android:background="@drawable/style_spinner">
<ImageView
android:id="@+id/imageViewStartDate"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:src="@drawable/calendar_48" />
<TextView
android:id="@+id/textViewStartDate"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:text="10:41, 12.12.2011"
android:textSize="18sp"
android:paddingLeft="1dp"
android:textColor="#000000"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/endDate"
android:textSize="22dp"
android:paddingLeft="5dp"
android:textColor="#000000"
android:gravity="left"
android:id="@+id/labelEndDate"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/layoutEndPicker"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_gravity="left"
android:gravity="right"
android:layout_marginTop="3sp"
android:layout_marginLeft="2sp"
android:layout_marginRight="3sp"
android:orientation="horizontal"
android:background="@drawable/style_spinner">
<ImageView
android:id="@+id/imageViewEndDate"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:src="@drawable/calendar_48_red" />
<TextView
android:id="@+id/textViewEndDate"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:text="10:00, 13.12.2011"
android:textSize="18sp"
android:paddingLeft="1dp"
android:textColor="#000000" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="bottom">
<TextView
android:id="@+id/textViewSearch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom"
android:text=""
android:textSize="16dp"
android:paddingLeft="5dp"
android:textColor="#000000"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="0"
style="?header"
android:gravity="center"
android:paddingTop="4dp">
<Button
android:id="@+id/buttonDisplay"
style="?login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_weight="0"
android:text="@string/display" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="20dp"
android:layout_height="fill_parent"
android:id="@+id/slidelayout"
android:layout_toRightOf="@id/liveVehicle"
android:gravity="center_vertical"
android:orientation="vertical"
android:layout_weight="0">
<ImageView <ImageView
android:id="@+id/slideLayoutImage" android:id="@+id/imageViewDown"
android:layout_width="fill_parent" android:layout_width="20dp"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:gravity="center_horizontal" android:layout_gravity="center_vertical"
android:src="@drawable/arrow_left" android:layout_marginBottom="2dp"
android:layout_weight="1" android:layout_marginTop="2dp"
style="?sliders" /> android:focusable="false"
</LinearLayout> android:visibility="invisible"
android:src="@drawable/arrow_menu_down" />
<ImageButton
android:id="@+id/imageButtonAdd2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:scaleType="centerInside"
android:layout_marginRight="5dp"
android:paddingLeft="2dp"
android:visibility="invisible"
android:background="@drawable/addmessage_selector"/>
<ImageView
android:id="@+id/changeTraffic"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:padding="3dp"
android:layout_weight="0"
android:src="@drawable/traffic_off"
android:adjustViewBounds="true"/>
<ImageView
android:id="@+id/changeMapTypeHeader"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:padding="3dp"
android:layout_weight="0"
android:src="@drawable/satellite"
android:adjustViewBounds="true"/>
<TextView
android:id="@+id/textViewNew"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:text="New"
android:textStyle="bold"
android:paddingTop="7dp"
android:textColor="#FFFFFF"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_weight="0"
android:paddingRight="5dp"
android:visibility="gone"/>
<!-- android:background="@drawable/addmessage_selector" -->
</LinearLayout>
</RelativeLayout>
<LinearLayout <RelativeLayout
android:id="@+id/layoutGoogleMaps" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:layout_below="@+id/relativeHeader">
android:layout_toRightOf="@id/slidelayout"
android:layout_weight="1" <LinearLayout
android:orientation="horizontal" > android:layout_width="fill_parent"
</LinearLayout> android:layout_height="fill_parent"
android:weightSum="1">
<LinearLayout
android:layout_width="200dp"
android:layout_height="fill_parent"
android:id="@+id/layoutBig"
android:orientation="vertical"
android:visibility="visible">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/liveVehicle"
android:background="#ffffff"
android:orientation="vertical">
<LinearLayout
android:id="@+id/LayoutSpinner"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:paddingTop="10dp"
android:gravity="top"
android:layout_weight="1">
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/vehicle"
android:textSize="20dp"
android:paddingLeft="5dp"
android:textColor="#000000"
android:gravity="left"
android:id="@+id/labelVehicle"/>
<Spinner
android:id="@+id/spinnerVehicle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:entries="@array/arrayLanguages"
android:gravity="center_horizontal"
android:prompt="@string/selUsername"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/startDate"
android:textSize="22dp"
android:paddingLeft="5dp"
android:textColor="#000000"
android:gravity="left"
android:id="@+id/labelStartDate"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/layoutStartPicker"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_gravity="left"
android:gravity="right"
android:layout_marginLeft="2sp"
android:layout_marginRight="3sp"
android:orientation="horizontal"
android:background="@drawable/style_spinner">
<ImageView
android:id="@+id/imageViewStartDate"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:src="@drawable/calendar_48" />
<TextView
android:id="@+id/textViewStartDate"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:text="10:41, 12.12.2011"
android:textSize="18sp"
android:paddingLeft="1dp"
android:textColor="#000000"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/endDate"
android:textSize="22dp"
android:paddingLeft="5dp"
android:textColor="#000000"
android:gravity="left"
android:id="@+id/labelEndDate"
android:visibility="gone"/>
<LinearLayout
android:id="@+id/layoutEndPicker"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_gravity="left"
android:gravity="right"
android:layout_marginTop="3sp"
android:layout_marginLeft="2sp"
android:layout_marginRight="3sp"
android:orientation="horizontal"
android:background="@drawable/style_spinner">
<ImageView
android:id="@+id/imageViewEndDate"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:src="@drawable/calendar_48_red" />
<TextView
android:id="@+id/textViewEndDate"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:text="10:00, 13.12.2011"
android:textSize="18sp"
android:paddingLeft="1dp"
android:textColor="#000000" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="bottom">
<TextView
android:id="@+id/textViewSearch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom"
android:text=""
android:textSize="16dp"
android:paddingLeft="5dp"
android:textColor="#000000"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_weight="0"
style="?header"
android:gravity="center"
android:paddingTop="4dp">
<Button
android:id="@+id/buttonDisplay"
style="?login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_weight="0"
android:text="@string/display" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
<ImageView <LinearLayout
android:id="@+id/changeMapType" android:layout_width="20dp"
android:layout_width="wrap_content" android:layout_height="fill_parent"
android:layout_height="wrap_content" android:id="@+id/slidelayout"
android:layout_alignParentRight="true" android:layout_toRightOf="@id/liveVehicle"
android:layout_alignParentTop="true" android:gravity="center_vertical"
android:padding="3dp" android:orientation="vertical"
android:src="@drawable/satellite" android:layout_weight="0">
android:visibility="gone"/> <ImageView
<LinearLayout android:id="@+id/slideLayoutImage"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="30dp" android:layout_height="fill_parent"
android:layout_margin="3dp" android:gravity="center_horizontal"
android:layout_alignLeft="@+id/changeMapType" android:src="@drawable/arrow_left"
android:layout_below="@+id/changeMapType" android:layout_weight="1"
android:background="#fff" style="?sliders" />
android:orientation="horizontal" </LinearLayout>
android:id="@+id/layoutTraffic"
android:visibility="gone"> <LinearLayout
<ImageView android:id="@+id/layoutGoogleMaps"
android:id="@+id/checkTraffic" android:layout_width="fill_parent"
android:layout_width="wrap_content" android:layout_height="fill_parent"
android:layout_height="fill_parent" android:layout_toRightOf="@id/slidelayout"
android:padding="1dp" android:layout_weight="1"
android:src="@drawable/checked"/> android:orientation="horizontal" >
<TextView </LinearLayout>
android:id="@+id/changeTraffic2"
android:text="Traffic" </LinearLayout>
android:textSize="16dp" <ImageView
android:textColor="#000" android:id="@+id/changeMapType"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="wrap_content"
android:gravity="center_vertical"/> android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:padding="3dp"
android:src="@drawable/satellite"
android:visibility="gone"/>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="30dp"
android:layout_margin="3dp"
android:layout_alignLeft="@+id/changeMapType"
android:layout_below="@+id/changeMapType"
android:background="#fff"
android:orientation="horizontal"
android:id="@+id/layoutTraffic"
android:visibility="gone">
<ImageView
android:id="@+id/checkTraffic"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:padding="1dp"
android:src="@drawable/checked"/>
<TextView
android:id="@+id/changeTraffic2"
android:text="Traffic"
android:textSize="16dp"
android:textColor="#000"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical"/>
</LinearLayout> </LinearLayout>
</RelativeLayout>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>

181
safeDispatch/src/main/res/layout/tabpanel.xml
View File

@ -5,70 +5,90 @@
android:orientation="vertical" > android:orientation="vertical" >
<LinearLayout <LinearLayout
android:id="@+id/linearLayout1" android:id="@+id/linearLayout1"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="#000000"> android:background="#000000">
<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/linearLayout2" android:orientation="vertical">
<LinearLayout <!--
android:layout_width="fill_parent" <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/linearLayout3">
android:id="@+id/linearLayout6"
android:orientation="horizontal" <LinearLayout android:layout_width="80dp" android:id="@+id/linearLayout4" android:layout_height="wrap_content">
android:layout_height="fill_parent"> <Button android:layout_width="wrap_content" android:text="Create tabs" android:layout_height="wrap_content" android:id="@+id/button1"></Button>
<TabHost </LinearLayout>
android:layout_width="fill_parent" <LinearLayout android:layout_height="match_parent" android:id="@+id/linearLayout5" android:layout_width="match_parent">
android:layout_height="fill_parent" <LinearLayout android:layout_width="100dp" android:layout_height="match_parent" android:id="@+id/linearLayout7" android:layout_weight="0.29" android:weightSum="1">
android:id="@android:id/tabhost" <Button android:text="Remove selected tab" android:layout_height="wrap_content" android:id="@+id/button3" android:layout_width="wrap_content"></Button>
android:layout_weight="1"> </LinearLayout>
<RelativeLayout <EditText android:layout_width="wrap_content" android:id="@+id/editText1" android:layout_height="wrap_content" android:inputType="number" android:layout_weight="13.86">
android:orientation="vertical" <requestFocus></requestFocus>
android:layout_width="fill_parent" </EditText>
android:layout_height="fill_parent" <LinearLayout android:layout_width="80dp" android:layout_height="match_parent" android:id="@+id/linearLayout7" android:layout_weight="0.29" android:weightSum="1">
android:padding="0dp"> <Button android:layout_width="wrap_content" android:text="Add tab" android:layout_height="wrap_content" android:id="@+id/button2" android:layout_weight="0.25"></Button>
<TabWidget </LinearLayout>
android:id="@android:id/tabs" </LinearLayout>
android:layout_width="390dp"
android:layout_height="wrap_content"/>
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_below="@android:id/tabs"/>
</RelativeLayout>
</TabHost>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="0"
android:orientation="horizontal">
<LinearLayout
android:layout_width="20dp"
android:layout_height="fill_parent"
android:id="@+id/layoutSlideMenu"
android:gravity="center_vertical"
android:orientation="vertical"
android:layout_weight="0">
<ImageView
android:id="@+id/imageViewSlideMenu"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_horizontal"
android:src="@drawable/arrow_right"
android:layout_weight="1"
style="?sliders" />
</LinearLayout> </LinearLayout>
<include -->
android:id="@+id/layoutMenu"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
layout="@layout/menu" />
</LinearLayout> </LinearLayout>
</LinearLayout> <LinearLayout
</LinearLayout> android:layout_width="fill_parent"
android:id="@+id/linearLayout6"
android:orientation="horizontal"
android:layout_height="fill_parent">
<TabHost
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@android:id/tabhost"
android:layout_weight="1">
<RelativeLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="0dp">
<TabWidget
android:id="@android:id/tabs"
android:layout_width="390dp"
android:layout_height="wrap_content"/>
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_below="@android:id/tabs"/>
</RelativeLayout>
</TabHost>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="0"
android:orientation="horizontal">
<LinearLayout
android:layout_width="20dp"
android:layout_height="fill_parent"
android:id="@+id/layoutSlideMenu"
android:gravity="center_vertical"
android:orientation="vertical"
android:layout_weight="0">
<ImageView
android:id="@+id/imageViewSlideMenu"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_horizontal"
android:src="@drawable/arrow_right"
android:layout_weight="1"
style="?sliders" />
</LinearLayout>
<include
android:id="@+id/layoutMenu"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
layout="@layout/menu" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/layoutNewMessage" android:id="@+id/layoutNewMessage"
android:layout_width="250dp" android:layout_width="250dp"
@ -80,20 +100,20 @@
android:layout_margin="2dp" android:layout_margin="2dp"
android:visibility="invisible" android:visibility="invisible"
android:background="@drawable/alert_message"> android:background="@drawable/alert_message">
<ImageView <ImageView
android:id="@+id/imageViewClose" android:id="@+id/imageViewClose"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/balloon_overlay_close" android:src="@drawable/balloon_overlay_close"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:visibility="invisible" android:visibility="invisible"
android:background="@drawable/balloon_close_bg_selector" /> android:background="@drawable/balloon_close_bg_selector" />
<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"
android:padding="3dp"> android:padding="3dp">
<TextView <TextView
android:id="@+id/slideTabsText" android:id="@+id/slideTabsText"
@ -107,15 +127,15 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:layout_above="@android:id/tabs"/> android:layout_above="@android:id/tabs"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/imageViewPopUp" android:id="@+id/imageViewPopUp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@drawable/message" android:src="@drawable/message"
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -142,6 +162,7 @@
android:layout_gravity="center_vertical"/> android:layout_gravity="center_vertical"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>