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

Button for opening colour picker now tints properly, including its text and icon

Browse Source
This commit is contained in:
denizk0461
2023-05-16 14:14:38 +02:00
parent a573e2e071
commit 2566952d96
6 changed files with 39 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable/color_lens.xml
+5
View File
@@ -0,0 +1,5 @@
<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="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
</vector>
app/src/main/res/layout/fragment_settings_new.xml
+4
View File
@@ -310,8 +310,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:icon="@drawable/color_lens"
app:strokeColor="@color/list_button_stroke"
app:strokeWidth="1dp"
android:text="@string/settings_text_colour_button_text"
android:layout_marginStart="8dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>
@@ -532,8 +534,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:icon="@drawable/color_lens"
app:strokeColor="@color/list_button_stroke"
app:strokeWidth="1dp"
android:text="@string/settings_highlight_colour_button_text"
android:layout_marginStart="8dp"/>
</androidx.appcompat.widget.LinearLayoutCompat>
app/src/main/res/values-de/strings.xml
+2
View File
@@ -37,6 +37,7 @@
<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_button_text">Wähle eine Farbe</string>
<string name="settings_text_colour_dialog_title">Wähle eine Textfarbe</string>
<string name="settings_text_transparency_header">Textopazität</string>
@@ -48,6 +49,7 @@
<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_button_text">Wähle eine 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>
app/src/main/res/values/strings.xml
+2
View File
@@ -36,6 +36,7 @@
<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_button_text">Pick a colour</string>
<string name="settings_text_colour_dialog_title">Pick a text colour</string>
<string name="settings_text_transparency_header">Text opacity</string>
@@ -47,6 +48,7 @@
<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_button_text">Pick a colour</string>
<string name="settings_highlight_colour_dialog_title">Pick a highlight colour</string>
<string name="settings_highlight_transparency_header">Opacity</string>