From e7a2ecf86ac40f6dfaff3c96c3abd18e201f82b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mieszko=20Wrzeszczy=C5=84ski?= <miewrz@st.amu.edu.pl>
Date: Sun, 16 Dec 2018 22:14:55 +0100
Subject: [PATCH] Add new infoboxes

---
 .idea/misc.xml                                       |  2 +-
 .../com/uam/wmi/findmytutor/utils/LocaleUtils.java   | 12 +-----------
 .../com/uam/wmi/findmytutor/utils/PrefUtils.java     |  2 +-
 app/src/main/res/layout/info_popup_userlist.xml      |  9 +++++++++
 app/src/main/res/values-pl/strings.xml               |  7 +++++--
 app/src/main/res/values/strings.xml                  |  3 ++-
 6 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index dc44dda..b0c7b20 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -29,7 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/LocaleUtils.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/LocaleUtils.java
index 9e9f0da..7046b83 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/LocaleUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/LocaleUtils.java
@@ -1,20 +1,10 @@
 package com.uam.wmi.findmytutor.utils;
 
-import android.content.Context;
 import android.content.res.Resources;
-import android.os.Build;
 import android.support.v4.os.ConfigurationCompat;
 
-import java.util.Locale;
-
 public class LocaleUtils {
-    public static String getCurrentLocale(Context context){
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+    public static String getCurrentLocale(){
             return String.valueOf(ConfigurationCompat.getLocales(Resources.getSystem().getConfiguration()));
-        } else{
-            //noinspection deprecation
-            return String.valueOf(context.getResources().getConfiguration().locale);
-
-        }
     }
 }
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java b/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
index 27367f4..5d45d85 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/utils/PrefUtils.java
@@ -144,7 +144,7 @@ public class PrefUtils {
     }
 
     public static String getLocale(Context context) {
-        return getSharedPreferences(context).getString("LOCALE", LocaleUtils.getCurrentLocale(context));
+        return getSharedPreferences(context).getString("LOCALE", LocaleUtils.getCurrentLocale());
     }
 
     public static Boolean isBackgroundLocationServiceRunning(Context context) {
diff --git a/app/src/main/res/layout/info_popup_userlist.xml b/app/src/main/res/layout/info_popup_userlist.xml
index 74e06df..afd1c17 100644
--- a/app/src/main/res/layout/info_popup_userlist.xml
+++ b/app/src/main/res/layout/info_popup_userlist.xml
@@ -63,4 +63,13 @@
         android:text="@string/info_icon_userlist_tab_level_status_inactive_tip"
         android:textColor="@color/half_black"/>
 
+    <TextView
+        android:id="@+id/userListPopupInfoTextViewSummary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_marginTop="10dp"
+        android:text="@string/info_icon_userlist_summary"
+        android:textColor="@color/half_black"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 28e278d..1dad4d7 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -172,7 +172,7 @@
     <string name="map_info_text_p1">Na mapie wyświetlane są markery reprezentujące profesorów udostępniających w tej chwili swoją lokalizację.</string>
     <string name="map_info_text_p2">Po kliknięciu w marker możemy sprawdzić kto udostępnia lokalizację, oraz status opisowy (jeśli profesor go ustawił).</string>
     <string name="map_info_text_p3">W aplikacji dostępne są 3 rodzaje lokalizacji, które reprezentowane są przez markery różnego koloru.</string>
-    <string name="map_info_text_marker_exact">- lokalizacja dokładna (udostępniana z GPS telefonu)</string>
+    <string name="map_info_text_marker_exact">- lokalizacja dokładna\n(udostępniana z GPS telefonu)</string>
     <string name="map_info_text_marker_approximated">- lokalizacja przybliżona</string>
     <string name="map_info_text_marker_manual">- lokalizacja manualna (wybrana ręcznie)</string>
 
@@ -211,7 +211,10 @@
     <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>
+    <string name="info_icon_userlist_tab_level_status_inactive_tip">(nie udostępnił żadnych danych o lokalizacji od co najmniej tygodnia)</string>
+    <string name="info_icon_userlist_summary">Po kliknięciu w imię i nazwisko, wyświetli się karta zawierająca dokładne informacje o profesorze.</string>
+
+
     <string name="lack_of_status">Użytkownik nie zdefiniował statusu.</string>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca5da17..ec50538 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -280,7 +280,7 @@
     <string name="info_icon_sharing_tab_p3_level_exact"><b>exact</b> - localization displayed on a map, based on GPS</string>
     <string name="info_icon_sharing_tab_p3_level_approximate"><b>approximated</b> - approximated localization based on GPS</string>
     <string name="info_icon_sharing_tab_p3_level_manual"><b>manual</b> - sharing from manually picked point</string>
-    <string name="info_icon_sharing_tab_p3_level_presence"><b>presence only</b> - sharing only information whether you are present on the faculty or not, without sharing your localization</string>
+    <string name="info_icon_sharing_tab_p3_level_presence"><b>presence only</   b> - sharing only information whether you are present on the faculty or not, without sharing your localization</string>
     <string name="info_icon_sharing_tab_p4">Each level, except from manual, will be automatically turned on when entering, and turn off when leaving the faculty. You only need to make sure that sharing is on, and the localization will be shared only when on the faculty.</string>
     <string name="info_icon_sharing_tab_p5">Sharing can be turned off at any time with the switch.</string>
     <string name="info_icon_sharing_tab_p6">Additionally, you can add descriptive status to your localization (visible for users after clicking on a marker).</string>
@@ -293,6 +293,7 @@
     <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>
+    <string name="info_icon_userlist_summary">After clicking on a name, the tutor tab will pop up, containing details about selected tutor.</string>
 
     <string name="possitive_dialog_button">yes</string>
     <string name="negative_dialog_button">No</string>