Merge branch 'master' into export_import_settings

This commit is contained in:
Konstantin Merenkov 2023-07-18 16:27:09 +10:00 committed by GitHub
commit 321e4f11ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 1266 additions and 63 deletions

View file

@ -146,6 +146,21 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_manage_blocked_keywords_holder"
style="@style/SettingsHolderTextViewOneLinerStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_manage_blocked_keywords"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/manage_blocked_keywords" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_font_size_holder"
style="@style/SettingsHolderTextViewStyle"