diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/FooterViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/FooterViewHolder.java index a93ee4de8..b4e2be141 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/FooterViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/FooterViewHolder.java @@ -42,11 +42,8 @@ public class FooterViewHolder extends RecyclerView.ViewHolder { progressBar = itemView.findViewById(R.id.footer_progress_bar); endMessage = itemView.findViewById(R.id.footer_end_message); Drawable top = AppCompatResources.getDrawable(itemView.getContext(), - R.drawable.elephant_friend); - if (top != null) { - top.setBounds(0, 0, top.getIntrinsicWidth() / 2, top.getIntrinsicHeight() / 2); - } - endMessage.setCompoundDrawables(null, top, null, null); + R.drawable.elephant_friend_empty); + endMessage.setCompoundDrawablesWithIntrinsicBounds(null, top, null, null); } public void setState(State state) { diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java index d0394834f..a2c3c9006 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java @@ -216,11 +216,8 @@ public class NotificationsFragment extends SFragment implements private void setupNothingView() { Drawable top = AppCompatResources.getDrawable(Objects.requireNonNull(getContext()), - R.drawable.elephant_friend); - if (top != null) { - top.setBounds(0, 0, top.getIntrinsicWidth() / 2, top.getIntrinsicHeight() / 2); - } - nothingMessageView.setCompoundDrawables(null, top, null, null); + R.drawable.elephant_friend_empty); + nothingMessageView.setCompoundDrawablesWithIntrinsicBounds(null, top, null, null); nothingMessageView.setVisibility(View.GONE); } diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java index a7f7a9330..62fe57c87 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java @@ -423,11 +423,8 @@ public class TimelineFragment extends SFragment implements } private void setupNothingView() { - Drawable top = AppCompatResources.getDrawable(requireContext(), R.drawable.elephant_friend); - if (top != null) { - top.setBounds(0, 0, top.getIntrinsicWidth() / 2, top.getIntrinsicHeight() / 2); - } - nothingMessageView.setCompoundDrawables(null, top, null, null); + Drawable top = AppCompatResources.getDrawable(requireContext(), R.drawable.elephant_friend_empty); + nothingMessageView.setCompoundDrawablesWithIntrinsicBounds(null, top, null, null); nothingMessageView.setVisibility(View.GONE); } diff --git a/app/src/main/res/drawable/elephant_friend.png b/app/src/main/res/drawable/elephant_friend.png deleted file mode 100644 index a4e5e3e61..000000000 Binary files a/app/src/main/res/drawable/elephant_friend.png and /dev/null differ diff --git a/app/src/main/res/drawable/elephant_friend.xml b/app/src/main/res/drawable/elephant_friend.xml new file mode 100644 index 000000000..e31866738 --- /dev/null +++ b/app/src/main/res/drawable/elephant_friend.xml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/elephant_friend_empty.xml b/app/src/main/res/drawable/elephant_friend_empty.xml new file mode 100644 index 000000000..dba4aee30 --- /dev/null +++ b/app/src/main/res/drawable/elephant_friend_empty.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout-sw640dp/fragment_timeline.xml b/app/src/main/res/layout-sw640dp/fragment_timeline.xml index 0e3604b41..a76a40e66 100644 --- a/app/src/main/res/layout-sw640dp/fragment_timeline.xml +++ b/app/src/main/res/layout-sw640dp/fragment_timeline.xml @@ -36,7 +36,7 @@ android:id="@+id/nothing_message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:drawablePadding="16dp" + android:drawablePadding="32dp" android:text="@string/footer_empty" android:textAlignment="center" android:textSize="?attr/status_text_medium" diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml index 2ebdfcbce..d8de0e97c 100644 --- a/app/src/main/res/layout/activity_license.xml +++ b/app/src/main/res/layout/activity_license.xml @@ -161,6 +161,16 @@ license:link="https://github.com/c1710/blobmoji" license:name="Blobmoji" /> + + + app:srcCompat="@drawable/elephant_friend" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f71ca19a7..543bec8d3 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -84,4 +84,15 @@ #8c2b90d9 + + #121419 + @color/primary + #9BAEC8 + #8192A6 + #7F90A4 + #CAD4E0 + #d9e1e8 + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dad4c0498..1a1ff7d01 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -340,6 +340,8 @@ Tusky contains code and assets from the following open source projects: Licensed under the Apache License (copy below) CC-BY 4.0 + CC-BY-SA 4.0 + Profile metadata add data Label