v 1.7.10 fixed image loader

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId 'org.nuclearfog.twidda'
         minSdkVersion 16
         targetSdkVersion 29
-        versionCode 17
-        versionName '1.7.9'
+        versionCode 18
+        versionName '1.7.10'
         vectorDrawables.useSupportLibrary true
     }
 

app/src/main/java/org/nuclearfog/twidda/adapter/ImageAdapter.java

@@ -7,8 +7,6 @@ import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ImageButton;
 import android.widget.ImageView;
-import android.widget.LinearLayout.LayoutParams;
-import android.widget.ProgressBar;
 
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
@@ -22,8 +20,6 @@ import java.util.LinkedList;
 import java.util.List;
 
 import static android.view.View.VISIBLE;
-import static android.widget.ListPopupWindow.MATCH_PARENT;
-import static android.widget.ListPopupWindow.WRAP_CONTENT;
 import static androidx.recyclerview.widget.RecyclerView.NO_POSITION;
 
 
@@ -92,8 +88,9 @@ public class ImageAdapter extends Adapter<ViewHolder> {
     @NonNull
     @Override
     public ViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, int viewType) {
+        LayoutInflater inflater = LayoutInflater.from(parent.getContext());
         if (viewType == PICTURE) {
-            View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_image, parent, false);
+            View view = inflater.inflate(R.layout.item_image, parent, false);
             final ImageItem item = new ImageItem(view);
             item.preview.setOnClickListener(new OnClickListener() {
                 @Override
@@ -120,10 +117,8 @@ public class ImageAdapter extends Adapter<ViewHolder> {
             }
             return item;
         } else {
-            ProgressBar circle = new ProgressBar(parent.getContext());
-            LayoutParams param = new LayoutParams(WRAP_CONTENT, MATCH_PARENT);
-            circle.setLayoutParams(param);
-            return new LoadItem(circle);
+            View view = inflater.inflate(R.layout.item_image_load, parent, false);
+            return new LoadItem(view);
         }
     }
 
@@ -155,11 +150,9 @@ public class ImageAdapter extends Adapter<ViewHolder> {
      * Holder for progress circle
      */
     class LoadItem extends ViewHolder {
-        final ProgressBar circle;
 
-        LoadItem(ProgressBar circle) {
-            super(circle);
-            this.circle = circle;
+        LoadItem(View v) {
+            super(v);
         }
     }
 

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:background="@color/half_transparent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="@dimen/item_image_progress_size"
+        android:layout_height="@dimen/item_image_progress_size"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp" />
+</LinearLayout>

app/src/main/res/values-de-rDE/strings.xml

@@ -108,7 +108,6 @@
     <string name="proxy_authentication">Proxy Login</string>
     <string name="error_empty_port">Proxy port muss gesetzt werden!</string>
     <string name="error_empty_pass">Proxy Passort darf nicht leer sein!</string>
-    <string name="error_image_download">Bild konnte nicht geladen werden!</string>
     <string name="error_dm_send">Direktnachricht konnte nicht an diesen Nutzer gesendet werden!</string>
     <string name="confirm_mute">User stummschalten?</string>
     <string name="error_location">Standort konnte nicht ermittelt werden!</string>
@@ -147,6 +146,5 @@
     <string name="error_file_not_found">Datei nicht gefunden!</string>
     <string name="item_load_more">Mehr laden</string>
     <string name="error_image_loading">Bild konnte nicht geladen werden!</string>
-    <string name="item_image_prev">Bildvorschau</string>
     <string name="item_image_save">Bild speichern</string>
 </resources>

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

@@ -70,4 +70,5 @@
     <dimen name="item_image_button_margin">5dp</dimen>
     <dimen name="item_image_button">30dp</dimen>
     <dimen name="item_image_margin">2dp</dimen>
+    <dimen name="item_image_progress_size">48dp</dimen>
 </resources>

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

@@ -108,7 +108,6 @@
     <string name="proxy_authentication">Proxy login</string>
     <string name="error_empty_port">Port must be set!</string>
     <string name="error_empty_pass">Proxy password should not be empty!</string>
-    <string name="error_image_download">Image could not be loaded!</string>
     <string name="error_dm_send">Cannot send direct message to this user!</string>
     <string name="settings_info_link" translatable="false">https://github.com/nuclearfog/Shitter</string>
     <string name="confirm_mute">mute user?</string>
@@ -150,6 +149,5 @@
     <string name="error_file_not_found">File not found!</string>
     <string name="item_load_more">Load more</string>
     <string name="error_image_loading">Could not load image!</string>
-    <string name="item_image_prev">image preview</string>
     <string name="item_image_save">save image</string>
 </resources>