diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawables/peertube/drawable/progress_bar.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/layouts/mastodon/layout/activity_about.xml | 28 | ||||
| -rw-r--r-- | app/src/main/res/layouts/mastodon/layout/custom_emoji_picker.xml | 21 | ||||
| -rw-r--r-- | app/src/main/res/layouts/mastodon/layout/drawer_status.xml | 89 | ||||
| -rw-r--r-- | app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values-de/strings.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values-gl/strings.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values-night/themes.xml | 12 | ||||
| -rw-r--r-- | app/src/main/res/values-tr/strings.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | app/src/main/res/values/themes.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/xml/pref_timelines.xml | 21 |
12 files changed, 179 insertions, 35 deletions
diff --git a/app/src/main/res/drawables/peertube/drawable/progress_bar.xml b/app/src/main/res/drawables/peertube/drawable/progress_bar.xml index c0a479c89..049d4b601 100644 --- a/app/src/main/res/drawables/peertube/drawable/progress_bar.xml +++ b/app/src/main/res/drawables/peertube/drawable/progress_bar.xml @@ -3,7 +3,7 @@ <item android:id="@android:id/background"> <shape> <corners android:radius="8dp" /> - <solid android:color="?secondaryColor" /> + <solid android:color="?colorSecondary" /> </shape> </item> @@ -17,7 +17,7 @@ <scale android:scaleWidth="100%"> <shape> <corners android:radius="8dp" /> - <solid android:color="?primaryColor" /> + <solid android:color="?colorPrimary" /> </shape> </scale> </item> diff --git a/app/src/main/res/layouts/mastodon/layout/activity_about.xml b/app/src/main/res/layouts/mastodon/layout/activity_about.xml index bc940ac2e..4d7114ad6 100644 --- a/app/src/main/res/layouts/mastodon/layout/activity_about.xml +++ b/app/src/main/res/layouts/mastodon/layout/activity_about.xml @@ -35,14 +35,32 @@ android:text="@string/app_name" android:textSize="20sp" /> <!-- About version --> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/about_version" + <androidx.appcompat.widget.LinearLayoutCompat android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" android:layout_marginTop="10dp" - android:gravity="center_horizontal" - android:textSize="16sp" /> + android:gravity="center" + android:orientation="horizontal"> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/about_version" + tools:text="x.y.z" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center_horizontal" + android:textSize="16sp" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/about_version_copy" + style="@style/Widget.Material3.Button.OutlinedButton" + android:layout_width="36dp" + android:layout_height="36dp" + app:iconGravity="textStart" + app:iconPadding="0dp" + android:layout_marginStart="10dp" + android:contentDescription="@string/copy_version" + app:icon="@drawable/ic_copy_link"/> + </androidx.appcompat.widget.LinearLayoutCompat> + <!-- About developer --> <androidx.appcompat.widget.AppCompatTextView diff --git a/app/src/main/res/layouts/mastodon/layout/custom_emoji_picker.xml b/app/src/main/res/layouts/mastodon/layout/custom_emoji_picker.xml new file mode 100644 index 000000000..46d565c30 --- /dev/null +++ b/app/src/main/res/layouts/mastodon/layout/custom_emoji_picker.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:padding="15dp" + android:orientation="vertical"> + <androidx.appcompat.widget.SearchView + android:id="@+id/toolbar_search" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:iconifiedByDefault="false" + android:layout_gravity="center_vertical" + android:gravity="center" /> + <GridView + android:id="@+id/gridview" + android:layout_width="match_parent" + android:numColumns="5" + android:layout_height="0dp" + android:layout_weight="1"/> +</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file diff --git a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml index 1f27d35fc..d331c73d4 100644 --- a/app/src/main/res/layouts/mastodon/layout/drawer_status.xml +++ b/app/src/main/res/layouts/mastodon/layout/drawer_status.xml @@ -657,32 +657,53 @@ <androidx.appcompat.widget.AppCompatTextView android:id="@+id/reply_count" + android:layout_marginStart="10dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom" android:text="+" android:textColor="?colorControlNormal" - android:textSize="12sp" android:visibility="gone" tools:ignore="HardcodedText" tools:visibility="visible" /> </androidx.appcompat.widget.LinearLayoutCompat> - <com.varunest.sparkbutton.SparkButton - android:id="@+id/action_button_boost" - android:layout_width="48dp" + + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/action_button_boost_container" + android:layout_width="wrap_content" android:layout_height="48dp" - android:adjustViewBounds="true" - android:contentDescription="@string/reblog_add" - app:activeImage="@drawable/ic_round_repeat_active_24" - app:iconSize="28dp" - app:inactiveImage="@drawable/ic_round_repeat_24" + android:orientation="horizontal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/action_button_quote" app:layout_constraintStart_toEndOf="@+id/action_button_reply_container" app:layout_constraintTop_toTopOf="parent" - app:primaryColor="@color/boost_icon" - app:secondaryColor="@color/boost_icon" /> + app:layout_constraintVertical_bias="0.0"> + + <com.varunest.sparkbutton.SparkButton + android:id="@+id/action_button_boost" + android:layout_width="48dp" + android:layout_height="48dp" + android:adjustViewBounds="true" + android:layout_gravity="center" + android:contentDescription="@string/reblog_add" + app:activeImage="@drawable/ic_round_repeat_active_24" + app:iconSize="28dp" + app:inactiveImage="@drawable/ic_round_repeat_24" + app:primaryColor="@color/boost_icon" + app:secondaryColor="@color/boost_icon" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/boost_count" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:textColor="?colorControlNormal" + android:visibility="gone" + tools:ignore="HardcodedText" + tools:visibility="visible" /> + + </androidx.appcompat.widget.LinearLayoutCompat> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/action_button_quote" @@ -697,28 +718,44 @@ android:src="@drawable/ic_baseline_format_quote_24" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/action_button_favorite" - app:layout_constraintStart_toEndOf="@+id/action_button_boost" + app:layout_constraintEnd_toStartOf="@+id/action_button_favorite_container" + app:layout_constraintStart_toEndOf="@+id/action_button_boost_container" app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> - <com.varunest.sparkbutton.SparkButton - android:id="@+id/action_button_favorite" - android:layout_width="48dp" + <androidx.appcompat.widget.LinearLayoutCompat + android:id="@+id/action_button_favorite_container" + android:layout_width="wrap_content" android:layout_height="48dp" - android:layout_gravity="center" - android:adjustViewBounds="true" - android:contentDescription="@string/favourite_add" - app:activeImage="@drawable/ic_round_star_24" - app:animationSpeed="1.5" - app:inactiveImage="@drawable/ic_round_star_border_24" + android:orientation="horizontal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/action_button_bookmark" app:layout_constraintStart_toEndOf="@+id/action_button_quote" app:layout_constraintTop_toTopOf="parent" - app:primaryColor="@color/marked_icon" - app:secondaryColor="@color/marked_icon" - sparkbutton:iconSize="28dp" /> + app:layout_constraintVertical_bias="0.0"> + <com.varunest.sparkbutton.SparkButton + android:id="@+id/action_button_favorite" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_gravity="center" + android:adjustViewBounds="true" + android:contentDescription="@string/favourite_add" + app:activeImage="@drawable/ic_round_star_24" + app:animationSpeed="1.5" + app:inactiveImage="@drawable/ic_round_star_border_24" + app:primaryColor="@color/marked_icon" + app:secondaryColor="@color/marked_icon" + sparkbutton:iconSize="28dp" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/favorite_count" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:textColor="?colorControlNormal" + android:visibility="gone" + tools:ignore="HardcodedText" + tools:visibility="visible" /> + </androidx.appcompat.widget.LinearLayoutCompat> <com.varunest.sparkbutton.SparkButton android:id="@+id/action_button_bookmark" @@ -732,7 +769,7 @@ app:inactiveImage="@drawable/ic_round_bookmark_border_24" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/action_button_translate" - app:layout_constraintStart_toEndOf="@+id/action_button_favorite" + app:layout_constraintStart_toEndOf="@+id/action_button_favorite_container" app:layout_constraintTop_toTopOf="parent" app:primaryColor="@color/marked_icon" app:secondaryColor="@color/marked_icon" diff --git a/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml b/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml index 6801a9698..eaef53569 100644 --- a/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml +++ b/app/src/main/res/layouts/mastodon/layout/fragment_pagination.xml @@ -38,7 +38,10 @@ android:layout_height="wrap_content" android:clipToPadding="false" android:paddingBottom="6dp" - android:scrollbars="none" /> + android:fastScrollEnabled="true" + android:scrollbarSize="5dp" + android:scrollbarThumbVertical="?colorPrimary" + android:scrollbars="vertical" /> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 032da2569..c82e4c75c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1068,4 +1068,10 @@ <string name="thumbnail">Vorschau</string> <string name="thread_long_message_message">Der Beitrag wird in mehrere Antworten aufgeteilt, um die maximale Zeichenanzahl Ihrer Instanz einzuhalten.</string> <string name="thread_long_this_message">Diese Beiträge in Antworten aufteilen?</string> + <string name="clipboard_version">Informationen wurden in die Zwischenablage kopiert</string> + <string name="set_display_relative_date">Zeige relatives Datum für Beiträge an</string> + <string name="copy_version">Informationen kopieren</string> + <string name="underline_links">Anklickbare Elemente unterstreichen</string> + <string name="tag_already_followed">Du folgst bereits diesem Tag!</string> + <string name="timeline_scrollbar">Bildlaufleiste in der Timeline anzeigen</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index cff7941cd..e2b37deaf 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -747,7 +747,7 @@ <string name="label_eraser_mode">Modo Borrar</string> <string name="delete_cache_message">Tes a certeza de querer baleirar a caché\? Se tes borradores que inclúen multimedia, estes perderanse.</string> <string name="my_account">A miña conta</string> - <string name="set_display_counters_description">Montrará icona con contador para as novas mensaxes nas cronoloxías da lapela</string> + <string name="set_display_counters_description">Mostrará un contador nas cronoloxías das pestanas para as novas mensaxes</string> <string name="load_settings">Cargar axustes exportados</string> <string name="push_distributors">Xestor de notificacións</string> <string name="import_settings">Importar axustes</string> @@ -1062,4 +1062,9 @@ <string name="thumbnail">Miniatura</string> <string name="thread_long_message_message">A mensaxe vai ser dividida en varias respostas para cumprir co número máximo de caracteres da túa instancia.</string> <string name="thread_long_this_message">Dividir estas mensaxes nas respostas?</string> + <string name="clipboard_version">Copiouse a información ao portapapeis</string> + <string name="set_display_relative_date">Mostrar a data relativa das mensaxes</string> + <string name="copy_version">Copiar información</string> + <string name="underline_links">Subliñar os elementos clicables</string> + <string name="tag_already_followed">Xa segues ese cancelo!</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index a77b7b9ad..8344bd2c0 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -45,6 +45,7 @@ </item> <item name="android:windowSharedElementExitTransition">@transition/change_image_transform </item> + <item name="alertDialogTheme">@style/AppThemeAlertDialog</item> </style> <style name="AppThemeBar" parent="Theme.Material3.Dark"> @@ -81,6 +82,7 @@ <item name="android:windowLightStatusBar" tools:targetApi="m">false</item> <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item> <item name="android:isLightTheme" tools:targetApi="q">false</item> + <item name="alertDialogTheme">@style/AppThemeAlertDialog</item> </style> @@ -98,6 +100,7 @@ </item> <item name="android:windowTranslucentStatus">true</item> <item name="android:windowTranslucentNavigation">true</item> + <item name="alertDialogTheme">@style/AppThemeAlertDialog</item> </style> <style name="AppThemeAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog"> @@ -168,6 +171,7 @@ <item name="colorOnSurfaceInverse">@color/solarized_md_theme_dark_inverseOnSurface</item> <item name="colorSurfaceInverse">@color/solarized_md_theme_dark_inverseSurface</item> <item name="colorPrimaryInverse">@color/solarized_md_theme_dark_inversePrimary</item> + <item name="alertDialogTheme">@style/SolarizedAlertDialog</item> </style> <style name="SolarizedAppThemeBar" parent="AppThemeBar"> @@ -203,6 +207,7 @@ <item name="colorOnSurfaceInverse">@color/solarized_md_theme_dark_inverseOnSurface</item> <item name="colorSurfaceInverse">@color/solarized_md_theme_dark_inverseSurface</item> <item name="colorPrimaryInverse">@color/solarized_md_theme_dark_inversePrimary</item> + <item name="alertDialogTheme">@style/SolarizedAlertDialog</item> </style> <style name="TransparentSolarized" parent="SolarizedAppThemeBar"> @@ -221,6 +226,7 @@ </item> <item name="android:windowTranslucentStatus">true</item> <item name="android:windowTranslucentNavigation">true</item> + <item name="alertDialogTheme">@style/SolarizedAlertDialog</item> </style> <style name="SolarizedAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog"> @@ -289,6 +295,7 @@ <item name="colorOnSurfaceInverse">@color/black</item> <item name="colorSurfaceInverse">@color/white</item> <item name="colorPrimaryInverse">@color/black</item> + <item name="alertDialogTheme">@style/BlackAlertDialog</item> </style> <style name="BlackAppThemeBar" parent="AppThemeBar"> @@ -320,6 +327,7 @@ <item name="colorOnSurfaceInverse">@color/black</item> <item name="colorSurfaceInverse">@color/white</item> <item name="colorPrimaryInverse">@color/black</item> + <item name="alertDialogTheme">@style/BlackAlertDialog</item> </style> <style name="TransparentBlack" parent="BlackAppThemeBar"> @@ -337,6 +345,7 @@ </item> <item name="android:windowTranslucentStatus">true</item> <item name="android:windowTranslucentNavigation">true</item> + <item name="alertDialogTheme">@style/BlackAlertDialog</item> </style> <style name="BlackAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog"> @@ -402,6 +411,7 @@ <item name="colorOnSurfaceInverse">@color/dracula_comment</item> <item name="colorSurfaceInverse">@color/dracula_foreground</item> <item name="colorPrimaryInverse">@color/dracula_comment</item> + <item name="alertDialogTheme">@style/DraculaAlertDialog</item> </style> @@ -434,6 +444,7 @@ <item name="colorOnSurfaceInverse">@color/dracula_comment</item> <item name="colorSurfaceInverse">@color/dracula_foreground</item> <item name="colorPrimaryInverse">@color/dracula_comment</item> + <item name="alertDialogTheme">@style/DraculaAlertDialog</item> </style> <style name="TransparentDracula" parent="DraculaAppThemeBar"> @@ -452,6 +463,7 @@ </item> <item name="android:windowTranslucentStatus">true</item> <item name="android:windowTranslucentNavigation">true</item> + <item name="alertDialogTheme">@style/DraculaAlertDialog</item> </style> <style name="DraculaAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog"> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d51b8f8e3..fe5c2d5eb 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1066,4 +1066,10 @@ <string name="thumbnail">Küçük resim</string> <string name="thread_long_message_message">Mesaj, sunucunuzun en fazla karakter sayısına uygun olacak şekilde birkaç yanıta bölünecek.</string> <string name="thread_long_this_message">Bu mesajlar yanıtlara bölünsün mü?</string> + <string name="clipboard_version">Bilgiler panoya kopyalandı</string> + <string name="set_display_relative_date">Mesajlar için göreceli tarihi görüntüle</string> + <string name="copy_version">Bilgileri kopyala</string> + <string name="underline_links">Tıklanabilir ögelerin altını çiz</string> + <string name="tag_already_followed">Bu etiketi zaten takip ediyorsunuz!</string> + <string name="timeline_scrollbar">Zaman çizelgeleri için kaydırma çubuğu göster</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ea49a4198..565a3579a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -27,6 +27,8 @@ <string name="add_account">Add an account</string> <string name="clipboard">The content of the message has been copied to the clipboard</string> <string name="clipboard_url">The URL of the message has been copied to the clipboard</string> + <string name="clipboard_version">Information have been copied to the clipboard</string> + <string name="tag_already_followed">You already follow that tag!</string> <string name="camera">Camera</string> <string name="delete_all">Delete all</string> <string name="schedule">Schedule</string> @@ -407,6 +409,7 @@ <string name="action_logout_account">Logout account</string> <string name="all">All</string> <string name="copy_link">Copy link</string> + <string name="copy_version">Copy information</string> <string name="calls_blocked">http calls blocked by the application</string> <string name="list_of_blocked_domains">List of blocked calls</string> <string name="submit">Submit</string> @@ -1168,6 +1171,7 @@ <string name="SET_NOTIF_VALIDATION_FAV" translatable="false">SET_NOTIF_VALIDATION_FAV</string> <string name="SET_DISPLAY_COUNTER_FAV_BOOST" translatable="false">SET_DISPLAY_COUNTER_FAV_BOOST</string> + <string name="SET_DISPLAY_RELATIVE_DATE" translatable="false">SET_DISPLAY_RELATIVE_DATE</string> <string name="SET_REMOVE_LEFT_MARGIN" translatable="false">SET_REMOVE_LEFT_MARGIN</string> <string name="SET_PROFILE_REMOTELY" translatable="false">SET_PROFILE_REMOTELY</string> @@ -1186,8 +1190,10 @@ <string name="SET_GROUP_REBLOGS" translatable="false">SET_GROUP_REBLOGS</string> <string name="SET_BOOST_ORIGINAL_DATE" translatable="false">SET_BOOST_ORIGINAL_DATE</string> + <string name="SET_TIMELINE_SCROLLBAR" translatable="false">SET_TIMELINE_SCROLLBAR</string> <string name="SET_MARKDOWN_SUPPORT" translatable="false">SET_MARKDOWN_SUPPORT</string> <string name="SET_TRUNCATE_LINKS" translatable="false">SET_TRUNCATE_LINKS</string> + <string name="SET_UNDERLINE_CLICKABLE" translatable="false">SET_UNDERLINE_CLICKABLE</string> <string name="SET_TRUNCATE_LINKS_MAX" translatable="false">SET_TRUNCATE_LINKS_MAX</string> <string name="SET_HIDE_SINGLE_MEDIA_WITH_CARD" translatable="false">SET_HIDE_SINGLE_MEDIA_WITH_CARD</string> @@ -1729,6 +1735,7 @@ <string name="set_timelines_in_a_list_title">Timelines in a list</string> <string name="set_timelines_in_a_list">When enabled, all pinned timelines will be displayed in a drop-down menu</string> <string name="set_display_counter">Display counters for messages</string> + <string name="set_display_relative_date">Display relative date for messages</string> <string name="set_use_cache">Use cache</string> <string name="set_use_cache_indication">Timelines will be cached so the application will be faster.</string> <string name="load_media_type_title">Load thumbnails for media</string> @@ -1945,6 +1952,7 @@ <string name="also_followed_by">Followed by:</string> <string name="Directory">Directory</string> <string name="boost_original_date">Display original date for boosts</string> + <string name="timeline_scrollbar">Display a scroll bar for timelines</string> <string name="markdown_support">Markdown support</string> <string name="set_disable_release_notes">Disable release notes</string> <string name="set_disable_release_notes_indication">When a new version is published, you will not be alerted inside the app.</string> @@ -1989,6 +1997,7 @@ <string name="toot_error_no_media_description">There are missing media descriptions</string> <string name="truncate_links">Truncate links</string> + <string name="underline_links">Underline clickable elements</string> <string name="truncate_links_max">Max chars in links</string> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 409d14f9d..e69af45c3 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -46,6 +46,7 @@ <item name="android:windowSharedElementExitTransition">@transition/change_image_transform </item> <item name="android:statusBarColor">?android:colorBackground</item> + <item name="alertDialogTheme">@style/AppThemeAlertDialog</item> </style> <style name="AppThemeBar" parent="Theme.Material3.Light"> @@ -82,6 +83,7 @@ <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item> <item name="android:isLightTheme" tools:targetApi="q">true</item> <item name="android:statusBarColor">?android:colorBackground</item> + <item name="alertDialogTheme">@style/AppThemeAlertDialog</item> </style> <style name="Transparent" parent="AppThemeBar"> @@ -98,6 +100,7 @@ </item> <item name="android:windowTranslucentStatus">true</item> <item name="android:windowTranslucentNavigation">true</item> + <item name="alertDialogTheme">@style/AppThemeAlertDialog</item> </style> <style name="AppThemeAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog"> @@ -167,6 +170,7 @@ <item name="colorOnSurfaceInverse">@color/solarized_md_theme_light_inverseOnSurface</item> <item name="colorSurfaceInverse">@color/solarized_md_theme_light_inverseSurface</item> <item name="colorPrimaryInverse">@color/solarized_md_theme_light_inversePrimary</item> + <item name="alertDialogTheme">@style/SolarizedAlertDialog</item> </style> <style name="TransparentSolarized" parent="SolarizedAppThemeBar"> @@ -183,6 +187,7 @@ </item> <item name="android:windowTranslucentStatus">true</item> <item name="android:windowTranslucentNavigation">true</item> + <item name="alertDialogTheme">@style/SolarizedAlertDialog</item> </style> <style name="SolarizedAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog"> @@ -254,6 +259,7 @@ <item name="colorOnSurfaceInverse">@color/solarized_md_theme_light_inverseOnSurface</item> <item name="colorSurfaceInverse">@color/solarized_md_theme_light_inverseSurface</item> <item name="colorPrimaryInverse">@color/solarized_md_theme_light_inversePrimary</item> + <item name="alertDialogTheme">@style/SolarizedAlertDialog</item> </style> <style name="Fedilab.SmallIconButton" parent="Widget.Material3.Button.IconButton"> diff --git a/app/src/main/res/xml/pref_timelines.xml b/app/src/main/res/xml/pref_timelines.xml index 3335f68d0..ecf37ffd1 100644 --- a/app/src/main/res/xml/pref_timelines.xml +++ b/app/src/main/res/xml/pref_timelines.xml @@ -50,6 +50,14 @@ app:singleLineTitle="false" app:title="@string/boost_original_date" /> + + <SwitchPreferenceCompat + android:defaultValue="false" + app:iconSpaceReserved="false" + app:key="@string/SET_TIMELINE_SCROLLBAR" + app:singleLineTitle="false" + app:title="@string/timeline_scrollbar" /> + <SwitchPreferenceCompat android:defaultValue="true" app:iconSpaceReserved="false" @@ -64,6 +72,13 @@ app:singleLineTitle="false" app:title="@string/truncate_links" /> + <SwitchPreferenceCompat + android:defaultValue="false" + app:iconSpaceReserved="false" + app:key="@string/SET_UNDERLINE_CLICKABLE" + app:singleLineTitle="false" + app:title="@string/underline_links" /> + <androidx.preference.SeekBarPreference android:defaultValue="30" android:max="150" @@ -198,6 +213,12 @@ app:key="@string/SET_DISPLAY_COUNTER_FAV_BOOST" app:singleLineTitle="false" app:title="@string/set_display_counter" /> + <SwitchPreferenceCompat + android:defaultValue="true" + app:iconSpaceReserved="false" + app:key="@string/SET_DISPLAY_RELATIVE_DATE" + app:singleLineTitle="false" + app:title="@string/set_display_relative_date" /> <SeekBarPreference android:defaultValue="0" android:max="20" |