mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4238 from nextcloud/removeBottomBar

Browse source 
Remove old and unmaintained bottom bar
This commit is contained in:
Andy Scherzinger 2019-07-16 20:20:40 +02:00 committed by GitHub
commit 4f1a725942
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 37 additions and 388 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java
View file

@ -29,7 +29,6 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import android.widget.Toast;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.FileDataStorageManager;
import com.owncloud.android.datamodel.OCFile;
@ -45,7 +44,6 @@ import com.owncloud.android.ui.adapter.ActivityListAdapter;
import com.owncloud.android.ui.interfaces.ActivityListInterface;
import com.owncloud.android.ui.preview.PreviewImageActivity;
import com.owncloud.android.ui.preview.PreviewImageFragment;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.ThemeUtils;
import java.util.List;
@ -86,9 +84,6 @@ public class ActivitiesActivity extends FileActivity implements ActivityListInte
@BindView(android.R.id.list)
public RecyclerView recyclerView;
@BindView(R.id.bottom_navigation_view)
public BottomNavigationView bottomNavigationView;
@BindString(R.string.activities_no_results_headline)
public String noResultsHeadline;
@ -199,18 +194,6 @@ public class ActivitiesActivity extends FileActivity implements ActivityListInte
}
});
if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
bottomNavigationView.setVisibility(View.VISIBLE);
DisplayUtils.setupBottomBar(
getUserAccountManager().getCurrentAccount(),
bottomNavigationView,
getResources(),
getUserAccountManager(),
this,
-1
);
}
mActionListener.loadActivities(null);
}

17
src/main/java/com/owncloud/android/ui/activity/ContactsPreferenceActivity.java
View file

@ -25,12 +25,10 @@ import android.accounts.Account;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import com.evernote.android.job.JobManager;
import com.evernote.android.job.JobRequest;
import com.evernote.android.job.util.support.PersistableBundleCompat;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.OCFile;
@ -39,7 +37,6 @@ import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.ui.fragment.FileFragment;
import com.owncloud.android.ui.fragment.contactsbackup.ContactListFragment;
import com.owncloud.android.ui.fragment.contactsbackup.ContactsBackupFragment;
import com.owncloud.android.utils.DisplayUtils;
import org.parceler.Parcels;
@ -104,20 +101,6 @@ public class ContactsPreferenceActivity extends FileActivity implements FileFrag
}
transaction.commit();
}
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation_view);
if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
bottomNavigationView.setVisibility(View.VISIBLE);
DisplayUtils.setupBottomBar(
getUserAccountManager().getCurrentAccount(),
bottomNavigationView,
getResources(),
accountManager,
this,
-1
);
}
}
public static void startContactBackupJob(Account account) {

1
src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file

@ -368,7 +368,6 @@ public abstract class DrawerActivity extends ToolbarActivity
boolean hasSearchSupport = accountManager.getServerVersion(account).isSearchSupported();
DrawerMenuUtil.filterForBottomToolbarMenuItems(menu, getResources());
DrawerMenuUtil.filterSearchMenuItems(menu, account, getResources(), hasSearchSupport);
DrawerMenuUtil.filterTrashbinMenuItem(menu, account, capability, accountManager);
DrawerMenuUtil.filterActivityMenuItem(menu, capability);

13
src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -56,7 +56,6 @@ import android.view.ViewTreeObserver;
import android.widget.EditText;
import android.widget.ImageView;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.snackbar.Snackbar;
import com.nextcloud.client.appinfo.AppInfo;
import com.nextcloud.client.di.Injectable;
@ -1177,16 +1176,6 @@ public class FileDisplayActivity extends FileActivity
}
}
private void revertBottomNavigationBarToAllFiles() {
if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
BottomNavigationView bottomNavigationView = getListOfFilesFragment().getView()
.findViewById(R.id.bottom_navigation_view);
if (bottomNavigationView.getMenu().findItem(R.id.nav_bar_settings).isChecked()) {
bottomNavigationView.getMenu().findItem(R.id.nav_bar_files).setChecked(true);
}
}
}
@Override
public void onBackPressed() {
boolean isDrawerOpen = isDrawerOpen();
@ -1265,8 +1254,6 @@ public class FileDisplayActivity extends FileActivity
setFile(startFile);
}
revertBottomNavigationBarToAllFiles();
// refresh list of files
if (searchView != null && !TextUtils.isEmpty(searchQuery)) {
searchView.setQuery(searchQuery, false);

14
src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java
View file

@ -38,7 +38,6 @@ import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.snackbar.Snackbar;
import com.nextcloud.client.account.UserAccountManager;
import com.owncloud.android.R;
@ -242,19 +241,6 @@ public class NotificationsActivity extends FileActivity implements Notifications
recyclerView.setLayoutManager(layoutManager);
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation_view);
if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
bottomNavigationView.setVisibility(View.VISIBLE);
DisplayUtils.setupBottomBar(
getUserAccountManager().getCurrentAccount(),
bottomNavigationView,
getResources(),
accountManager,
this,
-1);
}
fetchAndSetData();
}

15
src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java
View file

@ -41,7 +41,6 @@ import android.view.View;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.nextcloud.client.di.Injectable;
import com.nextcloud.client.preferences.AppPreferences;
import com.owncloud.android.BuildConfig;
@ -200,20 +199,6 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
mRecyclerView.setLayoutManager(lm);
mRecyclerView.setAdapter(mAdapter);
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation_view);
if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
bottomNavigationView.setVisibility(View.VISIBLE);
DisplayUtils.setupBottomBar(
getUserAccountManager().getCurrentAccount(),
bottomNavigationView,
getResources(),
accountManager,
this,
-1
);
}
load(gridWidth * 2, false);
}

16
src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
View file

@ -43,7 +43,6 @@ import com.evernote.android.job.Job;
import com.evernote.android.job.JobManager;
import com.evernote.android.job.JobRequest;
import com.evernote.android.job.util.support.PersistableBundleCompat;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.device.PowerManagementService;
import com.nextcloud.client.network.ConnectivityService;
@ -59,7 +58,6 @@ import com.owncloud.android.operations.CheckCurrentCredentialsOperation;
import com.owncloud.android.ui.EmptyRecyclerView;
import com.owncloud.android.ui.adapter.UploadListAdapter;
import com.owncloud.android.ui.decoration.MediaGridItemDecoration;
import com.owncloud.android.utils.DisplayUtils;
import com.owncloud.android.utils.FilesSyncHelper;
import com.owncloud.android.utils.ThemeUtils;
@ -154,20 +152,6 @@ public class UploadListActivity extends FileActivity {
if (getSupportActionBar() != null) {
ThemeUtils.setColoredTitle(getSupportActionBar(), R.string.uploads_view_title, this);
}
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation_view);
if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
bottomNavigationView.setVisibility(View.VISIBLE);
DisplayUtils.setupBottomBar(
getUserAccountManager().getCurrentAccount(),
bottomNavigationView,
getResources(),
accountManager,
this,
-1
);
}
}
private void setupContent() {

28
src/main/java/com/owncloud/android/ui/fragment/ExtendedListFragment.java
View file

@ -50,10 +50,8 @@ import android.widget.GridView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.di.Injectable;
@ -225,19 +223,6 @@ public class ExtendedListFragment extends Fragment implements
if (!(getActivity() instanceof UploadFilesActivity)) {
setFabVisible(!hasFocus);
}
boolean searchSupported = accountManager.isSearchSupported(accountManager.getCurrentAccount());
if (getResources().getBoolean(R.bool.bottom_toolbar_enabled) && searchSupported) {
BottomNavigationView bottomNavigationView = getActivity().
findViewById(R.id.bottom_navigation_view);
if (hasFocus) {
bottomNavigationView.setVisibility(View.GONE);
} else {
bottomNavigationView.setVisibility(View.VISIBLE);
}
}
}
}
}, 100);
@ -402,19 +387,6 @@ public class ExtendedListFragment extends Fragment implements
mFabMain = v.findViewById(R.id.fab_main);
ThemeUtils.tintFloatingActionButton(mFabMain, R.drawable.ic_plus, getContext());
boolean searchSupported = accountManager.isSearchSupported(accountManager.getCurrentAccount());
if (getResources().getBoolean(R.bool.bottom_toolbar_enabled) && searchSupported) {
RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) mFabMain.getLayoutParams();
final float scale = v.getResources().getDisplayMetrics().density;
BottomNavigationView bottomNavigationView = v.findViewById(R.id.bottom_navigation_view);
// convert the DP into pixel
int pixel = (int) (32 * scale + 0.5f);
layoutParams.setMargins(0, 0, pixel / 2, bottomNavigationView.getMeasuredHeight() + pixel * 2);
}
return v;
}

70
src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file

@ -47,7 +47,6 @@ import android.widget.AbsListView;
import android.widget.PopupMenu;
import android.widget.RelativeLayout;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.snackbar.Snackbar;
import com.nextcloud.client.account.UserAccountManager;
import com.nextcloud.client.device.DeviceInfo;
@ -187,8 +186,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
private ActionMode mActiveActionMode;
private OCFileListFragment.MultiChoiceModeListener mMultiChoiceModeListener;
private BottomNavigationView bottomNavigationView;
private SearchType currentSearchType;
private boolean searchFragment;
private SearchEvent searchEvent;
@ -271,7 +268,6 @@ public class OCFileListFragment extends ExtendedListFragment implements
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
Log_OC.i(TAG, "onCreateView() start");
View v = super.onCreateView(inflater, container, savedInstanceState);
bottomNavigationView = v.findViewById(R.id.bottom_navigation_view);
if (savedInstanceState != null
&& Parcels.unwrap(savedInstanceState.getParcelable(KEY_CURRENT_SEARCH_TYPE)) != null &&
@ -283,30 +279,14 @@ public class OCFileListFragment extends ExtendedListFragment implements
currentSearchType = SearchType.NO_SEARCH;
}
if (getResources().getBoolean(R.bool.bottom_toolbar_enabled)) {
bottomNavigationView.setVisibility(View.VISIBLE);
DisplayUtils.setupBottomBar(
accountManager.getCurrentAccount(),
bottomNavigationView, getResources(),
accountManager,
getActivity(),
R.id.nav_bar_files
);
}
if (!getResources().getBoolean(R.bool.bottom_toolbar_enabled) || savedInstanceState != null) {
if (savedInstanceState != null) {
final View fabView = v.findViewById(R.id.fab_main);
final RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams)
fabView.getLayoutParams();
layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM, 1);
Handler handler = new Handler();
handler.post(new Runnable() {
@Override
public void run() {
fabView.setLayoutParams(layoutParams);
fabView.invalidate();
}
new Handler().post(() -> {
fabView.setLayoutParams(layoutParams);
fabView.invalidate();
});
}
@ -1337,16 +1317,9 @@ public class OCFileListFragment extends ExtendedListFragment implements
}
private void unsetAllMenuItems(final boolean unsetDrawer) {
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
if (unsetDrawer) {
EventBus.getDefault().post(new DummyDrawerEvent());
} else {
if (bottomNavigationView != null) {
bottomNavigationView.getMenu().findItem(R.id.nav_bar_files).setChecked(true);
}
}
new Handler(Looper.getMainLooper()).post(() -> {
if (unsetDrawer) {
EventBus.getDefault().post(new DummyDrawerEvent());
}
});
@ -1498,30 +1471,11 @@ public class OCFileListFragment extends ExtendedListFragment implements
unsetAllMenuItems(true);
}
if (bottomNavigationView != null && isSearchEventSet(searchEvent)) {
switch (currentSearchType) {
case FAVORITE_SEARCH:
DisplayUtils.setBottomBarItem(bottomNavigationView, R.id.nav_bar_favorites);
break;
case PHOTO_SEARCH:
DisplayUtils.setBottomBarItem(bottomNavigationView, R.id.nav_bar_photos);
break;
default:
DisplayUtils.setBottomBarItem(bottomNavigationView, -1);
break;
}
}
Runnable switchViewsRunnable = new Runnable() {
@Override
public void run() {
if (isGridViewPreferred(mFile) && !isGridEnabled()) {
switchToGridView();
} else if (!isGridViewPreferred(mFile) && isGridEnabled()) {
switchToListView();
}
Runnable switchViewsRunnable = () -> {
if (isGridViewPreferred(mFile) && !isGridEnabled()) {
switchToGridView();
} else if (!isGridViewPreferred(mFile) && isGridEnabled()) {
switchToListView();
}
};

80
src/main/java/com/owncloud/android/utils/DisplayUtils.java
View file

@ -43,8 +43,6 @@ import android.text.format.DateUtils;
import android.text.style.StyleSpan;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import com.bumptech.glide.GenericRequestBuilder;
@ -55,10 +53,8 @@ import com.bumptech.glide.load.resource.file.FileToStreamDecoder;
import com.bumptech.glide.request.target.SimpleTarget;
import com.bumptech.glide.request.target.Target;
import com.caverock.androidsvg.SVG;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.snackbar.Snackbar;
import com.nextcloud.client.account.CurrentAccountProvider;
import com.nextcloud.client.account.UserAccountManager;
import com.owncloud.android.MainApp;
import com.owncloud.android.R;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
@ -66,10 +62,8 @@ import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.datamodel.ThumbnailsCacheManager;
import com.owncloud.android.lib.common.OwnCloudAccount;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.files.SearchRemoteOperation;
import com.owncloud.android.ui.TextDrawable;
import com.owncloud.android.ui.activity.FileDisplayActivity;
import com.owncloud.android.ui.events.MenuItemClickEvent;
import com.owncloud.android.ui.events.SearchEvent;
import com.owncloud.android.ui.fragment.OCFileListFragment;
import com.owncloud.android.utils.glide.CustomGlideUriLoader;
@ -570,80 +564,6 @@ public final class DisplayUtils {
}
}
public static void setupBottomBar(
Account account,
BottomNavigationView view,
Resources resources,
UserAccountManager accountManager,
final Activity activity,
int checkedMenuItem
) {
Menu menu = view.getMenu();
boolean searchSupported = accountManager.isSearchSupported(account);
if (!searchSupported) {
menu.removeItem(R.id.nav_bar_favorites);
menu.removeItem(R.id.nav_bar_photos);
}
if (resources.getBoolean(R.bool.use_home)) {
menu.findItem(R.id.nav_bar_files).setTitle(resources.
getString(R.string.drawer_item_home));
menu.findItem(R.id.nav_bar_files).setIcon(R.drawable.ic_home);
}
setBottomBarItem(view, checkedMenuItem);
view.setOnNavigationItemSelectedListener(
new BottomNavigationView.OnNavigationItemSelectedListener() {
@Override
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.nav_bar_files:
EventBus.getDefault().post(new MenuItemClickEvent(item));
if (activity != null) {
activity.invalidateOptionsMenu();
}
break;
case R.id.nav_bar_favorites:
SearchEvent favoritesEvent = new SearchEvent("",
SearchRemoteOperation.SearchType.FAVORITE_SEARCH,
SearchEvent.UnsetType.UNSET_DRAWER);
switchToSearchFragment(activity, favoritesEvent);
break;
case R.id.nav_bar_photos:
SearchEvent photosEvent = new SearchEvent("image/%",
SearchRemoteOperation.SearchType.CONTENT_TYPE_SEARCH,
SearchEvent.UnsetType.UNSET_DRAWER);
switchToSearchFragment(activity, photosEvent);
break;
case R.id.nav_bar_settings:
EventBus.getDefault().post(new MenuItemClickEvent(item));
break;
default:
break;
}
return true;
}
});
}
public static void setBottomBarItem(BottomNavigationView view, int checkedMenuItem) {
Menu menu = view.getMenu();
for (int i = 0; i < menu.size(); i++) {
menu.getItem(i).setChecked(false);
}
if (checkedMenuItem != -1) {
menu.findItem(checkedMenuItem).setChecked(true);
}
}
private static void switchToSearchFragment(Activity activity, SearchEvent event) {
if (activity instanceof FileDisplayActivity) {
EventBus.getDefault().post(event);

6
src/main/java/com/owncloud/android/utils/DrawerMenuUtil.java
View file

@ -38,12 +38,6 @@ public final class DrawerMenuUtil {
private DrawerMenuUtil() {
}
public static void filterForBottomToolbarMenuItems(Menu menu, Resources resources) {
if (resources.getBoolean(R.bool.bottom_toolbar_enabled)) {
filterMenuItems(menu, R.id.nav_all_files, R.id.nav_settings, R.id.nav_favorites, R.id.nav_photos);
}
}
public static void filterSearchMenuItems(Menu menu,
Account account,
Resources resources,

14
src/main/res/layout/activity_list_layout.xml
View file

@ -18,7 +18,6 @@
License along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -38,7 +37,6 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/bottom_navigation_view"
android:layout_below="@+id/navigation_bar">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@ -64,18 +62,6 @@
<include layout="@layout/empty_list" />
</FrameLayout>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:visibility="gone"
app:itemBackground="@color/primary_button_background_color"
app:itemIconTint="@color/primary_button_text_color"
app:itemTextColor="@color/primary_button_text_color"
app:menu="@menu/navigation_bar_menu" />
</RelativeLayout>

24
src/main/res/layout/contacts_preference.xml
View file

@ -19,12 +19,11 @@
License along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true">
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true">
<!-- The main content view -->
<RelativeLayout
@ -40,23 +39,10 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/bottom_navigation_view"
android:layout_below="@+id/navigation_bar"
android:id="@+id/frame_container">
</FrameLayout>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:visibility="gone"
app:itemBackground="@color/primary_button_background_color"
app:itemIconTint="@color/primary_button_text_color"
app:itemTextColor="@color/primary_button_text_color"
app:menu="@menu/navigation_bar_menu"/>
</RelativeLayout>
<include

23
src/main/res/layout/list_fragment.xml
View file

@ -18,9 +18,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/list_fragment_layout"
@ -43,13 +42,11 @@
<include layout="@layout/empty_list"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_main"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/bottom_navigation_view"
android:layout_gravity="end|bottom"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="@dimen/standard_margin"
@ -58,17 +55,5 @@
android:contentDescription="@string/fab_label"
android:visibility="gone" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom"
android:visibility="gone"
app:itemBackground="@color/primary_button_background_color"
app:itemIconTint="@color/primary_button_text_color"
app:itemTextColor="@color/primary_button_text_color"
app:menu="@menu/navigation_bar_menu"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</RelativeLayout>

24
src/main/res/layout/notifications_layout.xml
View file

@ -19,12 +19,11 @@
License along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true">
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true">
<!-- The main content view -->
<RelativeLayout
@ -39,7 +38,6 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/bottom_navigation_view"
android:layout_below="@+id/navigation_bar">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@ -74,18 +72,6 @@
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
</FrameLayout>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:visibility="gone"
app:itemBackground="@color/primary_button_background_color"
app:itemIconTint="@color/primary_button_text_color"
app:itemTextColor="@color/primary_button_text_color"
app:menu="@menu/navigation_bar_menu"/>
</RelativeLayout>
<include

12
src/main/res/layout/synced_folders_layout.xml
View file

@ -47,7 +47,6 @@
android:id="@+id/ListLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/bottom_navigation_view"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
@ -98,17 +97,6 @@
android:visibility="visible"/>
</FrameLayout>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:visibility="gone"
app:itemBackground="@color/primary_button_background_color"
app:itemIconTint="@color/primary_button_text_color"
app:itemTextColor="@color/primary_button_text_color"
app:menu="@menu/navigation_bar_menu"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
<include

25
src/main/res/layout/trashbin_activity.xml
View file

@ -20,13 +20,12 @@
along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true"
android:focusable="true">
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true"
android:focusable="true">
<!-- The main content view -->
<RelativeLayout
@ -41,7 +40,6 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/bottom_navigation_view"
android:layout_below="@+id/navigation_bar">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@ -62,17 +60,6 @@
</FrameLayout>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:visibility="gone"
app:itemBackground="@color/primary_button_background_color"
app:itemIconTint="@color/primary_button_text_color"
app:itemTextColor="@color/primary_button_text_color"
app:menu="@menu/navigation_bar_menu"/>
</RelativeLayout>
<include

23
src/main/res/layout/upload_list_layout.xml
View file

@ -17,12 +17,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clickable="true"
android:fitsSystemWindows="true"
android:focusable="true">
<!-- The main content view -->
@ -38,7 +37,6 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/bottom_navigation_view"
android:layout_below="@+id/navigation_bar">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@ -60,17 +58,6 @@
</FrameLayout>
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/bottom_navigation_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:visibility="gone"
app:itemBackground="@color/primary_button_background_color"
app:itemIconTint="@color/primary_button_text_color"
app:itemTextColor="@color/primary_button_text_color"
app:menu="@menu/navigation_bar_menu"/>
</RelativeLayout>
<include

3
src/main/res/values/setup.xml
View file

@ -80,9 +80,6 @@
<!-- Various other options -->
<bool name="allow_profile_click">true</bool>
<!-- Bottom toolbar -->
<bool name="bottom_toolbar_enabled">false</bool>
<!-- Help, imprint and feedback, and other things -->
<bool name="passcode_enabled">true</bool>
<bool name="device_credentials_enabled">true</bool>