Merge branch 'dev' into main

This commit is contained in:
rebel onion 2023-12-18 17:17:24 -06:00 committed by GitHub
commit 74328cf4cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 973 additions and 225 deletions

View file

@ -121,6 +121,28 @@
</com.google.android.material.materialswitch.MaterialSwitch>
<com.google.android.material.switchmaterial.SwitchMaterial
android:id="@+id/uiSettingsImmersiveList"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:checked="true"
android:drawableStart="@drawable/ic_round_fullscreen_24"
android:drawablePadding="16dp"
app:drawableTint="?attr/colorPrimary"
android:elegantTextHeight="true"
android:fontFamily="@font/poppins_bold"
android:minHeight="64dp"
android:paddingStart="32dp"
android:paddingEnd="32dp"
android:text="@string/immersive_modelist"
android:textAlignment="viewStart"
android:textColor="?attr/colorOnBackground"
app:cornerRadius="0dp"
app:showText="false"
app:thumbTint="@color/button_switch_track">
</com.google.android.material.switchmaterial.SwitchMaterial>
<View
android:layout_width="match_parent"
android:layout_height="1dp"