FreshRSS/Readrops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add back arrows to activities which didn't have one

Browse Source
This commit is contained in:
Shinokuni 2019-08-27 14:00:14 +02:00
parent 05c291d29d
commit ff15826fe4
4 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java
View File

@ -3,6 +3,7 @@ package com.readrops.app.activities;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcelable; import android.os.Parcelable;
import android.view.MenuItem;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
@ -48,6 +49,8 @@ public class AccountTypeListActivity extends AppCompatActivity {
fromMainActivity = getIntent().getBooleanExtra("fromMainActivity", false); fromMainActivity = getIntent().getBooleanExtra("fromMainActivity", false);
if (fromMainActivity)
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
adapter = new AccountTypeListAdapter(accountType -> { adapter = new AccountTypeListAdapter(accountType -> {
if (!(accountType == AccountType.LOCAL)) { if (!(accountType == AccountType.LOCAL)) {
@ -111,4 +114,15 @@ public class AccountTypeListActivity extends AppCompatActivity {
} }
}); });
} }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
} }

15
app/src/main/java/com/readrops/app/activities/AddAccountActivity.java
View File

@ -3,6 +3,7 @@ package com.readrops.app.activities;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Patterns; import android.util.Patterns;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
@ -50,6 +51,9 @@ public class AddAccountActivity extends AppCompatActivity {
accountToEdit = getIntent().getParcelableExtra(EDIT_ACCOUNT); accountToEdit = getIntent().getParcelableExtra(EDIT_ACCOUNT);
if (forwardResult || accountToEdit != null)
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
try { try {
if (accountToEdit != null) { if (accountToEdit != null) {
viewModel.setAccountType(accountToEdit.getAccountType()); viewModel.setAccountType(accountToEdit.getAccountType());
@ -226,4 +230,15 @@ public class AddAccountActivity extends AppCompatActivity {
} }
}); });
} }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
} }

1
app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java
View File

@ -45,6 +45,7 @@ public class ManageFeedsFoldersActivity extends AppCompatActivity {
binding = DataBindingUtil.setContentView(this, R.layout.activity_manage_feeds_folders); binding = DataBindingUtil.setContentView(this, R.layout.activity_manage_feeds_folders);
setSupportActionBar(binding.manageFeedsFoldersToolbar); setSupportActionBar(binding.manageFeedsFoldersToolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
binding.manageFeedsFoldersToolbar.setTitleTextColor(Color.WHITE); binding.manageFeedsFoldersToolbar.setTitleTextColor(Color.WHITE);
binding.manageFeedsFoldersTablayout.setTabTextColors(Color.WHITE, Color.WHITE); binding.manageFeedsFoldersTablayout.setTabTextColors(Color.WHITE, Color.WHITE);

14
app/src/main/java/com/readrops/app/activities/SettingsActivity.java
View File

@ -1,6 +1,7 @@
package com.readrops.app.activities; package com.readrops.app.activities;
import android.os.Bundle; import android.os.Bundle;
import android.view.MenuItem;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@ -18,6 +19,8 @@ public class SettingsActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings); setContentView(R.layout.activity_settings);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Account account = getIntent().getParcelableExtra(AccountSettingsFragment.ACCOUNT); Account account = getIntent().getParcelableExtra(AccountSettingsFragment.ACCOUNT);
SettingsKey settingsKey = SettingsKey.values()[getIntent().getIntExtra(SETTINGS_KEY, -1)]; SettingsKey settingsKey = SettingsKey.values()[getIntent().getIntExtra(SETTINGS_KEY, -1)];
@ -39,4 +42,15 @@ public class SettingsActivity extends AppCompatActivity {
public enum SettingsKey { public enum SettingsKey {
ACCOUNT_SETTINGS ACCOUNT_SETTINGS
} }
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
} }