archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make main menu popover intercept key events so that menu button can dismiss it

Browse Source
pull/14/head
Sam Bosley 14 years ago
parent cc25b593b4
commit cc80afcfef
5 changed files with 122 additions and 53 deletions
Show Stats Download Patch File Download Diff File

44
astrid/res/layout/main_menu_popover.xml
Unescape Escape View File

@ -1,27 +1,31 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <com.todoroo.astrid.ui.TouchInterceptingFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:paddingLeft="10dip"> <RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dip">
<include layout="@layout/main_menu_popover_body"/> <include layout="@layout/main_menu_popover_body"/>
<ImageView <ImageView
android:id="@+id/gdi_arrow_up" android:id="@+id/gdi_arrow_up"
android:layout_width="27dip" android:layout_width="27dip"
android:layout_height="27dip" android:layout_height="27dip"
android:layout_marginLeft="-10dip" android:layout_marginLeft="-10dip"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_marginBottom="-8dip" android:layout_marginBottom="-8dip"
android:src="?attr/asListArrowUp" /> android:src="?attr/asListArrowUp" />
<ImageView <ImageView
android:id="@+id/gdi_arrow_down" android:id="@+id/gdi_arrow_down"
android:layout_width="27dip" android:layout_width="27dip"
android:layout_height="27dip" android:layout_height="27dip"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_marginBottom="-8dip" android:layout_marginBottom="-8dip"
android:layout_below="@android:id/list"/> android:layout_below="@android:id/list"/>
</RelativeLayout> </RelativeLayout>
</com.todoroo.astrid.ui.TouchInterceptingFrameLayout>

45
astrid/res/layout/main_menu_popover_tablet.xml
Unescape Escape View File

@ -1,27 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <com.todoroo.astrid.ui.TouchInterceptingFrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:paddingLeft="10dip"> <RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dip">
<include layout="@layout/main_menu_popover_body_tablet"/> <include layout="@layout/main_menu_popover_body_tablet"/>
<ImageView <ImageView
android:id="@+id/gdi_arrow_up" android:id="@+id/gdi_arrow_up"
android:layout_width="27dip" android:layout_width="27dip"
android:layout_height="27dip" android:layout_height="27dip"
android:layout_marginLeft="-10dip" android:layout_marginLeft="-10dip"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_marginBottom="-8dip" android:layout_marginBottom="-8dip"
android:src="@drawable/list_arrow_up_white" /> android:src="@drawable/list_arrow_up_white" />
<ImageView <ImageView
android:id="@+id/gdi_arrow_down" android:id="@+id/gdi_arrow_down"
android:layout_width="27dip" android:layout_width="27dip"
android:layout_height="27dip" android:layout_height="27dip"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_marginBottom="-8dip" android:layout_marginBottom="-8dip"
android:layout_below="@android:id/list"/> android:layout_below="@android:id/list"/>
</RelativeLayout>
</RelativeLayout> </com.todoroo.astrid.ui.TouchInterceptingFrameLayout>

7
astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -497,10 +497,9 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
@Override @Override
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_MENU) { if (keyCode == KeyEvent.KEYCODE_MENU) {
if (mainMenuPopover.isShowing()) mainMenuPopover.suppressNextKeyEvent();
mainMenuPopover.dismiss(); mainMenu.performClick();
else return true;
mainMenu.performClick();
} }
return super.onKeyDown(keyCode, event); return super.onKeyDown(keyCode, event);
} }

29
astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.todoroo.astrid.ui;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.view.KeyEvent;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@ -14,8 +15,9 @@ import android.widget.TextView;
import com.timsu.astrid.R; import com.timsu.astrid.R;
import com.todoroo.astrid.activity.AstridActivity; import com.todoroo.astrid.activity.AstridActivity;
import com.todoroo.astrid.service.ThemeService; import com.todoroo.astrid.service.ThemeService;
import com.todoroo.astrid.ui.TouchInterceptingFrameLayout.InterceptTouchListener;
public class MainMenuPopover extends FragmentPopover { public class MainMenuPopover extends FragmentPopover implements InterceptTouchListener {
public static final int MAIN_MENU_ITEM_LISTS = R.string.TLA_menu_lists; public static final int MAIN_MENU_ITEM_LISTS = R.string.TLA_menu_lists;
public static final int MAIN_MENU_ITEM_FRIENDS = R.string.TLA_menu_friends; public static final int MAIN_MENU_ITEM_FRIENDS = R.string.TLA_menu_friends;
@ -34,6 +36,7 @@ public class MainMenuPopover extends FragmentPopover {
private final LinearLayout topFixed; private final LinearLayout topFixed;
private final LinearLayout bottomFixed; private final LinearLayout bottomFixed;
private final int rowLayout; private final int rowLayout;
private boolean suppressNextKeyEvent = false;
public void setMenuListener(MainMenuListener listener) { public void setMenuListener(MainMenuListener listener) {
this.mListener = listener; this.mListener = listener;
@ -42,6 +45,9 @@ public class MainMenuPopover extends FragmentPopover {
public MainMenuPopover(Context context, int layout, boolean isTablet) { public MainMenuPopover(Context context, int layout, boolean isTablet) {
super(context, layout); super(context, layout);
TouchInterceptingFrameLayout rootLayout = (TouchInterceptingFrameLayout) getContentView();
rootLayout.setInterceptTouchListener(this);
if (AstridActivity.shouldUseThreePane(context)) if (AstridActivity.shouldUseThreePane(context))
rowLayout = R.layout.main_menu_row_tablet; rowLayout = R.layout.main_menu_row_tablet;
else else
@ -57,6 +63,27 @@ public class MainMenuPopover extends FragmentPopover {
addFixedItems(isTablet); addFixedItems(isTablet);
} }
public boolean didInterceptTouch(KeyEvent event) {
int keyCode = event.getKeyCode();
if (!suppressNextKeyEvent) {
if ((keyCode == KeyEvent.KEYCODE_MENU || keyCode == KeyEvent.KEYCODE_BACK) && isShowing()) {
dismiss();
return true;
}
}
suppressNextKeyEvent = false;
return false;
}
public void suppressNextKeyEvent() {
suppressNextKeyEvent = true;
}
@Override
public void setBackgroundDrawable(Drawable background) {
super.setBackgroundDrawable(null);
}
private void addFixedItems(boolean isTablet) { private void addFixedItems(boolean isTablet) {
if (!isTablet) if (!isTablet)
addMenuItem(R.string.TLA_menu_lists, addMenuItem(R.string.TLA_menu_lists,

36
astrid/src/com/todoroo/astrid/ui/TouchInterceptingFrameLayout.java
Unescape Escape View File

@ -0,0 +1,36 @@
package com.todoroo.astrid.ui;
import android.content.Context;
import android.graphics.Color;
import android.util.AttributeSet;
import android.view.KeyEvent;
import android.widget.FrameLayout;
public class TouchInterceptingFrameLayout extends FrameLayout {
public interface InterceptTouchListener {
public boolean didInterceptTouch(KeyEvent event);
}
private InterceptTouchListener mListener;
public TouchInterceptingFrameLayout(Context context, AttributeSet attrs) {
super(context, attrs);
setBackgroundColor(Color.TRANSPARENT);
}
@Override
public boolean dispatchKeyEvent(KeyEvent event) {
if (mListener != null && mListener.didInterceptTouch(event))
return true;
return super.dispatchKeyEvent(event);
}
public InterceptTouchListener getInterceptTouchListener() {
return mListener;
}
public void setInterceptTouchListener(InterceptTouchListener mListener) {
this.mListener = mListener;
}
}
Write Preview
Loading…
Cancel
Save