Skip to content

fix wide buttons on larger screens #196

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

Open
wassupluke wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix wide buttons on larger screens #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d586ca
improve layout on large screens using wrapper ConstraintLayout
wassupluke Mar 16, 2026
3267cb8
fix buggy tutorial sub-screen centering on large screens
wassupluke Mar 16, 2026
a8359e3
replace match_parent with 0dp for ConstraintLayout children
wassupluke Mar 16, 2026
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
107 changes: 61 additions & 46 deletions app/src/main/res/layout/activity_pin_shortcut.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<TextView
android:id="@+id/list_heading"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="center"
android:minHeight="?actionBarSize"
Expand Down Expand Up @@ -63,62 +63,77 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/pin_shortcut_appbar">

<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="20dp"
android:orientation="vertical">

<TextView
android:id="@+id/pin_shortcut_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="50dp"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:minHeight="40dp"
tools:drawableLeft="@drawable/baseline_settings_24"
tools:text="Shortcut name" />

<Space
android:layout_width="match_parent"
android:layout_height="10dp" />

<CheckBox
android:id="@+id/pin_shortcut_switch_visible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="?android:textColor"
android:checked="true"
android:text="@string/pin_shortcut_switch_visible" />

<Space
android:layout_width="match_parent"
android:layout_height="10dp" />
android:layout_height="wrap_content">

<Button
android:id="@+id/pin_shortcut_button_bind"
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/pin_shortcut_button_bind" />

<Space
android:layout_width="match_parent"
android:layout_height="10dp" />

</LinearLayout>
android:layout_gravity="center_vertical"
android:layout_margin="20dp"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/max_button_width">

<TextView
android:id="@+id/pin_shortcut_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="50dp"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:minHeight="40dp"
tools:drawableLeft="@drawable/baseline_settings_24"
tools:text="Shortcut name" />

<Space
android:layout_width="match_parent"
android:layout_height="10dp" />

<CheckBox
android:id="@+id/pin_shortcut_switch_visible"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:textColor="?android:textColor"
android:checked="true"
android:text="@string/pin_shortcut_switch_visible" />

<Space
android:layout_width="match_parent"
android:layout_height="10dp" />

<Button
android:id="@+id/pin_shortcut_button_bind"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:text="@string/pin_shortcut_button_bind" />

<Space
android:layout_width="match_parent"
android:layout_height="10dp" />

</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

</ScrollView>

<Button
android:id="@+id/pin_shortcut_button_ok"
android:layout_margin="10dp"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:text="@android:string/ok"
app:layout_constraintBottom_toBottomOf="parent" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintWidth_max="@dimen/max_button_width" />

</androidx.constraintlayout.widget.ConstraintLayout>
76 changes: 45 additions & 31 deletions app/src/main/res/layout/activity_report_crash.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,52 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp">
android:layout_height="wrap_content">

<de.jrpie.android.launcher.ui.util.HtmlTextView
android:layout_width="match_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/crash_info" />

<Button
android:id="@+id/report_crash_button_copy"
android:text="@string/report_crash_button_copy"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<Space
android:layout_width="match_parent"
android:layout_height="20dp" />

<Button
android:id="@+id/report_crash_button_mail"
android:text="@string/report_crash_button_mail"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<Button
android:id="@+id/report_crash_button_report"
android:text="@string/report_crash_button_report"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
android:orientation="vertical"
android:padding="10dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/max_button_width">

<de.jrpie.android.launcher.ui.util.HtmlTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/crash_info" />

<Button
android:id="@+id/report_crash_button_copy"
android:text="@string/report_crash_button_copy"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp" />

<Space
android:layout_width="match_parent"
android:layout_height="20dp" />

<Button
android:id="@+id/report_crash_button_mail"
android:text="@string/report_crash_button_mail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp" />

<Button
android:id="@+id/report_crash_button_report"
android:text="@string/report_crash_button_report"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp" />
</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_select_widget.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/select_widget_recycler"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/layout/dialog_choose_color.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
android:id="@+id/dialog_select_color_seekbar_alpha"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:max="255" />

<Space
Expand All @@ -48,6 +49,7 @@
android:id="@+id/dialog_select_color_seekbar_red"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:max="255" />

<Space
Expand All @@ -63,6 +65,7 @@
android:id="@+id/dialog_select_color_seekbar_green"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:max="255" />

<Space
Expand All @@ -78,6 +81,7 @@
android:id="@+id/dialog_select_color_seekbar_blue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:max="255" />

</LinearLayout>
50 changes: 30 additions & 20 deletions app/src/main/res/layout/list_apps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,43 @@

</androidx.recyclerview.widget.RecyclerView>

<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_margin="8dp">

<androidx.appcompat.widget.SearchView
android:id="@+id/list_apps_searchview"
android:layout_width="fill_parent"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:iconifiedByDefault="false"
app:iconifiedByDefault="false"
app:queryHint="@string/list_apps_search_hint"
app:searchHintIcon="@drawable/baseline_search_24"
app:searchIcon="@drawable/baseline_search_24" />
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/max_search_bar_width">

<CheckBox
android:id="@+id/list_apps_check_box_favorites"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0"
android:layout_marginEnd="16dp"
android:contentDescription="@string/content_description_toggle_favorites"
android:button="@drawable/checkbox_favorite" />
<androidx.appcompat.widget.SearchView
android:id="@+id/list_apps_searchview"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:iconifiedByDefault="false"
app:iconifiedByDefault="false"
app:queryHint="@string/list_apps_search_hint"
app:searchHintIcon="@drawable/baseline_search_24"
app:searchIcon="@drawable/baseline_search_24" />

</LinearLayout>
<CheckBox
android:id="@+id/list_apps_check_box_favorites"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_weight="0"
android:layout_marginEnd="16dp"
android:contentDescription="@string/content_description_toggle_favorites"
android:button="@drawable/checkbox_favorite" />

</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>


</LinearLayout>
8 changes: 5 additions & 3 deletions app/src/main/res/layout/settings_actions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/settings_actions_rview_fragment"
android:name="de.jrpie.android.launcher.ui.settings.actions.SettingsFragmentActionsRecycler"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toTopOf="@+id/settings_actions_buttons"
Expand All @@ -23,18 +23,20 @@

<LinearLayout
android:id="@+id/settings_actions_buttons"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintWidth_max="@dimen/max_button_width">

<Button
android:id="@+id/settings_actions_button_install_apps"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:text="@string/settings_apps_install"
android:textAllCaps="false" />

Expand Down
17 changes: 14 additions & 3 deletions app/src/main/res/layout/settings_meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/settings_meta_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:context=".ui.settings.meta.SettingsFragmentMeta">

<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center|top"
android:orientation="vertical"
android:paddingLeft="32sp"
android:paddingTop="16sp"
android:paddingRight="32sp">
android:paddingRight="32sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_max="@dimen/max_button_width">


<Button
Expand Down Expand Up @@ -117,4 +126,6 @@
tools:text="v1.2.3" />

</LinearLayout>
</ScrollView>

</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
Loading
Loading