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

4
safeDispatch/src/main/res/values/ic_launcher_background.xml Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFFFFF</color>
</resources>

4
safeDispatch/src/main/res/values/strings.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">SafeMobile Dispatch</string>
<string name="app_name_demo">SafeMobile Dispatch Demo</string>
<string name="app_name">SafeDispatch Mobile</string>
<string name="app_name_demo">SafeDispatch Mobile Demo</string>
<string name="app_name_radiopod">RadioPod</string>
<string name="app_name_radiopad">RadioPad</string>
<string name="app_name_radiopodd">RadioPod</string>

12
safeDispatch/src/main/res/values/styles.xml
View File

@ -82,7 +82,7 @@
<style name="mainBackground_sd">
<item name="android:orientation">vertical</item>
<item name="android:background">@drawable/safedispatch</item>
<item name="android:background">@drawable/safedispatch_logo</item>
<item name="android:scaleType">centerInside</item>
</style>
@ -138,7 +138,7 @@
</style>
<style name="bg_sd">
<item name="android:background">@drawable/safedispatch</item>
<item name="android:background">@drawable/safedispatch_logo</item>
</style>
<style name="header_sd">
@ -155,7 +155,7 @@
<style name="mainBackground_hy">
<item name="android:orientation">vertical</item>
<item name="android:background">@drawable/safedispatch</item>
<item name="android:background">@drawable/safedispatch_logo</item>
<item name="android:scaleType">centerInside</item>
</style>
@ -211,7 +211,7 @@
</style>
<style name="bg_hy">
<item name="android:background">@drawable/safedispatch</item>
<item name="android:background">@drawable/safedispatch_logo</item>
</style>
<style name="header_hy">
@ -228,7 +228,7 @@
<style name="mainBackground_vi">
<item name="android:orientation">vertical</item>
<item name="android:background">@drawable/safedispatch</item>
<item name="android:background">@drawable/safedispatch_logo</item>
<item name="android:scaleType">centerInside</item>
</style>
@ -285,7 +285,7 @@
</style>
<style name="bg_vi">
<item name="android:background">@drawable/safedispatch</item>
<item name="android:background">@drawable/safedispatch_logo</item>
</style>
<style name="header_vi">