Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
Konrad Pozniak 2017-10-16 23:31:39 +02:00 committed by GitHub
parent 402f696c10 34918884b5
commit 5176fc104d
15 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/keylesspalace/tusky/AccountActivity.java
View File

@ -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)

1
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View File

@ -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);
}

1
app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java
View File

@ -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)

1
app/src/main/java/com/keylesspalace/tusky/adapter/AccountViewHolder.java
View File

@ -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);
}

1
app/src/main/java/com/keylesspalace/tusky/adapter/BlocksAdapter.java
View File

@ -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);
}

1
app/src/main/java/com/keylesspalace/tusky/adapter/FollowRequestsAdapter.java
View File

@ -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);
}

1
app/src/main/java/com/keylesspalace/tusky/adapter/MutesAdapter.java
View File

@ -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);
}

2
app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java
View File

@ -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);
}

1
app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
View File

@ -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);
}

10
app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
View File

@ -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;

BIN
app/src/main/res/drawable/avatar_default.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
app/src/main/res/drawable/avatar_error.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

2
app/src/main/res/menu/status_more.xml
View File

@ -12,6 +12,8 @@
android:title="@string/status_share_content"/>
</menu>
</item>
<item android:title="@string/action_copy_link"
android:id="@+id/status_copy_link" />
<item android:title="@string/action_mute"
android:id="@+id/status_mute" />
<item android:title="@string/action_block"

2
app/src/main/res/values-fr/strings.xml
View File

@ -97,6 +97,8 @@
<string name="action_undo">Annuler</string>
<string name="action_view_follow_requests">Demandes de follow</string>
<string name="action_view_mutes">Utilisateurs muets</string>
<string name="action_copy_link">Copier le lien</string>
<string name="send_status_link_to">Partager l’URL de votre pouet avec…</string>
<string name="send_status_content_to">Partager le pouet avec…</string>
<string name="download_image">Téléchargement de %1$s</string>

3
app/src/main/res/values/strings.xml
View File

@ -100,8 +100,11 @@
<string name="action_reject">Reject</string>
<string name="action_search">Search</string>
<string name="action_access_saved_toot">Drafts</string>
<string name="download_image">Downloading %1$s</string>
<string name="action_copy_link">Copy the link</string>
<string name="send_status_link_to">Share toot URL to…</string>
<string name="send_status_content_to">Share toot to…</string>