Commit 22902ac0 authored by Thomas's avatar Thomas
Browse files

Fix some crashes

parent db3d317a

app/src/main/AndroidManifest.xml

+4 −4
Original line number Diff line number Diff line
@@ -287,15 +287,15 @@ 
            android:name=".activities.InstanceActivity"

            android:configChanges="keyboardHidden|orientation|screenSize"

            android:label="@string/action_about_instance"

            android:theme="@style/MaterialAlertDialog.Material3" />

            android:theme="@style/Theme.Material3.Dark.Dialog.Alert" />

        <activity

            android:name=".activities.InstanceProfileActivity"

            android:excludeFromRecents="true"

            android:theme="@style/MaterialAlertDialog.Material3" />

            android:theme="@style/Theme.Material3.Dark.Dialog.Alert" />

        <activity

            android:name=".activities.ProxyActivity"

            android:excludeFromRecents="true"

            android:theme="@style/MaterialAlertDialog.Material3" />

            android:theme="@style/Theme.Material3.Dark.Dialog.Alert" />

        <activity

            android:name=".activities.HashTagActivity"

            android:configChanges="keyboardHidden|orientation|screenSize" />
@@ -310,7 +310,7 @@ 
        <activity

            android:name=".activities.InstanceHealthActivity"

            android:excludeFromRecents="true"

            android:theme="@style/MaterialAlertDialog.Material3" />

            android:theme="@style/Theme.Material3.Dark.Dialog.Alert" />



        <activity

            android:name=".activities.ReportActivity"

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

+1 −3
Original line number Diff line number Diff line
@@ -109,9 +109,7 @@ 
            android:layout_gravity="center"

            android:layout_marginTop="20dp"

            android:text="@string/close"

            android:textAllCaps="false"

            android:textColor="@color/white"

            android:textSize="16sp" />

            android:textAllCaps="false" />

    </LinearLayout>

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

+3 −3
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
                    android:layout_marginEnd="6dp"

                    android:contentDescription="@string/set_notify"

                    android:scaleType="fitCenter"

                    android:icon="@drawable/ic_baseline_notifications_off_24"

                    app:icon="@drawable/ic_baseline_notifications_off_24"

                    android:visibility="gone"

                    app:layout_constraintEnd_toStartOf="@id/avatar_container"

                    app:layout_constraintTop_toBottomOf="@id/banner_container"
@@ -125,7 +125,7 @@ 
                    android:layout_marginTop="6dp"

                    android:contentDescription="@string/edit_profile"

                    android:scaleType="fitCenter"

                    android:icon="@drawable/ic_baseline_edit_24"

                    app:icon="@drawable/ic_baseline_edit_24"

                    android:visibility="gone"

                    app:layout_constraintStart_toEndOf="@id/avatar_container"

                    app:layout_constraintTop_toBottomOf="@id/banner_container"
@@ -353,7 +353,7 @@ 
                        android:layout_marginTop="6dp"

                        android:contentDescription="@string/display_remote_profile"

                        android:scaleType="fitCenter"

                        android:icon="@drawable/ic_baseline_manage_search_24" />

                        app:icon="@drawable/ic_baseline_manage_search_24" />

                </androidx.appcompat.widget.LinearLayoutCompat>

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

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
            android:layout_height="36dp"

            android:adjustViewBounds="true"

            android:backgroundTint="@color/editColor"

            android:icon="@drawable/ic_baseline_mode_edit_24"

            app:icon="@drawable/ic_baseline_mode_edit_24"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toTopOf="parent" />
@@ -56,7 +56,7 @@ 
            android:layout_height="36dp"

            android:adjustViewBounds="true"

            android:backgroundTint="@color/errorColor"

            android:icon="@drawable/ic_compose_attachment_remove"

            app:icon="@drawable/ic_compose_attachment_remove"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toTopOf="parent" />
@@ -66,7 +66,7 @@ 
            android:layout_width="48dp"

            android:layout_height="48dp"

            android:adjustViewBounds="true"

            android:icon="@drawable/ic_compose_attachment_order_up"

            app:icon="@drawable/ic_compose_attachment_order_up"

            app:layout_constraintStart_toStartOf="parent"

            app:layout_constraintTop_toBottomOf="@id/preview" />
@@ -94,7 +94,7 @@ 
            android:layout_width="48dp"

            android:layout_height="48dp"

            android:adjustViewBounds="true"

            android:icon="@drawable/ic_compose_attachment_order_down"

            app:icon="@drawable/ic_compose_attachment_order_down"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toBottomOf="@id/preview" />

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

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
                android:layout_height="48dp"

                android:layout_marginStart="6dp"

                android:adjustViewBounds="true"

                android:icon="@drawable/ic_baseline_close_24" />

                app:icon="@drawable/ic_baseline_close_24" />



            <com.google.android.material.button.MaterialButton

                android:id="@+id/accept_button"