General fixes, UI cleanup and popup animations

This commit is contained in:
partisan 2025-05-17 20:43:06 +02:00
parent e810208a14
commit 6d9024a580
20 changed files with 457 additions and 77 deletions

View file

@ -19,9 +19,11 @@
app:titleTextColor="?attr/colorOnSurface"
app:navigationIconTint="?attr/colorOnSurface"
app:title="@string/app_name"
app:titleTextAppearance="@style/Toolbar.Title.Small"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
app:layout_constraintEnd_toEndOf="parent">
</com.google.android.material.appbar.MaterialToolbar>
<FrameLayout
android:id="@+id/fragmentContainer"

View file

@ -5,44 +5,24 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="32dp"
tools:context=".PopupSettingsFragment">
android:padding="32dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<!-- Delay label -->
<TextView
android:id="@+id/description"
android:id="@+id/delayDescription"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/popup_settings_description"
android:textSize="16sp"
android:text="@string/redirection_delay_description"
android:textSize="12sp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<CheckBox
android:id="@+id/popupEnabledCheckbox"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/popup_enabled"
android:textSize="14sp"
app:layout_constraintTop_toBottomOf="@id/description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/popupPreview"
android:layout_marginTop="16dp" />
<Button
android:id="@+id/popupPreview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/test"
app:layout_constraintTop_toTopOf="@id/popupEnabledCheckbox"
app:layout_constraintBottom_toBottomOf="@id/popupEnabledCheckbox"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginStart="8dp" />
<!-- Delay slider -->
<com.google.android.material.slider.Slider
android:id="@+id/redirectionDelay"
android:layout_width="0dp"
@ -51,22 +31,24 @@
android:valueFrom="2"
android:valueTo="4"
android:contentDescription="@string/redirection_delay_description"
app:layout_constraintTop_toBottomOf="@id/popupEnabledCheckbox"
app:layout_constraintTop_toBottomOf="@id/delayDescription"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="16dp" />
android:layout_marginTop="8dp" />
<!-- Position label -->
<TextView
android:id="@+id/delayDescription"
android:id="@+id/heightDescription"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/redirection_delay_description"
android:text="@string/popup_position"
android:textSize="12sp"
app:layout_constraintTop_toBottomOf="@id/redirectionDelay"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="4dp" />
android:layout_marginTop="16dp" />
<!-- Position slider -->
<com.google.android.material.slider.Slider
android:id="@+id/popupHeightSlider"
android:layout_width="0dp"
@ -75,21 +57,43 @@
android:valueTo="100"
android:stepSize="1"
android:contentDescription="@string/popup_position"
app:layout_constraintTop_toBottomOf="@id/delayDescription"
app:layout_constraintTop_toBottomOf="@id/heightDescription"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="16dp" />
android:layout_marginTop="8dp" />
<!-- Animation label -->
<TextView
android:id="@+id/heightDescription"
android:id="@+id/popupEffectLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/popup_position"
android:text="@string/popup_effect_label"
android:textSize="12sp"
app:layout_constraintTop_toBottomOf="@id/popupHeightSlider"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="4dp" />
android:layout_marginTop="16dp" />
<!-- Animation dropdown -->
<Spinner
android:id="@+id/popupEffectSpinner"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/popupEffectLabel"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="8dp" />
<!-- Test button -->
<Button
android:id="@+id/popupPreview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/test"
app:layout_constraintTop_toBottomOf="@id/popupEffectSpinner"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginTop="16dp" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>

View file

@ -6,23 +6,25 @@
android:layout_height="match_parent"
android:padding="16dp">
<TextView
android:id="@+id/serviceHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/service_settings_title"
android:textSize="18sp"
android:textStyle="bold"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginBottom="8dp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/serviceRecycler"
android:layout_width="0dp"
android:layout_height="0dp"
android:scrollbars="vertical"
app:layout_constraintTop_toBottomOf="@id/serviceHeader"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/serviceHeader"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/serviceHeader"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/services_desc"
android:textSize="12sp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
app:layout_constraintTop_toBottomOf="@id/serviceRecycler"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />

View file

@ -5,8 +5,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
app:cardCornerRadius="24dp"
app:cardElevation="4dp"
android:padding="24dp"
app:cardBackgroundColor="?attr/colorSurface">
<LinearLayout

View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.switchmaterial.SwitchMaterial xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/globalPopupToggle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
android:checked="true" />