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

ColorPickerDialog has been implemented - picking colours for text and highlight now works!

Browse Source
This commit is contained in:
denizk0461
2023-05-16 12:58:58 +02:00
parent 4dfc2a2df6
commit a573e2e071
7 changed files with 185 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/color/list_button_stroke.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:color="?attr/colorText"/>
</selector>
app/src/main/res/layout/fragment_settings_new.xml
+86
View File
@@ -275,6 +275,49 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<!-- Text colour -->
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/mono_semibold_italic"
android:text="@string/settings_text_colour_header"
android:textSize="16sp" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/text_text_colour_code"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="16sp"
android:fontFamily="@font/mono_medium"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.TonalButton"
android:id="@+id/button_text_colour_display"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:strokeColor="@color/list_button_stroke"
app:strokeWidth="1dp"
android:layout_marginStart="8dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</com.google.android.material.card.MaterialCardView>
@@ -454,6 +497,49 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<!-- Highlight colour -->
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="8dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/mono_semibold_italic"
android:text="@string/settings_highlight_colour_header"
android:textSize="16sp" />
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/text_highlight_colour_code"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="16sp"
android:fontFamily="@font/mono_medium"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.TonalButton"
android:id="@+id/button_highlight_colour_display"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:strokeColor="@color/list_button_stroke"
app:strokeWidth="1dp"
android:layout_marginStart="8dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</com.google.android.material.card.MaterialCardView>
app/src/main/res/values-de/strings.xml
+6
View File
@@ -24,6 +24,8 @@
<string name="guide_fragment_title">Anleitung</string>
<string name="settings_fragment_title">Einstellungen</string>
<string name="settings_colour_dialog_negative">Schließen</string>
<string name="settings_colour_dialog_positive">Speichern</string>
<string name="settings_text_header">Textstil</string>
<string name="settings_text_font_header">Textschrift</string>
@@ -34,6 +36,8 @@
<string name="settings_text_style_button_italic">Kursiv</string>
<string name="settings_text_style_button_bolditalic">Fett &amp; Kursiv</string>
<string name="settings_text_size_header">Textgröße</string>
<string name="settings_text_colour_header">Textfarbe</string>
<string name="settings_text_colour_dialog_title">Wähle eine Textfarbe</string>
<string name="settings_text_transparency_header">Textopazität</string>
<string name="settings_highlight_header">Highlight-Stil</string>
@@ -43,6 +47,8 @@
<string name="settings_highlight_style_button_stroke">Umrandet</string>
<string name="settings_highlight_style_button_shadow">Schatten</string>
<string name="settings_highlight_intensity_header">Stärke</string>
<string name="settings_highlight_colour_header">Highlight-Farbe</string>
<string name="settings_highlight_colour_dialog_title">Wähle eine Highlight-Farbe</string>
<string name="settings_highlight_transparency_header">Highlight-Opazität</string>
<string name="settings_widget_header">Widget</string>
app/src/main/res/values/strings.xml
+6
View File
@@ -23,6 +23,8 @@
<string name="guide_fragment_title">Guide</string>
<string name="settings_fragment_title">Settings</string>
<string name="settings_colour_dialog_negative">Close</string>
<string name="settings_colour_dialog_positive">Save</string>
<string name="settings_text_header">Text Style</string>
<string name="settings_text_font_header">Text font</string>
@@ -33,6 +35,8 @@
<string name="settings_text_style_button_italic">Italic</string>
<string name="settings_text_style_button_bolditalic">Bold &amp; Italic</string>
<string name="settings_text_size_header">Text size</string>
<string name="settings_text_colour_header">Text colour</string>
<string name="settings_text_colour_dialog_title">Pick a text colour</string>
<string name="settings_text_transparency_header">Text opacity</string>
<string name="settings_highlight_header">Highlight Style</string>
@@ -42,6 +46,8 @@
<string name="settings_highlight_style_button_stroke">Stroke</string>
<string name="settings_highlight_style_button_shadow">Shadow</string>
<string name="settings_highlight_intensity_header">Intensity</string>
<string name="settings_highlight_colour_header">Highlight colour</string>
<string name="settings_highlight_colour_dialog_title">Pick a highlight colour</string>
<string name="settings_highlight_transparency_header">Opacity</string>
<string name="settings_widget_header">Widget</string>