From 4fc348af5607d1781f77e704c4908f4c45b9ec05 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 23:28:10 +0100
Subject: [PATCH] Fix strings

---
 .../java/com/uam/wmi/findmytutor/activity/BaseActivity.java   | 2 +-
 .../com/uam/wmi/findmytutor/activity/SettingsActivity.java    | 3 ++-
 app/src/main/res/layout/duty_hours_item.xml                   | 4 ++--
 app/src/main/res/layout/pref_main.xml                         | 1 -
 app/src/main/res/layout/user_list_modal.xml                   | 2 ++
 app/src/main/res/values-pl/strings.xml                        | 4 ++--
 app/src/main/res/values/strings.xml                           | 2 +-
 7 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
index 3d5afa4..3a5956e 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
@@ -389,7 +389,7 @@ public abstract class BaseActivity
             if (itemId == R.id.nav_map) {
                 removeFragment(sharingFragment);
                 removeFragment(userListFragment);
-                activeFragment = ActiveFragment.NONE;
+                activeFragment = ActiveFragment.NONE;   
             } else if (itemId == R.id.nav_profile) {
                 loadUserSettingsFragment();
             } else if (itemId == R.id.nav_user_list) {
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
index 1b7a63d..fa54e0f 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
@@ -11,6 +11,7 @@ import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
+import android.util.Log;
 import android.view.MenuItem;
 
 import com.uam.wmi.findmytutor.R;
@@ -54,7 +55,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
             Preference languagesList = findPreference(getResources().getString(R.string.key_language));
             languagesList.setDefaultValue(0);
 
-            if(PrefUtils.getLocale(getActivity()).equals("pl")){
+            if(PrefUtils.getLocale(getActivity()).equals("1")){
                 languagesList.setDefaultValue(1);
             }
 
diff --git a/app/src/main/res/layout/duty_hours_item.xml b/app/src/main/res/layout/duty_hours_item.xml
index 88a7c3b..b28041c 100644
--- a/app/src/main/res/layout/duty_hours_item.xml
+++ b/app/src/main/res/layout/duty_hours_item.xml
@@ -3,8 +3,8 @@
     android:id="@android:id/text1"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceListItemSmall"
     android:gravity="center_vertical"
-    android:textSize="16sp"
+    android:textSize="14sp"
+    android:paddingTop="2dp"
     android:fontFamily="@font/lato_regular"
     android:textColor="@color/mapboxWhite" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/pref_main.xml b/app/src/main/res/layout/pref_main.xml
index eedf7e1..b6ff788 100644
--- a/app/src/main/res/layout/pref_main.xml
+++ b/app/src/main/res/layout/pref_main.xml
@@ -7,7 +7,6 @@
     <PreferenceCategory android:title="@string/settings_category_general">
 
         <ListPreference
-            android:defaultValue="0"
             android:dialogTitle="@string/settings_language"
             android:entries="@array/language_entries"
             android:entryValues="@array/language_values"
diff --git a/app/src/main/res/layout/user_list_modal.xml b/app/src/main/res/layout/user_list_modal.xml
index def2edd..921b2ba 100644
--- a/app/src/main/res/layout/user_list_modal.xml
+++ b/app/src/main/res/layout/user_list_modal.xml
@@ -147,6 +147,8 @@
                 android:layout_height="wrap_content"
                 android:paddingLeft="25dp"
                 android:paddingTop="-10dp"
+                android:divider="@color/background_user_modal"
+                android:dividerHeight="1dp"
                 android:textColor="@color/mapboxWhite"
                />
         </LinearLayout>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1dad4d7..d9bc19d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -94,7 +94,7 @@
     <string name="assembly_c">Skrzydło C</string>
     <string name="passage_d">ŁącznikD</string>
 
-    <string name="key_language">key_language</string>
+    <string name="key_language">LOCALE</string>
     <string name="title_activity_settings2">Ustawienia</string>
 
     <!-- Example General settings -->
@@ -121,7 +121,7 @@
     <string name="prompt_login">Login (Ldap)</string>
     <string name="action_log_in">Zaloguj!</string>
     <string name="error_invalid_login_name">Niepoprawny format loginu.</string>
-    <string name="user_list_nav">Lista użytkowników</string>
+    <string name="user_list_nav">Kadra</string>
     <string name="select_a_location">Wybierz lokalizacje</string>
     <string name="user_location_permission_not_granted">Nie dodano uprawnień do lokalizacji.</string>
     <string name="user_location_permission_explanation">Ta aplikacja potrzebuje uprawnień do lokalizacji.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bcc12e9..bd26ab8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -109,7 +109,7 @@
     <string name="lang_eng">English</string>
     <string name="lang_pol">Polish</string>
     <string name="settings_language">Choose language</string>
-    <string name="key_language">key_language</string>
+    <string name="key_language">LOCALE</string>
 
 
     <string name="pref_header_about">About</string>
-- 
2.20.1