From d5050a0ba5b37ee7eb34abdfa234c0bb0fb63115 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sat, 18 May 2019 16:47:49 +0200 Subject: [PATCH] test --- .../android/drawers/StatusListAdapter.java | 27 +++++++++-------- .../android/fragments/SettingsFragment.java | 29 +++++++++++++++++++ .../app/fedilab/android/helper/Helper.java | 2 ++ .../res/layout-sw600dp/fragment_settings.xml | 17 +++++++++++ app/src/main/res/layout/fragment_settings.xml | 16 ++++++++++ app/src/main/res/values/strings.xml | 2 ++ 6 files changed, 81 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index c2fc03849..7e9aee651 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -1577,7 +1577,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.status_content_container.setVisibility(View.VISIBLE); } } - + boolean blur_sensitive = sharedpreferences.getBoolean(Helper.SET_BLUR_SENSITIVE, true); if (status.getReblog() == null) { if (status.getMedia_attachments().size() < 1) { @@ -1601,7 +1601,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.status_horizontal_document_container.setVisibility(View.GONE); else holder.status_document_container.setVisibility(View.GONE); - if(behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi)){ + if(blur_sensitive && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))){ loadAttachments(status, holder, true); } } else { @@ -1646,7 +1646,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct holder.status_horizontal_document_container.setVisibility(View.GONE); else holder.status_document_container.setVisibility(View.GONE); - if(behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi)){ + if(blur_sensitive && (behaviorWithAttachments == Helper.ATTACHMENT_ALWAYS || (behaviorWithAttachments == Helper.ATTACHMENT_WIFI && isOnWifi))){ loadAttachments(status, holder, true); } } else { @@ -3081,15 +3081,18 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct } } }); - imageView.setOnLongClickListener(new View.OnLongClickListener() { - @Override - public boolean onLongClick(View v) { - String myDir = sharedpreferences.getString(Helper.SET_FOLDER_RECORD, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath()); - String fileName = URLUtil.guessFileName(attachment.getUrl(), null, null); - Helper.download(context,myDir+"/"+fileName, attachment.getUrl()); - return true; - } - }); + boolean long_press_media = sharedpreferences.getBoolean(Helper.SET_LONG_PRESS_MEDIA, true); + if( long_press_media) { + imageView.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + String myDir = sharedpreferences.getString(Helper.SET_FOLDER_RECORD, Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath()); + String fileName = URLUtil.guessFileName(attachment.getUrl(), null, null); + Helper.download(context, myDir + "/" + fileName, attachment.getUrl()); + return true; + } + }); + } i++; position++; } diff --git a/app/src/main/java/app/fedilab/android/fragments/SettingsFragment.java b/app/src/main/java/app/fedilab/android/fragments/SettingsFragment.java index 1d90f062f..f6d60d0a7 100644 --- a/app/src/main/java/app/fedilab/android/fragments/SettingsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/SettingsFragment.java @@ -502,6 +502,35 @@ public class SettingsFragment extends Fragment { } }); + + boolean blur_sensitive = sharedpreferences.getBoolean(Helper.SET_BLUR_SENSITIVE, true); + final CheckBox set_blur_sensitive = rootView.findViewById(R.id.set_blur_sensitive); + set_blur_sensitive.setChecked(blur_sensitive); + + set_blur_sensitive.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putBoolean(Helper.SET_BLUR_SENSITIVE, set_blur_sensitive.isChecked()); + editor.apply(); + } + }); + + boolean long_press_media = sharedpreferences.getBoolean(Helper.SET_LONG_PRESS_MEDIA, true); + final CheckBox set_long_press_media = rootView.findViewById(R.id.set_long_press_media); + set_long_press_media.setChecked(long_press_media); + + set_long_press_media.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putBoolean(Helper.SET_LONG_PRESS_MEDIA, set_long_press_media.isChecked()); + editor.apply(); + } + }); + + + int truncate_toots_size = sharedpreferences.getInt(Helper.SET_TRUNCATE_TOOTS_SIZE, 0); SeekBar set_truncate_size = rootView.findViewById(R.id.set_truncate_size); set_truncate_size.setMax(20); diff --git a/app/src/main/java/app/fedilab/android/helper/Helper.java b/app/src/main/java/app/fedilab/android/helper/Helper.java index 57a0529fc..6e1aa9af5 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -324,6 +324,8 @@ public class Helper { public static final String SET_FEATURED_TAG_ACTION ="set_featured_tag_action"; public static final String SET_HIDE_DELETE_BUTTON_ON_TAB = "set_hide_delete_notification_on_tab"; public static final String SET_RETRIEVE_METADATA_IF_URL_FROM_EXTERAL = "set_retrieve_metadata_share_from_extras"; + public static final String SET_BLUR_SENSITIVE = "set_blur_sensitive"; + public static final String SET_LONG_PRESS_MEDIA = "set_long_press_media"; public static final int S_NO = 0; static final int S_512KO = 1; public static final int S_1MO = 2; diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml index 9a714f554..5079c7869 100644 --- a/app/src/main/res/layout-sw600dp/fragment_settings.xml +++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml @@ -114,6 +114,23 @@ android:text="@string/set_hide_delete_notification_on_tab" android:layout_height="wrap_content" /> + + + + + + + + + GNU instance Cached status Forward tags in replies + Long press to store media + Blur sensitive media %d vote