Merge pull request #814 from zerrium/master

Added filter post function

app/build.gradle

@@ -116,5 +116,6 @@ dependencies {
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6'
 
+
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
 }

app/src/main/java/awais/instagrabber/adapters/KeywordsFilterAdapter.java

@@ -0,0 +1,42 @@
+package awais.instagrabber.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+
+import awais.instagrabber.R;
+import awais.instagrabber.adapters.viewholder.dialogs.KeywordsFilterDialogViewHolder;
+
+public class KeywordsFilterAdapter extends RecyclerView.Adapter<KeywordsFilterDialogViewHolder> {
+
+    private final Context context;
+    private final ArrayList<String> items;
+
+    public KeywordsFilterAdapter(Context context, ArrayList<String> items){
+        this.context = context;
+        this.items = items;
+    }
+
+    @NonNull
+    @Override
+    public KeywordsFilterDialogViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        final View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_keyword, parent, false);
+        return new KeywordsFilterDialogViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull KeywordsFilterDialogViewHolder holder, int position) {
+        holder.bind(items, position, context, this);
+    }
+
+    @Override
+    public int getItemCount() {
+        return items.size();
+    }
+}

app/src/main/java/awais/instagrabber/adapters/viewholder/dialogs/KeywordsFilterDialogViewHolder.java

@@ -0,0 +1,51 @@
+package awais.instagrabber.adapters.viewholder.dialogs;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import awais.instagrabber.R;
+import awais.instagrabber.adapters.KeywordsFilterAdapter;
+import awais.instagrabber.utils.Constants;
+import awais.instagrabber.utils.SettingsHelper;
+
+public class KeywordsFilterDialogViewHolder extends RecyclerView.ViewHolder {
+
+    private final Button deleteButton;
+    private final TextView item;
+
+    public KeywordsFilterDialogViewHolder(@NonNull View itemView) {
+        super(itemView);
+        deleteButton = itemView.findViewById(R.id.keyword_delete);
+        item = itemView.findViewById(R.id.keyword_text);
+    }
+
+    public void bind(ArrayList<String> items, int position, Context context, KeywordsFilterAdapter adapter){
+        item.setText(items.get(position));
+        deleteButton.setOnClickListener(view -> {
+            final String s = items.get(position);
+            SettingsHelper settingsHelper = new SettingsHelper(context);
+            items.remove(position);
+            settingsHelper.putStringSet(Constants.KEYWORD_FILTERS, new HashSet<>(items));
+            adapter.notifyDataSetChanged();
+            final String message = context.getString(R.string.removed_keywords, s);
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+        });
+    }
+
+    public Button getDeleteButton(){
+        return deleteButton;
+    }
+
+    public TextView getTextView(){
+        return item;
+    }
+}

app/src/main/java/awais/instagrabber/asyncs/FeedPostFetchService.java

@@ -40,7 +40,10 @@ public class FeedPostFetchService implements PostFetcher.PostFetchService {
                 } else if (result == null) return;
                 nextCursor = result.getNextCursor();
                 hasNextPage = result.hasNextPage();
-                feedModels.addAll(result.getFeedModels());
+
+                final List<Media> mediaResults = result.getFeedModels();
+                feedModels.addAll(mediaResults);
+
                 if (fetchListener != null) {
                     // if (feedModels.size() < 15 && hasNextPage) {
                     //     feedService.fetch(csrfToken, nextCursor, this);

app/src/main/java/awais/instagrabber/customviews/PostsRecyclerView.java

@@ -32,11 +32,15 @@ import awais.instagrabber.customviews.helpers.RecyclerLazyLoaderAtEdge;
 import awais.instagrabber.interfaces.FetchListener;
 import awais.instagrabber.models.PostsLayoutPreferences;
 import awais.instagrabber.repositories.responses.Media;
+import awais.instagrabber.utils.Constants;
+import awais.instagrabber.utils.KeywordsFilterUtils;
 import awais.instagrabber.utils.ResponseBodyUtils;
 import awais.instagrabber.utils.Utils;
 import awais.instagrabber.viewmodels.MediaViewModel;
 import awais.instagrabber.workers.DownloadWorker;
 
+import static awais.instagrabber.utils.Utils.settingsHelper;
+
 public class PostsRecyclerView extends RecyclerView {
     private static final String TAG = "PostsRecyclerView";
 
@@ -70,7 +74,13 @@ public class PostsRecyclerView extends RecyclerView {
             }
             final List<Media> models = mediaViewModel.getList().getValue();
             final List<Media> modelsCopy = models == null ? new ArrayList<>() : new ArrayList<>(models);
-            modelsCopy.addAll(result);
+            if (settingsHelper.getBoolean(Constants.TOGGLE_KEYWORD_FILTER)){
+                final ArrayList<String> items = new ArrayList<>(settingsHelper.getStringSet(Constants.KEYWORD_FILTERS));
+                modelsCopy.addAll(new KeywordsFilterUtils(items).filter(result));
+            }
+            else {
+                modelsCopy.addAll(result);
+            }
             mediaViewModel.getList().postValue(modelsCopy);
             dispatchFetchStatus();
         }

app/src/main/java/awais/instagrabber/dialogs/KeywordsFilterDialog.java

@@ -0,0 +1,78 @@
+package awais.instagrabber.dialogs;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.Window;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import awais.instagrabber.R;
+import awais.instagrabber.adapters.KeywordsFilterAdapter;
+import awais.instagrabber.databinding.DialogKeywordsFilterBinding;
+import awais.instagrabber.utils.Constants;
+import awais.instagrabber.utils.SettingsHelper;
+import awais.instagrabber.utils.Utils;
+
+public final class KeywordsFilterDialog extends DialogFragment {
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        final Dialog dialog = getDialog();
+        if (dialog == null) return;
+        final Window window = dialog.getWindow();
+        if (window == null) return;
+        final int height = ViewGroup.LayoutParams.WRAP_CONTENT;
+        final int width = (int) (Utils.displayMetrics.widthPixels * 0.8);
+        window.setLayout(width, height);
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        final DialogKeywordsFilterBinding dialogKeywordsFilterBinding = DialogKeywordsFilterBinding.inflate(inflater, container, false);
+        init(dialogKeywordsFilterBinding, getContext());
+        dialogKeywordsFilterBinding.btnOK.setOnClickListener(view -> this.dismiss());
+        return dialogKeywordsFilterBinding.getRoot();
+    }
+
+    private void init(DialogKeywordsFilterBinding dialogKeywordsFilterBinding, Context context){
+        final LinearLayoutManager linearLayoutManager = new LinearLayoutManager(context);
+        final RecyclerView recyclerView = dialogKeywordsFilterBinding.recyclerKeyword;
+        recyclerView.setLayoutManager(linearLayoutManager);
+
+        final SettingsHelper settingsHelper = new SettingsHelper(context);
+        final ArrayList<String> items = new ArrayList<>(settingsHelper.getStringSet(Constants.KEYWORD_FILTERS));
+        final KeywordsFilterAdapter adapter = new KeywordsFilterAdapter(context, items);
+        recyclerView.setAdapter(adapter);
+
+        final EditText editText = dialogKeywordsFilterBinding.editText;
+
+        dialogKeywordsFilterBinding.btnAdd.setOnClickListener(view ->{
+            final String s = editText.getText().toString();
+            if(s.isEmpty()) return;
+            if(items.contains(s)) {
+                editText.setText("");
+                return;
+            }
+            items.add(s.toLowerCase());
+            settingsHelper.putStringSet(Constants.KEYWORD_FILTERS, new HashSet<>(items));
+            adapter.notifyItemInserted(items.size());
+            final String message = context.getString(R.string.added_keywords, s);
+            Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+            editText.setText("");
+        });
+    }
+}

app/src/main/java/awais/instagrabber/fragments/settings/PostPreferencesFragment.java

@@ -8,10 +8,9 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreferenceCompat;
 
 import awais.instagrabber.R;
+import awais.instagrabber.dialogs.KeywordsFilterDialog;
 import awais.instagrabber.utils.Constants;
 
-import static awais.instagrabber.utils.Utils.settingsHelper;
-
 public class PostPreferencesFragment extends BasePreferencesFragment {
     @Override
     void setupPreferenceScreen(final PreferenceScreen screen) {
@@ -20,6 +19,8 @@ public class PostPreferencesFragment extends BasePreferencesFragment {
         // generalCategory.addPreference(getAutoPlayVideosPreference(context));
         screen.addPreference(getAlwaysMuteVideosPreference(context));
         screen.addPreference(getShowCaptionPreference(context));
+        screen.addPreference(getToggleKeywordFilterPreference(context));
+        screen.addPreference(getEditKeywordFilterPreference(context));
     }
 
     private Preference getAutoPlayVideosPreference(@NonNull final Context context) {
@@ -46,4 +47,24 @@ public class PostPreferencesFragment extends BasePreferencesFragment {
         preference.setIconSpaceReserved(false);
         return preference;
     }
+
+    private Preference getToggleKeywordFilterPreference(@NonNull final Context context) {
+        final SwitchPreferenceCompat preference = new SwitchPreferenceCompat(context);
+        preference.setKey(Constants.TOGGLE_KEYWORD_FILTER);
+        preference.setDefaultValue(false);
+        preference.setTitle(R.string.toggle_keyword_filter);
+        preference.setIconSpaceReserved(false);
+        return preference;
+    }
+
+    private Preference getEditKeywordFilterPreference(@NonNull final Context context){
+        final Preference preference = new Preference(context);
+        preference.setTitle(R.string.edit_keyword_filter);
+        preference.setIconSpaceReserved(false);
+        preference.setOnPreferenceClickListener(view ->{
+            new KeywordsFilterDialog().show(getParentFragmentManager(), null);
+            return true;
+        });
+        return preference;
+    }
 }

app/src/main/java/awais/instagrabber/utils/Constants.java

@@ -9,12 +9,15 @@ public final class Constants {
     public static final String APP_THEME = "app_theme_v19";
     public static final String APP_LANGUAGE = "app_language_v19";
     public static final String STORY_SORT = "story_sort";
+    // set string prefs
+    public static final String KEYWORD_FILTERS = "keyword_filters";
     // int prefs, do not export
     public static final String PREV_INSTALL_VERSION = "prevVersion";
     public static final String BROWSER_UA_CODE = "browser_ua_code";
     public static final String APP_UA_CODE = "app_ua_code";
     // boolean prefs
     public static final String DOWNLOAD_USER_FOLDER = "download_user_folder";
+    public static final String TOGGLE_KEYWORD_FILTER = "toggle_keyword_filter";
     // deprecated: public static final String BOTTOM_TOOLBAR = "bottom_toolbar";
     public static final String FOLDER_SAVE_TO = "saved_to";
     public static final String AUTOPLAY_VIDEOS = "autoplay_videos";

app/src/main/java/awais/instagrabber/utils/KeywordsFilterUtils.java

@@ -0,0 +1,49 @@
+package awais.instagrabber.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import awais.instagrabber.repositories.responses.Caption;
+import awais.instagrabber.repositories.responses.Media;
+
+public final class KeywordsFilterUtils {
+
+    private final ArrayList<String> keywords;
+
+    public KeywordsFilterUtils(final ArrayList<String> keywords){
+        this.keywords = keywords;
+    }
+
+    public boolean filter(final String caption){
+        if(caption == null) return false;
+        if(keywords.isEmpty()) return false;
+        final String temp = caption.toLowerCase();
+        for(final String s:keywords){
+            if(temp.contains(s)) return true;
+        }
+        return false;
+    }
+
+    public boolean filter(final Media media){
+        if(media == null) return false;
+        final Caption c = media.getCaption();
+        if(c == null) return false;
+        if(keywords.isEmpty()) return false;
+        final String temp = c.getText().toLowerCase();
+        for(final String s:keywords){
+            if(temp.contains(s)) return true;
+        }
+        return false;
+    }
+
+    public List<Media> filter(final List<Media> media){
+        if(keywords.isEmpty()) return media;
+        if(media == null) return new ArrayList<>();
+
+        final List<Media> result= new ArrayList<>();
+        for(final Media m:media){
+            if(!filter(m)) result.add(m);
+        }
+        return result;
+    }
+}

app/src/main/java/awais/instagrabber/utils/SettingsHelper.java

@@ -8,6 +8,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StringDef;
 import androidx.appcompat.app.AppCompatDelegate;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import static awais.instagrabber.fragments.settings.PreferenceKeys.PREF_ENABLE_DM_AUTO_REFRESH;
 import static awais.instagrabber.fragments.settings.PreferenceKeys.PREF_ENABLE_DM_AUTO_REFRESH_FREQ_NUMBER;
 import static awais.instagrabber.fragments.settings.PreferenceKeys.PREF_ENABLE_DM_AUTO_REFRESH_FREQ_UNIT;
@@ -38,6 +41,7 @@ import static awais.instagrabber.utils.Constants.MUTED_VIDEOS;
 import static awais.instagrabber.utils.Constants.PREF_DARK_THEME;
 import static awais.instagrabber.utils.Constants.PREF_EMOJI_VARIANTS;
 import static awais.instagrabber.utils.Constants.PREF_HASHTAG_POSTS_LAYOUT;
+import static awais.instagrabber.utils.Constants.KEYWORD_FILTERS;
 import static awais.instagrabber.utils.Constants.PREF_LIGHT_THEME;
 import static awais.instagrabber.utils.Constants.PREF_LIKED_POSTS_LAYOUT;
 import static awais.instagrabber.utils.Constants.PREF_LOCATION_POSTS_LAYOUT;
@@ -53,6 +57,7 @@ import static awais.instagrabber.utils.Constants.SHOW_QUICK_ACCESS_DIALOG;
 import static awais.instagrabber.utils.Constants.SKIPPED_VERSION;
 import static awais.instagrabber.utils.Constants.STORY_SORT;
 import static awais.instagrabber.utils.Constants.SWAP_DATE_TIME_FORMAT_ENABLED;
+import static awais.instagrabber.utils.Constants.TOGGLE_KEYWORD_FILTER;
 
 public final class SettingsHelper {
     private final SharedPreferences sharedPreferences;
@@ -68,6 +73,12 @@ public final class SettingsHelper {
         return stringDefault;
     }
 
+    public Set<String> getStringSet(@StringSetSettings final String key) {
+        final Set<String> stringSetDefault = new HashSet<>();
+        if (sharedPreferences != null) return sharedPreferences.getStringSet(key, stringSetDefault);
+        return stringSetDefault;
+    }
+
     public int getInteger(@IntegerSettings final String key) {
         final int integerDefault = getIntegerDefault(key);
         if (sharedPreferences != null) return sharedPreferences.getInt(key, integerDefault);
@@ -122,6 +133,10 @@ public final class SettingsHelper {
         if (sharedPreferences != null) sharedPreferences.edit().putString(key, val).apply();
     }
 
+    public void putStringSet(@StringSetSettings final String key, final Set<String> val) {
+        if (sharedPreferences != null) sharedPreferences.edit().putStringSet(key, val).apply();
+    }
+
     public void putInteger(@IntegerSettings final String key, final int val) {
         if (sharedPreferences != null) sharedPreferences.edit().putInt(key, val).apply();
     }
@@ -141,9 +156,12 @@ public final class SettingsHelper {
     @StringDef({DOWNLOAD_USER_FOLDER, FOLDER_SAVE_TO, AUTOPLAY_VIDEOS, SHOW_QUICK_ACCESS_DIALOG, MUTED_VIDEOS,
                        SHOW_CAPTIONS, CUSTOM_DATE_TIME_FORMAT_ENABLED, MARK_AS_SEEN, DM_MARK_AS_SEEN, CHECK_ACTIVITY,
                        CHECK_UPDATES, SWAP_DATE_TIME_FORMAT_ENABLED, PREF_ENABLE_DM_NOTIFICATIONS, PREF_ENABLE_DM_AUTO_REFRESH,
-                       FLAG_SECURE})
+                       FLAG_SECURE, TOGGLE_KEYWORD_FILTER})
     public @interface BooleanSettings {}
 
     @StringDef({PREV_INSTALL_VERSION, BROWSER_UA_CODE, APP_UA_CODE, PREF_ENABLE_DM_AUTO_REFRESH_FREQ_NUMBER})
     public @interface IntegerSettings {}
+
+    @StringDef({KEYWORD_FILTERS})
+    public @interface StringSetSettings {}
 }

app/src/main/res/layout/dialog_keywords_filter.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:animateLayoutChanges="true"
+        android:paddingTop="16dp">
+
+        <androidx.appcompat.widget.AppCompatEditText
+            android:id="@+id/edit_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:hint="@string/hint_keyword"
+            android:singleLine="true"
+            app:layout_constraintEnd_toStartOf="@id/btnAdd"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <Button
+            android:id="@+id/btnAdd"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:background="@drawable/ic_add"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/edit_text"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="@id/edit_text" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerKeyword"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/btnAdd"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:layout_editor_absoluteX="16dp"
+            tools:listitem="@layout/item_keyword" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnOK"
+            style="@style/Widget.AppCompat.Button.ButtonBar.AlertDialog"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:text="@string/ok"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/recyclerKeyword" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>

app/src/main/res/layout/item_keyword.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingBottom="8dp"
+    android:paddingTop="8dp">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/keyword_text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
+
+    <Button
+        android:id="@+id/keyword_delete"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:background="@drawable/ic_delete"
+        android:scaleType="center" />
+
+</LinearLayout>

app/src/main/res/values/strings.xml

@@ -466,6 +466,11 @@
     <string name="generic_null_response">Response is null!</string>
     <string name="generic_not_ok_response">Response status is not ok!</string>
     <string name="generic_failed_request">Request failed!</string>
+    <string name="hint_keyword">Keyword</string>
+    <string name="toggle_keyword_filter">Enable keyword filter</string>
+    <string name="edit_keyword_filter">Edit keyword filters</string>
+    <string name="added_keywords">Added keyword: %s to filter list</string>
+    <string name="removed_keywords">Removed keyword: %s from filter list</string>
     <string name="marked_as_seen">Marked as seen</string>
     <string name="delete_unsuccessful">Delete unsuccessful</string>
 </resources>