Skip to content

Home: move the threshold slider under the gauge and slim it down #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
almothafar merged 1 commit into from
Jul 12, 2026
Merged

Home: move the threshold slider under the gauge and slim it down #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 35 additions & 29 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,53 +39,37 @@
android:layout_height="160dp"
tools:cpb_subtitle="subtitle"
tools:cpb_title="Title"
android:layout_marginTop="10dp"
android:layout_marginTop="-2dp"
android:layout_marginBottom="-10dp" />
</LinearLayout>

<androidx.fragment.app.FragmentContainerView
android:id="@+id/detailsFragmentLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:name="com.almothafar.simplebatterynotifier.ui.fragment.BatteryDetailsFragment"
tools:layout="@layout/fragment_battery_details" />

<!-- Battery Health Section -->
<!-- In-fly critical/warning threshold adjuster, placed directly under the gauge it controls.
Mirrors the Settings range slider and writes the same preference keys, so changes here
update the gauge immediately. -->
<LinearLayout
android:id="@+id/homeBottomSection"
android:id="@+id/thresholdSection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@android:color/white"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="16dp"
android:paddingBottom="@dimen/content_navigation_bar_padding"
android:background="@android:color/white">

<!-- In-fly critical/warning threshold adjuster. Mirrors the Settings range slider and
writes the same preference keys, so changes here update the gauge immediately. -->
<TextView
android:id="@+id/thresholdTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/battery_range_title"
android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
android:textColor="@color/default_text_color" />
android:paddingTop="4dp"
android:paddingBottom="4dp">

<com.google.android.material.slider.RangeSlider
android:id="@+id/thresholdSlider"
style="@style/Widget.App.RangeSlider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stepSize="1"
android:valueFrom="10"
android:valueTo="50"
app:labelBehavior="floating" />
android:valueTo="50" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="-6dp"
android:orientation="horizontal">

<TextView
Expand All @@ -95,7 +79,7 @@
android:layout_weight="1"
android:gravity="start"
android:textColor="@color/circular_progress_default_progress_alert"
android:textSize="13sp"
android:textSize="12sp"
android:textStyle="bold" />

<TextView
Expand All @@ -105,11 +89,33 @@
android:layout_weight="1"
android:gravity="end"
android:textColor="@color/circular_progress_default_progress_warning"
android:textSize="13sp"
android:textSize="12sp"
android:textStyle="bold" />

</LinearLayout>

</LinearLayout>

<androidx.fragment.app.FragmentContainerView
android:id="@+id/detailsFragmentLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:name="com.almothafar.simplebatterynotifier.ui.fragment.BatteryDetailsFragment"
tools:layout="@layout/fragment_battery_details" />

<!-- Battery Health Section -->
<LinearLayout
android:id="@+id/homeBottomSection"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="8dp"
android:paddingBottom="@dimen/content_navigation_bar_padding"
android:background="@android:color/white">

<!-- Battery Insights Button - Material3 -->
<com.google.android.material.button.MaterialButton
android:id="@+id/batteryInsightsButton"
Expand Down
24 changes: 8 additions & 16 deletions app/src/main/res/layout/preference_battery_range_slider.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,33 +9,25 @@
android:orientation="vertical"
android:clickable="false"
android:focusable="false"
android:minHeight="64dp"
android:minHeight="48dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="12dp"
android:paddingBottom="12dp">

<TextView
android:id="@android:id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
android:textColor="?android:attr/textColorPrimary"
tools:text="Battery Alert Levels" />
android:paddingTop="8dp"
android:paddingBottom="8dp">

<com.google.android.material.slider.RangeSlider
android:id="@+id/battery_range_slider"
style="@style/Widget.App.RangeSlider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:stepSize="1"
android:valueFrom="10"
android:valueTo="50"
app:labelBehavior="floating" />
android:valueTo="50" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="-6dp"
android:orientation="horizontal">

<TextView
Expand All @@ -45,7 +37,7 @@
android:layout_weight="1"
android:gravity="start"
android:textColor="@color/circular_progress_default_progress_alert"
android:textSize="13sp"
android:textSize="12sp"
android:textStyle="bold"
tools:text="Critical 20%" />

Expand All @@ -56,7 +48,7 @@
android:layout_weight="1"
android:gravity="end"
android:textColor="@color/circular_progress_default_progress_warning"
android:textSize="13sp"
android:textSize="12sp"
android:textStyle="bold"
tools:text="Warning 40%" />

Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
<string name="alert_start_level">المستوى الحرج يبدأ من</string>

<!-- Combined critical/warning battery range slider -->
<string name="battery_range_title">مستويات تنبيه البطارية</string>
<string name="battery_range_caption_critical">حرج %1$d%%</string>
<string name="battery_range_caption_warning">تحذير %1$d%%</string>
<string name="battery_range_summary">حرج %1$d%% • تحذير %2$d%%</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
<string name="alert_start_level">Critical Level Start From</string>

<!-- Combined critical/warning battery range slider -->
<string name="battery_range_title">Battery Alert Levels</string>
<string name="battery_range_caption_critical">Critical %1$d%%</string>
<string name="battery_range_caption_warning">Warning %1$d%%</string>
<string name="battery_range_summary">Critical %1$d%% • Warning %2$d%%</string>
Expand Down
16 changes: 16 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,20 @@
<item name="android:minHeight">64dp</item>
<item name="seekBarIncrement">1</item>
</style>

<!-- Shared look for the critical/warning RangeSlider (Home + Settings) so size/color tweaks
live in one place. Material 1.14's slider defaults to tall bar thumbs and draws a tick dot
per step (40 dots over 10-50), which looks noisy; here we hide the ticks, use a compact
round thumb snug to the track, drop the floating bubble (the captions show the values),
and keep a comfortable touch target. -->
<style name="Widget.App.RangeSlider" parent="Widget.Material3.Slider">
<item name="labelBehavior">gone</item>
<item name="tickVisible">false</item>
<item name="thumbWidth">16dp</item>
<item name="thumbHeight">16dp</item>
<item name="thumbTrackGapSize">0dp</item>
<item name="trackHeight">4dp</item>
<item name="trackStopIndicatorSize">0dp</item>
<item name="minTouchTargetSize">40dp</item>
</style>
</resources>
1 change: 0 additions & 1 deletion app/src/main/res/xml/pref_general.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<com.almothafar.simplebatterynotifier.ui.preference.BatteryRangeSliderPreference
android:key="@string/_pref_key_battery_level_range"
android:persistent="false"
android:title="@string/battery_range_title"
app:criticalKey="@string/_pref_key_critical_battery_level"
app:warningKey="@string/_pref_key_warn_battery_level"
app:sliderFrom="10"
Expand Down