NClientV2 1.7.3

* Bug fixed
Dar9586 · Feb 4, 2019 · bd66b17 · bd66b17
1 parent e630507
commit bd66b17
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 26 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 172
-        versionName "1.7.2"
+        versionCode 173
+        versionName "1.7.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 

diff --git a/app/src/main/java/com/dar/nclientv2/adapters/TagsAdapter.java b/app/src/main/java/com/dar/nclientv2/adapters/TagsAdapter.java
@@ -126,7 +126,7 @@ public void onBindViewHolder(@NonNull final TagsAdapter.ViewHolder holder, int p
         holder.count.setText(String.format(Locale.US,"%d",ent.getCount()));
         holder.master.setOnClickListener(v -> {
             if(!online) {
-                if (!TagV2.maxTagReached() || ent.getStatus() != TagStatus.DEFAULT) updateLogo(ent, holder.imgView, TagV2.updateStatus(ent));
+                if (!TagV2.maxTagReached() || ent.getStatus() != TagStatus.DEFAULT) updateLogo(holder.imgView, TagV2.updateStatus(ent));
                 else Snackbar.make(context.getViewPager(), context.getString(R.string.tags_max_reached, TagV2.MAXTAGS), Snackbar.LENGTH_LONG).show();
             }else{
                 try {
@@ -141,7 +141,7 @@ public void onBindViewHolder(@NonNull final TagsAdapter.ViewHolder holder, int p
             else Toast.makeText(context, R.string.tag_already_in_blacklist, Toast.LENGTH_SHORT).show();
             return true;
         });
-        updateLogo(ent,holder.imgView,online?TagStatus.AVOIDED:ent.getStatus());
+        updateLogo(holder.imgView,online?TagStatus.AVOIDED:ent.getStatus());
         Log.d(Global.LOGTAG,"PASSED: "+ent);
     }
 
@@ -192,7 +192,7 @@ public void onResponse(@NonNull Call call, @NonNull Response response) throws IO
                         if(s.equals("{\"status\": \"ok\"}")) {
                             if (add) Login.addOnlineTag(tag);
                             else Login.removeOnlineTag(tag);
-                            if(online)updateLogo(tag, imgView, add ? TagStatus.AVOIDED : TagStatus.DEFAULT);
+                            if(online)updateLogo(imgView, add ? TagStatus.AVOIDED : TagStatus.DEFAULT);
                         }
                     }
                 });
@@ -206,18 +206,11 @@ private static void writeTag(JsonWriter jw, Tag tag) throws IOException{
         jw.name("type").value(tag.getTypeString());
         jw.endObject();
     }
-    private void updateLogo(Tag tag, ImageView img, TagStatus s){
-try{
-        Log.d(Global.LOGTAG,"Changineg to: "+s);
+    private void updateLogo(ImageView img, TagStatus s){
         switch (s){
-            case DEFAULT:Global.loadImage(R.drawable.ic_void,img); break;
-            case ACCEPTED:Global.loadImage(R.drawable.ic_check,img);break;
-            case AVOIDED:Global.loadImage(R.drawable.ic_close,img);break;
-        }
-        Global.setTint(img.getDrawable());
-        }catch (Exception e){
-    Log.e(Global.LOGTAG,tag.toString());
-    throw e;
+            case DEFAULT:img.setImageDrawable(null);break;//Global.loadImage(R.drawable.ic_void,img); break;
+            case ACCEPTED:Global.loadImage(R.drawable.ic_check,img);Global.setTint(img.getDrawable());break;
+            case AVOIDED:Global.loadImage(R.drawable.ic_close,img);Global.setTint(img.getDrawable());break;
         }
     }
 

diff --git a/app/src/main/res/drawable/ic_void.xml b/app/src/main/res/drawable/ic_void.xml
diff --git a/app/src/main/res/layout/entry_tag_layout.xml b/app/src/main/res/layout/entry_tag_layout.xml
@@ -20,12 +20,11 @@
         <ImageView
             android:contentDescription="@string/tag_preference"
             android:id="@+id/image"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
             android:layout_marginBottom="8dp"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
-            app:srcCompat="@drawable/ic_close"
             android:background="?attr/selectableItemBackgroundBorderless"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"