Commit af10d647 authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop'

parents 8c98b9e4 31025af9

app/build.gradle

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

        minSdk 21

        targetSdk 33

        versionCode 462

        versionName "3.14.0"

        versionCode 463

        versionName "3.14.1"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"
@@ -97,6 +97,10 @@ dependencies { 
    implementation 'org.framagit.tom79:SparkButton:1.0.13'

    implementation "com.github.bumptech.glide:glide:4.14.2"

    implementation "com.github.bumptech.glide:okhttp3-integration:4.14.2"

    implementation("com.github.bumptech.glide:recyclerview-integration:4.14.2") {

        // Excludes the support library because it's already included by Glide.

        transitive = false

    }



    implementation "org.jsoup:jsoup:1.15.1"

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

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

  {

    "version": "3.14.1",

    "code": "463",

    "note": "Added:\n- Search bar: display suggestions when starting by \"@\" or \"#\"\n\nChanged:\n- Preload media in timelines to avoid jumps\n- Search: Automatically switch to account tab if no results for tags\n\nFixed:\n- Fix jumps with the fetch more feature\n- Fix videos cannot be saved\n- Tags cannot be pinned when there are no custom tabs\n- PixelFed view: NSFW not honored\n- Fix crashes"

  },

  {

    "version": "3.14.0",

    "code": "462",

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+80 −0
Original line number Diff line number Diff line
@@ -23,11 +23,13 @@ import static app.fedilab.android.ui.drawer.StatusAdapter.sendAction; 


import android.Manifest;

import android.annotation.SuppressLint;

import android.app.SearchManager;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.SharedPreferences;

import android.database.MatrixCursor;

import android.graphics.PorterDuff;

import android.graphics.drawable.Drawable;

import android.net.Uri;
@@ -35,6 +37,7 @@ import android.os.Build; 
import android.os.Bundle;

import android.os.Handler;

import android.os.Looper;

import android.provider.BaseColumns;

import android.text.Editable;

import android.text.Html;

import android.text.TextWatcher;
@@ -63,6 +66,7 @@ import androidx.appcompat.widget.SearchView; 
import androidx.core.app.ActivityCompat;

import androidx.core.app.ActivityOptionsCompat;

import androidx.core.view.GravityCompat;

import androidx.cursoradapter.widget.CursorAdapter;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentTransaction;

import androidx.lifecycle.ViewModelProvider;
@@ -75,7 +79,9 @@ import androidx.preference.PreferenceManager; 


import com.bumptech.glide.Glide;

import com.bumptech.glide.load.resource.gif.GifDrawable;

import com.bumptech.glide.request.FutureTarget;

import com.bumptech.glide.request.target.CustomTarget;

import com.bumptech.glide.request.target.Target;

import com.bumptech.glide.request.transition.Transition;

import com.google.android.material.snackbar.Snackbar;

import com.google.android.material.tabs.TabLayout;
@@ -91,6 +97,7 @@ import java.util.ArrayList; 
import java.util.HashMap;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.ExecutionException;

import java.util.concurrent.TimeUnit;

import java.util.regex.Matcher;

import java.util.regex.Pattern;
@@ -129,6 +136,7 @@ import app.fedilab.android.client.entities.api.Filter; 
import app.fedilab.android.client.entities.api.Instance;

import app.fedilab.android.client.entities.api.MastodonList;

import app.fedilab.android.client.entities.api.Status;

import app.fedilab.android.client.entities.api.Tag;

import app.fedilab.android.client.entities.app.Account;

import app.fedilab.android.client.entities.app.BaseAccount;

import app.fedilab.android.client.entities.app.BottomMenu;
@@ -146,12 +154,15 @@ import app.fedilab.android.helper.Helper; 
import app.fedilab.android.helper.MastodonHelper;

import app.fedilab.android.helper.PinnedTimelineHelper;

import app.fedilab.android.helper.PushHelper;

import app.fedilab.android.ui.drawer.AccountsSearchTopBarAdapter;

import app.fedilab.android.ui.drawer.TagSearchTopBarAdapter;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonConversation;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;

import app.fedilab.android.ui.fragment.timeline.FragmentNotificationContainer;

import app.fedilab.android.viewmodel.mastodon.AccountsVM;

import app.fedilab.android.viewmodel.mastodon.FiltersVM;

import app.fedilab.android.viewmodel.mastodon.InstancesVM;

import app.fedilab.android.viewmodel.mastodon.SearchVM;

import app.fedilab.android.viewmodel.mastodon.TimelinesVM;

import app.fedilab.android.viewmodel.mastodon.TopBarVM;

import es.dmoral.toasty.Toasty;
@@ -777,6 +788,75 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt 


            @Override

            public boolean onQueryTextChange(String newText) {

                String pattern = "^(@[\\w_-]+@[a-z0-9.\\-]+|@[\\w_-]+)";

                final Pattern mentionPattern = Pattern.compile(pattern);

                String patternTag = "^#([\\w-]{2,})$";

                final Pattern tagPattern = Pattern.compile(patternTag);

                Matcher matcherMention, matcherTag;

                matcherMention = mentionPattern.matcher(newText);

                matcherTag = tagPattern.matcher(newText);

                if (newText.trim().isEmpty()) {

                    binding.toolbarSearch.setSuggestionsAdapter(null);

                }

                if (matcherMention.matches()) {

                    String[] from = new String[]{SearchManager.SUGGEST_COLUMN_ICON_1, SearchManager.SUGGEST_COLUMN_TEXT_1};

                    int[] to = new int[]{R.id.account_pp, R.id.account_un};

                    String searchGroup = matcherMention.group();

                    AccountsVM accountsVM = new ViewModelProvider(BaseMainActivity.this).get(AccountsVM.class);

                    MatrixCursor cursor = new MatrixCursor(new String[]{BaseColumns._ID,

                            SearchManager.SUGGEST_COLUMN_ICON_1,

                            SearchManager.SUGGEST_COLUMN_TEXT_1});

                    accountsVM.searchAccounts(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, searchGroup, 5, false, false)

                            .observe(BaseMainActivity.this, accounts -> {

                                if (accounts == null) {

                                    return;

                                }

                                AccountsSearchTopBarAdapter cursorAdapter = new AccountsSearchTopBarAdapter(BaseMainActivity.this, accounts, R.layout.drawer_account_search, null, from, to, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);

                                binding.toolbarSearch.setSuggestionsAdapter(cursorAdapter);

                                new Thread(() -> {

                                    int i = 0;

                                    for (app.fedilab.android.client.entities.api.Account account : accounts) {

                                        FutureTarget<File> futureTarget = Glide

                                                .with(BaseMainActivity.this.getApplicationContext())

                                                .load(account.avatar_static)

                                                .downloadOnly(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL);

                                        File cacheFile;

                                        try {

                                            cacheFile = futureTarget.get();

                                            cursor.addRow(new String[]{String.valueOf(i), cacheFile.getAbsolutePath(), "@" + account.acct});

                                            i++;

                                        } catch (ExecutionException | InterruptedException e) {

                                            e.printStackTrace();

                                        }

                                    }

                                    runOnUiThread(() -> cursorAdapter.changeCursor(cursor));

                                }).start();



                            });

                } else if (matcherTag.matches()) {

                    SearchVM searchVM = new ViewModelProvider(BaseMainActivity.this).get(SearchVM.class);

                    String[] from = new String[]{SearchManager.SUGGEST_COLUMN_TEXT_1};

                    int[] to = new int[]{R.id.tag_name};

                    String searchGroup = matcherTag.group();

                    MatrixCursor cursor = new MatrixCursor(new String[]{BaseColumns._ID,

                            SearchManager.SUGGEST_COLUMN_TEXT_1});

                    searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, searchGroup, null,

                            "hashtags", false, true, false, 0,

                            null, null, 10).observe(BaseMainActivity.this,

                            results -> {

                                if (results == null || results.hashtags == null) {

                                    return;

                                }

                                TagSearchTopBarAdapter cursorAdapter = new TagSearchTopBarAdapter(BaseMainActivity.this, results.hashtags, R.layout.drawer_tag_search, null, from, to, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);

                                binding.toolbarSearch.setSuggestionsAdapter(cursorAdapter);

                                int i = 0;

                                for (Tag tag : results.hashtags) {

                                    cursor.addRow(new String[]{String.valueOf(i), "#" + tag.name});

                                    i++;

                                }

                                runOnUiThread(() -> cursorAdapter.changeCursor(cursor));

                            });

                }

                return false;

            }

        });

app/src/main/java/app/fedilab/android/activities/HashTagActivity.java

+13 −12
Original line number Diff line number Diff line
@@ -105,8 +105,10 @@ public class HashTagActivity extends BaseActivity { 
        });

        ReorderVM reorderVM = new ViewModelProvider(HashTagActivity.this).get(ReorderVM.class);

        reorderVM.getAllPinned().observe(HashTagActivity.this, pinned -> {

            if (pinned != null) {

                this.pinned = pinned;

            if (pinned == null) {

                pinned = new Pinned();

                pinned.pinnedTimelines = new ArrayList<>();

            }

            pinnedTag = false;

            if (pinned.pinnedTimelines != null) {

                for (PinnedTimeline pinnedTimeline : pinned.pinnedTimelines) {
@@ -120,7 +122,6 @@ public class HashTagActivity extends BaseActivity { 
                }

                invalidateOptionsMenu();

            }

            }

        });

        if (MainActivity.filterFetched && MainActivity.mainFilters != null) {

            mutedTag = false;

app/src/main/java/app/fedilab/android/activities/SearchResultTabActivity.java

+91 −0
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ package app.fedilab.android.activities; 


import android.app.SearchManager;

import android.content.Context;

import android.database.MatrixCursor;

import android.os.Bundle;

import android.provider.BaseColumns;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuItem;
@@ -26,22 +28,38 @@ import android.widget.Toast; 


import androidx.annotation.NonNull;

import androidx.appcompat.widget.SearchView;

import androidx.cursoradapter.widget.CursorAdapter;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentManager;

import androidx.fragment.app.FragmentStatePagerAdapter;

import androidx.lifecycle.ViewModelProvider;

import androidx.viewpager.widget.PagerAdapter;

import androidx.viewpager.widget.ViewPager;



import com.bumptech.glide.Glide;

import com.bumptech.glide.request.FutureTarget;

import com.bumptech.glide.request.target.Target;

import com.google.android.material.tabs.TabLayout;



import org.jetbrains.annotations.NotNull;



import java.io.File;

import java.util.concurrent.ExecutionException;

import java.util.regex.Matcher;

import java.util.regex.Pattern;



import app.fedilab.android.BaseMainActivity;

import app.fedilab.android.R;

import app.fedilab.android.client.entities.api.Tag;

import app.fedilab.android.databinding.ActivitySearchResultTabsBinding;

import app.fedilab.android.helper.Helper;

import app.fedilab.android.ui.drawer.AccountsSearchTopBarAdapter;

import app.fedilab.android.ui.drawer.TagSearchTopBarAdapter;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonAccount;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTag;

import app.fedilab.android.ui.fragment.timeline.FragmentMastodonTimeline;

import app.fedilab.android.viewmodel.mastodon.AccountsVM;

import app.fedilab.android.viewmodel.mastodon.SearchVM;

import es.dmoral.toasty.Toasty;
@@ -140,6 +158,75 @@ public class SearchResultTabActivity extends BaseBarActivity { 


            @Override

            public boolean onQueryTextChange(String newText) {

                String pattern = "^(@[\\w_-]+@[a-z0-9.\\-]+|@[\\w_-]+)";

                final Pattern mentionPattern = Pattern.compile(pattern);

                String patternTag = "^#([\\w-]{2,})$";

                final Pattern tagPattern = Pattern.compile(patternTag);

                Matcher matcherMention, matcherTag;

                matcherMention = mentionPattern.matcher(newText);

                matcherTag = tagPattern.matcher(newText);

                if (newText.trim().isEmpty()) {

                    searchView.setSuggestionsAdapter(null);

                }

                if (matcherMention.matches()) {

                    String[] from = new String[]{SearchManager.SUGGEST_COLUMN_ICON_1, SearchManager.SUGGEST_COLUMN_TEXT_1};

                    int[] to = new int[]{R.id.account_pp, R.id.account_un};

                    String searchGroup = matcherMention.group();

                    AccountsVM accountsVM = new ViewModelProvider(SearchResultTabActivity.this).get(AccountsVM.class);

                    MatrixCursor cursor = new MatrixCursor(new String[]{BaseColumns._ID,

                            SearchManager.SUGGEST_COLUMN_ICON_1,

                            SearchManager.SUGGEST_COLUMN_TEXT_1});

                    accountsVM.searchAccounts(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, searchGroup, 5, false, false)

                            .observe(SearchResultTabActivity.this, accounts -> {

                                if (accounts == null) {

                                    return;

                                }

                                AccountsSearchTopBarAdapter cursorAdapter = new AccountsSearchTopBarAdapter(SearchResultTabActivity.this, accounts, R.layout.drawer_account_search, null, from, to, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);

                                searchView.setSuggestionsAdapter(cursorAdapter);

                                new Thread(() -> {

                                    int i = 0;

                                    for (app.fedilab.android.client.entities.api.Account account : accounts) {

                                        FutureTarget<File> futureTarget = Glide

                                                .with(SearchResultTabActivity.this.getApplicationContext())

                                                .load(account.avatar_static)

                                                .downloadOnly(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL);

                                        File cacheFile;

                                        try {

                                            cacheFile = futureTarget.get();

                                            cursor.addRow(new String[]{String.valueOf(i), cacheFile.getAbsolutePath(), "@" + account.acct});

                                            i++;

                                        } catch (ExecutionException | InterruptedException e) {

                                            e.printStackTrace();

                                        }

                                    }

                                    runOnUiThread(() -> cursorAdapter.changeCursor(cursor));

                                }).start();



                            });

                } else if (matcherTag.matches()) {

                    SearchVM searchVM = new ViewModelProvider(SearchResultTabActivity.this).get(SearchVM.class);

                    String[] from = new String[]{SearchManager.SUGGEST_COLUMN_TEXT_1};

                    int[] to = new int[]{R.id.tag_name};

                    String searchGroup = matcherTag.group();

                    MatrixCursor cursor = new MatrixCursor(new String[]{BaseColumns._ID,

                            SearchManager.SUGGEST_COLUMN_TEXT_1});

                    searchVM.search(BaseMainActivity.currentInstance, BaseMainActivity.currentToken, searchGroup, null,

                            "hashtags", false, true, false, 0,

                            null, null, 10).observe(SearchResultTabActivity.this,

                            results -> {

                                if (results == null || results.hashtags == null) {

                                    return;

                                }

                                TagSearchTopBarAdapter cursorAdapter = new TagSearchTopBarAdapter(SearchResultTabActivity.this, results.hashtags, R.layout.drawer_tag_search, null, from, to, CursorAdapter.FLAG_REGISTER_CONTENT_OBSERVER);

                                searchView.setSuggestionsAdapter(cursorAdapter);

                                int i = 0;

                                for (Tag tag : results.hashtags) {

                                    cursor.addRow(new String[]{String.valueOf(i), "#" + tag.name});

                                    i++;

                                }

                                runOnUiThread(() -> cursorAdapter.changeCursor(cursor));

                            });

                }

                return false;

            }

        });
@@ -188,6 +275,10 @@ public class SearchResultTabActivity extends BaseBarActivity { 
    }





    public void moveToAccount() {

        binding.searchViewpager.setCurrentItem(1);

    }



    /**

     * Pager adapter for the 4 fragments

     */