improved color picker

mariotaku · Dec 22, 2013 · 2145426 · 2145426
1 parent 02336f1
commit 2145426
Show file tree

Hide file tree

Showing 29 changed files with 815 additions and 568 deletions.
diff --git a/res/layout/color_picker.xml b/res/layout/color_picker.xml
@@ -12,16 +12,11 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="1"/>
 
-	<HorizontalScrollView
+	<com.scvngr.levelup.views.gallery.Gallery
+		android:id="@+id/color_presets"
 		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:layout_weight="0">
-
-		<org.mariotaku.twidere.view.ColorPickerPresetsView
-			android:id="@+id/color_presets"
-			android:layout_width="wrap_content"
-			android:layout_height="@dimen/button_bar_height"
-			android:padding="@dimen/element_spacing_small"/>
-	</HorizontalScrollView>
+		android:layout_height="@dimen/button_bar_height"
+		android:layout_weight="0"
+		android:spacing="0dp"/>
 
 </LinearLayout>
diff --git a/res/layout/color_picker_preset_item.xml b/res/layout/color_picker_preset_item.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.mariotaku.twidere.view.ColorView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="@dimen/color_button_width"
+<org.mariotaku.twidere.view.SquareRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="wrap_content"
 	android:layout_height="match_parent"
-	android:background="?android:selectableItemBackground"
-	android:padding="@dimen/element_spacing_small"/>
+	android:padding="@dimen/element_spacing_extra_small">
+
+	<org.mariotaku.twidere.view.ForegroundColorView
+		android:id="@+id/color"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:layout_alignParentBottom="true"
+		android:layout_alignParentTop="true"
+		android:background="?android:activatedBackgroundIndicator"
+		android:foreground="?android:selectableItemBackground"
+		android:padding="@dimen/element_spacing_extra_small"/>
+
+</org.mariotaku.twidere.view.SquareRelativeLayout>
diff --git a/res/menu/action_user_profile.xml b/res/menu/action_user_profile.xml
@@ -15,35 +15,13 @@
 		android:icon="@android:drawable/ic_menu_add"
 		android:title="@string/add_to_list"/>
 	<item
-		android:id="@+id/set_color_submenu"
+		android:id="@id/set_color"
 		android:icon="@drawable/ic_menu_color_palette"
-		android:title="@string/set_color">
-		<menu>
-			<item
-				android:id="@id/set_color"
-				android:icon="@drawable/ic_menu_color_palette"
-				android:title="@string/set_color"/>
-			<item
-				android:id="@id/clear_color"
-				android:icon="@android:drawable/ic_menu_close_clear_cancel"
-				android:title="@string/clear"/>
-		</menu>
-	</item>
-	<item
-		android:id="@+id/set_nickname_submenu"
+		android:title="@string/set_color"/>
+	<item
+		android:id="@id/set_nickname"
 		android:icon="@android:drawable/ic_menu_edit"
-		android:title="@string/set_nickname">
-		<menu>
-			<item
-				android:id="@id/set_nickname"
-				android:icon="@android:drawable/ic_menu_edit"
-				android:title="@string/set_nickname"/>
-			<item
-				android:id="@id/clear_nickname"
-				android:icon="@android:drawable/ic_menu_close_clear_cancel"
-				android:title="@string/clear"/>
-		</menu>
-	</item>
+		android:title="@string/set_nickname"/>
 	<item
 		android:id="@id/mute_user"
 		android:icon="@drawable/ic_menu_mute"

diff --git a/res/menu/menu_status.xml b/res/menu/menu_status.xml
@@ -43,35 +43,13 @@
 		android:icon="@drawable/ic_menu_mute"
 		android:title="@string/add_to_filter"/>
 	<item
-		android:id="@+id/set_color_submenu"
+		android:id="@id/set_color"
 		android:icon="@drawable/ic_menu_color_palette"
-		android:title="@string/set_color">
-		<menu>
-			<item
-				android:id="@id/set_color"
-				android:icon="@drawable/ic_menu_color_palette"
-				android:title="@string/set_color"/>
-			<item
-				android:id="@id/clear_color"
-				android:icon="@android:drawable/ic_menu_close_clear_cancel"
-				android:title="@string/clear"/>
-		</menu>
-	</item>
+		android:title="@string/set_color"/>
 	<item
-		android:id="@+id/set_nickname_submenu"
+		android:id="@id/set_nickname"
 		android:icon="@android:drawable/ic_menu_edit"
-		android:title="@string/set_nickname">
-		<menu>
-			<item
-				android:id="@id/set_nickname"
-				android:icon="@android:drawable/ic_menu_edit"
-				android:title="@string/set_nickname"/>
-			<item
-				android:id="@id/clear_nickname"
-				android:icon="@android:drawable/ic_menu_close_clear_cancel"
-				android:title="@string/clear"/>
-		</menu>
-	</item>
+		android:title="@string/set_nickname"/>
 	<item
 		android:id="@+id/delete_submenu"
 		android:icon="@android:drawable/ic_menu_delete"

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
@@ -47,7 +47,8 @@
 	<dimen name="item_menu_card_padding_compact">20dp</dimen>
 
 	<!-- Dimensions for color picker -->
-	<dimen name="color_button_width">36dp</dimen>
+	<dimen name="color_button_width">48dp</dimen>
+	<dimen name="color_button_height">48dp</dimen>
 
 	<!-- Dimensions for compose dialog -->
 	<dimen name="compose_min_width">400dp</dimen>
@@ -56,4 +57,7 @@
 	<!-- Dimensions for Tab indicator -->
 	<dimen name="tab_item_minwidth_vpi">64dp</dimen>
 
+	<!-- Dimensions for alert dialog -->
+	<dimen name="icon_size_alert_dialog">32dp</dimen>
+
 </resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
@@ -47,7 +47,6 @@
 	<item name="up" type="id"/>
 	<item name="down" type="id"/>
 	<item name="multi_select" type="id"/>
-	<item name="clear_color" type="id"/>
 	<item name="copy" type="id"/>
 	<item name="right_pane" type="id"/>
 	<item name="right_pane_container" type="id"/>

diff --git a/src/com/scvngr/levelup/views/gallery/Gallery.java b/src/com/scvngr/levelup/views/gallery/Gallery.java
@@ -179,7 +179,6 @@ public void run() {
 	private boolean mIsRtl = true;
 
 	private boolean mScrollToChildAfterItemClickEnabled;
-	private boolean mScrollWhenChildsLesserThanItems;
 	private boolean mRightSpacingEnabled;
 
 	/**
@@ -214,7 +213,6 @@ public Gallery(final Context context, final AttributeSet attrs, final int defSty
 		mGestureDetector = new GestureDetector(context, this);
 		mGestureDetector.setIsLongpressEnabled(true);
 		setScrollAfterItemClickEnabled(true);
-		setScrollWhenChildsLesserThanItems(true);
 		setScrollRightSpacingEnabled(true);
 	}
 
@@ -504,10 +502,6 @@ public void setScrollRightSpacingEnabled(final boolean enabled) {
 		mRightSpacingEnabled = enabled;
 	}
 
-	public void setScrollWhenChildsLesserThanItems(final boolean enabled) {
-		mScrollWhenChildsLesserThanItems = enabled;
-	}
-
 	/**
 	 * Sets the spacing between items in a Gallery.
 	 * 
@@ -1367,8 +1361,6 @@ void trackMotionScroll(final int deltaX) {
 
 		if (getChildCount() == 0) return;
 
-		if (!mScrollWhenChildsLesserThanItems && mAdapter != null && getChildCount() >= mAdapter.getCount()) return;
-
 		final boolean toLeft = deltaX < 0;
 
 		final int limitedDeltaX = getLimitedMotionScrollAmount(toLeft, deltaX);

diff --git a/src/org/mariotaku/twidere/Constants.java b/src/org/mariotaku/twidere/Constants.java
@@ -79,7 +79,6 @@ public interface Constants extends TwidereConstants {
 	public static final int MENU_UP = R.id.up;
 	public static final int MENU_DOWN = R.id.down;
 	public static final int MENU_MULTI_SELECT = R.id.multi_select;
-	public static final int MENU_CLEAR_COLOR = R.id.clear_color;
 	public static final int MENU_COPY = R.id.copy;
 	public static final int MENU_TOGGLE_SENSITIVE = R.id.toggle_sensitive;
 	public static final int MENU_REVOKE = R.id.revoke;

diff --git a/src/org/mariotaku/twidere/TwidereConstants.java b/src/org/mariotaku/twidere/TwidereConstants.java
@@ -490,6 +490,7 @@ public interface TwidereConstants {
 	public static final String EXTRA_RECIPIENT_ID = "recipient_id";
 	public static final String EXTRA_OFFICIAL_KEY_ONLY = "official_key_only";
 	public static final String EXTRA_SEARCH_ID = "search_id";
+	public static final String EXTRA_CLEAR_BUTTON = "clear_button";
 
 	public static final int MENU_GROUP_STATUS_EXTENSION = 10;
 	public static final int MENU_GROUP_COMPOSE_EXTENSION = 11;

diff --git a/src/org/mariotaku/twidere/activity/support/ColorPickerDialogActivity.java b/src/org/mariotaku/twidere/activity/support/ColorPickerDialogActivity.java
@@ -25,16 +25,24 @@
 import android.os.Bundle;
 
 import org.mariotaku.twidere.fragment.support.ColorPickerDialogFragment;
-import org.mariotaku.twidere.fragment.support.ColorPickerDialogFragment.OnColorSelectedListener;
+import org.mariotaku.twidere.fragment.support.ColorPickerDialogFragment.Callback;
 import org.mariotaku.twidere.util.ThemeUtils;
 
-public class ColorPickerDialogActivity extends BaseSupportDialogActivity implements OnColorSelectedListener {
+public class ColorPickerDialogActivity extends BaseSupportDialogActivity implements Callback {
+
+	public static final int RESULT_CLEARED = -2;
 
 	@Override
 	public int getThemeResourceId() {
 		return ThemeUtils.getNoDisplayThemeResource(this);
 	}
 
+	@Override
+	public void onColorCleared() {
+		setResult(RESULT_CLEARED);
+		finish();
+	}
+
 	@Override
 	public void onColorSelected(final int color) {
 		final Intent intent = new Intent();
@@ -51,6 +59,7 @@ protected void onCreate(final Bundle savedInstanceState) {
 			final InternalColorPickerDialogFragment f = new InternalColorPickerDialogFragment();
 			final Bundle args = new Bundle();
 			args.putInt(EXTRA_COLOR, intent.getIntExtra(EXTRA_COLOR, Color.WHITE));
+			args.putBoolean(EXTRA_CLEAR_BUTTON, intent.getBooleanExtra(EXTRA_CLEAR_BUTTON, false));
 			args.putBoolean(EXTRA_ALPHA_SLIDER, intent.getBooleanExtra(EXTRA_ALPHA_SLIDER, true));
 			f.setArguments(args);
 			f.show(getSupportFragmentManager(), "color_picker_dialog");

diff --git a/src/org/mariotaku/twidere/activity/support/ComposeActivity.java b/src/org/mariotaku/twidere/activity/support/ComposeActivity.java
@@ -562,7 +562,6 @@ protected void onCreate(final Bundle savedInstanceState) {
 		mAccountSelector.setOnItemClickListener(this);
 		mAccountSelector.setOnItemLongClickListener(this);
 		mAccountSelector.setScrollAfterItemClickEnabled(false);
-		mAccountSelector.setScrollWhenChildsLesserThanItems(false);
 		mAccountSelector.setScrollRightSpacingEnabled(false);
 
 		final Intent intent = getIntent();

diff --git a/src/org/mariotaku/twidere/activity/support/SignInActivity.java b/src/org/mariotaku/twidere/activity/support/SignInActivity.java
@@ -144,8 +144,10 @@ public void onActivityResult(final int requestCode, final int resultCode, final
 				break;
 			}
 			case REQUEST_SET_COLOR: {
-				if (resultCode == BaseSupportActivity.RESULT_OK && data != null) {
-					mUserColor = data.getIntExtra(EXTRA_COLOR, Color.TRANSPARENT);
+				if (resultCode == BaseSupportActivity.RESULT_OK) {
+					mUserColor = data != null ? data.getIntExtra(EXTRA_COLOR, Color.TRANSPARENT) : null;
+				} else if (resultCode == ColorPickerDialogActivity.RESULT_CLEARED) {
+					mUserColor = null;
 				}
 				setUserColorButton();
 				break;
@@ -193,6 +195,7 @@ public void onClick(final View v) {
 					intent.putExtra(EXTRA_COLOR, mUserColor);
 				}
 				intent.putExtra(EXTRA_ALPHA_SLIDER, false);
+				intent.putExtra(EXTRA_CLEAR_BUTTON, true);
 				startActivityForResult(intent, REQUEST_SET_COLOR);
 				break;
 			}