From 374f8cf472c04635915632d6db44fdc106cb4aa1 Mon Sep 17 00:00:00 2001 From: William Mora Date: Thu, 18 Dec 2014 00:12:38 -0300 Subject: [PATCH] SnackbarManager now in lib --- .../SnackbarListViewSampleActivity.java | 4 +-- .../SnackbarRecyclerViewSampleActivity.java | 4 +-- .../snackbar/SnackbarSampleActivity.java | 18 ++++++------- .../snackbar/utils/SnackbarManager.java | 27 ------------------- 4 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 sample/src/main/java/com/nispok/sample/snackbar/utils/SnackbarManager.java diff --git a/sample/src/main/java/com/nispok/sample/snackbar/SnackbarListViewSampleActivity.java b/sample/src/main/java/com/nispok/sample/snackbar/SnackbarListViewSampleActivity.java index 27fd7c2..bb4349b 100644 --- a/sample/src/main/java/com/nispok/sample/snackbar/SnackbarListViewSampleActivity.java +++ b/sample/src/main/java/com/nispok/sample/snackbar/SnackbarListViewSampleActivity.java @@ -1,7 +1,7 @@ package com.nispok.sample.snackbar; -import com.nispok.sample.snackbar.utils.SnackbarManager; import com.nispok.snackbar.Snackbar; +import com.nispok.snackbar.SnackbarManager; import android.graphics.Color; import android.os.Bundle; @@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override public void onItemClick(AdapterView parent, View view, int position, long id) { - SnackbarManager.getInstance().show( + SnackbarManager.show( Snackbar.with(SnackbarListViewSampleActivity.this) .text(String.format("Item %d pressed", (position + 1))) .actionLabel("Close") diff --git a/sample/src/main/java/com/nispok/sample/snackbar/SnackbarRecyclerViewSampleActivity.java b/sample/src/main/java/com/nispok/sample/snackbar/SnackbarRecyclerViewSampleActivity.java index 9ef0c66..11256e5 100644 --- a/sample/src/main/java/com/nispok/sample/snackbar/SnackbarRecyclerViewSampleActivity.java +++ b/sample/src/main/java/com/nispok/sample/snackbar/SnackbarRecyclerViewSampleActivity.java @@ -1,7 +1,7 @@ package com.nispok.sample.snackbar; -import com.nispok.sample.snackbar.utils.SnackbarManager; import com.nispok.snackbar.Snackbar; +import com.nispok.snackbar.SnackbarManager; import android.content.Context; import android.graphics.Color; @@ -61,7 +61,7 @@ public boolean onOptionsItemSelected(MenuItem item) { finish(); return true; case R.id.action_add_snackbar: - SnackbarManager.getInstance().show( + SnackbarManager.show( Snackbar.with(SnackbarRecyclerViewSampleActivity.this) .text("Woo, snackbar!") .actionLabel("Close") diff --git a/sample/src/main/java/com/nispok/sample/snackbar/SnackbarSampleActivity.java b/sample/src/main/java/com/nispok/sample/snackbar/SnackbarSampleActivity.java index 9ee1cc2..258437c 100644 --- a/sample/src/main/java/com/nispok/sample/snackbar/SnackbarSampleActivity.java +++ b/sample/src/main/java/com/nispok/sample/snackbar/SnackbarSampleActivity.java @@ -13,8 +13,8 @@ import android.widget.Button; import android.widget.Toast; -import com.nispok.sample.snackbar.utils.SnackbarManager; import com.nispok.snackbar.Snackbar; +import com.nispok.snackbar.SnackbarManager; import com.nispok.snackbar.enums.SnackbarType; import com.nispok.snackbar.listeners.ActionClickListener; import com.nispok.snackbar.listeners.EventListener; @@ -32,7 +32,7 @@ protected void onCreate(Bundle savedInstanceState) { singleLineButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SnackbarManager.getInstance().show( + SnackbarManager.show( Snackbar.with(SnackbarSampleActivity.this) .text("Single-line snackbar")); } @@ -42,7 +42,7 @@ public void onClick(View v) { singleLineWithActionButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SnackbarManager.getInstance().show( + SnackbarManager.show( Snackbar.with(SnackbarSampleActivity.this) .text("Something has been done") .actionLabel("Undo") @@ -61,7 +61,7 @@ public void onActionClicked(Snackbar snackbar) { multiLineButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SnackbarManager.getInstance().show( + SnackbarManager.show( Snackbar.with(SnackbarSampleActivity.this) .type(SnackbarType.MULTI_LINE) .text("This is a multi-line snackbar. Keep in mind that snackbars" + @@ -73,7 +73,7 @@ public void onClick(View v) { multiLineWithActionButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SnackbarManager.getInstance().show( + SnackbarManager.show( Snackbar.with(SnackbarSampleActivity.this) .type(SnackbarType.MULTI_LINE) .text("This is a multi-line snackbar with an action button. Note " + @@ -94,7 +94,7 @@ public void onActionClicked(Snackbar snackbar) { noAnimationButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SnackbarManager.getInstance().show( + SnackbarManager.show( Snackbar.with(SnackbarSampleActivity.this) .text("No animation :(") .animation(false) @@ -106,7 +106,7 @@ public void onClick(View v) { eventListenerButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SnackbarManager.getInstance().show( + SnackbarManager.show( Snackbar.with(SnackbarSampleActivity.this) .text("I'm showing a toast on exit") .eventListener(new EventListener() { @@ -150,7 +150,7 @@ public void onDismissed(Snackbar snackbar) { customColorsButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SnackbarManager.getInstance().show( + SnackbarManager.show( Snackbar.with(SnackbarSampleActivity.this) .text("Different colors!!!") .textColor(Color.parseColor("#ff9d9d9c")) @@ -171,7 +171,7 @@ public void onActionClicked(Snackbar snackbar) { unswipeableButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - SnackbarManager.getInstance().show( + SnackbarManager.show( Snackbar.with(SnackbarSampleActivity.this) .text("Try to swipe me off the screen") .swipeToDismiss(false)); diff --git a/sample/src/main/java/com/nispok/sample/snackbar/utils/SnackbarManager.java b/sample/src/main/java/com/nispok/sample/snackbar/utils/SnackbarManager.java deleted file mode 100644 index d31c0da..0000000 --- a/sample/src/main/java/com/nispok/sample/snackbar/utils/SnackbarManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.nispok.sample.snackbar.utils; - -import android.app.Activity; - -import com.nispok.snackbar.Snackbar; - -public class SnackbarManager { - - private static SnackbarManager INSTANCE = new SnackbarManager(); - - public static SnackbarManager getInstance() { - return INSTANCE; - } - - private Snackbar currentSnackbar; - - private SnackbarManager() { - } - - public void show(Snackbar snackbar) { - if (currentSnackbar != null) { - currentSnackbar.dismiss(); - } - currentSnackbar = snackbar; - currentSnackbar.show((Activity) currentSnackbar.getContext()); - } -}