Use imagebuttons instead of a menu for preferences and feedback. On android 5 feedfack is not shown on smaller screens otherwise

Author: David Graeff

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

@@ -12,7 +12,6 @@
 import android.provider.Settings;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.ActionMenuView;
 import android.support.v7.widget.DefaultItemAnimator;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
@@ -48,10 +47,7 @@
 import oly.netpowerctrl.groups.GroupListFragment;
 import oly.netpowerctrl.groups.GroupUtilities;
 import oly.netpowerctrl.main.EditActivity;
-import oly.netpowerctrl.main.FeedbackFragment;
-import oly.netpowerctrl.main.MainActivity;
 import oly.netpowerctrl.network.Utils;
-import oly.netpowerctrl.preferences.PreferencesFragment;
 import oly.netpowerctrl.preferences.SharedPrefs;
 import oly.netpowerctrl.scenes.SceneHelp;
 import oly.netpowerctrl.ui.EmptyListener;
@@ -200,23 +196,6 @@ public void onServiceFinished(DataService service) {
         dataService = null;
     }
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_about: {
-                FragmentUtils.changeToFragment(getActivity(), FeedbackFragment.class.getName());
-                ((MainActivity) getActivity()).closeGroupMenu();
-                return true;
-            }
-            case R.id.menu_preferences: {
-                FragmentUtils.changeToFragment(getActivity(), PreferencesFragment.class.getName());
-                ((MainActivity) getActivity()).closeGroupMenu();
-                return true;
-            }
-        }
-        return false;
-    }
-
     @Override
     public View onCreateView(LayoutInflater inflater, final ViewGroup container,
                              Bundle savedInstanceState) {
@@ -236,16 +215,6 @@ public void onClick(View view) {
             }
         });
 
-        ActionMenuView menu = ((ActionMenuView) getActivity().findViewById(R.id.amvMenu));
-        menu.setOnMenuItemClickListener(new ActionMenuView.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem menuItem) {
-                return onOptionsItemSelected(menuItem);
-            }
-        });
-        menu.getMenu().clear();
-        getActivity().getMenuInflater().inflate(R.menu.outlets, menu.getMenu());
-
         mRecyclerView = (RecyclerView) view.findViewById(android.R.id.list);
         mRecyclerView.setItemAnimator(new DefaultItemAnimator());
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));

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

@@ -9,14 +9,15 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 
 import oly.netpowerctrl.R;
 import oly.netpowerctrl.data.DataService;
 import oly.netpowerctrl.data.onServiceReady;
 import oly.netpowerctrl.executables.ExecutablesFragment;
 import oly.netpowerctrl.ioconnection.IOConnectionsFragment;
+import oly.netpowerctrl.main.FeedbackFragment;
 import oly.netpowerctrl.main.MainActivity;
+import oly.netpowerctrl.preferences.PreferencesFragment;
 import oly.netpowerctrl.preferences.SharedPrefs;
 import oly.netpowerctrl.ui.EmptyListener;
 import oly.netpowerctrl.ui.FragmentUtils;
@@ -96,7 +97,7 @@ public boolean dividerForPosition(int position) {
 
         groupAdapter.start();
 
-        Button button = (Button) root.findViewById(R.id.btnAdd);
+        View button = root.findViewById(R.id.btnAdd);
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -111,7 +112,7 @@ public void onGroupCreated(Group group) {
             }
         });
 
-        button = (Button) root.findViewById(R.id.btnDevices);
+        button = root.findViewById(R.id.btnDevices);
         button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -120,6 +121,24 @@ public void onClick(View view) {
             }
         });
 
+        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.btnFeedback);
+        button.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                FragmentUtils.changeToFragment(getActivity(), FeedbackFragment.class.getName());
+                ((MainActivity) getActivity()).closeGroupMenu();
+            }
+        });
+
         return root;
     }
 

app/src/main/java/oly/netpowerctrl/widget/WidgetExecutable.java

@@ -31,8 +31,6 @@
 import oly.netpowerctrl.utils.ObserverUpdateActions;
 import oly.netpowerctrl.utils.onCollectionUpdated;
 
-;
-
 /**
  * Created by david on 15.04.15.
  */

app/src/main/java/oly/netpowerctrl/widget/WidgetGroupList.java

@@ -26,8 +26,6 @@
 import oly.netpowerctrl.network.ReachabilityStates;
 import oly.netpowerctrl.preferences.SharedPrefs;
 
-;
-
 /**
  * Represents
  */

app/src/main/java/oly/netpowerctrl/widget/WidgetUpdateService.java

@@ -20,8 +20,6 @@
 import oly.netpowerctrl.ui.notifications.InAppNotifications;
 import oly.netpowerctrl.utils.Logging;
 
-;
-
 /**
  * Widget Update Service for all types of widgets.
  */

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

@@ -25,7 +25,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_margin="@dimen/list_outer_padding"
+            android:layout_margin="@dimen/list_inner_padding"
             card_view:cardBackgroundColor="?cards_background"
             card_view:cardCornerRadius="4dp"
             card_view:cardElevation="5dp">
@@ -230,7 +230,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_margin="@dimen/list_outer_padding"
+            android:layout_margin="@dimen/list_inner_padding"
             card_view:cardBackgroundColor="?cards_background"
             card_view:cardCornerRadius="4dp"
             card_view:cardElevation="5dp">
@@ -296,7 +296,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_margin="@dimen/list_outer_padding"
+            android:layout_margin="@dimen/list_inner_padding"
             card_view:cardBackgroundColor="?cards_background"
             card_view:cardCornerRadius="4dp"
             card_view:cardElevation="5dp">

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

@@ -11,27 +11,39 @@
         android:layout_height="wrap_content"
         app:theme="?attr/toolbar_style">
 
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center">
 
-            <android.support.v7.widget.ActionMenuView
-                android:id="@+id/amvMenu"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true" />
-
             <com.rey.material.widget.Button
                 android:id="@+id/btnDevices"
                 style="@style/FlatButtonRippleStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_toStartOf="@id/amvMenu"
-                android:gravity="center"
                 android:text="@string/devices"
                 android:textColor="?attr/textColorPrimary" />
-        </RelativeLayout>
+
+            <com.rey.material.widget.ImageButton
+                android:id="@+id/btnPreferences"
+                style="@style/FlatButtonRippleStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/preferences"
+                android:paddingEnd="5dp"
+                android:paddingStart="5dp"
+                android:src="?attr/ic_action_settings" />
+
+            <com.rey.material.widget.ImageButton
+                android:id="@+id/btnFeedback"
+                style="@style/FlatButtonRippleStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/drawer_feedback"
+                android:paddingEnd="5dp"
+                android:paddingStart="5dp"
+                android:src="?attr/ic_action_good" />
+        </LinearLayout>
     </android.support.v7.widget.Toolbar>
 
     <android.support.v7.widget.Toolbar

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

@@ -8,7 +8,7 @@
     <color name="colorSecondaryLight">#0099cc</color>
     <color name="colorSecondaryDark">#1b3c47</color>
     <color name="colorBackgroundLight">#a0cdff</color>
-    <color name="colorBackgroundDark">#000000</color>
+    <color name="colorBackgroundDark">#1f1f1f</color>
     <color name="colorBackgroundCardsDark">#1b3c47</color>
     <color name="colorControlNormal">#FF78909C</color>
     <color name="colorControlActivated">#FF03A9F4</color>

app/src/main/res/menu/outlets.xml unused/outlets.xmlapp/src/main/res/menu/outlets.xml renamed to unused/outlets.xml

@@ -5,13 +5,11 @@
     <item
         android:id="@+id/menu_preferences"
         android:icon="?attr/ic_action_settings"
-        android:title="@string/preferences"
-        app:showAsAction="always" />
+        android:title="@string/preferences" app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/menu_about"
         android:icon="?attr/ic_action_good"
-        android:title="@string/drawer_feedback"
-        app:showAsAction="always" />
+        android:title="@string/drawer_feedback" app:showAsAction="ifRoom" />
 
 </menu>