Commit 01109c38 authored by Thomas's avatar Thomas
Browse files

Allow to scroll buttons for larger screen in conversation

parent cbed45da

app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecoration.java

+1 −5
Original line number Diff line number Diff line
@@ -69,9 +69,8 @@ public class DividerDecoration extends RecyclerView.ItemDecoration { 
        StatusAdapter statusAdapter = ((StatusAdapter) parent.getAdapter());

        if (statusAdapter != null && statusAdapter.getItemCount() > position && position > 0) {

            Status status = statusAdapter.getItem(position);

            int indentation = (status.isFocused?1:indentationMax);

            int start = (int) Helper.convertDpToPixel(

                    6 * fontScale * CommentDecorationHelper.getIndentation(status.in_reply_to_id, statusList, indentation),

                    6 * fontScale * CommentDecorationHelper.getIndentation(status.in_reply_to_id, statusList, indentationMax),

                    _mContext);



            if (parent.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR) {
@@ -95,9 +94,6 @@ public class DividerDecoration extends RecyclerView.ItemDecoration { 
                int indentation = Math.min(

                        CommentDecorationHelper.getIndentation(status.in_reply_to_id, statusList, indentationMax),

                        indentationMax);

                if(status.isFocused) {

                    indentation = 1;

                }

                if (indentation > 0) {

                    Paint paint = new Paint();

                    paint.setDither(false);

app/src/main/java/app/fedilab/android/ui/fragment/FragmentLoginMain.java

+1 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static app.fedilab.android.activities.LoginActivity.client_secretLogin; 
import static app.fedilab.android.activities.LoginActivity.currentInstanceLogin;

import static app.fedilab.android.activities.LoginActivity.requestedAdmin;

import static app.fedilab.android.activities.LoginActivity.softwareLogin;

import static app.fedilab.android.mastodon.helper.Helper.TAG;



import android.Manifest;

import android.content.Intent;
@@ -263,7 +262,7 @@ public class FragmentLoginMain extends Fragment { 
                if (apiLogin != Account.API.PEERTUBE) {

                    retrievesClientId(currentInstanceLogin);

                } else {

                    Intent peertubeLogin = new Intent(requireActivity(), LoginActivity.class);

                    Intent peertubeLogin = new Intent(requireActivity(), app.fedilab.android.peertube.activities.LoginActivity.class);

                    peertubeLogin.putExtra(Helper.ARG_INSTANCE, instance);

                    startActivity(peertubeLogin);

                    requireActivity().finish();

app/src/main/res/layouts/mastodon/layout/drawer_status.xml

+64 −59
Original line number Diff line number Diff line
@@ -528,19 +528,22 @@ 
            tools:text="Fedilab"

            tools:visibility="visible" />



        <androidx.appcompat.widget.LinearLayoutCompat

            android:id="@+id/status_info"

        <HorizontalScrollView

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:fillViewport="true"

            android:layout_marginStart="48dp"

            android:layout_marginTop="6dp"

            android:layout_marginEnd="6dp"

            android:layout_marginEnd="6dp">

            <androidx.appcompat.widget.LinearLayoutCompat

                android:id="@+id/status_info"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:alpha="0.8"

                android:gravity="center_vertical"

                android:padding="6dp"

                android:visibility="gone"

                tools:visibility="visible">



                <androidx.appcompat.widget.AppCompatTextView

                    android:id="@+id/time"

                    android:layout_width="wrap_content"
@@ -608,6 +611,8 @@ 
                    app:srcCompat="@drawable/ic_baseline_public_24" />



            </androidx.appcompat.widget.LinearLayoutCompat>

        </HorizontalScrollView>





        <androidx.appcompat.widget.LinearLayoutCompat

            android:id="@+id/action_share_container"