mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactoring

This commit is contained in:
M66B 2022-02-20 10:20:44 +01:00
parent 7d87f2b444
commit ecc9bc2bf3
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/FragmentBase.java
View File

@ -83,6 +83,14 @@ public class FragmentBase extends Fragment {
static final String ACTION_STORE_ATTACHMENT = BuildConfig.APPLICATION_ID + ".STORE_ATTACHMENT"; static final String ACTION_STORE_ATTACHMENT = BuildConfig.APPLICATION_ID + ".STORE_ATTACHMENT";
static final String ACTION_STORE_ATTACHMENTS = BuildConfig.APPLICATION_ID + ".STORE_ATTACHMENTS"; static final String ACTION_STORE_ATTACHMENTS = BuildConfig.APPLICATION_ID + ".STORE_ATTACHMENTS";
protected ActionBar getSupportActionBar() {
FragmentActivity activity = getActivity();
if (activity instanceof ActivityBase)
return ((ActivityBase) activity).getSupportActionBar();
else
return null;
}
protected void setTitle(int resid) { protected void setTitle(int resid) {
setTitle(getString(resid)); setTitle(getString(resid));
} }

8
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -108,6 +108,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu; import androidx.appcompat.widget.PopupMenu;
import androidx.appcompat.widget.SwitchCompat; import androidx.appcompat.widget.SwitchCompat;
@ -1572,11 +1573,10 @@ public class FragmentCompose extends FragmentBase {
menu.findItem(R.id.menu_zoom).setTitle(ssbZoom); menu.findItem(R.id.menu_zoom).setTitle(ssbZoom);
PopupMenuLifecycle.insertIcon(context, menu.findItem(R.id.menu_zoom), false); PopupMenuLifecycle.insertIcon(context, menu.findItem(R.id.menu_zoom), false);
FragmentActivity activity = getActivity(); ActionBar actionBar = getSupportActionBar();
Context tcontext = (activity instanceof ActivityBase Context actionBarContext = (actionBar == null ? context : actionBar.getThemedContext());
? ((ActivityBase) activity).getSupportActionBar().getThemedContext() : context);
int colorEncrypt = Helper.resolveColor(context, R.attr.colorEncrypt); int colorEncrypt = Helper.resolveColor(context, R.attr.colorEncrypt);
int colorActionForeground = Helper.resolveColor((tcontext), android.R.attr.textColorPrimary); int colorActionForeground = Helper.resolveColor(actionBarContext, android.R.attr.textColorPrimary);
View v = menu.findItem(R.id.menu_encrypt).getActionView(); View v = menu.findItem(R.id.menu_encrypt).getActionView();
ImageButton ib = v.findViewById(R.id.button); ImageButton ib = v.findViewById(R.id.button);