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

Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio

Browse Source 
# Conflicts:
#	safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java
#	safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
This commit is contained in:
Bogdan Ungureanu
2022-03-24 12:29:12 +02:00
parent 81937a5e0f c70a1b71a1
commit c07986d604
55 changed files with 419 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_launcher"
android:src="@mipmap/ic_launcher"
/>
<LinearLayout
android:layout_width="wrap_content"

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

@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_launcher"
android:src="@mipmap/ic_launcher"
android:contentDescription="image for dialog"
/>
<LinearLayout

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

@ -7,7 +7,7 @@
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_launcher"
android:src="@mipmap/ic_launcher"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp"

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

@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_height="fill_parent"
android:id="@+id/tab1Layout" android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/tab1Layout"
android:orientation="horizontal"
style="?bg">
<RelativeLayout
@ -162,10 +164,11 @@
android:text="@string/startDate"
android:textSize="22dp"
android:paddingLeft="5dp"
android:layout_marginTop="15sp"
android:textColor="#000000"
android:gravity="left"
android:id="@+id/labelStartDate"
android:visibility="gone"/>
/>
<LinearLayout
android:id="@+id/layoutStartPicker"
android:layout_height="wrap_content"
@ -202,7 +205,7 @@
android:textColor="#000000"
android:gravity="left"
android:id="@+id/labelEndDate"
android:visibility="gone"/>
/>
<LinearLayout
android:id="@+id/layoutEndPicker"
android:layout_height="wrap_content"
@ -284,14 +287,15 @@
</LinearLayout>
<fragment
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/map"
android:layout_toRightOf="@id/slidelayout"
android:layout_weight="1"
tools:context=".HistoryActivity"
android:name="com.google.android.gms.maps.SupportMapFragment" />
</LinearLayout>
<ImageView
android:id="@+id/changeMapType"