From cddfd426686683936015253a2de207bb6c1b256d Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Tue, 17 May 2016 12:51:35 +0800 Subject: [PATCH] removed SuperToast library --- twidere/build.gradle | 1 - .../twidere/activity/ComposeActivity.java | 21 +++++++++--------- .../MessagesConversationFragment.java | 22 +++++++++---------- .../layout/header_drawer_account_selector.xml | 2 +- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/twidere/build.gradle b/twidere/build.gradle index 2117f3ad3..7454a1f44 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -143,7 +143,6 @@ dependencies { compile 'com.commonsware.cwac:layouts:0.4.2' compile 'com.rengwuxian.materialedittext:library:2.1.4' compile 'com.pnikosis:materialish-progress:1.7' - compile 'com.github.johnpersano:supertoasts:1.3.4.1@aar' compile 'com.github.mariotaku:MessageBubbleView:1.2' compile 'com.github.mariotaku:DragSortListView:0.6.1' compile 'com.github.uucky:ColorPicker-Android:0.9.7@aar' diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java index 0026abd0a..5cc5d7986 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/ComposeActivity.java @@ -97,9 +97,6 @@ import com.afollestad.appthemeengine.customizers.ATEToolbarCustomizer; import com.afollestad.appthemeengine.util.ATEUtil; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; -import com.github.johnpersano.supertoasts.SuperToast; -import com.github.johnpersano.supertoasts.SuperToast.Duration; -import com.github.johnpersano.supertoasts.SuperToast.OnDismissListener; import com.twitter.Extractor; import org.apache.commons.lang3.ArrayUtils; @@ -209,6 +206,13 @@ public class ComposeActivity extends BaseActivity implements OnMenuItemClickList private SupportMenuInflater mMenuInflater; private ItemTouchHelper mItemTouchHelper; + private final Runnable mBackTimeoutRunnable = new Runnable() { + @Override + public void run() { + mNavigateBackPressed = false; + } + }; + // Views private RecyclerView mAttachedMediaPreview; private ActionMenuView mMenuBar; @@ -892,14 +896,9 @@ public class ComposeActivity extends BaseActivity implements OnMenuItemClickList if (ACTION_NAVIGATION_BACK.equals(action)) { if (mEditText.length() == 0 && !mTextChanged) { if (!mNavigateBackPressed) { - final SuperToast toast = SuperToast.create(this, getString(R.string.press_again_to_close), Duration.SHORT); - toast.setOnDismissListener(new OnDismissListener() { - @Override - public void onDismiss(View view) { - mNavigateBackPressed = false; - } - }); - toast.show(); + Toast.makeText(this, getString(R.string.press_again_to_close), Toast.LENGTH_SHORT).show(); + mEditText.removeCallbacks(mBackTimeoutRunnable); + mEditText.postDelayed(mBackTimeoutRunnable, 2000); } else { onBackPressed(); } diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/MessagesConversationFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/MessagesConversationFragment.java index e83482878..ceeede666 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/MessagesConversationFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/MessagesConversationFragment.java @@ -66,10 +66,8 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.Spinner; import android.widget.TextView; +import android.widget.Toast; -import com.github.johnpersano.supertoasts.SuperToast; -import com.github.johnpersano.supertoasts.SuperToast.Duration; -import com.github.johnpersano.supertoasts.SuperToast.OnDismissListener; import com.squareup.otto.Subscribe; import org.mariotaku.sqliteqb.library.Columns.Column; @@ -199,6 +197,13 @@ public class MessagesConversationFragment extends BaseSupportFragment implements private boolean mTextChanged, mQueryTextChanged; private View mInputPanel; + private final Runnable mBackTimeoutRunnable = new Runnable() { + @Override + public void run() { + mNavigateBackPressed = false; + } + }; + @Subscribe public void notifyTaskStateChanged(TaskStateChangedEvent event) { updateRefreshState(); @@ -585,14 +590,9 @@ public class MessagesConversationFragment extends BaseSupportFragment implements if (editText.length() == 0 && !textChanged) { final FragmentActivity activity = getActivity(); if (!mNavigateBackPressed) { - final SuperToast toast = SuperToast.create(activity, getString(R.string.press_again_to_close), Duration.SHORT); - toast.setOnDismissListener(new OnDismissListener() { - @Override - public void onDismiss(View view) { - mNavigateBackPressed = false; - } - }); - toast.show(); + Toast.makeText(activity, R.string.press_again_to_close, Toast.LENGTH_SHORT).show(); + editText.removeCallbacks(mBackTimeoutRunnable); + editText.postDelayed(mBackTimeoutRunnable, 2000); mNavigateBackPressed = true; } else { activity.onBackPressed(); diff --git a/twidere/src/main/res/layout/header_drawer_account_selector.xml b/twidere/src/main/res/layout/header_drawer_account_selector.xml index c65c41add..05a983bd5 100644 --- a/twidere/src/main/res/layout/header_drawer_account_selector.xml +++ b/twidere/src/main/res/layout/header_drawer_account_selector.xml @@ -119,7 +119,7 @@ android:focusable="false" android:singleLine="true" android:textAppearance="?android:textAppearanceSmall" - android:textColor="@color/light_gray" + android:textColor="@color/material_grey" tools:text="\@username"/>