Skip to content

Commit f29b5af

Browse files
author
David Graeff
committed
Use imagebuttons instead of a menu for preferences and feedback. On android 5 feedfack is not shown on smaller screens otherwise
1 parent 57c840b commit f29b5af

File tree

9 files changed

+50
-58
lines changed

9 files changed

+50
-58
lines changed

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

-31
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import android.provider.Settings;
1313
import android.support.v4.content.ContextCompat;
1414
import android.support.v4.widget.SwipeRefreshLayout;
15-
import android.support.v7.widget.ActionMenuView;
1615
import android.support.v7.widget.DefaultItemAnimator;
1716
import android.support.v7.widget.GridLayoutManager;
1817
import android.support.v7.widget.LinearLayoutManager;
@@ -48,10 +47,7 @@
4847
import oly.netpowerctrl.groups.GroupListFragment;
4948
import oly.netpowerctrl.groups.GroupUtilities;
5049
import oly.netpowerctrl.main.EditActivity;
51-
import oly.netpowerctrl.main.FeedbackFragment;
52-
import oly.netpowerctrl.main.MainActivity;
5350
import oly.netpowerctrl.network.Utils;
54-
import oly.netpowerctrl.preferences.PreferencesFragment;
5551
import oly.netpowerctrl.preferences.SharedPrefs;
5652
import oly.netpowerctrl.scenes.SceneHelp;
5753
import oly.netpowerctrl.ui.EmptyListener;
@@ -200,23 +196,6 @@ public void onServiceFinished(DataService service) {
200196
dataService = null;
201197
}
202198

203-
@Override
204-
public boolean onOptionsItemSelected(MenuItem item) {
205-
switch (item.getItemId()) {
206-
case R.id.menu_about: {
207-
FragmentUtils.changeToFragment(getActivity(), FeedbackFragment.class.getName());
208-
((MainActivity) getActivity()).closeGroupMenu();
209-
return true;
210-
}
211-
case R.id.menu_preferences: {
212-
FragmentUtils.changeToFragment(getActivity(), PreferencesFragment.class.getName());
213-
((MainActivity) getActivity()).closeGroupMenu();
214-
return true;
215-
}
216-
}
217-
return false;
218-
}
219-
220199
@Override
221200
public View onCreateView(LayoutInflater inflater, final ViewGroup container,
222201
Bundle savedInstanceState) {
@@ -236,16 +215,6 @@ public void onClick(View view) {
236215
}
237216
});
238217

239-
ActionMenuView menu = ((ActionMenuView) getActivity().findViewById(R.id.amvMenu));
240-
menu.setOnMenuItemClickListener(new ActionMenuView.OnMenuItemClickListener() {
241-
@Override
242-
public boolean onMenuItemClick(MenuItem menuItem) {
243-
return onOptionsItemSelected(menuItem);
244-
}
245-
});
246-
menu.getMenu().clear();
247-
getActivity().getMenuInflater().inflate(R.menu.outlets, menu.getMenu());
248-
249218
mRecyclerView = (RecyclerView) view.findViewById(android.R.id.list);
250219
mRecyclerView.setItemAnimator(new DefaultItemAnimator());
251220
mRecyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));

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

+22-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
import android.view.LayoutInflater;
1010
import android.view.View;
1111
import android.view.ViewGroup;
12-
import android.widget.Button;
1312

1413
import oly.netpowerctrl.R;
1514
import oly.netpowerctrl.data.DataService;
1615
import oly.netpowerctrl.data.onServiceReady;
1716
import oly.netpowerctrl.executables.ExecutablesFragment;
1817
import oly.netpowerctrl.ioconnection.IOConnectionsFragment;
18+
import oly.netpowerctrl.main.FeedbackFragment;
1919
import oly.netpowerctrl.main.MainActivity;
20+
import oly.netpowerctrl.preferences.PreferencesFragment;
2021
import oly.netpowerctrl.preferences.SharedPrefs;
2122
import oly.netpowerctrl.ui.EmptyListener;
2223
import oly.netpowerctrl.ui.FragmentUtils;
@@ -96,7 +97,7 @@ public boolean dividerForPosition(int position) {
9697

9798
groupAdapter.start();
9899

99-
Button button = (Button) root.findViewById(R.id.btnAdd);
100+
View button = root.findViewById(R.id.btnAdd);
100101
button.setOnClickListener(new View.OnClickListener() {
101102
@Override
102103
public void onClick(View view) {
@@ -111,7 +112,7 @@ public void onGroupCreated(Group group) {
111112
}
112113
});
113114

114-
button = (Button) root.findViewById(R.id.btnDevices);
115+
button = root.findViewById(R.id.btnDevices);
115116
button.setOnClickListener(new View.OnClickListener() {
116117
@Override
117118
public void onClick(View view) {
@@ -120,6 +121,24 @@ public void onClick(View view) {
120121
}
121122
});
122123

124+
button = root.findViewById(R.id.btnPreferences);
125+
button.setOnClickListener(new View.OnClickListener() {
126+
@Override
127+
public void onClick(View view) {
128+
FragmentUtils.changeToFragment(getActivity(), PreferencesFragment.class.getName());
129+
((MainActivity) getActivity()).closeGroupMenu();
130+
}
131+
});
132+
133+
button = root.findViewById(R.id.btnFeedback);
134+
button.setOnClickListener(new View.OnClickListener() {
135+
@Override
136+
public void onClick(View view) {
137+
FragmentUtils.changeToFragment(getActivity(), FeedbackFragment.class.getName());
138+
((MainActivity) getActivity()).closeGroupMenu();
139+
}
140+
});
141+
123142
return root;
124143
}
125144

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

-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
import oly.netpowerctrl.utils.ObserverUpdateActions;
3232
import oly.netpowerctrl.utils.onCollectionUpdated;
3333

34-
;
35-
3634
/**
3735
* Created by david on 15.04.15.
3836
*/

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

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
import oly.netpowerctrl.network.ReachabilityStates;
2727
import oly.netpowerctrl.preferences.SharedPrefs;
2828

29-
;
30-
3129
/**
3230
* Represents
3331
*/

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

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import oly.netpowerctrl.ui.notifications.InAppNotifications;
2121
import oly.netpowerctrl.utils.Logging;
2222

23-
;
24-
2523
/**
2624
* Widget Update Service for all types of widgets.
2725
*/

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:layout_width="fill_parent"
2626
android:layout_height="wrap_content"
2727
android:layout_gravity="center"
28-
android:layout_margin="@dimen/list_outer_padding"
28+
android:layout_margin="@dimen/list_inner_padding"
2929
card_view:cardBackgroundColor="?cards_background"
3030
card_view:cardCornerRadius="4dp"
3131
card_view:cardElevation="5dp">
@@ -230,7 +230,7 @@
230230
android:layout_width="fill_parent"
231231
android:layout_height="wrap_content"
232232
android:layout_gravity="center"
233-
android:layout_margin="@dimen/list_outer_padding"
233+
android:layout_margin="@dimen/list_inner_padding"
234234
card_view:cardBackgroundColor="?cards_background"
235235
card_view:cardCornerRadius="4dp"
236236
card_view:cardElevation="5dp">
@@ -296,7 +296,7 @@
296296
android:layout_width="fill_parent"
297297
android:layout_height="wrap_content"
298298
android:layout_gravity="center"
299-
android:layout_margin="@dimen/list_outer_padding"
299+
android:layout_margin="@dimen/list_inner_padding"
300300
card_view:cardBackgroundColor="?cards_background"
301301
card_view:cardCornerRadius="4dp"
302302
card_view:cardElevation="5dp">

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

+22-10
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,39 @@
1111
android:layout_height="wrap_content"
1212
app:theme="?attr/toolbar_style">
1313

14-
<RelativeLayout
14+
<LinearLayout
1515
android:layout_width="wrap_content"
1616
android:layout_height="wrap_content"
1717
android:layout_gravity="center">
1818

19-
<android.support.v7.widget.ActionMenuView
20-
android:id="@+id/amvMenu"
21-
android:layout_width="wrap_content"
22-
android:layout_height="wrap_content"
23-
android:layout_alignParentEnd="true" />
24-
2519
<com.rey.material.widget.Button
2620
android:id="@+id/btnDevices"
2721
style="@style/FlatButtonRippleStyle"
2822
android:layout_width="wrap_content"
2923
android:layout_height="wrap_content"
30-
android:layout_toStartOf="@id/amvMenu"
31-
android:gravity="center"
3224
android:text="@string/devices"
3325
android:textColor="?attr/textColorPrimary" />
34-
</RelativeLayout>
26+
27+
<com.rey.material.widget.ImageButton
28+
android:id="@+id/btnPreferences"
29+
style="@style/FlatButtonRippleStyle"
30+
android:layout_width="wrap_content"
31+
android:layout_height="wrap_content"
32+
android:contentDescription="@string/preferences"
33+
android:paddingEnd="5dp"
34+
android:paddingStart="5dp"
35+
android:src="?attr/ic_action_settings" />
36+
37+
<com.rey.material.widget.ImageButton
38+
android:id="@+id/btnFeedback"
39+
style="@style/FlatButtonRippleStyle"
40+
android:layout_width="wrap_content"
41+
android:layout_height="wrap_content"
42+
android:contentDescription="@string/drawer_feedback"
43+
android:paddingEnd="5dp"
44+
android:paddingStart="5dp"
45+
android:src="?attr/ic_action_good" />
46+
</LinearLayout>
3547
</android.support.v7.widget.Toolbar>
3648

3749
<android.support.v7.widget.Toolbar

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<color name="colorSecondaryLight">#0099cc</color>
99
<color name="colorSecondaryDark">#1b3c47</color>
1010
<color name="colorBackgroundLight">#a0cdff</color>
11-
<color name="colorBackgroundDark">#000000</color>
11+
<color name="colorBackgroundDark">#1f1f1f</color>
1212
<color name="colorBackgroundCardsDark">#1b3c47</color>
1313
<color name="colorControlNormal">#FF78909C</color>
1414
<color name="colorControlActivated">#FF03A9F4</color>

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
<item
66
android:id="@+id/menu_preferences"
77
android:icon="?attr/ic_action_settings"
8-
android:title="@string/preferences"
9-
app:showAsAction="always" />
8+
android:title="@string/preferences" app:showAsAction="ifRoom" />
109

1110
<item
1211
android:id="@+id/menu_about"
1312
android:icon="?attr/ic_action_good"
14-
android:title="@string/drawer_feedback"
15-
app:showAsAction="always" />
13+
android:title="@string/drawer_feedback" app:showAsAction="ifRoom" />
1614

1715
</menu>

0 commit comments

Comments
 (0)