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

Merge branch 'bottomNavHighlighytAndBlackListStringsFix' of s416084/find-my-tutor-android into develop

Browse Source
This commit is contained in:
Adam Domagalski 2019-01-08 22:10:48 +00:00 committed by Gogs
commit 59cb517ac7
7 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/uam/wmi/findmytutor/activity/BlackList.java
View File

@ -104,11 +104,11 @@ public class BlackList extends AppCompatActivity {
.create(UserService.class); .create(UserService.class);
if (PrefUtils.isBlackListing(this)){ if (PrefUtils.isBlackListing(this)){
aSwitch.setText(getString(R.string.action_black_list) +" ON"); aSwitch.setText(getString(R.string.action_black_list) + " " +getString(R.string.on));
aSwitch.setChecked(true); aSwitch.setChecked(true);
handleChangeRequest(true); handleChangeRequest(true);
}else{ }else{
aSwitch.setText(getString(R.string.action_black_list) +" OFF"); aSwitch.setText(getString(R.string.action_black_list) + " " +getString(R.string.off) );
aSwitch.setChecked(false); aSwitch.setChecked(false);
handleChangeRequest(false); handleChangeRequest(false);
} }

1
app/src/main/java/com/uam/wmi/findmytutor/activity/UsersListFragment.java
View File

@ -229,6 +229,7 @@ public class UsersListFragment extends Fragment {
fragmentTransaction.hide(usersListFragment); fragmentTransaction.hide(usersListFragment);
fragmentTransaction.commit(); fragmentTransaction.commit();
((MapActivity) getActivity()).searchUser(user.getFirstName()); ((MapActivity) getActivity()).searchUser(user.getFirstName());
((MapActivity) getActivity()).updateNavigationBarState();
/* List<User> list = new ArrayList<User>(); /* List<User> list = new ArrayList<User>();
list.add(user); list.add(user);

4
app/src/main/java/com/uam/wmi/findmytutor/activity/WhiteList.java
View File

@ -88,11 +88,11 @@ public class WhiteList extends AppCompatActivity {
.create(UserService.class); .create(UserService.class);
if (PrefUtils.isWhiteListing(this)) { if (PrefUtils.isWhiteListing(this)) {
aSwitch.setText(getString(R.string.action_white_list) + " ON"); aSwitch.setText(getString(R.string.action_white_list) +" "+getString(R.string.on) );
aSwitch.setChecked(true); aSwitch.setChecked(true);
handleChangeRequest(true); handleChangeRequest(true);
} else { } else {
aSwitch.setText(getString(R.string.action_white_list) + " OFF"); aSwitch.setText(getString(R.string.action_white_list) +" "+getString(R.string.off) );
aSwitch.setChecked(false); aSwitch.setChecked(false);
handleChangeRequest(false); handleChangeRequest(false);
} }

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

@ -40,7 +40,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="Block the users" android:text="@string/block_the_users"
android:textSize="15sp"/> android:textSize="15sp"/>
<Switch <Switch

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

@ -40,7 +40,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:text="Be visible for these users" android:text="@string/be_visible_for_these_users "
android:textSize="15sp"/> android:textSize="15sp"/>
<Switch <Switch

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

@ -276,14 +276,17 @@
<!--(ENG) Blacked/Whited users --> <!--(ENG) Blacked/Whited users -->
<string name="add_user_to_list">Użytkownik został dodany!</string> <string name="add_user_to_list">Użytkownik został dodany!</string>
<string name="user_removed">Użytkownik usunięty!</string> <string name="user_removed">Użytkownik usunięty!</string>
<string name="floor">Piętro</string>
<string name="block_the_users">Zablokuj użytkowników</string>
<string name="be_visible_for_these_users">Bądź dostępny dla użytkowników</string>
<!--(ENG) Sharing Modes --> <!--(ENG) Sharing Modes -->
<string name="manual_mode">manualny</string> <string name="manual_mode">manual</string>
<string name="exact_mode">dokładny</string> <string name="exact_mode">exact</string>
<string name="approx_mode">przybliżony</string> <string name="approx_mode">approximate</string>
<!--(ENG) Undefined manual --> <!--(ENG) Undefined manual -->
<string name="other_location">Niezapisana lokalizacja.</string> <string name="other_location">Not saved location.</string>
</resources> </resources>

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

@ -222,9 +222,9 @@
<string name="nav_profile">User profile</string> <string name="nav_profile">User profile</string>
<string name="remove_manual_location">Remove Manual location</string> <string name="remove_manual_location">Remove Manual location</string>
<string name="title_activity_tutor_tab">TutorTab</string> <string name="title_activity_tutor_tab">TutorTab</string>
<string name="manual_modal_title">Do you want to save this localization?</string> <string name="manual_modal_title">Manual localization</string>
<string name="lbl_ok">Save!</string> <string name="lbl_ok">Save</string>
<string name="lbl_cancel">Cancel!</string> <string name="lbl_cancel">Cancel</string>
<string name="manual_marker_info">Your marker will disappear in next couple minutes</string> <string name="manual_marker_info">Your marker will disappear in next couple minutes</string>
<string name="manual_location_selected">Manual Locations selected!</string> <string name="manual_location_selected">Manual Locations selected!</string>
<string name="location_saved">Location saved!</string> <string name="location_saved">Location saved!</string>
@ -342,7 +342,7 @@
<string name="network_err">Network Error !</string> <string name="network_err">Network Error !</string>
<string name="search_null">Search response is empty!</string> <string name="search_null">Search response is empty!</string>
<string name="modal_manual_hint">Insert a name for this localization.</string> <string name="modal_manual_hint">Name the localization</string>
<string name="online">Online</string> <string name="online">Online</string>
<string name="offline">Offline</string> <string name="offline">Offline</string>
<string name="inactive">Inactive</string> <string name="inactive">Inactive</string>
@ -351,6 +351,9 @@
<!--(ENG) Blacked/Whited users --> <!--(ENG) Blacked/Whited users -->
<string name="add_user_to_list">User has been added!</string> <string name="add_user_to_list">User has been added!</string>
<string name="user_removed">User removed!</string> <string name="user_removed">User removed!</string>
<string name="floor">Floor</string>
<string name="block_the_users">Block the users</string>
<string name="be_visible_for_these_users">Be visible for these users</string>
<string name="title_activity_scrolling">ScrollingActivity</string> <string name="title_activity_scrolling">ScrollingActivity</string>
<string name="large_text"> <string name="large_text">
"Material is the metaphor.\n\n" "Material is the metaphor.\n\n"
@ -441,8 +444,9 @@
"For example, position the FAB to one side of stream of a cards so the FAB won’t interfere " "For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
"when a user tries to pick up one of cards.\n\n" "when a user tries to pick up one of cards.\n\n"
</string> </string>
<string name="manual_mode">manualny</string> <string name="manual_mode">manualny</string>
<string name="exact_mode">dokładny</string> <string name="exact_mode">dokładny</string>
<string name="approx_mode">przybliżony</string> <string name="approx_mode">przybliżony</string>
<string name="other_location">Not saved location.</string> <string name="other_location">Niezapisana lokalizacja.</string>
</resources> </resources>