Commit 447ad45f authored by Thomas's avatar Thomas
Browse files

Release 3.14.3

parent d3f721f7

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ android { 
    defaultConfig {

        minSdk 21

        targetSdk 33

        versionCode 464

        versionName "3.14.2"

        versionCode 465

        versionName "3.14.3"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"

app/src/main/assets/release_notes/notes.json

+5 −0
Original line number Diff line number Diff line 
[

  {

    "version": "3.14.3",

    "code": "465",

    "note": "Added:\n- Display date of the message instead of the boost (default: disabled)\n- Allow to disable release notes popup in Settings\n\nFixed:\n- Fix timelines slow down and stuttering after some scrolls\n- Fix color issues with follow buttons\n- Fix import from settings (import from login was OK)"

  },

  {

    "version": "3.14.2",

    "code": "464",

app/src/main/java/app/fedilab/android/helper/Helper.java

+4 −0
Original line number Diff line number Diff line
@@ -1781,6 +1781,10 @@ public class Helper { 
        SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(activity);

        int lastReleaseNoteRead = sharedpreferences.getInt(activity.getString(R.string.SET_POPUP_RELEASE_NOTES), 0);

        int versionCode = BuildConfig.VERSION_CODE;

        boolean disabled = sharedpreferences.getBoolean(activity.getString(R.string.SET_DISABLE_RELEASE_NOTES_ALERT), false);

        if (disabled && !forced) {

            return;

        }

        if (lastReleaseNoteRead != versionCode || forced) {

            try {

                InputStream is = activity.getAssets().open("release_notes/notes.json");

app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java

+16 −3
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
        boolean displayQuote = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_QUOTES) + MainActivity.currentUserID + MainActivity.currentInstance, true);

        boolean displayReactions = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_REACTIONS) + MainActivity.currentUserID + MainActivity.currentInstance, true);

        boolean compactButtons = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_COMPACT_ACTION_BUTTON), false);

        boolean originalDateForBoost = sharedpreferences.getBoolean(context.getString(R.string.SET_BOOST_ORIGINAL_DATE), true);



        if (compactButtons) {

            ConstraintSet set = new ConstraintSet();
@@ -1081,7 +1082,11 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
            } else {

                holder.binding.editTime.setVisibility(View.GONE);

            }

            if (originalDateForBoost || status.reblog == null) {

                holder.binding.time.setText(Helper.longDateToString(statusToDeal.created_at));

            } else {

                holder.binding.time.setText(Helper.longDateToString(status.created_at));

            }

            holder.binding.time.setVisibility(View.VISIBLE);

            holder.binding.dateShort.setVisibility(View.GONE);

            holder.binding.visibility.setImageResource(ressource);
@@ -1108,7 +1113,11 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                holder.binding.visibilitySmall.setVisibility(View.GONE);

                holder.binding.reblogsCount.setText(String.valueOf(statusToDeal.reblogs_count));

                holder.binding.favoritesCount.setText(String.valueOf(statusToDeal.favourites_count));

                if (originalDateForBoost || status.reblog == null) {

                    holder.binding.time.setText(Helper.dateDiff(context, statusToDeal.created_at));

                } else {

                    holder.binding.time.setText(Helper.dateDiff(context, status.created_at));

                }

                if (statusToDeal.edited_at != null) {

                    Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_baseline_mode_edit_message_24);

                    img.setBounds(0, 0, (int) (Helper.convertDpToPixel(16, context) * scale + 0.5f), (int) (Helper.convertDpToPixel(16, context) * scale + 0.5f));
@@ -1130,7 +1139,11 @@ public class StatusAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> 
                } else {

                    holder.binding.dateShort.setCompoundDrawables(null, null, null, null);

                }

                if (originalDateForBoost || status.reblog == null) {

                    holder.binding.dateShort.setText(Helper.dateDiff(context, statusToDeal.created_at));

                } else {

                    holder.binding.dateShort.setText(Helper.dateDiff(context, status.created_at));

                }

                holder.binding.time.setVisibility(View.GONE);

                Helper.absoluteDateTimeReveal(context, holder.binding.dateShort, statusToDeal.created_at, statusToDeal.edited_at);

            }

app/src/main/java/app/fedilab/android/ui/fragment/settings/FragmentSettingsCategories.java

+3 −10
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.os.Build;

import android.os.Bundle;

import android.webkit.URLUtil;

import android.widget.Toast;



import androidx.activity.result.ActivityResultLauncher;
@@ -164,9 +163,10 @@ public class FragmentSettingsCategories extends PreferenceFragmentCompat { 
            pref_import_settings.setOnPreferenceClickListener(preference -> {

                Intent openFileIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT);

                openFileIntent.addCategory(Intent.CATEGORY_OPENABLE);

                openFileIntent.setType("text/plain");

                String[] mimeTypes = new String[]{"text/plain"};

                openFileIntent.setType("application/zip");

                String[] mimeTypes = new String[]{"application/zip"};

                openFileIntent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);

                //noinspection deprecation

                startActivityForResult(

                        Intent.createChooser(

                                openFileIntent,
@@ -184,13 +184,6 @@ public class FragmentSettingsCategories extends PreferenceFragmentCompat { 
                Toasty.error(requireActivity(), getString(R.string.toot_select_file_error), Toast.LENGTH_LONG).show();

                return;

            }

            String uriFullPath = data.getData().getPath();

            String[] uriFullPathStr = uriFullPath.split(":");

            String fullPath = uriFullPath;

            if (uriFullPathStr.length > 1) {

                fullPath = uriFullPathStr[1];

            }

            final String fileName = URLUtil.guessFileName(fullPath, null, null);

            Helper.createFileFromUri(requireActivity(), data.getData(), file -> ZipHelper.importData(requireActivity(), file));

        }

    }