~singpolyma/cheogram-android

b156e93f9d4b9565b9a27dfb49d0f270cc458127 — Stephen Paul Weber 6 months ago 37c5e43
Make default option look less like a header
M src/cheogram/res/layout/command_button_grid_field.xml => src/cheogram/res/layout/command_button_grid_field.xml +14 -2
@@ 29,15 29,27 @@
        <com.google.android.material.button.MaterialButton
            style="@style/Widget.Material3.Button.TonalButton"
            android:id="@+id/default_button"
            android:layout_width="match_parent"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginRight="40dp"
            android:layout_marginLeft="40dp"
            android:layout_marginBottom="24dp"
            android:layout_marginTop="24dp"
				android:layout_gravity="center_horizontal"
            android:gravity="center"
            android:textAllCaps="false"
            android:minHeight="75dp" />
            android:minHeight="35dp" />

        <TextView
            android:id="@+id/default_button_seperator"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:paddingLeft="16dp"
            android:paddingRight="8dp"
            android:gravity="center"
				android:layout_gravity="center_horizontal"
            android:textAppearance="?textAppearanceBodyMedium"
            android:text="or" />

        <com.cheogram.android.GridView
            android:id="@+id/buttons"

M src/main/java/eu/siacs/conversations/entities/Conversation.java => src/main/java/eu/siacs/conversations/entities/Conversation.java +3 -1
@@ 2674,14 2674,16 @@ public class Conversation extends AbstractEntity
                    }
                    if (defaultOption == null) {
                        binding.defaultButton.setVisibility(View.GONE);
                        binding.defaultButtonSeperator.setVisibility(View.GONE);
                    } else {
                        theOptions.remove(defaultOption);
                        binding.defaultButton.setVisibility(View.VISIBLE);
                        binding.defaultButtonSeperator.setVisibility(View.VISIBLE);

                        final SVG defaultIcon = defaultOption.getIcon();
                        if (defaultIcon != null) {
                             DisplayMetrics display = mPager.get().getContext().getResources().getDisplayMetrics();
                             int height = (int)(display.heightPixels*display.density/4);
                             int height = (int)(display.heightPixels*display.density/8);
                             binding.defaultButton.setCompoundDrawablesRelativeWithIntrinsicBounds(null, getDrawableForSVG(defaultIcon, defaultOption.getIconEl(), height), null, null);
                        }