chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Theme refactoring (#1656)

Browse source 
* Theme refactoring

* disable the automatic tinting of surfaces with elevation in dark mode

* make the media warning visible again with the dark theme

* fix nav bar on api 27+

* use correct color for all media warnings
This commit is contained in:
Konrad Pozniak 2020-01-30 21:37:28 +01:00 • committed by GitHub
commit 8767d2ed3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
122 changed files with 330 additions and 724 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/res/layout/activity_account.xml
View file

@ -33,7 +33,7 @@
android:layout_width="match_parent"
android:layout_height="180dp"
android:layout_alignTop="@+id/account_header_info"
android:background="?attr/account_header_background_color"
android:background="?attr/colorPrimaryDark"
android:scaleType="centerCrop"
app:layout_collapseMode="parallax"
app:layout_constraintStart_toStartOf="parent"
@ -130,7 +130,7 @@
app:layout_constraintBottom_toBottomOf="@+id/accountUsernameTextView"
app:layout_constraintStart_toEndOf="@+id/accountUsernameTextView"
app:layout_constraintTop_toTopOf="@+id/accountUsernameTextView"
app:srcCompat="@drawable/reblog_private_light"
app:srcCompat="@drawable/ic_reblog_private_24dp"
tools:visibility="visible" />
<TextView
@ -326,7 +326,7 @@
style="@style/TuskyTabAppearance"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
app:tabGravity="center"
app:tabMode="scrollable"
app:tabTextAppearance="@style/TuskyTabAppearance" />
@ -337,7 +337,7 @@
android:id="@+id/accountFragmentViewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/tab_page_margin_color"
android:background="?android:windowBackground"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<com.google.android.material.floatingactionbutton.FloatingActionButton

28
app/src/main/res/layout/activity_compose.xml
View file

@ -24,7 +24,7 @@
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/atButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="end"
@ -36,7 +36,7 @@
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/hashButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="end"
@ -77,7 +77,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:background="?attr/compose_reply_content_background"
android:background="?attr/colorBackgroundAccent"
android:lineSpacingMultiplier="1.1"
android:paddingLeft="16dp"
android:paddingTop="4dp"
@ -154,7 +154,7 @@
android:id="@+id/addMediaBottomSheet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
android:elevation="12dp"
android:orientation="vertical"
android:paddingStart="16dp"
@ -197,7 +197,7 @@
android:id="@+id/emojiView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
android:clipToPadding="false"
android:elevation="12dp"
android:orientation="vertical"
@ -213,7 +213,7 @@
android:id="@+id/composeOptionsBottomSheet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
android:elevation="12dp"
android:paddingStart="16dp"
android:paddingTop="8dp"
@ -227,7 +227,7 @@
android:id="@+id/composeScheduleView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
android:elevation="12dp"
android:paddingStart="16dp"
android:paddingTop="8dp"
@ -241,7 +241,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
android:elevation="12dp"
android:animateLayoutChanges="true"
android:gravity="center_vertical"
@ -252,7 +252,7 @@
<ImageButton
android:id="@+id/composeAddMediaButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="4dp"
@ -263,7 +263,7 @@
<ImageButton
android:id="@+id/composeToggleVisibilityButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="4dp"
@ -274,7 +274,7 @@
<ImageButton
android:id="@+id/composeHideMediaButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="4dp"
@ -285,7 +285,7 @@
<ImageButton
android:id="@+id/composeContentWarningButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="4dp"
@ -296,7 +296,7 @@
<ImageButton
android:id="@+id/composeEmojiButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="4dp"
@ -307,7 +307,7 @@
<ImageButton
android:id="@+id/composeScheduleButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginEnd="4dp"

2
app/src/main/res/layout/activity_edit_profile.xml
View file

@ -139,7 +139,7 @@
android:paddingStart="8dp"
android:text="@string/lock_account_label"
android:textSize="?attr/status_text_medium"
app:buttonTint="?attr/compound_button_color" />
app:buttonTint="@color/compound_button_color" />
<TextView
android:layout_width="match_parent"

3
app/src/main/res/layout/activity_main.xml
View file

@ -11,6 +11,7 @@
android:id="@+id/main_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:elevationOverlayEnabled="false"
android:elevation="@dimen/actionbar_elevation">
<androidx.appcompat.widget.Toolbar
@ -35,7 +36,7 @@
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/pager"
android:background="?attr/tab_page_margin_color"
android:background="?android:windowBackground"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/tab_layout"

4
app/src/main/res/layout/activity_view_media.xml
View file

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:background="@color/black"
android:orientation="vertical">
<androidx.viewpager2.widget.ViewPager2
@ -15,7 +15,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/toolbar_view_media"
android:background="@color/transparent_black"
android:theme="@style/ViewMediaActivity.AppBarLayout"
app:titleTextColor="@color/white" />

2
app/src/main/res/layout/dialog_add_poll.xml
View file

@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:text="@string/poll_allow_multiple_choices"
app:buttonTint="?attr/compound_button_color"
app:buttonTint="@color/compound_button_color"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/addChoiceButton" />

2
app/src/main/res/layout/fragment_accounts_in_list.xml
View file

@ -49,7 +49,7 @@
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="8dp"
android:background="?attr/window_background"
android:background="?android:attr/windowBackground"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

2
app/src/main/res/layout/fragment_report_note.xml
View file

@ -86,7 +86,7 @@
android:layout_marginTop="16dp"
android:text="@string/report_remote_instance"
android:textSize="?attr/status_text_medium"
app:buttonTint="?attr/compound_button_color"
app:buttonTint="@color/compound_button_color"
app:layout_constraintEnd_toEndOf="@id/guideEnd"
app:layout_constraintStart_toStartOf="@id/guideBegin"
app:layout_constraintTop_toBottomOf="@id/reportDescriptionRemoteInstance" />

5
app/src/main/res/layout/fragment_search.xml
View file

@ -3,8 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layoutRoot"
android:layout_width="@dimen/timeline_width"
android:layout_height="match_parent"
android:background="?attr/tab_page_margin_color">
android:layout_height="match_parent">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"
@ -16,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="?attr/window_background"
android:background="?android:attr/windowBackground"
tools:listitem="@layout/item_account" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

2
app/src/main/res/layout/fragment_timeline.xml
View file

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/window_background">
android:background="?android:attr/colorBackground">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayout"

5
app/src/main/res/layout/fragment_timeline_notifications.xml
View file

@ -9,7 +9,7 @@
android:id="@+id/appBarOptions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:background="?attr/colorSurface"
app:elevation="0dp"
app:layout_behavior="com.keylesspalace.tusky.util.AppBarLayoutNoEmptyScrollBehavior">
@ -58,8 +58,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/window_background" />
android:layout_height="match_parent" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

2
app/src/main/res/layout/fragment_view_thread.xml
View file

@ -9,7 +9,7 @@
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/window_background"
android:background="?android:attr/colorBackground"
android:scrollbars="vertical" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

2
app/src/main/res/layout/item_add_poll_option.xml
View file

@ -20,7 +20,7 @@
<ImageButton
android:id="@+id/deleteButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_marginStart="8dp"
android:layout_width="32dp"
android:layout_height="32dp"

2
app/src/main/res/layout/item_autocomplete_divider.xml
View file

@ -2,4 +2,4 @@
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/autocomplete_divider_drawable" />
android:background="@drawable/status_divider" />

2
app/src/main/res/layout/item_blocked_user.xml
View file

@ -19,7 +19,7 @@
<ImageButton
android:id="@+id/blocked_user_unblock"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentEnd="true"

18
app/src/main/res/layout/item_conversation.xml
View file

@ -256,7 +256,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_0"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_0"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -268,7 +268,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_1"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_1"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_1"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -280,7 +280,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_2"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_2"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_2"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -292,7 +292,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_3"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_3"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_3"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -321,7 +321,7 @@
android:paddingRight="12dp"
android:paddingBottom="8dp"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textColor="?android:attr/textColorSecondary"
android:textSize="?attr/status_text_medium"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
@ -424,7 +424,7 @@
<ImageButton
android:id="@+id/status_reply"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="4dp"
@ -448,9 +448,9 @@
app:layout_constraintEnd_toStartOf="@id/status_bookmark"
app:layout_constraintStart_toEndOf="@id/status_reply"
app:layout_constraintTop_toTopOf="@id/status_reply"
sparkbutton:activeImage="?attr/status_favourite_active_drawable"
sparkbutton:activeImage="@drawable/ic_favourite_active_24dp"
sparkbutton:iconSize="28dp"
sparkbutton:inactiveImage="?attr/status_favourite_inactive_drawable"
sparkbutton:inactiveImage="@drawable/ic_favourite_24dp"
sparkbutton:primaryColor="@color/tusky_orange"
sparkbutton:secondaryColor="@color/tusky_orange_light" />
@ -473,7 +473,7 @@
<ImageButton
android:id="@+id/status_more"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="24dp"
android:layout_height="30dp"
android:layout_marginEnd="8dp"

4
app/src/main/res/layout/item_emoji_pref.xml
View file

@ -96,7 +96,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/emojicompat_name"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_cancel_black_24dp" />
app:srcCompat="@drawable/ic_cancel_24dp" />
<!--You'll probably want to select an emoji font, don't you?-->
<androidx.appcompat.widget.AppCompatRadioButton
@ -104,7 +104,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
app:buttonTint="?attr/compound_button_color"
app:buttonTint="@color/compound_button_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/emojicompat_name"

4
app/src/main/res/layout/item_follow_request.xml
View file

@ -50,7 +50,7 @@
<ImageButton
android:id="@+id/acceptButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_centerVertical="true"
@ -63,7 +63,7 @@
<ImageButton
android:id="@+id/rejectButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentEnd="true"

2
app/src/main/res/layout/item_list.xml
View file

@ -21,7 +21,7 @@
<ImageButton
android:id="@+id/editListButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="36dp"
android:layout_height="wrap_content"
android:layout_margin="8dp"

2
app/src/main/res/layout/item_muted_domain.xml
View file

@ -12,7 +12,7 @@
<ImageButton
android:id="@+id/muted_domain_unmute"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="32dp"
android:layout_height="32dp"
app:layout_constraintTop_toTopOf="parent"

2
app/src/main/res/layout/item_muted_user.xml
View file

@ -19,7 +19,7 @@
<ImageButton
android:id="@+id/muted_user_unmute"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_alignParentEnd="true"

1
app/src/main/res/layout/item_picker_list.xml
View file

@ -5,4 +5,5 @@
android:layout_height="wrap_content"
android:padding="16dp"
android:drawablePadding="8dp"
android:textColor="@color/textColorSecondary"
android:textSize="?attr/status_text_medium" />

4
app/src/main/res/layout/item_poll.xml
View file

@ -27,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="?attr/status_text_medium"
app:buttonTint="?attr/compound_button_color"
app:buttonTint="@color/compound_button_color"
tools:text="Option 1" />
<CheckBox
@ -37,7 +37,7 @@
android:ellipsize="end"
android:lines="1"
android:textSize="?attr/status_text_medium"
app:buttonTint="?attr/compound_button_color"
app:buttonTint="@color/compound_button_color"
tools:text="Option 1" />
</FrameLayout>

12
app/src/main/res/layout/item_report_status.xml
View file

@ -148,7 +148,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_0"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_0"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -160,7 +160,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_1"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_1"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_1"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -172,7 +172,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_2"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_2"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_2"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -184,7 +184,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_3"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_3"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_3"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -214,7 +214,7 @@
android:paddingRight="12dp"
android:paddingBottom="8dp"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textColor="?android:attr/textColorSecondary"
android:textSize="?attr/status_text_medium"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
@ -354,7 +354,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_margin="16dp"
app:buttonTint="?attr/compound_button_color"
app:buttonTint="@color/compound_button_color"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/timestampInfo" />

2
app/src/main/res/layout/item_saved_toot.xml
View file

@ -15,7 +15,7 @@
<ImageButton
android:id="@+id/suppr"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center_vertical"

4
app/src/main/res/layout/item_scheduled_toot.xml
View file

@ -15,7 +15,7 @@
<ImageButton
android:id="@+id/edit"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center_vertical"
@ -27,7 +27,7 @@
<ImageButton
android:id="@+id/delete"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center_vertical"

22
app/src/main/res/layout/item_status.xml
View file

@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/status_reblogged_bar_padding_top"
android:drawableStart="?attr/status_reblog_small_drawable"
android:drawableStart="@drawable/ic_reblog_18dp"
android:drawablePadding="6dp"
android:gravity="center_vertical"
android:importantForAccessibility="no"
@ -245,7 +245,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_0"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_0"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -257,7 +257,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_1"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_1"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_1"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -269,7 +269,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_2"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_2"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_2"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -281,7 +281,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_3"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_3"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_3"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -311,7 +311,7 @@
android:paddingRight="12dp"
android:paddingBottom="8dp"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textColor="?android:attr/textColorSecondary"
android:textSize="?attr/status_text_medium"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
@ -416,7 +416,7 @@
<ImageButton
android:id="@+id/status_reply"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_marginTop="4dp"
@ -444,7 +444,7 @@
app:layout_constraintTop_toTopOf="@id/status_reply"
sparkbutton:activeImage="@drawable/ic_reblog_active_24dp"
sparkbutton:iconSize="28dp"
sparkbutton:inactiveImage="?attr/status_reblog_inactive_drawable"
sparkbutton:inactiveImage="@drawable/ic_reblog_24dp"
sparkbutton:primaryColor="@color/tusky_blue"
sparkbutton:secondaryColor="@color/tusky_blue_light" />
@ -459,9 +459,9 @@
app:layout_constraintEnd_toStartOf="@id/status_bookmark"
app:layout_constraintStart_toEndOf="@id/status_inset"
app:layout_constraintTop_toTopOf="@id/status_inset"
sparkbutton:activeImage="?attr/status_favourite_active_drawable"
sparkbutton:activeImage="@drawable/ic_favourite_active_24dp"
sparkbutton:iconSize="28dp"
sparkbutton:inactiveImage="?attr/status_favourite_inactive_drawable"
sparkbutton:inactiveImage="@drawable/ic_favourite_24dp"
sparkbutton:primaryColor="@color/tusky_orange"
sparkbutton:secondaryColor="@color/tusky_orange_light" />
@ -484,7 +484,7 @@
<ImageButton
android:id="@+id/status_more"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="24dp"
android:layout_height="30dp"
android:layout_marginEnd="8dp"

22
app/src/main/res/layout/item_status_detailed.xml
View file

@ -148,7 +148,7 @@
android:layout_width="match_parent"
android:layout_height="300dp"
android:layout_margin="1dp"
android:background="?attr/card_background_color"
android:background="?attr/colorBackgroundAccent"
android:importantForAccessibility="no"
android:scaleType="center" />
@ -259,7 +259,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_0"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_0"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -271,7 +271,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_1"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_1"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_1"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -283,7 +283,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_2"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_2"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_2"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -295,7 +295,7 @@
app:layout_constraintEnd_toEndOf="@+id/status_media_preview_3"
app:layout_constraintStart_toStartOf="@+id/status_media_preview_3"
app:layout_constraintTop_toTopOf="@+id/status_media_preview_3"
app:srcCompat="?attr/play_indicator_drawable"
app:srcCompat="@drawable/ic_play_indicator"
tools:ignore="ContentDescription" />
<ImageView
@ -324,7 +324,7 @@
android:paddingRight="12dp"
android:paddingBottom="8dp"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textColor="?android:attr/textColorSecondary"
android:textSize="?attr/status_text_medium"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
@ -504,7 +504,7 @@
<ImageButton
android:id="@+id/status_reply"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="4dp"
@ -532,7 +532,7 @@
app:layout_constraintTop_toTopOf="@id/status_reply"
sparkbutton:activeImage="@drawable/ic_reblog_active_24dp"
sparkbutton:iconSize="28dp"
sparkbutton:inactiveImage="?attr/status_reblog_inactive_drawable"
sparkbutton:inactiveImage="@drawable/ic_reblog_24dp"
sparkbutton:primaryColor="@color/tusky_blue"
sparkbutton:secondaryColor="@color/tusky_blue_light" />
@ -547,9 +547,9 @@
app:layout_constraintEnd_toStartOf="@id/status_bookmark"
app:layout_constraintStart_toEndOf="@id/status_inset"
app:layout_constraintTop_toTopOf="@id/status_inset"
sparkbutton:activeImage="?attr/status_favourite_active_drawable"
sparkbutton:activeImage="@drawable/ic_favourite_active_24dp"
sparkbutton:iconSize="28dp"
sparkbutton:inactiveImage="?attr/status_favourite_inactive_drawable"
sparkbutton:inactiveImage="@drawable/ic_favourite_24dp"
sparkbutton:primaryColor="@color/tusky_orange"
sparkbutton:secondaryColor="@color/tusky_orange_light" />
@ -572,7 +572,7 @@
<ImageButton
android:id="@+id/status_more"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:contentDescription="@string/action_more"

2
app/src/main/res/layout/item_tab_preference.xml
View file

@ -42,7 +42,7 @@
<ImageButton
android:id="@+id/removeButton"
style="?attr/image_button_style"
style="@style/TuskyImageButton"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="end"

2
app/src/main/res/layout/notifications_filter.xml
View file

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="200dp"
android:layout_height="wrap_content"
android:background="?attr/window_background">
android:background="?android:attr/windowBackground">
<ListView
android:id="@+id/listView"
android:layout_width="match_parent"

8
app/src/main/res/layout/view_compose_options.xml
View file

@ -23,7 +23,7 @@
android:paddingStart="10dp"
android:text="@string/visibility_public"
android:textColor="?android:textColorTertiary"
app:buttonTint="?attr/compound_button_color" />
app:buttonTint="@color/compound_button_color" />
<RadioButton
android:id="@+id/unlistedRadioButton"
@ -36,7 +36,7 @@
android:paddingStart="10dp"
android:text="@string/visibility_unlisted"
android:textColor="?android:textColorTertiary"
app:buttonTint="?attr/compound_button_color" />
app:buttonTint="@color/compound_button_color" />
<RadioButton
android:id="@+id/privateRadioButton"
@ -49,7 +49,7 @@
android:paddingStart="10dp"
android:text="@string/visibility_private"
android:textColor="?android:textColorTertiary"
app:buttonTint="?attr/compound_button_color" />
app:buttonTint="@color/compound_button_color" />
<RadioButton
android:id="@+id/directRadioButton"
@ -61,7 +61,7 @@
android:paddingStart="10dp"
android:text="@string/visibility_direct"
android:textColor="?android:textColorTertiary"
app:buttonTint="?attr/compound_button_color" />
app:buttonTint="@color/compound_button_color" />
</RadioGroup>