Mastodon/pachli-android
1
0
Fork 0
mirror of https://github.com/pachli/pachli-android.git synced 2025-02-03 02:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed the share button menu to allow for sharing either the link, or the actual content of the post

Browse Source 
added values into @string file to accommodate for the change
added the new share submenu into the status_more layout xml
This commit is contained in:
Zachary Epps 2017-04-12 16:21:48 -04:00
parent 2e45a0bbff
commit 52343b6ab2
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,8 +182,8 @@ public class SFragment extends BaseFragment {
callList.add(call); callList.add(call);
} }
protected void more(Status status, View view, final AdapterItemRemover adapter, protected void more(final Status status, View view, final AdapterItemRemover adapter,
final int position) { final int position) {
final String id = status.getActionableId(); final String id = status.getActionableId();
final String accountId = status.getActionableStatus().account.id; final String accountId = status.getActionableStatus().account.id;
final String accountUsename = status.getActionableStatus().account.username; final String accountUsename = status.getActionableStatus().account.username;
@ -201,12 +201,25 @@ public class SFragment extends BaseFragment {
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.status_share: { case R.id.status_share_content: {
StringBuilder sb = new StringBuilder();
sb.append(status.account.username);
sb.append(" - ");
sb.append(status.content.toString());
Intent sendIntent = new Intent();
sendIntent.setAction(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_TEXT, sb.toString());
sendIntent.setType("text/plain");
startActivity(Intent.createChooser(sendIntent, getResources().getText(R.string.send_status_content_to)));
return true;
}
case R.id.status_share_link: {
Intent sendIntent = new Intent(); Intent sendIntent = new Intent();
sendIntent.setAction(Intent.ACTION_SEND); sendIntent.setAction(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_TEXT, statusUrl); sendIntent.putExtra(Intent.EXTRA_TEXT, statusUrl);
sendIntent.setType("text/plain"); sendIntent.setType("text/plain");
startActivity(Intent.createChooser(sendIntent, getResources().getText(R.string.send_status_to))); startActivity(Intent.createChooser(sendIntent, getResources().getText(R.string.send_status_link_to)));
return true; return true;
} }
case R.id.status_block: { case R.id.status_block: {

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

@ -2,7 +2,16 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item <item
android:id="@+id/status_share" android:id="@+id/status_share"
android:title="@string/action_share"/> android:title="@string/action_share">
<menu>
<item
android:id="@+id/status_share_link"
android:title="@string/status_share_link" />
<item
android:id="@+id/status_share_content"
android:title="@string/status_share_content"/>
</menu>
</item>
<item android:title="@string/action_block" <item android:title="@string/action_block"
android:id="@+id/status_block" /> android:id="@+id/status_block" />
<item android:title="@string/action_report" <item android:title="@string/action_report"

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

@ -83,7 +83,8 @@
<string name="toggle_nsfw">NSFW</string> <string name="toggle_nsfw">NSFW</string>
<string name="action_compose_options">Options</string> <string name="action_compose_options">Options</string>
<string name="send_status_to">Share toot URL to…</string> <string name="send_status_link_to">Share toot URL to…</string>
<string name="send_status_content_to">Share toot to…</string>
<string name="search">Search accounts…</string> <string name="search">Search accounts…</string>
@ -137,5 +138,7 @@
<string name="notification_title_summary">%d new interactions</string> <string name="notification_title_summary">%d new interactions</string>
<string name="description_account_locked">Locked Account</string> <string name="description_account_locked">Locked Account</string>
<string name="status_share_content">Share content of toot</string>
<string name="status_share_link">Share link to toot</string>
</resources> </resources>