jrpie/launcher
1
0
Fork 0
mirror of https://github.com/jrpie/Launcher.git synced 2025-06-28 11:55:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge d1c194dd8a into b9792e9942

Browse source
This commit is contained in:
Luke Wass 2025-06-24 22:02:53 +02:00 • committed by GitHub
commit f29818c345
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 349 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

54
app/src/main/res/layout/activity_pin_shortcut.xml
View file

@ -63,61 +63,63 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/pin_shortcut_appbar"> app:layout_constraintTop_toBottomOf="@id/pin_shortcut_appbar">
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="20dp" android:layout_margin="20dp"
android:orientation="vertical"> android:padding="16dp">
<TextView <TextView
android:id="@+id/pin_shortcut_label" android:id="@+id/pin_shortcut_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_marginBottom="50dp"
android:layout_margin="50dp"
android:drawablePadding="10dp" android:drawablePadding="10dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:minHeight="40dp" android:minHeight="40dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:drawableLeft="@drawable/baseline_settings_24" tools:drawableLeft="@drawable/baseline_settings_24"
tools:text="Shortcut name" /> tools:text="Shortcut name" />
<Space
android:layout_width="match_parent"
android:layout_height="10dp" />
<CheckBox <CheckBox
android:id="@+id/pin_shortcut_switch_visible" android:id="@+id/pin_shortcut_switch_visible"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="10dp"
android:minHeight="48dp"
android:text="@string/pin_shortcut_switch_visible"
android:textColor="?android:textColor" android:textColor="?android:textColor"
android:checked="true" app:layout_constraintEnd_toEndOf="parent"
android:text="@string/pin_shortcut_switch_visible" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/pin_shortcut_label"
<Space app:layout_constraintWidth_max="@dimen/max_button_width" />
android:layout_width="match_parent"
android:layout_height="10dp" />
<Button <Button
android:id="@+id/pin_shortcut_button_bind" android:id="@+id/pin_shortcut_button_bind"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/pin_shortcut_button_bind" /> android:layout_margin="10dp"
android:text="@string/pin_shortcut_button_bind"
<Space app:layout_constraintEnd_toEndOf="parent"
android:layout_width="match_parent" app:layout_constraintStart_toStartOf="parent"
android:layout_height="10dp" /> app:layout_constraintTop_toBottomOf="@id/pin_shortcut_switch_visible"
app:layout_constraintWidth_max="@dimen/max_button_width" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>
<Button <Button
android:id="@+id/pin_shortcut_button_ok" android:id="@+id/pin_shortcut_button_ok"
android:layout_margin="10dp" android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="16dp"
android:text="@android:string/ok" 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> </androidx.constraintlayout.widget.ConstraintLayout>

76
app/src/main/res/layout/activity_report_crash.xml
View file

@ -23,37 +23,67 @@
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" > app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="10dp"> android:padding="10dp">
<de.jrpie.android.launcher.ui.util.HtmlTextView <de.jrpie.android.launcher.ui.util.HtmlTextView
android:id="@+id/crash_info_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/crash_info" /> android:text="@string/crash_info"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<Button <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/report_crash_button_copy" android:id="@+id/button_container"
android:text="@string/report_crash_button_copy" android:layout_width="0dp"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" /> android:layout_marginTop="20dp"
<Space android:maxWidth="@dimen/max_button_width"
android:layout_width="match_parent" app:layout_constraintBottom_toBottomOf="parent"
android:layout_height="20dp" /> app:layout_constraintEnd_toEndOf="parent"
<Button app:layout_constraintStart_toStartOf="parent"
android:id="@+id/report_crash_button_mail" app:layout_constraintTop_toBottomOf="@id/crash_info_text">
android:text="@string/report_crash_button_mail"
android:layout_width="match_parent" <Button
android:layout_height="wrap_content" /> android:id="@+id/report_crash_button_copy"
<Button android:layout_width="match_parent"
android:id="@+id/report_crash_button_report" android:layout_height="wrap_content"
android:text="@string/report_crash_button_report" android:minHeight="48dp"
android:layout_width="match_parent" android:text="@string/report_crash_button_copy"
android:layout_height="wrap_content" /> app:layout_constraintEnd_toEndOf="parent"
</LinearLayout> app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/report_crash_button_mail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:text="@string/report_crash_button_mail"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/report_crash_button_copy" />
<Button
android:id="@+id/report_crash_button_report"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="48dp"
android:text="@string/report_crash_button_report"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/report_crash_button_mail" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView> </ScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

94
app/src/main/res/layout/dialog_choose_color.xml
View file

@ -1,83 +1,105 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/AlertDialogCustom" style="@style/AlertDialogCustom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="20dp"> android:padding="20dp">
<EditText <EditText
android:id="@+id/dialog_select_color_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:singleLine="true" android:singleLine="true"
android:hint="@string/dialog_select_color_color_hex" android:hint="@string/dialog_select_color_color_hex"
android:autofillHints="color" android:autofillHints="color"
android:id="@+id/dialog_select_color_preview" android:gravity="center"
android:layout_width="match_parent" android:minHeight="48dp"
android:layout_height="wrap_content"
android:gravity="center|center_horizontal"
android:padding="5dp" android:padding="5dp"
android:textSize="20sp" android:textSize="20sp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
tools:text="#ffbb00" /> tools:text="#ffbb00" />
<Space
android:layout_width="match_parent"
android:layout_height="10dp" />
<TextView <TextView
android:id="@+id/label_alpha"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dialog_select_color_alpha" /> android:text="@string/dialog_select_color_alpha"
app:layout_constraintTop_toBottomOf="@id/dialog_select_color_preview"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<SeekBar <SeekBar
android:id="@+id/dialog_select_color_seekbar_alpha" android:id="@+id/dialog_select_color_seekbar_alpha"
android:layout_height="48dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:max="255"
android:max="255" /> android:minHeight="48dp"
app:layout_constraintTop_toBottomOf="@id/label_alpha"
<Space app:layout_constraintStart_toStartOf="parent"
android:layout_width="match_parent" app:layout_constraintEnd_toEndOf="parent" />
android:layout_height="10dp" />
<TextView <TextView
android:id="@+id/label_red"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dialog_select_color_red" /> android:text="@string/dialog_select_color_red"
app:layout_constraintTop_toBottomOf="@id/dialog_select_color_seekbar_alpha"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<SeekBar <SeekBar
android:id="@+id/dialog_select_color_seekbar_red" android:id="@+id/dialog_select_color_seekbar_red"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="48dp"
android:max="255" /> android:max="255"
android:minHeight="48dp"
<Space app:layout_constraintTop_toBottomOf="@id/label_red"
android:layout_width="match_parent" app:layout_constraintStart_toStartOf="parent"
android:layout_height="10dp" /> app:layout_constraintEnd_toEndOf="parent" />
<TextView <TextView
android:id="@+id/label_green"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dialog_select_color_green" /> android:text="@string/dialog_select_color_green"
app:layout_constraintTop_toBottomOf="@id/dialog_select_color_seekbar_red"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<SeekBar <SeekBar
android:id="@+id/dialog_select_color_seekbar_green" android:id="@+id/dialog_select_color_seekbar_green"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="48dp"
android:max="255" /> android:max="255"
android:minHeight="48dp"
<Space app:layout_constraintTop_toBottomOf="@id/label_green"
android:layout_width="match_parent" app:layout_constraintStart_toStartOf="parent"
android:layout_height="10dp" /> app:layout_constraintEnd_toEndOf="parent" />
<TextView <TextView
android:id="@+id/label_blue"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dialog_select_color_blue" /> android:text="@string/dialog_select_color_blue"
app:layout_constraintTop_toBottomOf="@id/dialog_select_color_seekbar_green"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<SeekBar <SeekBar
android:id="@+id/dialog_select_color_seekbar_blue" android:id="@+id/dialog_select_color_seekbar_blue"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="48dp"
android:max="255" /> android:max="255"
android:minHeight="48dp"
app:layout_constraintTop_toBottomOf="@id/label_blue"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent" />
</LinearLayout> </androidx.constraintlayout.widget.ConstraintLayout>

60
app/src/main/res/layout/dialog_report_bug.xml
View file

@ -1,53 +1,71 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <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" xmlns:tools="http://schemas.android.com/tools"
style="@style/AlertDialogDanger" style="@style/AlertDialogDanger"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:layout_margin="20dp"
android:padding="20dp"> android:padding="16dp">
<TextView <TextView
android:id="@+id/dialog_report_bug_info" android:id="@+id/dialog_report_bug_info"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dialog_report_bug_info" /> android:text="@string/dialog_report_bug_info"
app:layout_constraintTop_toTopOf="parent"
<Space app:layout_constraintStart_toStartOf="parent"
android:layout_width="match_parent" app:layout_constraintEnd_toEndOf="parent" />
android:layout_height="20dp" />
<TextView <TextView
android:id="@+id/dialog_report_bug_device_info" android:id="@+id/dialog_report_bug_device_info"
android:padding="10dp" android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:text="Version: ?\nAndroid Version: ?" /> android:padding="10dp"
tools:text="Version: ?&#10;Android Version: ?"
app:layout_constraintTop_toBottomOf="@id/dialog_report_bug_info"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<Button <Button
android:id="@+id/dialog_report_bug_button_clipboard" android:id="@+id/dialog_report_bug_button_clipboard"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dialog_report_bug_button_clipboard" /> android:minHeight="48dp"
android:paddingTop="12dp"
<Space android:paddingBottom="12dp"
android:layout_width="match_parent" android:text="@string/dialog_report_bug_button_clipboard"
android:layout_height="20dp" /> app:layout_constraintTop_toBottomOf="@id/dialog_report_bug_device_info"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<TextView <TextView
android:layout_width="match_parent" android:id="@+id/dialog_report_bug_security_info"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dialog_report_bug_security_info"/> android:layout_marginTop="20dp"
android:text="@string/dialog_report_bug_security_info"
app:layout_constraintTop_toBottomOf="@id/dialog_report_bug_button_clipboard"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<Button <Button
android:id="@+id/dialog_report_bug_button_security" android:id="@+id/dialog_report_bug_button_security"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dialog_report_bug_button_security" /> android:layout_marginTop="20dp"
android:minHeight="48dp"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:text="@string/dialog_report_bug_button_security"
app:layout_constraintTop_toBottomOf="@id/dialog_report_bug_security_info"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</ScrollView> </ScrollView>

27
app/src/main/res/layout/dialog_select_lock_method.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="10dp"> android:padding="10dp">
@ -7,27 +8,33 @@
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content">
<de.jrpie.android.launcher.ui.util.HtmlTextView
android:id="@+id/dialog_select_lock_method_text"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/screen_lock_method_dialog_text" android:padding="16dp"
android:textColor="@android:color/black" /> android:gravity="center_horizontal">
<de.jrpie.android.launcher.ui.util.HtmlTextView
android:id="@+id/dialog_select_lock_method_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/screen_lock_method_dialog_text"
android:textColor="@android:color/black"
android:layout_marginBottom="20dp"
tools:ignore="VisualLintLongText" />
<Button <Button
android:id="@+id/dialog_select_lock_method_button_device_admin" android:id="@+id/dialog_select_lock_method_button_device_admin"
android:text="@string/screen_lock_method_use_device_admin" android:text="@string/screen_lock_method_use_device_admin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="48dp"
/> android:minHeight="48dp"
android:layout_marginBottom="12dp" />
<Button <Button
android:id="@+id/dialog_select_lock_method_button_accessibility" android:id="@+id/dialog_select_lock_method_button_accessibility"
android:text="@string/screen_lock_method_use_accessibility" android:text="@string/screen_lock_method_use_accessibility"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="48dp"
android:minHeight="48dp" />
</LinearLayout> </LinearLayout>

74
app/src/main/res/layout/list_apps.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/list_apps_container" android:id="@+id/list_apps_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_apps_rview" android:id="@+id/list_apps_rview"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -21,44 +21,54 @@
app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb_drawable" app:fastScrollHorizontalThumbDrawable="@drawable/fast_scroll_thumb_drawable"
app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track_drawable" app:fastScrollHorizontalTrackDrawable="@drawable/fast_scroll_track_drawable"
app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb_drawable" app:fastScrollVerticalThumbDrawable="@drawable/fast_scroll_thumb_drawable"
app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track_drawable" > app:fastScrollVerticalTrackDrawable="@drawable/fast_scroll_track_drawable" />
<androidx.constraintlayout.widget.ConstraintLayout
<!-- android:id="@+id/bottom_controls_wrapper"
android:scrollbars="vertical"
-->
<!--:fastScrollAlwaysVisible="true"-->
</androidx.recyclerview.widget.RecyclerView>
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_margin="8dp" android:layout_margin="8dp"
> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<androidx.appcompat.widget.SearchView <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/list_apps_searchview" android:id="@+id/bottomBar"
android:layout_width="fill_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:maxWidth="@dimen/max_search_bar_width"
android:iconifiedByDefault="false" app:layout_constraintWidth_max="@dimen/max_search_bar_width"
app:iconifiedByDefault="false" app:layout_constraintStart_toStartOf="parent"
app:queryHint="@string/list_apps_search_hint" app:layout_constraintEnd_toEndOf="parent"
app:searchHintIcon="@drawable/baseline_search_24" app:layout_constraintTop_toTopOf="parent"
app:searchIcon="@drawable/baseline_search_24" /> app:layout_constraintBottom_toBottomOf="parent">
<CheckBox <androidx.appcompat.widget.SearchView
android:id="@+id/list_apps_check_box_favorites" android:id="@+id/list_apps_searchview"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="0" app:iconifiedByDefault="false"
android:layout_marginEnd="16dp" app:layout_constraintStart_toStartOf="parent"
android:button="@drawable/checkbox_favorite" /> app:layout_constraintEnd_toStartOf="@+id/list_apps_check_box_favorites"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
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="48dp"
android:layout_height="48dp"
android:button="@drawable/checkbox_favorite"
android:contentDescription="@string/list_title_favorite"
app:layout_constraintTop_toTopOf="@+id/list_apps_searchview"
app:layout_constraintBottom_toBottomOf="@+id/list_apps_searchview"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/list_apps_searchview" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>

39
app/src/main/res/layout/settings_actions.xml
View file

@ -16,28 +16,37 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
app:layout_constraintBottom_toTopOf="@+id/settings_actions_buttons" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toTopOf="@+id/settings_actions_buttons_wrapper"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintEnd_toEndOf="parent" />
<LinearLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/settings_actions_buttons" android:id="@+id/settings_actions_buttons_wrapper"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="32dp" app:layout_constraintStart_toStartOf="parent"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintWidth_max="@dimen/max_button_width">
<Button <LinearLayout
android:id="@+id/settings_actions_button_install_apps" android:id="@+id/settings_actions_buttons"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_apps_install" android:layout_marginBottom="32dp"
android:textAllCaps="false" /> android:orientation="vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
</LinearLayout> <Button
android:id="@+id/settings_actions_button_install_apps"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_apps_install"
android:textAllCaps="false" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

171
app/src/main/res/layout/settings_meta.xml
View file

@ -9,112 +9,105 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center|top" android:gravity="center_horizontal"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="32sp" android:paddingLeft="32sp"
android:paddingTop="16sp" android:paddingTop="16sp"
android:paddingRight="32sp"> android:paddingRight="32sp">
<LinearLayout
<Button android:layout_width="wrap_content"
android:id="@+id/settings_meta_button_view_tutorial"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_meta_show_tutorial" android:minWidth="@dimen/max_button_width"
android:textAllCaps="false" /> android:orientation="vertical">
<Button <Button
android:id="@+id/settings_meta_button_reset_settings" android:id="@+id/settings_meta_button_view_tutorial"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_meta_reset" android:text="@string/settings_meta_show_tutorial"
android:textAllCaps="false" /> android:textAllCaps="false" />
<Space <Button
android:layout_width="match_parent" android:id="@+id/settings_meta_button_reset_settings"
android:layout_height="64sp" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_meta_reset"
android:textAllCaps="false"
android:layout_marginBottom="64sp"/>
<Button <Button
android:id="@+id/settings_meta_button_view_code" android:id="@+id/settings_meta_button_view_code"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_meta_view_code" android:text="@string/settings_meta_view_code"
android:textAllCaps="false" /> android:textAllCaps="false" />
<Button <Button
android:id="@+id/settings_meta_button_view_docs" android:id="@+id/settings_meta_button_view_docs"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_meta_view_docs" android:text="@string/settings_meta_view_docs"
android:textAllCaps="false" /> android:textAllCaps="false" />
<Button <Button
android:id="@+id/settings_meta_button_report_bug" android:id="@+id/settings_meta_button_report_bug"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginBottom="64dp"
android:text="@string/settings_meta_report_bug" android:layout_width="match_parent"
android:textAllCaps="false" /> android:text="@string/settings_meta_report_bug"
android:textAllCaps="false" />
<Space <Button
android:layout_width="match_parent" android:id="@+id/settings_meta_button_join_chat"
android:layout_height="64sp" /> android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_meta_join_chat"
android:textAllCaps="false" />
<Button <!--<Button
android:id="@+id/settings_meta_button_join_chat" android:id="@+id/settings_meta_button_contact"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_meta_join_chat" android:text="@string/settings_meta_contact"
android:textAllCaps="false" /> android:textAllCaps="false" />-->
<!--<Button <Button
android:id="@+id/settings_meta_button_contact" android:id="@+id/settings_meta_button_fork_contact"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_meta_contact" android:text="@string/settings_meta_fork_contact"
android:textAllCaps="false" />--> android:textAllCaps="false" />
<Button <Button
android:id="@+id/settings_meta_button_fork_contact" android:id="@+id/settings_meta_button_donate"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginBottom="64dp"
android:text="@string/settings_meta_fork_contact" android:layout_width="match_parent"
android:textAllCaps="false" /> android:text="@string/settings_meta_donate"
android:textAllCaps="false" />
<Button <Button
android:id="@+id/settings_meta_button_donate" android:id="@+id/settings_meta_button_privacy"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_meta_donate" android:text="@string/settings_meta_privacy"
android:textAllCaps="false" /> android:textAllCaps="false" />
<Space <Button
android:layout_width="match_parent" android:id="@+id/settings_meta_button_licenses"
android:layout_height="64sp" /> android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
<Button android:layout_width="match_parent"
android:id="@+id/settings_meta_button_privacy" android:text="@string/settings_meta_licenses"
android:layout_width="match_parent" android:textAllCaps="false" />
android:layout_height="wrap_content"
android:text="@string/settings_meta_privacy"
android:textAllCaps="false" />
<Button
android:id="@+id/settings_meta_button_licenses"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings_meta_licenses"
android:textAllCaps="false" />
<Space
android:layout_width="match_parent"
android:layout_height="32sp" />
<TextView
android:id="@+id/settings_meta_text_version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="textEnd"
tools:text="v1.2.3" />
<TextView
android:id="@+id/settings_meta_text_version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="textEnd"
tools:text="v1.2.3" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

2
app/src/main/res/values/dimens.xml
View file

@ -2,4 +2,6 @@
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="appbar_padding">16dp</dimen> <dimen name="appbar_padding">16dp</dimen>
<dimen name="app_icon_side">40dip</dimen> <dimen name="app_icon_side">40dip</dimen>
<dimen name="max_button_width">400dp</dimen>
<dimen name="max_search_bar_width">600dp</dimen>
</resources> </resources>