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

Fixes elements visibility

This commit is contained in:
tom79 2017-09-16 15:16:16 +02:00
parent 26cf7e636a
commit 84a2080f32
5 changed files with 123 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java
View File

@ -879,7 +879,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
return;
}else if (which == 3){
Bitmap bitmap = Helper.getBitmapFromView(view);
Bitmap bitmap = Helper.convertTootIntoBitmap(view);
Intent intent = new Intent(context, TootActivity.class);
Bundle b = new Bundle();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
@ -921,7 +921,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
return;
}else if (which == 5){
Bitmap bitmap = Helper.getBitmapFromView(view);
Bitmap bitmap = Helper.convertTootIntoBitmap(view);
Intent intent = new Intent(context, TootActivity.class);
Bundle b = new Bundle();
ByteArrayOutputStream stream = new ByteArrayOutputStream();

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

@ -1322,7 +1322,6 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
final boolean isOwner = status.getAccount().getId().equals(userId);
AlertDialog.Builder builderSingle = new AlertDialog.Builder(context);
//builderSingle.setTitle(R.string.make_a_choice);
final String[] stringArray, stringArrayConf;
final API.StatusAction[] doAction;
if( isOwner) {
@ -1376,7 +1375,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
return;
}else if( which == 3) {
Bitmap bitmap = Helper.getBitmapFromView(view);
Bitmap bitmap = Helper.convertTootIntoBitmap(view);
Intent intent = new Intent(context, TootActivity.class);
Bundle b = new Bundle();
ByteArrayOutputStream stream = new ByteArrayOutputStream();
@ -1418,7 +1417,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
context.startActivity(Intent.createChooser(sendIntent, context.getString(R.string.share_with)));
return;
}else if( which == 5 ){
Bitmap bitmap = Helper.getBitmapFromView(view);
Bitmap bitmap = Helper.convertTootIntoBitmap(view);
Intent intent = new Intent(context, TootActivity.class);
Bundle b = new Bundle();
ByteArrayOutputStream stream = new ByteArrayOutputStream();

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

@ -21,6 +21,7 @@ import android.app.Activity;
import android.app.NotificationManager;
import android.preference.PreferenceManager;
import android.support.annotation.RequiresApi;
import android.support.design.widget.FloatingActionButton;
import android.support.v7.app.AlertDialog;
import android.app.DownloadManager;
import android.app.PendingIntent;
@ -1604,8 +1605,79 @@ public class Helper {
* @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);
public static Bitmap convertTootIntoBitmap(View view) {
int status_content_v = 0, status_content_translated_v = 0, yandex_translate_v = 0, google_translate_v = 0, status_content_translated_container_v = 0;
int status_action_container_v = 0, status_content_container_v = 0, status_translate_v = 0, new_element_v = 0, notification_delete_v = 0;
//Removes some elements
TextView status_content = (TextView) view.findViewById(R.id.status_content);
if( status_content != null) {
status_content_v = status_content.getVisibility();
status_content.setVisibility(View.VISIBLE);
}
TextView status_content_translated = (TextView) view.findViewById(R.id.status_content_translated);
if( status_content_translated != null) {
status_content_translated_v = status_content_translated.getVisibility();
status_content_translated.setVisibility(View.GONE);
}
TextView yandex_translate = (TextView) view.findViewById(R.id.yandex_translate);
if( yandex_translate != null) {
yandex_translate_v = yandex_translate.getVisibility();
yandex_translate.setVisibility(View.GONE);
}
TextView google_translate = (TextView) view.findViewById(R.id.google_translate);
if( google_translate != null) {
google_translate_v = google_translate.getVisibility();
google_translate.setVisibility(View.GONE);
}
TextView mastalab_watermark = (TextView) view.findViewById(R.id.mastalab_watermark);
if( mastalab_watermark != null) {
mastalab_watermark.setVisibility(View.VISIBLE);
}
LinearLayout status_content_translated_container = (LinearLayout) view.findViewById(R.id.status_content_translated_container);
if( status_content_translated_container != null) {
status_content_translated_container_v = status_content_translated_container.getVisibility();
status_content_translated_container.setVisibility(View.VISIBLE);
}
LinearLayout status_action_container = (LinearLayout) view.findViewById(R.id.status_action_container);
if( status_action_container != null) {
status_action_container_v = status_action_container.getVisibility();
status_action_container.setVisibility(View.GONE);
}
LinearLayout status_content_container = (LinearLayout) view.findViewById(R.id.status_content_container);
if( status_content_container != null) {
status_content_container_v = status_content_container.getVisibility();
status_content_container.setVisibility(View.VISIBLE);
}
FloatingActionButton status_translate = (FloatingActionButton) view.findViewById(R.id.status_translate);
if( status_translate != null) {
status_translate_v = status_translate.getVisibility();
status_translate.setVisibility(View.GONE);
}
ImageView new_element = (ImageView) view.findViewById(R.id.new_element);
if( new_element != null) {
new_element_v = new_element.getVisibility();
new_element.setVisibility(View.GONE);
}
ImageView notification_delete = (ImageView) view.findViewById(R.id.notification_delete);
if( notification_delete != null) {
notification_delete_v = notification_delete.getVisibility();
notification_delete.setVisibility(View.GONE);
}
Bitmap returnedBitmap = Bitmap.createBitmap(view.getWidth(), view.getHeight(), Bitmap.Config.ARGB_8888);
Canvas canvas = new Canvas(returnedBitmap);
Drawable bgDrawable =view.getBackground();
if (bgDrawable!=null)
@ -1613,6 +1685,31 @@ public class Helper {
else
canvas.drawColor(Color.WHITE);
view.draw(canvas);
//Restores initial visibilities
if( status_content != null)
status_content.setVisibility(status_content_v);
if( status_content_translated != null)
status_content_translated.setVisibility(status_content_translated_v);
if( yandex_translate != null)
yandex_translate.setVisibility(yandex_translate_v);
if( google_translate != null)
google_translate.setVisibility(google_translate_v);
if( mastalab_watermark != null)
mastalab_watermark.setVisibility(View.GONE);
if( status_content_translated_container != null)
status_content_translated_container.setVisibility(status_content_translated_container_v);
if( status_action_container != null)
status_action_container.setVisibility(status_action_container_v);
if( status_content_container != null)
status_content_container.setVisibility(status_content_container_v);
if( status_translate != null)
status_translate.setVisibility(status_translate_v);
if( new_element != null)
new_element.setVisibility(new_element_v);
if( notification_delete != null)
notification_delete.setVisibility(notification_delete_v);
return returnedBitmap;
}

10
app/src/main/res/layout/drawer_notification.xml
View File

@ -101,6 +101,16 @@
android:autoLink="web"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:visibility="gone"
android:id="@+id/mastalab_watermark"
android:layout_width="match_parent"
android:padding="2dp"
android:gravity="end"
android:text="Via #Mastalab"
android:layout_marginTop="10dp"
android:layout_height="wrap_content"
tools:ignore="HardcodedText"/>
<LinearLayout
android:id="@+id/status_document_container"
android:orientation="horizontal"

10
app/src/main/res/layout/drawer_status.xml
View File

@ -207,6 +207,16 @@
android:text="Powered by Google Translate"
android:layout_height="wrap_content"
tools:ignore="HardcodedText" />
<TextView
android:visibility="gone"
android:textColor="@color/mastodonC4"
android:id="@+id/mastalab_watermark"
android:layout_width="match_parent"
android:padding="2dp"
android:gravity="end"
android:text="Via #Mastalab"
android:layout_height="wrap_content"
tools:ignore="HardcodedText"/>
</LinearLayout>
<LinearLayout