karolina/text-basic
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented settings for text size, text transparency, font style, highlight style, highlight transparency, and randomised entry order; fixed a bug in QuoteAdapter.onRowMoved()

Browse Source
This commit is contained in:
denizk0461
2023-05-15 22:10:58 +02:00
parent 62278bbfe0
commit 8454d4f924
14 changed files with 479 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable/double_arrow_left.xml
+6
View File
@@ -0,0 +1,6 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M17.59,18l1.41,-1.41l-4.58,-4.59l4.58,-4.59l-1.41,-1.41l-6,6z"/>
<path android:fillColor="@android:color/white" android:pathData="M11,18l1.41,-1.41l-4.58,-4.59l4.58,-4.59l-1.41,-1.41l-6,6z"/>
</vector>
app/src/main/res/drawable/double_arrow_right.xml
+6
View File
@@ -0,0 +1,6 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M6.41,6l-1.41,1.41l4.58,4.59l-4.58,4.59l1.41,1.41l6,-6z"/>
<path android:fillColor="@android:color/white" android:pathData="M13,6l-1.41,1.41l4.58,4.59l-4.58,4.59l1.41,1.41l6,-6z"/>
</vector>
app/src/main/res/drawable/selectable_item_background.xml
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/selectable_item_ripple" />
</selector>
app/src/main/res/drawable/selectable_item_ripple.xml
+4
View File
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorSecondaryContainer"/>
app/src/main/res/layout/fragment_settings_new.xml
+165 -35
View File
@@ -189,7 +189,7 @@
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.OutlinedButton"
android:id="@+id/toggle_button_font_bolditalic"
android:id="@+id/toggle_button_font_bold_italic"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
@@ -224,6 +224,16 @@
android:orientation="horizontal"
android:gravity="center">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_size_decrease_fast"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/double_arrow_left"
android:layout_marginEnd="1dp"
android:minWidth="0dp"
app:iconPadding="0dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_size_decrease"
style="@style/Widget.Material3.Button.IconButton.Outlined"
@@ -250,6 +260,16 @@
android:minWidth="0dp"
app:iconPadding="0dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_size_increase_fast"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/double_arrow_right"
android:layout_marginStart="1dp"
android:minWidth="0dp"
app:iconPadding="0dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
@@ -276,6 +296,16 @@
android:orientation="horizontal"
android:gravity="center">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_text_transparency_decrease_fast"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/double_arrow_left"
android:layout_marginEnd="1dp"
android:minWidth="0dp"
app:iconPadding="0dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_text_transparency_decrease"
style="@style/Widget.Material3.Button.IconButton.Outlined"
@@ -302,6 +332,16 @@
android:minWidth="0dp"
app:iconPadding="0dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_text_transparency_increase_fast"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/double_arrow_right"
android:layout_marginStart="1dp"
android:minWidth="0dp"
app:iconPadding="0dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
@@ -434,6 +474,16 @@
android:orientation="horizontal"
android:gravity="center">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_intensity_decrease_fast"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/double_arrow_left"
android:layout_marginEnd="1dp"
android:minWidth="0dp"
app:iconPadding="0dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_intensity_decrease"
style="@style/Widget.Material3.Button.IconButton.Outlined"
@@ -460,6 +510,16 @@
android:minWidth="0dp"
app:iconPadding="0dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_intensity_increase_fast"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/double_arrow_right"
android:layout_marginStart="1dp"
android:minWidth="0dp"
app:iconPadding="0dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
@@ -486,6 +546,16 @@
android:orientation="horizontal"
android:gravity="center">
<com.google.android.material.button.MaterialButton
android:id="@+id/button_highlight_transparency_decrease_fast"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/double_arrow_left"
android:layout_marginEnd="1dp"
android:minWidth="0dp"
app:iconPadding="0dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_highlight_transparency_decrease"
style="@style/Widget.Material3.Button.IconButton.Outlined"
@@ -512,6 +582,16 @@
android:minWidth="0dp"
app:iconPadding="0dp"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_highlight_transparency_increase_fast"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/double_arrow_right"
android:layout_marginStart="1dp"
android:minWidth="0dp"
app:iconPadding="0dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
@@ -551,10 +631,90 @@
android:layout_marginHorizontal="16dp" />
<!-- Order entries -->
<androidx.appcompat.widget.LinearLayoutCompat
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/layout_pref_colour"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/switch_order_random"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/mono_semibold_italic"
android:text="@string/settings_widget_order_title"
android:textSize="16sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_widget_order_subtitle"
android:textSize="16sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switch_order_random"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</com.google.android.material.card.MaterialCardView>
<!-- Miscellaneous settings -->
<com.google.android.material.card.MaterialCardView
style="@style/Widget.Material3.CardView.Outlined"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:layout_marginVertical="4dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="8dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:fontFamily="@font/mono_bold_italic"
android:text="@string/settings_misc_header"
android:textSize="22sp" />
<com.google.android.material.divider.MaterialDivider
style="@style/DividerTheme"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" />
<!-- App version -->
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/button_app_version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/selectable_item_background"
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
@@ -563,45 +723,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/mono_semibold_italic"
android:text="@string/settings_widget_order_title"
android:text="@string/settings_misc_app_version"
android:textSize="16sp" />
<TextView
android:id="@+id/app_version_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/settings_widget_order_subtitle"
android:textSize="16sp" />
<com.google.android.material.button.MaterialButtonToggleGroup
android:id="@+id/toggle_group_order"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
app:singleSelection="true"
app:selectionRequired="true">
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.OutlinedButton"
android:id="@+id/toggle_button_order_default"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/settings_widget_order_default"
android:textColor="@color/list_group_button"
app:strokeColor="?attr/colorOutlineVariant"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.OutlinedButton"
android:id="@+id/toggle_button_order_random"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/settings_widget_order_random"
android:textColor="@color/list_group_button"
app:strokeColor="?attr/colorOutlineVariant"/>
</com.google.android.material.button.MaterialButtonToggleGroup>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
app/src/main/res/values-de/strings.xml
+5 -2
View File
@@ -46,12 +46,15 @@
<string name="settings_highlight_transparency_header">Highlight-Transparenz</string>
<string name="settings_widget_header">Widget</string>
<string name="settings_widget_order_title">Stelle Reihenfolge ein</string>
<string name="settings_widget_order_subtitle">Dies ist die Reihenfolge, in welcher deine Einträge angezeigt werden, wenn du auf das Widget klickst</string>
<string name="settings_widget_order_title">Nutze zufällige Reihenfolge</string>
<string name="settings_widget_order_subtitle">Sonst wird die Reihenfolge der Liste genutzt; ändere sie durch D rag &amp; Drop</string>
<string name="settings_widget_order_default">Standard</string>
<string name="settings_widget_order_random">Zufall</string>
<string name="settings_widget_position_title">Setze Position des Texts</string>
<string name="settings_misc_header">Sonstiges</string>
<string name="settings_misc_app_version">App-Version</string>
<string name="edit">Text bearbeiten</string>
<string name="nav_items_entries">Einträge</string>
<string name="guide">Anleitung</string>
app/src/main/res/values/strings.xml
+5 -2
View File
@@ -45,12 +45,15 @@
<string name="settings_highlight_transparency_header">Transparency</string>
<string name="settings_widget_header">Widget</string>
<string name="settings_widget_order_title">Set entry order</string>
<string name="settings_widget_order_subtitle">This is the order in which your entries will be shown when you click on the widget</string>
<string name="settings_widget_order_title">Randomise entry order</string>
<string name="settings_widget_order_subtitle">Order from the list is preserved otherwise; change by drag-and-drop</string>
<string name="settings_widget_order_default">Default</string>
<string name="settings_widget_order_random">Random</string>
<string name="settings_widget_position_title">Set position of the text</string>
<string name="settings_misc_header">Miscellaneous</string>
<string name="settings_misc_app_version">App Version</string>
<string name="edit">Edit Text</string>
<string name="nav_items_entries">Entries</string>
<string name="guide">Guide</string>