Commit ca6025f1 authored by Thomas's avatar Thomas
Browse files

some changes

parent 16de400f

app/src/main/java/app/fedilab/android/activities/ReorderTimelinesActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -116,8 +116,9 @@ public class ReorderTimelinesActivity extends BaseActivity implements OnStartDra 
        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(ReorderTimelinesActivity.this);

        boolean singleBar = sharedpreferences.getBoolean(getString(R.string.SET_USE_SINGLE_TOPBAR), false);

        if (singleBar) {

            binding.titleTop.setVisibility(View.GONE);

            binding.titleBottom.setVisibility(View.GONE);

            binding.lvReorderBottom.setVisibility(View.GONE);

            binding.titleTop.setVisibility(View.GONE);

        }

        changes = false;

        bottomChanges = false;

app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java

+10 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.content.SharedPreferences; 
import android.os.Bundle;

import android.text.Editable;

import android.text.TextWatcher;

import android.util.TypedValue;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;

import android.view.Menu;
@@ -98,13 +99,21 @@ public class PinnedTimelineHelper { 
        }

        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);

        boolean singleBar = sharedpreferences.getBoolean(activity.getString(R.string.SET_USE_SINGLE_TOPBAR), false);



        ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) activityMainBinding.viewPager.getLayoutParams();

        //Hiding/Showing bottom menu depending of settings

        if (singleBar) {

            activityMainBinding.bottomNavView.setVisibility(View.GONE);

            params.setMargins(0, 0, 0, 0);

        } else {

            TypedValue tv = new TypedValue();

            activityMainBinding.bottomNavView.setVisibility(View.VISIBLE);

            if (activity.getTheme().resolveAttribute(R.attr.actionBarSize, tv, true)) {

                int actionBarHeight = TypedValue.complexToDimensionPixelSize(tv.data, activity.getResources().getDisplayMetrics());

                params.setMargins(0, 0, 0, actionBarHeight);

            }



        }

        activityMainBinding.viewPager.setLayoutParams(params);

        List<PinnedTimeline> pinnedTimelines = pinned.pinnedTimelines;



        if (!singleBar) {

app/src/main/res/layout/activity_main.xml

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 
            android:layout_height="wrap_content"

            android:layout_alignParentStart="true"

            android:layout_gravity="bottom"

            android:layout_marginBottom="?actionBarSize"></androidx.coordinatorlayout.widget.CoordinatorLayout>

            android:layout_marginBottom="?actionBarSize" />



    </androidx.coordinatorlayout.widget.CoordinatorLayout>

    <com.google.android.material.navigation.NavigationView