NClientV2 1.8.1

+ Show popular tags in advanced search
Dar9586 · Mar 4, 2019 · 440053b · 440053b
1 parent 428bc68
commit 440053b
Show file tree

Hide file tree

Showing 13 changed files with 101 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.dar.nclientv2"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 180
-        versionName "1.8.0"
+        versionCode 181
+        versionName "1.8.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 

diff --git a/app/src/main/java/com/dar/nclientv2/MainActivity.java b/app/src/main/java/com/dar/nclientv2/MainActivity.java
@@ -72,9 +72,7 @@ protected void onCreate(Bundle savedInstanceState) {
         Global.initInfiniteScroll(this);
         com.dar.nclientv2.settings.Login.initUseAccountTag(this);
         setContentView(R.layout.activity_main);
-        Intent i=new Intent(this,ScrapeTags.class);
-        startService(i);
-        //getSharedPreferences("Settings",0).edit().remove("first_run").apply();
+
         final Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayShowTitleEnabled(true);
@@ -163,6 +161,8 @@ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy){
         } else new Inspector(this,1,"",ApiRequestType.BYALL);
         if(firstTime){
             if(Global.shouldCheckForUpdates(this))new VersionChecker(this,true);
+            Intent i=new Intent(this,ScrapeTags.class);
+            startService(i);
             firstTime=false;
         }
     }

diff --git a/app/src/main/java/com/dar/nclientv2/SearchActivity.java b/app/src/main/java/com/dar/nclientv2/SearchActivity.java
@@ -5,6 +5,7 @@
 import androidx.appcompat.widget.AppCompatAutoCompleteTextView;
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.inputmethod.EditorInfoCompat;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -15,6 +16,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -128,7 +130,10 @@ public boolean onQueryTextChange(String newText) {
 
     }
     private void populateGroup(){
-        for(Tag t:Queries.TagTable.getAllFiltered(Database.getDatabase()))addTag(t);
+        for(TagType type:new TagType[]{TagType.TAG,TagType.PARODY,TagType.CHARACTER,TagType.ARTIST,TagType.GROUP}) {
+            for (Tag t : Queries.TagTable.getTopTags(Database.getDatabase(),type,Global.getFavoriteLimit(this)))addTopTag(t);
+        }
+        for(Tag t:Queries.TagTable.getAllFiltered(Database.getDatabase()))if(!tagAlreadyExist(t.getName()))addTag(t);
         for(Tag t:Queries.TagTable.getTrueAllType(Database.getDatabase(),TagType.CATEGORY))addSpecialTag(t);
         for(Tag t:Queries.TagTable.getTrueAllType(Database.getDatabase(),TagType.LANGUAGE)){
             if(Global.getOnlyLanguage()== Language.UNKNOWN)t.setStatus(TagStatus.AVOIDED);
@@ -153,12 +158,31 @@ private void populateGroup(){
             Chip c=(Chip)getLayoutInflater().inflate(R.layout.chip_layout,cg,false);
             c.setCloseIconVisible(false);
             c.setChipIconResource(R.drawable.ic_add);
+            DrawableCompat.setTint(c.getChipIcon(), Color.BLACK);
             c.setText(getString(R.string.add));
             c.setOnClickListener(v -> loadTag(type));
             addChip[type.ordinal()]=c;
             cg.addView(c);
         }
     }
+    private boolean tagAlreadyExist(String s){
+        for(ChipTag t:tags){
+            if(t.getTag().getName().equals(s))return true;
+        }
+        return false;
+    }
+    private void addTopTag(Tag t) {
+        ChipGroup cg=getGroup(t.getType());
+        ChipTag c=(ChipTag)getLayoutInflater().inflate(R.layout.chip_layout_entry,cg,false);
+        c.setTag(t);
+        c.setCloseIconVisible(false);
+        c.setOnClickListener(v -> {
+            c.changeStatus(t.getStatus()== TagStatus.ACCEPTED?TagStatus.AVOIDED:t.getStatus()==TagStatus.AVOIDED?TagStatus.DEFAULT:TagStatus.ACCEPTED);
+            advanced=true;
+        });
+        cg.addView(c);
+        tags.add(c);
+    }
 
     private void addSpecialTag(Tag t) {
         ChipGroup cg=getGroup(t.getType());
@@ -216,6 +240,7 @@ private ChipGroup getGroup(TagType type){
     private void addDialog(){
         AlertDialog.Builder builder=new AlertDialog.Builder(this);
         builder.setView(autoComplete);
+        autoComplete.setText("");
         builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
             createChip();
         });
@@ -232,6 +257,7 @@ private void addDialog(){
 
     private void createChip() {
         Tag t=new Tag(autoComplete.getText().toString().toLowerCase(Locale.US),0,0,editTag,TagStatus.ACCEPTED);
+        if(tagAlreadyExist(t.getName()))return;
         getGroup(editTag).removeView(addChip[editTag.ordinal()]);
         addTag(t);
         getGroup(editTag).addView(addChip[editTag.ordinal()]);

diff --git a/app/src/main/java/com/dar/nclientv2/SettingsActivity.java b/app/src/main/java/com/dar/nclientv2/SettingsActivity.java
@@ -100,6 +100,25 @@ public void positive(int actual) {
                 );
                 return true;
             });
+            findPreference(getString(R.string.key_favorite_limit)).setOnPreferenceClickListener(preference -> {
+                DefaultDialogs.pageChangerDialog(
+                        new DefaultDialogs.Builder(getActivity())
+                                .setDrawable(R.drawable.ic_hashtag)
+                                .setTitle(R.string.favorite_count)
+                                .setMax(20)
+                                .setActual(Global.getFavoriteLimit(getActivity()))
+                                .setMin(0)
+                                .setDialogs(new DefaultDialogs.DialogResults() {
+                                    @Override
+                                    public void positive(int actual) {
+                                        Global.updateFavoriteLimit(getActivity(),actual);
+                                    }
+
+                                    @Override public void negative() {}
+                                })
+                );
+                return true;
+            });
         }
 
         private void removePic(){

diff --git a/app/src/main/java/com/dar/nclientv2/api/local/LocalGallery.java b/app/src/main/java/com/dar/nclientv2/api/local/LocalGallery.java
@@ -23,15 +23,18 @@ public LocalGallery(File file, int id){
         //Inizio ricerca pagine
         File[] files=file.listFiles((dir, name) -> name.endsWith(".jpg")&&name.length()==7);
         //trova la pagina col numero piu grande
-        if(files.length<1) Log.e(Global.LOGTAG,"FILE INESISTENTI");
-        for(File f:files){
-            try {
-                int x = Integer.parseInt(f.getName().substring(0, 3));
-                if(x>max)max=x;
-                if(x<min)min=x;
-            }catch (NumberFormatException e){Log.e(Global.LOGTAG,e.getLocalizedMessage(),e);}
+        if(files!=null) {
+            if (files.length < 1) Log.e(Global.LOGTAG, "FILE INESISTENTI");
+            for (File f : files) {
+                try {
+                    int x = Integer.parseInt(f.getName().substring(0, 3));
+                    if (x > max) max = x;
+                    if (x < min) min = x;
+                } catch (NumberFormatException e) {
+                    Log.e(Global.LOGTAG, e.getLocalizedMessage(), e);
+                }
+            }
         }
-
         this.max=max;
         this.min=min;
         valid=max<1000&&min>0&&id!=-1;

diff --git a/app/src/main/java/com/dar/nclientv2/async/ScrapeTags.java b/app/src/main/java/com/dar/nclientv2/async/ScrapeTags.java
@@ -17,9 +17,13 @@
 
 import androidx.annotation.Nullable;
 import okhttp3.Request;
+import okhttp3.Response;
 
 public class ScrapeTags extends IntentService {
+    /*It is updated once a month*/
     private static final String URL="https://violable-hats.000webhostapp.com/tags.json";
+
+    private static final String ALTERNATIVE_URL="https://raw.githubusercontent.com/Dar9586/NClientV2/master/data/tags.json";
     //check every 30day
     private static final long DIFFERENCE_TIME=30L*24*60*60;
     public ScrapeTags() {
@@ -31,7 +35,10 @@ public ScrapeTags() {
     protected void onHandleIntent(@Nullable Intent intent) {
         try {
             if(new Date().getTime()-getApplicationContext().getSharedPreferences("Settings",0).getLong("lastSync",new Date().getTime())<DIFFERENCE_TIME)return;
-            JsonReader reader=new JsonReader(Global.client.newCall(new Request.Builder().url(URL).build()).execute().body().charStream());
+            Response x=Global.client.newCall(new Request.Builder().url(URL).build()).execute();
+            if(x.code()!=200)x=Global.client.newCall(new Request.Builder().url(ALTERNATIVE_URL).build()).execute();
+            if(x.code()!=200)return;
+            JsonReader reader=new JsonReader(x.body().charStream());
             reader.beginArray();
             int id=reader.nextInt();
             String name=reader.nextString();

diff --git a/app/src/main/java/com/dar/nclientv2/async/database/Queries.java b/app/src/main/java/com/dar/nclientv2/async/database/Queries.java
@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -359,7 +360,20 @@ public static void resetAllStatus(SQLiteDatabase db){
             values.put(STATUS,TagStatus.DEFAULT.ordinal());
             db.updateWithOnConflict(TABLE_NAME,values,null,null,SQLiteDatabase.CONFLICT_IGNORE);
         }
+        public static Tag[] getTopTags(SQLiteDatabase db,TagType type,int count){
+            String query="SELECT * FROM "+TABLE_NAME+" WHERE "+TYPE+"=? ORDER BY "+COUNT+" DESC LIMIT ?;";
 
+            int i=0;
+            Cursor cursor=db.rawQuery(query,new String[]{""+type.ordinal(),""+count});
+            Tag[]tags=new Tag[cursor.getCount()];
+            if(cursor.moveToFirst()){
+                do{
+                    tags[i++]=cursorToTag(cursor);
+                }while(cursor.moveToNext());
+            }
+            cursor.close();
+            return tags;
+        }
         public static TagStatus getStatus(SQLiteDatabase db,Tag tag){
             String query="SELECT "+ STATUS +" FROM "+ TABLE_NAME +
                     " WHERE "+ IDTAG +" =?";

diff --git a/app/src/main/java/com/dar/nclientv2/loginapi/LoadTags.java b/app/src/main/java/com/dar/nclientv2/loginapi/LoadTags.java
@@ -33,6 +33,7 @@ public LoadTags(@Nullable TagsAdapter adapter) {
     @Override
     public void run() {
         super.run();
+        if(Login.getUser()==null)return;
         Log.d(Global.LOGTAG,String.format("Creating blacklist of: https://nhentai.net/users/%s/%s/blacklist",Login.getUser().getId(),Login.getUser().getCodename()));
         Global.client.newCall(new Request.Builder().url(String.format(Locale.US,"https://nhentai.net/users/%s/%s/blacklist",Login.getUser().getId(),Login.getUser().getCodename())).build()).enqueue(new Callback() {
             @Override

diff --git a/app/src/main/java/com/dar/nclientv2/settings/DefaultDialogs.java b/app/src/main/java/com/dar/nclientv2/settings/DefaultDialogs.java
@@ -39,8 +39,9 @@ public Builder(Context context) {
             dialogs=null;
         }
 
-        public void setMin(int min){
+        public Builder setMin(int min){
             this.min = min;
+            return this;
         }
 
         public Builder setTitle(int title) {

diff --git a/app/src/main/java/com/dar/nclientv2/settings/Global.java b/app/src/main/java/com/dar/nclientv2/settings/Global.java
@@ -41,6 +41,7 @@
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.fragment.app.FragmentActivity;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -56,6 +57,12 @@ public static long recursiveSize(File path) {
         return size;
     }
 
+    public static void updateFavoriteLimit(Context context, int limit) {
+        context.getSharedPreferences("Settings", 0).edit().putInt(context.getString(R.string.key_favorite_limit),limit).apply();
+    }
+    public static int getFavoriteLimit(Context context) {
+        return context.getSharedPreferences("Settings", 0).getInt(context.getString(R.string.key_favorite_limit),10);
+    }
     public enum ThemeScheme{LIGHT,DARK,BLACK}
 
     public static OkHttpClient client=null;

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -231,6 +231,8 @@
     <string name="insert_tag_name">Insert tag name:</string>
     <string name="other">other</string>
     <string name="cancelling">Cancelling…</string>
+    <string name="key_favorite_limit">favorite_limit</string>
+    <string name="favorite_count">Favorite count</string>
 
 
     <string-array name="theme">

diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
@@ -76,6 +76,10 @@
             android:summaryOn="@string/setting_on_use_account_tag"
             android:summaryOff="@string/setting_off_use_account_tag"
             android:title="@string/use_account_tag" />
+        <Preference android:title="@string/favorite_count"
+            android:key="@string/key_favorite_limit"
+            android:summary="The number of popular tags shown while in Advanced search"
+            />
     </PreferenceCategory>
     <PreferenceCategory
         android:title="@string/miscellaneous">

diff --git a/data/tags.json b/data/tags.json