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

Fix manual sharing #88

Merged
s416204 merged 1 commits from fix-manual-sharing into develop 2018-12-16 23:33:46 +01:00
Conversation 0 Commits 1 Files Changed 7 +10 -8
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/uam/wmi/findmytutor/activity/BaseActivity.java
View File

@ -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) {

3
app/src/main/java/com/uam/wmi/findmytutor/activity/SettingsActivity.java
View File

@ -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);
}

4
app/src/main/res/layout/duty_hours_item.xml
View File

@ -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" />

1
app/src/main/res/layout/pref_main.xml
View File

@ -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"

2
app/src/main/res/layout/user_list_modal.xml
View File

@ -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>

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

@ -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>

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

@ -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>