Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed hide_tab_bar_on_secondary_level_screens custom option

Browse source
This commit is contained in:
Sylvain Berfini 2019-05-02 15:44:12 +02:00
parent e40a59ff92
commit 20c32ccdab
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/org/linphone/activities/MainActivity.java
View file

@ -298,7 +298,10 @@ public abstract class MainActivity extends LinphoneGenericActivity
super.onResume(); super.onResume();
hideTopBar(); hideTopBar();
if (getFragmentManager().getBackStackEntryCount() == 0
|| !getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) {
showTabBar(); showTabBar();
}
mHistorySelected.setVisibility(View.GONE); mHistorySelected.setVisibility(View.GONE);
mContactsSelected.setVisibility(View.GONE); mContactsSelected.setVisibility(View.GONE);
@ -384,6 +387,10 @@ public abstract class MainActivity extends LinphoneGenericActivity
public boolean popBackStack() { public boolean popBackStack() {
if (getFragmentManager().getBackStackEntryCount() > 0) { if (getFragmentManager().getBackStackEntryCount() > 0) {
getFragmentManager().popBackStackImmediate(); getFragmentManager().popBackStackImmediate();
if (getFragmentManager().getBackStackEntryCount() == 0
&& getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) {
showTabBar();
}
return true; return true;
} }
return false; return false;
@ -597,6 +604,16 @@ public abstract class MainActivity extends LinphoneGenericActivity
} }
} }
if (getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) {
if (isChild) {
if (!isTablet()) {
hideTabBar();
}
} else {
showTabBar();
}
}
Compatibility.setFragmentTransactionReorderingAllowed(transaction, false); Compatibility.setFragmentTransactionReorderingAllowed(transaction, false);
if (isChild && isTablet()) { if (isChild && isTablet()) {
transaction.replace(R.id.fragmentContainer2, fragment, name); transaction.replace(R.id.fragmentContainer2, fragment, name);

2
app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
View file

@ -644,7 +644,7 @@ public class ChatMessagesFragment extends Fragment
} }
private void hideKeyboardVisibleMode() { private void hideKeyboardVisibleMode() {
if (getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) { if (!getResources().getBoolean(R.bool.hide_bottom_bar_on_second_level_views)) {
((ChatActivity) getActivity()).showTabBar(); ((ChatActivity) getActivity()).showTabBar();
} }
((ChatActivity) getActivity()).showStatusBar(); ((ChatActivity) getActivity()).showStatusBar();