s416084/find-my-tutor-android
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

moving from mac

Browse Source
This commit is contained in:
Adam Domagalski 2018-12-10 19:52:32 +01:00
parent 03c5a9a3ce
commit 9aa9e8e0df
4 changed files with 45 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/res/layout/activity_map.xml
View File

@ -9,6 +9,14 @@
android:fontFamily="@font/lato_regular"
tools:context=".activity.MapActivity">
<ImageButton
android:id="@+id/mapInfoImageButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
mapbox:srcCompat="@drawable/outline_info_24"
tools:layout_editor_absoluteX="336dp"
tools:layout_editor_absoluteY="1dp" />
<com.mapbox.mapboxsdk.maps.MapView
android:id="@+id/mapView"
android:layout_width="match_parent"
@ -21,15 +29,6 @@
</com.mapbox.mapboxsdk.maps.MapView>
<ImageButton
android:id="@+id/mapInfoImageButton"
style="@android:style/Widget.Material.Light.ImageButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
mapbox:srcCompat="@drawable/outline_info_24" />
<LinearLayout
android:id="@+id/linearLayout2"
android:layout_width="match_parent"

67
app/src/main/res/layout/info_popup_userlist.xml
View File

@ -1,76 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:padding="10dp"
android:background="@drawable/layout_bg">
android:layout_height="match_parent"
android:padding="5dp"
android:background="@drawable/layout_bg">
<TextView
android:id="@+id/textViewP1"
android:id="@+id/TextViewP1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:text="@string/map_info_text_p1" />
android:text="@string/info_icon_userlist_tab_p1" />
<TextView
android:id="@+id/textViewP2"
android:layout_marginTop="20dp"
android:layout_marginLeft="20dp"
android:id="@+id/TextViewP2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/map_info_text_p2" />
android:text="@string/info_icon_userlist_tab_p2" />
<TextView
android:id="@+id/textViewP3"
android:layout_marginTop="20dp"
android:layout_marginLeft="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/map_info_text_p3" />
<TextView
android:id="@+id/exactMarkerTextView"
android:id="@+id/TextView2"
android:gravity="center"
android:drawableLeft="@drawable/exact_localization_marker"
android:layout_marginTop="20dp"
android:layout_marginLeft="5dp"
android:drawableLeft="@drawable/online_user"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="5dp"
android:layout_weight="1"
android:text="@string/map_info_text_marker_exact" />
android:text="@string/info_icon_userlist_tab_level_status_online" />
<TextView
android:id="@+id/approximateTextView"
android:drawableLeft="@drawable/approximate_localization_marker"
android:id="@+id/TextVie3"
android:gravity="center"
android:drawableLeft="@drawable/user_list_offline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="5dp"
android:layout_marginLeft="5dp"
android:gravity="center"
android:layout_weight="1"
android:text="@string/map_info_text_marker_approximated" />
android:text="@string/info_icon_userlist_tab_level_status_offline" />
<TextView
android:id="@+id/manualMarkerTextView"
android:drawableLeft="@drawable/manual_localization_marker"
android:id="@+id/TextView4"
android:gravity="center"
android:drawableLeft="@drawable/user_list_off"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="5dp"
android:layout_marginLeft="5dp"
android:gravity="center"
android:layout_weight="1"
android:text="@string/map_info_text_marker_manual" />
android:text="@string/info_icon_userlist_tab_level_status_inactive" />
<TextView
android:id="@+id/TextViewTip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/info_icon_userlist_tab_level_status_inactive_tip" />
</LinearLayout>

10
app/src/main/res/values-pl/strings.xml
View File

@ -208,10 +208,12 @@
<string name="info_icon_sharing_tab_p7">Zarówno manualne lokalizacje jak i statusy możesz dodać do listy, które potem możesz wybrać w wygodny sposób.</string>
<!--(PL) Userlist Tab info helper-->
<string name="info_icon_userlist_tab_p1">W tym panelu znajduje się listę profesorów. Ich status symbolizowany jest przez kolorowe kropki:</string>
<string name="info_icon_userlist_tab_level_status_online"> GREEN dot - użytkownik jest obecnie online</string>
<string name="info_icon_userlist_tab_level_status_offline">RED dot - użytkownik jest obecnie offline</string>
<string name="info_icon_userlist_tab_level_status_inactive">BLACK dot - użytkownik jest nieaktywny (nie udostępnił żadnych danych o lokalizacji od conajmniej tygodnia).</string>
<string name="info_icon_userlist_tab_p1">W tym panelu znajduje się listę profesorów.</string>
<string name="info_icon_userlist_tab_p2">Ich status symbolizowany jest przez kolorowe kropki:</string>
<string name="info_icon_userlist_tab_level_status_online">- użytkownik jest obecnie online</string>
<string name="info_icon_userlist_tab_level_status_offline">- użytkownik jest obecnie offline</string>
<string name="info_icon_userlist_tab_level_status_inactive">- użytkownik jest nieaktywny</string>
<string name="info_icon_userlist_tab_level_status_inactive_tip">(nie udostępnił żadnych danych o lokalizacji od conajmniej tygodnia)</string>
</resources>

10
app/src/main/res/values/strings.xml
View File

@ -284,9 +284,11 @@
<string name="info_icon_sharing_tab_p7">Both manual localizations and statuses can be added to a list, and then used them in a convenient way. </string>
<!--(ENG) Userlist tab info helper-->
<string name="info_icon_userlist_tab_p1">This panel contains the list of tutors. Their status is represented by colorful dots:</string>
<string name="info_icon_userlist_tab_level_status_online">GREEN dot - user is currently online</string>
<string name="info_icon_userlist_tab_level_status_offline">RED dot - user is currently offline</string>
<string name="info_icon_userlist_tab_level_status_inactive">BLACK dot - user is inactive (didn’t share any localization data since 7 days)</string>
<string name="info_icon_userlist_tab_p1">This panel contains the list of tutors.</string>
<string name="info_icon_userlist_tab_p2">Their status is represented by colorful dots:</string>
<string name="info_icon_userlist_tab_level_status_online">- user is currently online</string>
<string name="info_icon_userlist_tab_level_status_offline">- user is currently offline</string>
<string name="info_icon_userlist_tab_level_status_inactive">- user is inactive </string>
<string name="info_icon_userlist_tab_level_status_inactive_tip">(didn’t share any localization data since 7 days)</string>
</resources>