Live Page #3

Merged
CiufudeanDani merged 8 commits from feature/live into develop 2022-03-17 08:20:52 +00:00
4 changed files with 482 additions and 533 deletions
Showing only changes of commit 4439687405 - Show all commits

View File

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

View File

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

View File

@ -5,337 +5,328 @@
android:id="@+id/tab1Layout" android:orientation="horizontal"
style="?bg">
<RelativeLayout
android:id="@+id/relativeHeader"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true">
<RelativeLayout
android:id="@+id/relativeHeader"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="left"
android:layout_weight="0"
android:orientation="horizontal"
style="?header"
android:id="@+id/layoutHeader">
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="left"
android:layout_weight="0"
android:orientation="horizontal"
style="?header"
android:id="@+id/layoutHeader">
<ImageView
android:id="@+id/imageViewMsg"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:src="@drawable/calendar_48_red"
android:paddingLeft="0dp"
android:layout_margin="3dp"
android:layout_weight="0" />
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:text="@string/history"
android:layout_marginLeft="5dp"
android:textStyle="bold"
android:paddingTop="7dp"
android:textColor="#FFFFFF"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_weight="0"/>
<ImageView
android:id="@+id/imageViewMsg"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:src="@drawable/calendar_48_red"
android:paddingLeft="0dp"
android:layout_margin="3dp"
android:layout_weight="0" />
<TextView
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:text="@string/history"
android:layout_marginLeft="5dp"
android:textStyle="bold"
android:paddingTop="7dp"
android:textColor="#FFFFFF"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_weight="0"/>
<ImageView
android:id="@+id/imageViewSeparator"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:src="@drawable/separator_white"
android:layout_margin="2dp"
android:layout_weight="0"
android:visibility="invisible"
android:focusable="false" />
<ImageView
android:id="@+id/imageViewSeparator"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:src="@drawable/separator_white"
android:layout_margin="2dp"
android:layout_weight="0"
android:visibility="invisible"
android:focusable="false" />
<ImageView
android:id="@+id/imageViewDown"
android:layout_width="20dp"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:layout_marginBottom="2dp"
android:layout_marginTop="2dp"
android:focusable="false"
android:visibility="invisible"
android:src="@drawable/arrow_menu_down" />
<ImageView
android:id="@+id/imageViewDown"
android:layout_width="20dp"
android:layout_height="fill_parent"
android:layout_gravity="center_vertical"
android:layout_marginBottom="2dp"
android:layout_marginTop="2dp"
android:focusable="false"
android:visibility="invisible"
android:src="@drawable/arrow_menu_down" />
<ImageButton
android:id="@+id/imageButtonAdd2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:scaleType="centerInside"
android:layout_marginRight="5dp"
android:paddingLeft="2dp"
android:visibility="invisible"
android:background="@drawable/addmessage_selector"/>
<ImageButton
android:id="@+id/imageButtonAdd2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:scaleType="centerInside"
android:layout_marginRight="5dp"
android:paddingLeft="2dp"
android:visibility="invisible"
android:background="@drawable/addmessage_selector"/>
<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/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"/>
<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>
<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">
<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: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"/>
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">
<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" />
<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
android:id="@+id/slideLayoutImage"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_horizontal"
android:src="@drawable/arrow_left"
android:layout_weight="1"
style="?sliders" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutGoogleMaps"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_toRightOf="@id/slidelayout"
android:layout_weight="1"
android:orientation="horizontal" >
</LinearLayout>
</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
android:id="@+id/slideLayoutImage"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_horizontal"
android:src="@drawable/arrow_left"
android:layout_weight="1"
style="?sliders" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutGoogleMaps"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_toRightOf="@id/slidelayout"
android:layout_weight="1"
android:orientation="horizontal" >
</LinearLayout>
</LinearLayout>
<ImageView
android:id="@+id/changeMapType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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"/>
<ImageView
android:id="@+id/changeMapType"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
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>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>

View File

@ -5,90 +5,70 @@
android:orientation="vertical" >
<LinearLayout
android:id="@+id/linearLayout1"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
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="match_parent" android:layout_height="wrap_content" android:id="@+id/linearLayout3">
<LinearLayout android:layout_width="80dp" android:id="@+id/linearLayout4" android:layout_height="wrap_content">
<Button android:layout_width="wrap_content" android:text="Create tabs" android:layout_height="wrap_content" android:id="@+id/button1"></Button>
</LinearLayout>
<LinearLayout android:layout_height="match_parent" android:id="@+id/linearLayout5" android:layout_width="match_parent">
<LinearLayout android:layout_width="100dp" android:layout_height="match_parent" android:id="@+id/linearLayout7" android:layout_weight="0.29" android:weightSum="1">
<Button android:text="Remove selected tab" android:layout_height="wrap_content" android:id="@+id/button3" android:layout_width="wrap_content"></Button>
</LinearLayout>
<EditText android:layout_width="wrap_content" android:id="@+id/editText1" android:layout_height="wrap_content" android:inputType="number" android:layout_weight="13.86">
<requestFocus></requestFocus>
</EditText>
<LinearLayout android:layout_width="80dp" android:layout_height="match_parent" android:id="@+id/linearLayout7" android:layout_weight="0.29" android:weightSum="1">
<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>
</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"/>
android:id="@+id/linearLayout1"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="#000000">
</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
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
android:id="@+id/layoutNewMessage"
android:layout_width="250dp"
@ -100,20 +80,20 @@
android:layout_margin="2dp"
android:visibility="invisible"
android:background="@drawable/alert_message">
<ImageView
android:id="@+id/imageViewClose"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/balloon_overlay_close"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:visibility="invisible"
android:background="@drawable/balloon_close_bg_selector" />
<ImageView
android:id="@+id/imageViewClose"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/balloon_overlay_close"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:visibility="invisible"
android:background="@drawable/balloon_close_bg_selector" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="3dp">
android:padding="3dp">
<TextView
android:id="@+id/slideTabsText"
@ -127,15 +107,15 @@
android:gravity="center_vertical"
android:layout_above="@android:id/tabs"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/imageViewPopUp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/message"
android:layout_gravity="center_vertical" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/imageViewPopUp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/message"
android:layout_gravity="center_vertical" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -162,7 +142,6 @@
android:layout_gravity="center_vertical"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>