diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index f7d49fe055..617c7f1513 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -159,9 +159,10 @@ public class FragmentAccount extends FragmentBase { @Override @Nullable public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - setSubtitle(R.string.title_edit_account); setHasOptionsMenu(true); + setSubtitle(R.string.title_edit_account); + view = (ViewGroup) inflater.inflate(R.layout.fragment_account, container, false); // Get controls diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java index 713ede2e39..6dc95042dc 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java +++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java @@ -56,6 +56,8 @@ public class FragmentAnswer extends FragmentBase { @Override @Nullable public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + setSubtitle(R.string.menu_answers); + view = (ViewGroup) inflater.inflate(R.layout.fragment_answer, container, false); // Get controls diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswers.java b/app/src/main/java/eu/faircode/email/FragmentAnswers.java index 1b87f3f1d6..f1e624754f 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAnswers.java +++ b/app/src/main/java/eu/faircode/email/FragmentAnswers.java @@ -48,10 +48,11 @@ public class FragmentAnswers extends FragmentBase { @Override @Nullable public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_answers, container, false); - + setSubtitle(R.string.menu_answers); setHasOptionsMenu(true); + View view = inflater.inflate(R.layout.fragment_answers, container, false); + // Get controls rvAnswer = view.findViewById(R.id.rvAnswer); pbWait = view.findViewById(R.id.pbWait); diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index 82d36bd9b8..fc7f1bcf17 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -69,9 +69,10 @@ public class FragmentFolders extends FragmentBase { @Override @Nullable public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_folders, container, false); setHasOptionsMenu(true); + View view = inflater.inflate(R.layout.fragment_folders, container, false); + // Get controls ibHintActions = view.findViewById(R.id.ibHintActions); ibHintSync = view.findViewById(R.id.ibHintSync); diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index db178fc7d1..dad3b4bd33 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -214,10 +214,10 @@ public class FragmentMessages extends FragmentBase { @Override @Nullable public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { - view = (ViewGroup) inflater.inflate(R.layout.fragment_messages, container, false); - setHasOptionsMenu(true); + view = (ViewGroup) inflater.inflate(R.layout.fragment_messages, container, false); + // Get controls swipeRefresh = view.findViewById(R.id.swipeRefresh); tvSupport = view.findViewById(R.id.tvSupport);