Dark theme repaired. Use ThemeHelper for dialogs. LoadStoreIconData: Move all inner classes out and create new SelectDrawableDialog class. Use recyclerview for the later.

Author: David Graeff

app/build.gradle

@@ -16,8 +16,8 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 22
-        versionCode 120
-        versionName "8.0"
+        versionCode 121
+        versionName "8.1"
         applicationId appID
         testApplicationId "oly.netpowerctrl.tests"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"

app/src/main/java/oly/netpowerctrl/data/graphic/ArrayAdapterWithIcons.java

@@ -2,43 +2,64 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.support.v7.widget.RecyclerView;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * A simple array adapter that additionally provide an icon per entry.
  */
-class ArrayAdapterWithIcons extends ArrayAdapter<ArrayAdapterWithIcons.Item> {
-    public final List<Item> items;
+class ArrayAdapterWithIcons extends RecyclerView.Adapter<ArrayAdapterWithIcons.ViewHolder> {
+    final static int resource = android.R.layout.select_dialog_item;
+    final static int textViewResourceId = android.R.id.text1;
+    public final List<Item> items = new ArrayList<>();
+    private int dp5;
 
     @SuppressWarnings("SameParameterValue")
-    public ArrayAdapterWithIcons(Context context, int resource, int textViewResourceId, List<Item> objects) {
-        super(context, resource, textViewResourceId, objects);
-        items = objects;
+    public ArrayAdapterWithIcons(Context context) {
+        //Add margin between image and text (support various screen densities)
+        dp5 = (int) (5 * context.getResources().getDisplayMetrics().density + 0.5f);
     }
 
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        //User super class to create the View
-        View v = super.getView(position, convertView, parent);
-        assert v != null;
-        TextView tv = (TextView) v.findViewById(android.R.id.text1);
+    public ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
+        return new ViewHolder(LayoutInflater.from(viewGroup.getContext()).inflate(resource, viewGroup, false));
+    }
+
+    @Override
+    public void onBindViewHolder(ViewHolder holder, int position) {
         //Put the image on the TextView
-        tv.setCompoundDrawablesWithIntrinsicBounds(items.get(position).icon, null, null, null);
+        Item item = items.get(position);
 
-        if (items.get(position).icon != null) {
-            //Add margin between image and text (support various screen densities)
-            int dp5 = (int) (5 * getContext().getResources().getDisplayMetrics().density + 0.5f);
-            tv.setCompoundDrawablePadding(dp5);
+        if (item.text != null)
+            holder.tv.setText(item.text);
+
+        holder.tv.setCompoundDrawablesWithIntrinsicBounds(item.icon, null, null, null);
+
+        if (item.icon != null) {
+            holder.tv.setCompoundDrawablePadding(dp5);
         } else {
-            tv.setCompoundDrawablePadding(0);
+            holder.tv.setCompoundDrawablePadding(0);
         }
+    }
 
-        return v;
+    @Override
+    public int getItemCount() {
+        return items.size();
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        TextView tv;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            tv = (TextView) itemView.findViewById(textViewResourceId);
+        }
     }
 
     public static class Item {

app/src/main/java/oly/netpowerctrl/data/graphic/DrawableCacheEntry.java

@@ -0,0 +1,16 @@
+package oly.netpowerctrl.data.graphic;
+
+import android.graphics.Bitmap;
+
+/**
+ * Created by david on 15.05.15.
+ */
+public class DrawableCacheEntry {
+    Bitmap bitmap;
+    boolean isDefault;
+
+    public DrawableCacheEntry(Bitmap bitmap, boolean isDefault) {
+        this.bitmap = bitmap;
+        this.isDefault = isDefault;
+    }
+}

app/src/main/java/oly/netpowerctrl/data/graphic/IconDeferredLoadingThread.java

@@ -61,12 +61,12 @@ public interface IconLoaded {
      * ViewHolder and the bitmap index.
      */
     public static class IconItem {
-        private final LoadStoreIconData.IconState state;
+        private final IconState state;
         private final WeakReference<IconLoaded> target;
         private final int position;
         private Drawable drawable;
 
-        public IconItem(LoadStoreIconData.IconState state, int position, IconLoaded target) {
+        public IconItem(IconState state, int position, IconLoaded target) {
             this.state = state;
             this.position = position;
             this.target = new WeakReference<>(target);

app/src/main/java/oly/netpowerctrl/data/graphic/IconSelected.java

@@ -0,0 +1,13 @@
+package oly.netpowerctrl.data.graphic;
+
+import android.content.Intent;
+import android.graphics.Bitmap;
+
+/**
+ * Created by david on 15.05.15.
+ */
+public interface IconSelected {
+    void setIcon(Object context_object, Bitmap bitmap);
+
+    void startActivityForResult(Intent intent, int requestCode);
+}

app/src/main/java/oly/netpowerctrl/data/graphic/IconState.java

@@ -0,0 +1,12 @@
+package oly.netpowerctrl.data.graphic;
+
+/**
+ * Created by david on 15.05.15.
+ */
+public enum IconState {
+    StateOn,
+    StateOff,
+    StateUnknown,
+    OnlyOneState,
+    StateNotApplicable // State does not apply e.g. for a background
+}