Add poll to buy fragment. Improve navigation drawer. fix crash while creating a group for a device.

Author: David Graeff

app/app.iml

@@ -100,6 +100,7 @@
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-animators-1.2.0" level="project" />
     <orderEntry type="library" exported="" name="material-1.1.0" level="project" />

app/build.gradle

@@ -16,8 +16,8 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 22
-        versionCode 125
-        versionName "8.5"
+        versionCode 126
+        versionName "8.6"
         applicationId appID
         testApplicationId "oly.netpowerctrl.tests"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
@@ -102,6 +102,7 @@ dependencies {
         exclude group: 'com.google.android'
         exclude group: 'com.android.support'
     }
+    compile 'com.google.code.gson:gson:2.3.1'
     compile('com.wefika:flowlayout:0.3.4') {
         exclude group: 'com.google.android'
         exclude group: 'com.android.support'

app/src/main/java/oly/netpowerctrl/data/AutomaticSetup.java

@@ -5,6 +5,7 @@
 import android.os.Message;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -189,6 +190,10 @@ public boolean updated(@NonNull CredentialsCollection o, @Nullable Credentials o
     }
 
     private void updateStatusTextWithUnconfiguredNumber() {
+        if (find_device_status == null) {
+            Log.e("AutomaticSetup", "Binding to textfield lost");
+            return;
+        }
         int n = dataService != null ? dataService.credentials.countNotConfigured() : 0;
         if (n == 0) {
             find_device_status.setText(App.getAppString(R.string.automatic_not_found_unconfigured_devices));

app/src/main/java/oly/netpowerctrl/executables/Executable.java

@@ -34,6 +34,7 @@ public class Executable implements Comparable, IOInterface {
     public int max_value = 0;
     public int current_value = 0;
     // The device this port belongs to.
+    @Nullable
     public String deviceUID;
     // Type of this executable
     public ExecutableType ui_type = ExecutableType.TypeUnknown;
@@ -316,6 +317,7 @@ public ReachabilityStates reachableState() {
 
     public void addToGroup(String groupUID) {
         group_uids.add(groupUID);
+        setHasChanged();
     }
 
     public boolean needCredentials() {

app/src/main/java/oly/netpowerctrl/executables/ExecutableCollection.java

@@ -106,7 +106,7 @@ public void remove(Executable executable) {
     public void remove(Credentials credentials) {
         for (Iterator<Executable> iterator = items.values().iterator(); iterator.hasNext(); ) {
             Executable executable = iterator.next();
-            if (executable.deviceUID.equals(credentials.deviceUID)) {
+            if (executable.needCredentials() && executable.deviceUID.equals(credentials.deviceUID)) {
                 iterator.remove();
                 storage.remove(executable);
                 dataService.favourites.setFavourite(executable.getUid(), false);
@@ -171,7 +171,8 @@ public List<Executable> filterExecutables(PredicateExecutable p) {
     public List<Executable> filterExecutables(Credentials credentials) {
         List<Executable> list = new ArrayList<>();
         for (Executable executable : items.values()) {
-            if (executable.deviceUID.equals(credentials.deviceUID)) list.add(executable);
+            if (executable.needCredentials() && executable.deviceUID.equals(credentials.deviceUID))
+                list.add(executable);
         }
 
         return list;

app/src/main/java/oly/netpowerctrl/groups/GroupAdapter.java

@@ -5,7 +5,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
+
+import com.rey.material.widget.Button;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,14 +24,11 @@
  */
 public class GroupAdapter extends RecyclerView.Adapter<GroupAdapter.ViewHolder> implements onCollectionUpdated<GroupCollection, Group>, onServiceReady {
     private final boolean showAllEntry;
+    protected EmptyListener emptyListener;
     private GroupCollection groupCollection;
     private int selectedItemPosition = -1;
     private int lastSelectedItemPosition = -1;
     private List<Group> items = new ArrayList<>();
-    private EmptyListener emptyListener = new EmptyListener() {
-        public void onEmptyListener(boolean empty) {
-        }
-    };
 
     public GroupAdapter(boolean showAllEntry, EmptyListener emptyListener) {
         this.emptyListener = emptyListener;
@@ -63,12 +61,12 @@ public void onBindViewHolder(ViewHolder viewHolder, int position) {
         viewHolder.textView.setText(items.get(position).name);
 
         if (lastSelectedItemPosition == position) {
-            viewHolder.layout_item.setActivated(false);
+            viewHolder.textView.setPressed(false);
             lastSelectedItemPosition = -1;
         }
 
         if (selectedItemPosition == position) {
-            viewHolder.layout_item.setActivated(true);
+            viewHolder.textView.setPressed(true);
         }
     }
 
@@ -84,41 +82,42 @@ public void onDestroy() {
 
     private void resetItems() {
         items.clear();
-        if (groupCollection.getItems().size() > 0) {
-            if (showAllEntry)
-                items.add(new Group("", App.getAppString(R.string.groups_all)));
-            for (Group group : groupCollection.getItems().values()) {
-                items.add(group);
-            }
+        if (showAllEntry)
+            items.add(new Group("", App.getAppString(R.string.groups_all)));
+        for (Group group : groupCollection.getItems().values()) {
+            items.add(group);
         }
         notifyDataSetChanged();
         emptyListener.onEmptyListener(items.isEmpty());
     }
 
+    protected void _notifyItemInserted(int pos) {
+        notifyItemInserted(pos);
+    }
+
+    protected void _notifyItemRemoved(int pos) {
+        notifyItemRemoved(pos);
+    }
+
+    protected void _notifyItemChanged(int pos) {
+        notifyItemChanged(pos);
+    }
+
     @Override
     public boolean updated(@NonNull GroupCollection groupCollection, Group group, @NonNull ObserverUpdateActions action) {
         switch (action) {
             case AddAction:
                 boolean empty = items.isEmpty();
-                if (showAllEntry && items.size() == 0) { // Add "show all" if nothing inside so far
-                    items.add(new Group("", App.getAppString(R.string.groups_all)));
-                    notifyItemInserted(0);
-                }
                 items.add(group);
-                notifyItemInserted(items.size() - 1);
+                _notifyItemInserted(items.size() - 1);
                 if (empty)
                     emptyListener.onEmptyListener(false);
                 break;
             case RemoveAction:
                 for (int i = 0; i < items.size(); ++i)
                     if (items.get(i).getUid().equals(group.getUid())) {
                         items.remove(i);
-                        notifyItemRemoved(i);
-                        if (showAllEntry && items.size() == 1) { // remove "show all"
-                            items.remove(0);
-                            notifyItemRemoved(0);
-                            emptyListener.onEmptyListener(true);
-                        }
+                        _notifyItemRemoved(i);
                         break;
                     }
                 break;
@@ -129,7 +128,7 @@ public boolean updated(@NonNull GroupCollection groupCollection, Group group, @N
             case UpdateAction:
                 for (int i = 0; i < items.size(); ++i)
                     if (items.get(i).getUid().equals(group.getUid())) {
-                        notifyItemChanged(i);
+                        _notifyItemChanged(i);
                         break;
                     }
         }
@@ -152,7 +151,7 @@ public void onServiceFinished(DataService service) {
     public void setSelectedItem(String groupUID) {
         lastSelectedItemPosition = selectedItemPosition;
         if (lastSelectedItemPosition != -1)
-            notifyItemChanged(lastSelectedItemPosition);
+            _notifyItemChanged(lastSelectedItemPosition);
 
         int pos = 0;
         for (int i = 0; i < items.size(); ++i)
@@ -163,17 +162,19 @@ public void setSelectedItem(String groupUID) {
 
         selectedItemPosition = pos;
         if (pos == -1) return;
-        notifyItemChanged(pos);
+        _notifyItemChanged(pos);
     }
 
-    static class ViewHolder extends RecyclerView.ViewHolder {
-        TextView textView;
-        View layout_item;
+    protected static class ViewHolder extends RecyclerView.ViewHolder {
+        //TextView textView;
+        //View layout_item;
+        public Button textView;
 
         public ViewHolder(View itemView) {
             super(itemView);
-            layout_item = itemView.findViewById(R.id.list_item);
-            textView = (TextView) itemView.findViewById(R.id.title);
+            //layout_item = itemView.findViewById(R.id.list_item);
+            //textView = (TextView) itemView.findViewById(R.id.title);
+            textView = (Button) itemView.findViewById(R.id.title);
         }
     }
 }

app/src/main/java/oly/netpowerctrl/groups/GroupListFragment.java

@@ -18,9 +18,9 @@
 import oly.netpowerctrl.main.BuyFragment;
 import oly.netpowerctrl.main.FeedbackFragment;
 import oly.netpowerctrl.main.MainActivity;
+import oly.netpowerctrl.main.NavigationAdapter;
 import oly.netpowerctrl.preferences.PreferencesFragment;
 import oly.netpowerctrl.preferences.SharedPrefs;
-import oly.netpowerctrl.ui.EmptyListener;
 import oly.netpowerctrl.ui.FragmentUtils;
 import oly.netpowerctrl.ui.LineDividerDecoration;
 import oly.netpowerctrl.ui.RecyclerItemClickListener;
@@ -30,10 +30,9 @@
 /**
  * Try to setup all found devices, The dialog shows a short log about the actions.
  */
-public class GroupListFragment extends Fragment implements onServiceReady, EmptyListener {
+public class GroupListFragment extends Fragment implements onServiceReady {
     private DataService dataService = null;
-    private GroupAdapter groupAdapter = new GroupAdapter(true, this);
-    private View group_help;
+    private NavigationAdapter groupAdapter = new NavigationAdapter();
 
     public GroupListFragment() {
     }
@@ -60,14 +59,37 @@ public void onServiceFinished(DataService service) {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View root = inflater.inflate(R.layout.fragment_group_list, container, false);
 
-        group_help = root.findViewById(R.id.group_help);
-
         RecyclerView group_list = (RecyclerView) root.findViewById(R.id.group_list);
         group_list.setItemAnimator(new DefaultItemAnimator());
         group_list.setLayoutManager(new LinearLayoutManager(getActivity()));
         group_list.addOnItemTouchListener(new RecyclerItemClickListener(getActivity(), new RecyclerItemClickListener.OnItemClickListener() {
             @Override
             public boolean onItemClick(View view, int position, boolean isLongClick) {
+                switch (position) {
+                    case 0: {
+                        FragmentUtils.changeToFragment(getActivity(), IOConnectionsFragment.class.getName());
+                        ((MainActivity) getActivity()).closeGroupMenu();
+                        return true;
+                    }
+                    case 1: {
+                        FragmentUtils.changeToFragment(getActivity(), PreferencesFragment.class.getName());
+                        ((MainActivity) getActivity()).closeGroupMenu();
+                        return true;
+                    }
+                    case 2: {
+                        FragmentUtils.changeToFragment(getActivity(), BuyFragment.class.getName());
+                        ((MainActivity) getActivity()).closeGroupMenu();
+                        return true;
+                    }
+                    case 3: {
+                        FragmentUtils.changeToFragment(getActivity(), FeedbackFragment.class.getName());
+                        ((MainActivity) getActivity()).closeGroupMenu();
+                        return true;
+                    }
+                    default:
+                        position -= groupAdapter.offset;
+                }
+
                 Group group = groupAdapter.getGroup(position);
 
                 ExecutablesFragment executablesFragment = (ExecutablesFragment) getFragmentManager().findFragmentByTag("outlets");
@@ -91,7 +113,7 @@ public boolean onItemClick(View view, int position, boolean isLongClick) {
         group_list.addItemDecoration(new LineDividerDecoration(getActivity(), LineDividerDecoration.VERTICAL_LIST) {
             @Override
             public boolean dividerForPosition(int position) {
-                return true;
+                return position == groupAdapter.offset - 1;
             }
         });
         group_list.setAdapter(groupAdapter);
@@ -112,52 +134,10 @@ public void onGroupCreated(Group group) {
                 });
             }
         });
-
-        button = root.findViewById(R.id.btnDevices);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                FragmentUtils.changeToFragment(getActivity(), IOConnectionsFragment.class.getName());
-                ((MainActivity) getActivity()).closeGroupMenu();
-            }
-        });
-
-        button = root.findViewById(R.id.btnPreferences);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                FragmentUtils.changeToFragment(getActivity(), PreferencesFragment.class.getName());
-                ((MainActivity) getActivity()).closeGroupMenu();
-            }
-        });
-
-        button = root.findViewById(R.id.btnBuy);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                FragmentUtils.changeToFragment(getActivity(), BuyFragment.class.getName());
-                ((MainActivity) getActivity()).closeGroupMenu();
-            }
-        });
-
-        button = root.findViewById(R.id.btnFeedback);
-        button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                FragmentUtils.changeToFragment(getActivity(), FeedbackFragment.class.getName());
-                ((MainActivity) getActivity()).closeGroupMenu();
-            }
-        });
-
         return root;
     }
 
     public GroupAdapter getAdapter() {
         return groupAdapter;
     }
-
-    @Override
-    public void onEmptyListener(boolean empty) {
-        group_help.setVisibility(groupAdapter.getItemCount() > 0 ? View.GONE : View.VISIBLE);
-    }
 }