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

Add buttons for removing statuses/locations in sharing tab #122

Merged
s416204 merged 75 commits from addRemovingManuals into develop 2019-01-05 00:45:41 +01:00
Conversation 0 Commits 75 Files Changed 54 +4 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aec9eaae19 - Show all commits

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

@ -89,7 +89,7 @@ public class BlackList extends AppCompatActivity {
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
setContentView(R.layout.activity_black_list); setContentView(R.layout.activity_black_list);
ButterKnife.bind(this); ButterKnife.bind(this);
aSwitch.setText(getString(R.string.blacklist) +" ON"); aSwitch.setText(getString(R.string.action_black_list) +" ON");
tutorId = PrefUtils.getUserId(getApplicationContext()); tutorId = PrefUtils.getUserId(getApplicationContext());
Toolbar toolbar = findViewById(R.id.toolbar); Toolbar toolbar = findViewById(R.id.toolbar);
@ -312,10 +312,10 @@ public class BlackList extends AppCompatActivity {
private void handleSwitch(){ private void handleSwitch(){
aSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> { aSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
if (isChecked){ if (isChecked){
aSwitch.setText(getString(R.string.blacklist) + " "+ getString(R.string.on)); aSwitch.setText(getString(R.string.action_black_list) + " "+ getString(R.string.on));
handleChangeRequest(true); handleChangeRequest(true);
}else { }else {
aSwitch.setText(getString(R.string.blacklist) + " "+getString(R.string.off)); aSwitch.setText(getString(R.string.action_black_list) + " "+getString(R.string.off));
handleChangeRequest(false); handleChangeRequest(false);
} }
}); });

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

@ -419,6 +419,7 @@
<string name="on">ON</string> <string name="on">ON</string>
<string name="off">OFF</string> <string name="off">OFF</string>
<string name="scrap_tutor_tab">Scrap!</string> <string name="scrap_tutor_tab">Scrap!</string>
<string name="scrap_tutor_msg">Data updated!</string>
<string name="no_online_users">Currently, there are no\nonline users.</string> <string name="no_online_users">Currently, there are no\nonline users.</string>
<string name="no_offline_users">Currently, there are no\noffline users.</string> <string name="no_offline_users">Currently, there are no\noffline users.</string>
<string name="only_online_users">Only online users</string> <string name="only_online_users">Only online users</string>