Skip to content

Some possible refactors #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duchuyctlk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Some possible refactors #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7b33bb
Refactor: use ternary in simple cases, split values into constants, d…
Jun 1, 2016
7a0c2ee
Refactor: Make PopupActivity be extended by the others
Jun 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions app/src/main/java/com/meetic/marypopup/sample/PopupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,23 @@ public class PopupActivity extends AppCompatActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setUpPopup();
}

protected void setUpPopup() {
setContentView(R.layout.activity_popup);
ButterKnife.bind(this);
popup = MaryPopup.with(this)
.cancellable(true)
.draggable(true)
.scaleDownDragging(true)
.fadeOutDragging(true)
.blackOverlayColor(Color.parseColor("#DD444444"))
.backgroundColor(Color.parseColor("#EFF4F5"));
popup = createMaryPopup()
.draggable(true)
.scaleDownDragging(true)
.fadeOutDragging(true);
}

protected MaryPopup createMaryPopup() {
return MaryPopup.with(this)
.cancellable(true)
.blackOverlayColor(Color.parseColor("#DD444444"))
.backgroundColor(Color.parseColor("#EFF4F5"));
}

@OnClick(R.id.cardView)
Expand All @@ -41,7 +49,7 @@ public void onClickCardView() {

@Override
public void onBackPressed() {
if(popup.isOpened()){
if (popup.isOpened()){
popup.close(true);
} else {
super.onBackPressed();
Expand Down
46 changes: 7 additions & 39 deletions app/src/main/java/com/meetic/marypopup/sample/PopupCenterActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,22 @@
package com.meetic.marypopup.sample;

import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;

import com.meetic.marypopup.MaryPopup;

import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;

public class PopupCenterActivity extends AppCompatActivity {
public class PopupCenterActivity extends PopupActivity {

@Bind(R.id.toolbar) Toolbar toolbar;
@Bind(R.id.cardView) View cardView;
MaryPopup popup;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
protected void setUpPopup() {
setContentView(R.layout.activity_popup_center);
ButterKnife.bind(this);
setSupportActionBar(toolbar);
popup = MaryPopup.with(this)
.cancellable(true)
.draggable(true)
.scaleDownDragging(true)
.fadeOutDragging(true)
.center(true)
.blackOverlayColor(Color.parseColor("#DD444444"))
.backgroundColor(Color.parseColor("#EFF4F5"));
}

@OnClick(R.id.cardView)
public void onClickCardView() {
popup
.content(R.layout.popup_content)
.from(cardView)
.show();
}

@Override
public void onBackPressed() {
if(popup.isOpened()){
popup.close(true);
} else {
super.onBackPressed();
}
popup = createMaryPopup()
.draggable(true)
.scaleDownDragging(true)
.fadeOutDragging(true)
.center(true);
}
}
42 changes: 4 additions & 38 deletions app/src/main/java/com/meetic/marypopup/sample/PopupDraggableActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,14 @@
package com.meetic.marypopup.sample;

import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

import com.meetic.marypopup.MaryPopup;

import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;

public class PopupDraggableActivity extends AppCompatActivity {

@Bind(R.id.cardView) View cardView;
MaryPopup popup;
public class PopupDraggableActivity extends PopupActivity {

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
protected void setUpPopup() {
setContentView(R.layout.activity_popup);
ButterKnife.bind(this);
popup = MaryPopup.with(this)
.cancellable(true)
.draggable(true)
.blackOverlayColor(Color.parseColor("#DD444444"))
.backgroundColor(Color.parseColor("#EFF4F5"));
}

@OnClick(R.id.cardView)
public void onClickCardView() {
popup
.content(R.layout.popup_content)
.from(cardView)
.show();
}

@Override
public void onBackPressed() {
if(popup.isOpened()){
popup.close(true);
} else {
super.onBackPressed();
}
popup = createMaryPopup()
.draggable(true);
}
}
42 changes: 4 additions & 38 deletions app/src/main/java/com/meetic/marypopup/sample/PopupFadeOutDraggableActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,15 @@
package com.meetic.marypopup.sample;

import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

import com.meetic.marypopup.MaryPopup;

import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;

public class PopupFadeOutDraggableActivity extends AppCompatActivity {

@Bind(R.id.cardView) View cardView;
MaryPopup popup;
public class PopupFadeOutDraggableActivity extends PopupActivity {

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
protected void setUpPopup() {
setContentView(R.layout.activity_popup);
ButterKnife.bind(this);
popup = MaryPopup.with(this)
.cancellable(true)
popup = createMaryPopup()
.draggable(true)
.fadeOutDragging(true)
.blackOverlayColor(Color.parseColor("#DD444444"))
.backgroundColor(Color.parseColor("#EFF4F5"));
}

@OnClick(R.id.cardView)
public void onClickCardView() {
popup
.content(R.layout.popup_content)
.from(cardView)
.show();
}

@Override
public void onBackPressed() {
if(popup.isOpened()){
popup.close(true);
} else {
super.onBackPressed();
}
.fadeOutDragging(true);
}
}
40 changes: 3 additions & 37 deletions app/src/main/java/com/meetic/marypopup/sample/PopupNotDraggableActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,13 @@
package com.meetic.marypopup.sample;

import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

import com.meetic.marypopup.MaryPopup;

import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;

public class PopupNotDraggableActivity extends AppCompatActivity {

@Bind(R.id.cardView) View cardView;
MaryPopup popup;
public class PopupNotDraggableActivity extends PopupActivity {

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
protected void setUpPopup() {
setContentView(R.layout.activity_popup);
ButterKnife.bind(this);
popup = MaryPopup.with(this)
.cancellable(true)
.blackOverlayColor(Color.parseColor("#DD444444"))
.backgroundColor(Color.parseColor("#EFF4F5"));
}

@OnClick(R.id.cardView)
public void onClickCardView() {
popup
.content(R.layout.popup_content)
.from(cardView)
.show();
}

@Override
public void onBackPressed() {
if(popup.isOpened()){
popup.close(true);
} else {
super.onBackPressed();
}
popup = createMaryPopup();
}
}
42 changes: 4 additions & 38 deletions app/src/main/java/com/meetic/marypopup/sample/PopupScaleDownDraggableActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,49 +1,15 @@
package com.meetic.marypopup.sample;

import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

import com.meetic.marypopup.MaryPopup;

import butterknife.Bind;
import butterknife.ButterKnife;
import butterknife.OnClick;

public class PopupScaleDownDraggableActivity extends AppCompatActivity {

@Bind(R.id.cardView) View cardView;
MaryPopup popup;
public class PopupScaleDownDraggableActivity extends PopupActivity {

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
protected void setUpPopup() {
setContentView(R.layout.activity_popup);
ButterKnife.bind(this);
popup = MaryPopup.with(this)
.cancellable(true)
popup = createMaryPopup()
.draggable(true)
.scaleDownDragging(true)
.blackOverlayColor(Color.parseColor("#DD444444"))
.backgroundColor(Color.parseColor("#EFF4F5"));
}

@OnClick(R.id.cardView)
public void onClickCardView() {
popup
.content(R.layout.popup_content)
.from(cardView)
.show();
}

@Override
public void onBackPressed() {
if(popup.isOpened()){
popup.close(true);
} else {
super.onBackPressed();
}
.scaleDownDragging(true);
}
}
Loading