From 61798a7ce13d46e9346c545799a27c4a9ff6214b Mon Sep 17 00:00:00 2001 From: Thomas Date: Sun, 1 Jan 2023 18:20:18 +0100 Subject: [PATCH] Release 3.13.4 --- app/src/main/assets/release_notes/notes.json | 5 +++++ .../fedilab/android/activities/ProfileActivity.java | 6 +++++- .../main/java/app/fedilab/android/helper/Helper.java | 12 +++++------- app/src/main/res/values/strings.xml | 4 ++++ app/src/main/res/xml/pref_interface.xml | 8 ++++++++ .../fastlane/metadata/android/en/changelogs/458.txt | 8 +++++--- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json index 24c9070a8..6d5afedbc 100644 --- a/app/src/main/assets/release_notes/notes.json +++ b/app/src/main/assets/release_notes/notes.json @@ -1,4 +1,9 @@ [ + { + "version": "3.13.4", + "code": "458", + "note": "Added:\n- Add Bubble timeline support in extra-features with filters\n- Allow to display public profiles by default to get all messages (Settings > Interface)\n\nChanged:\n- Full rework on links in messages (also mentions and tags)\n\nFixed:\n- Spoiler text when editing\n- Fix watermarks" + }, { "version": "3.13.3", "code": "457", diff --git a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java index 1edb53858..1ab57d6d8 100644 --- a/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ProfileActivity.java @@ -144,6 +144,7 @@ public class ProfileActivity extends BaseActivity { Bundle b = getIntent().getExtras(); binding.accountFollow.setEnabled(false); checkRemotely = false; + SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this); homeMuted = false; if (b != null) { account = (Account) b.getSerializable(Helper.ARG_ACCOUNT); @@ -151,6 +152,9 @@ public class ProfileActivity extends BaseActivity { mention_str = b.getString(Helper.ARG_MENTION, null); checkRemotely = b.getBoolean(Helper.ARG_CHECK_REMOTELY, false); } + if (!checkRemotely) { + checkRemotely = sharedpreferences.getBoolean(getString(R.string.SET_PROFILE_REMOTELY), false); + } ActivityCompat.postponeEnterTransition(ProfileActivity.this); //Remove title if (actionBar != null) { @@ -161,7 +165,7 @@ public class ProfileActivity extends BaseActivity { getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowHomeEnabled(true); } - SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(this); + float scale = sharedpreferences.getFloat(getString(R.string.SET_FONT_SCALE), 1.1f); binding.title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 18 * 1.1f / scale); accountsVM = new ViewModelProvider(ProfileActivity.this).get(AccountsVM.class); 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 f8c588199..310edb0d4 100644 --- a/app/src/main/java/app/fedilab/android/helper/Helper.java +++ b/app/src/main/java/app/fedilab/android/helper/Helper.java @@ -1173,19 +1173,17 @@ public class Helper { File files = new File(attachment.local_path); float textSize = 15; Paint paint = new Paint(); - float textWidht = paint.measureText(waterMark); - float width = Helper.convertDpToPixel(textWidht, context); + float width = paint.measureText(waterMark, 0, waterMark.length()); try { BitmapFactory.Options options = new BitmapFactory.Options(); Bitmap backgroundBitmap = BitmapFactory.decodeFile(files.getAbsolutePath(), options); - - int w = options.outWidth; - int h = options.outHeight; - float valx = (float) 1.0 - width / (float) w; + int w = backgroundBitmap.getWidth(); + int h = backgroundBitmap.getHeight(); + float valx = (float) 1.0 - ((Helper.convertDpToPixel(width, context) + 10)) / (float) w; if (valx < 0) valx = 0; - float valy = (h - Helper.convertDpToPixel(textSize, context) - 10) / (float) h; + float valy = (h - Helper.convertDpToPixel(textSize, context) - 0) / (float) h; WatermarkText watermarkText = new WatermarkText(waterMark) .setPositionX(valx) .setPositionY(valy) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dec946dd3..8f1e603a3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1445,6 +1445,8 @@ SET_NOTIF_VALIDATION_FAV SET_DISPLAY_COUNTER_FAV_BOOST SET_REMOVE_LEFT_MARGIN + + SET_PROFILE_REMOTELY SET_EXTAND_EXTRA_FEATURES SET_INNER_MARKER @@ -2182,4 +2184,6 @@ List Following Self + Remote profiles + The app will display publicly profiles to get all messages. Interactions will need an extra step to federate messages. \ No newline at end of file diff --git a/app/src/main/res/xml/pref_interface.xml b/app/src/main/res/xml/pref_interface.xml index 55b5f58ec..ef3387c38 100644 --- a/app/src/main/res/xml/pref_interface.xml +++ b/app/src/main/res/xml/pref_interface.xml @@ -28,6 +28,14 @@ app:summary="@string/set_remove_left_margin" app:title="@string/set_remove_left_margin_title" /> + + Interface) Changed: - +- Full rework on links in messages (also mentions and tags) Fixed: -- Spoiler text when editing \ No newline at end of file +- Spoiler text when editing +- Fix watermarks \ No newline at end of file