Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Prepares new code

This commit is contained in:
tom79 2017-09-16 12:10:01 +02:00
parent d894c38473
commit 32bc0a5738
5 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -14,6 +14,7 @@ package fr.gouv.etalab.mastodon.drawers;
* You should have received a copy of the GNU General Public License along with Mastalab; if not,
* see <http://www.gnu.org/licenses>. */
import android.graphics.Bitmap;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AlertDialog;
import android.content.ClipData;
@ -62,6 +63,7 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
@ -835,7 +837,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
holder.status_more.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
moreOptionDialog(status);
moreOptionDialog(status, holder.card_status_container);
}
});
@ -1312,7 +1314,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
* More option for status (report / remove status / Mute / Block)
* @param status Status current status
*/
private void moreOptionDialog(final Status status){
private void moreOptionDialog(final Status status, final View view){
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@ -1365,13 +1367,15 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
Toast.makeText(context,R.string.clipboard,Toast.LENGTH_LONG).show();
dialog.dismiss();
return;
}else {
}else if( which == 2) {
Intent sendIntent = new Intent(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
sendIntent.putExtra(Intent.EXTRA_TEXT, status.getUrl());
sendIntent.setType("text/plain");
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
return;
}else if( which == 3) {
}
}else {
if( which < 2 ){
@ -1395,13 +1399,25 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
Toast.makeText(context,R.string.clipboard,Toast.LENGTH_LONG).show();
dialog.dismiss();
return;
}else {
}else if( which == 4 ){
Intent sendIntent = new Intent(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.shared_via));
sendIntent.putExtra(Intent.EXTRA_TEXT, status.getUrl());
sendIntent.setType("text/plain");
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
return;
}else if( which == 5 ){
Bitmap bitmap = Helper.getBitmapFromView(view);
Intent intent = new Intent(context, TootActivity.class);
Bundle b = new Bundle();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream);
byte[] byteArray = stream.toByteArray();
intent.putExtra("picturemention", byteArray);
b.putParcelable("tootmention", status);
intent.putExtras(b);
context.startActivity(intent);
return;
}
}
//Text for report

17
app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
View File

@ -1599,4 +1599,21 @@ public class Helper {
}
}
/**
* Get a bitmap from a view
* @param view The view to convert
* @return Bitmap
*/
public static Bitmap getBitmapFromView(View view) {
Bitmap returnedBitmap = Bitmap.createBitmap(view.getWidth(), view.getHeight(),Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(returnedBitmap);
Drawable bgDrawable =view.getBackground();
if (bgDrawable!=null)
bgDrawable.draw(canvas);
else
canvas.drawColor(Color.WHITE);
view.draw(canvas);
return returnedBitmap;
}
}

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

@ -102,11 +102,13 @@
<item>Melden</item>
<item>Kopieren</item>
<item>Teilen</item>
<item>Erwähnen</item>
</string-array>
<string-array name="more_action_owner">
<item>Entfernen</item>
<item>Kopieren</item>
<item>Teilen</item>
<item>Erwähnen</item>
</string-array>
<string-array name="more_action_confirm">

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

@ -102,11 +102,13 @@
<item>Signaler</item>
<item>Copier</item>
<item>Partager</item>
<item>Mentionner</item>
</string-array>
<string-array name="more_action_owner">
<item>Supprimer</item>
<item>Copier</item>
<item>Partager</item>
<item>Mentionner</item>
</string-array>
<string-array name="more_action_confirm">

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

@ -105,11 +105,13 @@
<item>Report</item>
<item>Copy</item>
<item>Share</item>
<item>Mention</item>
</string-array>
<string-array name="more_action_owner">
<item>Remove</item>
<item>Copy</item>
<item>Share</item>
<item>Mention</item>
</string-array>
<string-array name="more_action_confirm">