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

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

This commit is contained in:
Adam Domagalski 2019-01-02 11:22:10 +00:00 committed by Gogs
parent fce812f3ce aec9eaae19
commit 96e31166c6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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);
setContentView(R.layout.activity_black_list);
ButterKnife.bind(this);
aSwitch.setText(getString(R.string.blacklist) +" ON");
aSwitch.setText(getString(R.string.action_black_list) +" ON");
tutorId = PrefUtils.getUserId(getApplicationContext());
Toolbar toolbar = findViewById(R.id.toolbar);
@ -312,10 +312,10 @@ public class BlackList extends AppCompatActivity {
private void handleSwitch(){
aSwitch.setOnCheckedChangeListener((buttonView, 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);
}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);
}
});

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

@ -419,6 +419,7 @@
<string name="on">ON</string>
<string name="off">OFF</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_offline_users">Currently, there are no\noffline users.</string>
<string name="only_online_users">Only online users</string>