Skip to content

Commit

Permalink
Updated code to pass quality checks
Browse files Browse the repository at this point in the history
  • Loading branch information
kpmmmurphy committed Feb 20, 2017
1 parent 9d87edc commit a7ce909
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 41 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,16 @@ Alerter.create(this)
```java
Alerter.create(ExampleActivity.this)
.setTitle("Alert Title")
.setOnShownListener(new OnAlertShownListener() {
.setOnShownListener(new OnShowAlertListener() {
@Override
public void onAlertShown() {
Toast.makeText(ExampleActivity.this, "OnAlertShown", Toast.LENGTH_LONG).show();
public void onShow() {
Toast.makeText(ExampleActivity.this, "Alert Shown", Toast.LENGTH_LONG).show();
}
})
.setOnHiddenListener(new OnAlertHiddenListener() {
.setOnHiddenListener(new OnHideListener() {
@Override
public void onAlertHidden() {
Toast.makeText(ExampleActivity.this, "OnAlertHidden", Toast.LENGTH_LONG).show();
public void onHide() {
Toast.makeText(ExampleActivity.this, "Alert Hidden", Toast.LENGTH_LONG).show();
}
})
.show();
Expand Down
2 changes: 1 addition & 1 deletion alerter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ apply plugin: "maven-publish"
apply from: rootProject.file('quality.gradle')

def final String PACKAGE_NAME = "com.tapadoo.android"
def final String VERSION = "1.0.1"
def final String VERSION = "1.0.2"
def final String DESCRIPTION = "An Android Alerting Library"
def final String GITHUB_URL = "https://github.com/Tapadoo/Alerter"

Expand Down
19 changes: 13 additions & 6 deletions alerter/src/main/java/com/tapadoo/alerter/Alert.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ public class Alert extends FrameLayout implements View.OnClickListener, Animatio
private Animation slideInAnimation;
private Animation slideOutAnimation;

private OnAlertShownListener onShowListener;
private OnAlertHiddenListener onHideListener;
private OnShowAlertListener onShowListener;
private OnHideAlertListener onHideListener;

private long duration = DISPLAY_TIME_IN_SECONDS;

Expand Down Expand Up @@ -199,7 +199,9 @@ public void onAnimationEnd(final Animation animation) {
}
}

if(onShowListener != null) onShowListener.onAlertShown();
if(onShowListener != null) {
onShowListener.onShow();
}

//Start the Handler to clean up the Alert
postDelayed(new Runnable() {
Expand Down Expand Up @@ -258,7 +260,10 @@ public void run() {
} else {
try {
((ViewGroup) getParent()).removeView(Alert.this);
if(onHideListener != null) onHideListener.onAlertHidden();

if(onHideListener != null) {
onHideListener.onHide();
}
} catch (Exception ex) {
Log.e(getClass().getSimpleName(), "Cannot remove from parent layout");
}
Expand Down Expand Up @@ -381,15 +386,17 @@ public void pulseIcon(final boolean shouldPulse) {
* Set the alert's listener to be fired on the alert being fully shown
* @param listener Listener to be fired
*/
public void setOnShownListener(OnAlertShownListener listener) {
public void setOnShowListener(@NonNull final OnShowAlertListener listener) {
this.onShowListener = listener;
}

/**
* Set the alert's listener to be fired on the alert being fully hidden
*
*
* @param listener Listener to be fired
*/
public void setOnHiddenListener(OnAlertHiddenListener listener) {
public void setOnHideListener(@NonNull final OnHideAlertListener listener) {
this.onHideListener = listener;
}

Expand Down
12 changes: 6 additions & 6 deletions alerter/src/main/java/com/tapadoo/alerter/Alerter.java
Original file line number Diff line number Diff line change
Expand Up @@ -238,25 +238,25 @@ public Alerter enableIconPulse(final boolean pulse) {
/**
* Sets the Alert Shown Listener
*
* @param listener OnAlertShownListener of Alert
* @param listener OnShowAlertListener of Alert
* @return This Alerter
*/
public Alerter setOnShownListener(final OnAlertShownListener listener) {
public Alerter setOnShowListener(@NonNull final OnShowAlertListener listener) {
if (getAlert() != null) {
getAlert().setOnShownListener(listener);
getAlert().setOnShowListener(listener);
}
return this;
}

/**
* Sets the Alert Hidden Listener
*
* @param listener OnAlertHiddenListener of Alert
* @param listener OnHideAlertListener of Alert
* @return This Alerter
*/
public Alerter setOnHiddenListener(final OnAlertHiddenListener listener) {
public Alerter setOnHideListener(@NonNull final OnHideAlertListener listener) {
if (getAlert() != null) {
getAlert().setOnHiddenListener(listener);
getAlert().setOnHideListener(listener);
}
return this;
}
Expand Down

This file was deleted.

This file was deleted.

15 changes: 15 additions & 0 deletions alerter/src/main/java/com/tapadoo/alerter/OnHideAlertListener.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.tapadoo.alerter;

/**
* On Hide Alert Listener
*
* @author edgeorge
* @since 20/02/2017.
*/

public interface OnHideAlertListener {
/**
* Called when the Alert is hidden
*/
void onHide();
}
14 changes: 14 additions & 0 deletions alerter/src/main/java/com/tapadoo/alerter/OnShowAlertListener.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.tapadoo.alerter;

/**
* On Show Alert Listener
*
* @author edgeorge
* @since 20/02/2017.
*/
public interface OnShowAlertListener {
/**
* Called when the Alert is initially Shown
*/
void onShow();
}
8 changes: 4 additions & 4 deletions app/src/main/java/com/tapadoo/example/ExampleActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import android.widget.Toast;

import com.tapadoo.alerter.Alerter;
import com.tapadoo.alerter.OnAlertHiddenListener;
import com.tapadoo.alerter.OnAlertShownListener;
import com.tapadoo.alerter.OnHideAlertListener;
import com.tapadoo.alerter.OnShowAlertListener;

public class ExampleActivity extends AppCompatActivity implements View.OnClickListener {

Expand Down Expand Up @@ -118,13 +118,13 @@ private void showAlertCallbacks(){
.setTitle("Alert Title")
.setText("Alert text...")
.setDuration(10000)
.setOnShownListener(new OnAlertShownListener() {
.setOnShownListener(new OnShowAlertListener() {
@Override
public void onAlertShown() {
Toast.makeText(ExampleActivity.this, "OnAlertShown", Toast.LENGTH_LONG).show();
}
})
.setOnHiddenListener(new OnAlertHiddenListener() {
.setOnHiddenListener(new OnHideAlertListener() {
@Override
public void onAlertHidden() {
Toast.makeText(ExampleActivity.this, "OnAlertHidden", Toast.LENGTH_LONG).show();
Expand Down

0 comments on commit a7ce909

Please sign in to comment.