From 0b4211b86a1373bbfeb5bed164b854ae215e566a Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Fri, 11 Aug 2017 22:41:29 +0200 Subject: [PATCH 1/2] rounded corners for avatar placeholder --- .../keylesspalace/tusky/AccountActivity.java | 1 - .../keylesspalace/tusky/ComposeActivity.java | 1 - .../tusky/EditProfileActivity.java | 1 - .../tusky/adapter/AccountViewHolder.java | 1 - .../tusky/adapter/BlocksAdapter.java | 1 - .../tusky/adapter/FollowRequestsAdapter.java | 1 - .../tusky/adapter/MutesAdapter.java | 1 - .../tusky/adapter/NotificationsAdapter.java | 2 -- .../tusky/adapter/StatusBaseViewHolder.java | 1 - app/src/main/res/drawable/avatar_default.png | Bin 1491 -> 1814 bytes app/src/main/res/drawable/avatar_error.png | Bin 1522 -> 0 bytes 11 files changed, 10 deletions(-) delete mode 100644 app/src/main/res/drawable/avatar_error.png diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java index 7175e5ea..b33745c4 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.java @@ -296,7 +296,6 @@ public class AccountActivity extends BaseActivity implements ActionButtonActivit Picasso.with(this) .load(account.avatar) .placeholder(R.drawable.avatar_default) - .error(R.drawable.avatar_error) .into(avatar); Picasso.with(this) .load(account.header) diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java index 6f766ea1..90948ab4 100644 --- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java @@ -1715,7 +1715,6 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm Picasso.with(context) .load(account.avatar) .placeholder(R.drawable.avatar_default) - .error(R.drawable.avatar_error) .transform(new RoundedTransformation(7, 0)) .into(avatar); } diff --git a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java index 455dcc64..ba6e4c30 100644 --- a/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java @@ -179,7 +179,6 @@ public class EditProfileActivity extends BaseActivity { Picasso.with(avatar.getContext()) .load(me.avatar) .placeholder(R.drawable.avatar_default) - .error(R.drawable.avatar_error) .into(avatar); Picasso.with(header.getContext()) .load(me.header) diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java index f6a5b228..4262f905 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java @@ -37,7 +37,6 @@ class AccountViewHolder extends RecyclerView.ViewHolder { Picasso.with(context) .load(account.avatar) .placeholder(R.drawable.avatar_default) - .error(R.drawable.avatar_error) .into(avatar); } diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java index f4e70fa7..c1153d1d 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java @@ -97,7 +97,6 @@ public class BlocksAdapter extends AccountAdapter { username.setText(formattedUsername); Picasso.with(avatar.getContext()) .load(account.avatar) - .error(R.drawable.avatar_error) .placeholder(R.drawable.avatar_default) .into(avatar); } diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java index c4578e52..bd7efb45 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java @@ -99,7 +99,6 @@ public class FollowRequestsAdapter extends AccountAdapter { username.setText(formattedUsername); Picasso.with(avatar.getContext()) .load(account.avatar) - .error(R.drawable.avatar_error) .placeholder(R.drawable.avatar_default) .into(avatar); } diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java index e7719775..a9dfd93c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java @@ -82,7 +82,6 @@ public class MutesAdapter extends AccountAdapter { username.setText(formattedUsername); Picasso.with(avatar.getContext()) .load(account.avatar) - .error(R.drawable.avatar_error) .placeholder(R.drawable.avatar_default) .into(avatar); } diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java index 934a2e40..1f34057f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java @@ -224,7 +224,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter { .fit() .transform(new RoundedTransformation(7, 0)) .placeholder(R.drawable.avatar_default) - .error(R.drawable.avatar_error) .into(avatar); } @@ -306,7 +305,6 @@ public class NotificationsAdapter extends RecyclerView.Adapter { Picasso.with(context) .load(statusAvatarUrl) .placeholder(R.drawable.avatar_default) - .error(R.drawable.avatar_error) .transform(new RoundedTransformation(7, 0)) .into(statusAvatar); } diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java index 279773a4..aa75c589 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java @@ -111,7 +111,6 @@ class StatusBaseViewHolder extends RecyclerView.ViewHolder { Picasso.with(avatar.getContext()) .load(url) .placeholder(R.drawable.avatar_default) - .error(R.drawable.avatar_error) .transform(new RoundedTransformation(7, 0)) .into(avatar); } diff --git a/app/src/main/res/drawable/avatar_default.png b/app/src/main/res/drawable/avatar_default.png index 78f789485855190381140acbdbb70d65bc8f4703..88462d68cd47eba6adfc757848ff64eb140f1ae7 100644 GIT binary patch literal 1814 zcmZ`)Ycv~(5>D$`nrJD~mLZlntU*Ly)X@Xa%9HwAx~cSGh`- zARa-BNIlxJr5?*5pWbG|t<^J8Yd@3ym}4N&fc8~^|S z+SyvWiet=Ila&_x3s~b306==u&f3a7W@53(+v(a{jh|9WH&WYp5sgQ-8t(Lx>JkY!b@>ov(zNA=P%U(HHV{xA5y zQvZhkO8x(eWki-fq_t4>iSF*69gxRrB@$DZ*^r;%_c+NEB?AgFDjtzUK zyLQbt`doYFf1~DAvt@-D?ZE~+6$#7P)N=R?^%~?gZR*dboj~lYa}?DiA(>8tAZVinO{*x5NS7~9x0xP0+ZVp{1w70D z9k(I4Su?gdsp0A6#j~PUYg@!M^oH%%Kb^S>WVn}+)xAFtIN>qg1r=c}7eZMs$(men zcZrJ0k5Z5g{GDuqdTk@noM+Y*mPXq3OI;2B(!3LO?6^+&QO6%f2|JDO)a5sd?Z}-1!A+Xz!#9169=RJsDlf+uWM8qsV{! zPSx6A(f@E08Y1&7YXFHoGP1_Qx`J4tkt_9r@HqjvbTjJnJG3`)NRC>Tp405phT-(34NQXfYxL)j|n)NlCY_gcbB`iT0Dj^2ATjsx3aqEYFBzQ7Q#>&;;@ zJUa*Tp>xwWXzAXB3F42NizwBbA;;CO9A#)~l{g42&-wN<FbJ^th|f#+lD2dOuR+*G=w_#SEyZ0nwAUhG_nm&gT&ha?Xk}T z3yTZz6>bL7=hr1>P7|539!31V@qfV{CXvbgw!*S$^B`O$2zq)}Emz1u9(?X{e=ZA<#SnTEU&N2rQ2hzugLjSV85YkppvK0qTGr!Jt>ij1}r=fH27P-Vl8ypET~FFh=E)R+D+ z^5AILx2M7DcP9<(io;fq-zksF6rUSaa69gk%RSeOib|gNn{<^@MaqS%YIt{w?9;Qu zNFf0h4}S%QU5^*i7x)p$_pf9Q`+s5JxuR+hy*K8=;9u`wHfAYo&5ed8t}xT)diD?3 z7~TsY8Qo-_*-&)BqOMJ9WoY3&kty)~1ZK2|%4pjkg#lD@jSrP?@^k_Q502vqS#VOv zTA`*9$;d}%vDdx)a+HN9};%o`rVxl$=^xq(X*0ZmIue97_rc(L9A>@GW6*Zu=T F{u5boW-I^z literal 1491 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 From b86887b56473567c1e7ac3651d692f3e4820f065 Mon Sep 17 00:00:00 2001 From: flyingrub Date: Mon, 25 Sep 2017 20:15:04 +0200 Subject: [PATCH 2/2] Add a menu entry to copy the link of a toot fixes #390 --- .../com/keylesspalace/tusky/fragment/SFragment.java | 10 ++++++++++ app/src/main/res/menu/status_more.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 2 ++ app/src/main/res/values/strings.xml | 1 + 4 files changed, 15 insertions(+) diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java index 1a5a6612..30830195 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java @@ -15,6 +15,9 @@ package com.keylesspalace.tusky.fragment; +import android.content.ClipData; +import android.content.ClipboardManager; +import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; @@ -271,6 +274,13 @@ public abstract class SFragment extends BaseFragment implements AdapterItemRemov startActivity(Intent.createChooser(sendIntent, getResources().getText(R.string.send_status_link_to))); return true; } + case R.id.status_copy_link: { + ClipboardManager clipboard = (ClipboardManager) + getActivity().getSystemService(Context.CLIPBOARD_SERVICE); + ClipData clip = ClipData.newPlainText(null, statusUrl); + clipboard.setPrimaryClip(clip); + return true; + } case R.id.status_mute: { mute(accountId); return true; diff --git a/app/src/main/res/menu/status_more.xml b/app/src/main/res/menu/status_more.xml index 95581c8f..627b3cce 100644 --- a/app/src/main/res/menu/status_more.xml +++ b/app/src/main/res/menu/status_more.xml @@ -12,6 +12,8 @@ android:title="@string/status_share_content"/> + Annuler Demandes de follow Utilisateurs muets + Copier le lien + Partager l’URL de votre pouet avec… Partager le pouet avec… diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7a8251a6..4d7cb6e6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -100,6 +100,7 @@ Reject Search Drafts + Copy the link Share toot URL to… Share toot to…