test publish

This commit is contained in:
cimenmus
2018-06-24 15:00:14 +03:00
parent 712ab4f1b3
commit 7c11f60a55
46 changed files with 142 additions and 122 deletions

View File

@@ -1,11 +1,17 @@
package ch.pizzapp.android.activity;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.view.Window;
import android.view.WindowManager;
import ch.pizzapp.android.helper.DisplayHelper;
import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
/**
@@ -20,6 +26,9 @@ public class BaseActivity extends AppCompatActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setCurrentActivity(this);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){
DisplayHelper.changeStatusColor();
}
}
@Override
@@ -36,4 +45,5 @@ public class BaseActivity extends AppCompatActivity {
public static void setCurrentActivity(BaseActivity currentActivity) {
BaseActivity.currentActivity = currentActivity;
}
}

View File

@@ -34,7 +34,7 @@ public class DialogHelper {
.title(title)
.content(message)
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(R.string.ok)
.positiveColor(ContextCompat.getColor(context, R.color.colorPrimary))
.onPositive(new MaterialDialog.SingleButtonCallback() {
@@ -59,7 +59,7 @@ public class DialogHelper {
.title(R.string.alert)
.content(content)
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(R.string.ok)
.positiveColor(ContextCompat.getColor(context, R.color.colorPrimary))
.typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf")
@@ -72,7 +72,7 @@ public class DialogHelper {
.title(R.string.alert)
.content(BaseActivity.currentActivity.getString(R.string.failed))
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(R.string.ok)
.positiveColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.colorPrimary))
.typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf")
@@ -85,7 +85,7 @@ public class DialogHelper {
.title(R.string.alert)
.content(BaseActivity.currentActivity.getString(R.string.no_network_message))
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(R.string.ok)
.positiveColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.colorPrimary))
.onPositive(new MaterialDialog.SingleButtonCallback() {
@@ -104,7 +104,7 @@ public class DialogHelper {
loadingDialog = new MaterialDialog.Builder(BaseActivity.currentActivity)
.content(BaseActivity.currentActivity.getString(R.string.loading))
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.cancelable(false)
.progress(true, 0)
.progressIndeterminateStyle(true)
@@ -141,7 +141,7 @@ public class DialogHelper {
.title(R.string.alert)
.content(message)
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(positiveTextResId)
.onPositive(positiveButtonCallback)
.negativeText(negativeTextResId)
@@ -160,7 +160,7 @@ public class DialogHelper {
.title(title)
.content(message)
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(positiveTextResId)
.onPositive(positiveButtonCallback)
.negativeText(negativeTextResId)
@@ -176,7 +176,7 @@ public class DialogHelper {
.title(R.string.alert)
.content(BaseActivity.currentActivity.getString(messageResourceId))
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(R.string.button_login)
.onPositive(new MaterialDialog.SingleButtonCallback() {
@Override
@@ -209,7 +209,7 @@ public class DialogHelper {
.title(R.string.alert)
.content(R.string.alert_update_app)
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(R.string.update_app)
.positiveColor(ContextCompat.getColor(context, R.color.colorPrimary))
.cancelable(false)
@@ -217,7 +217,7 @@ public class DialogHelper {
@Override
public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setData(Uri.parse("market://details?id=ch.pizzalink.android"));
intent.setData(Uri.parse("market://details?id=ch.pizzapp.capri"));
BaseActivity.currentActivity.startActivity(intent);
BaseActivity.currentActivity.finishAffinity();
}
@@ -232,7 +232,7 @@ public class DialogHelper {
.title(R.string.app_name)
.content(message)
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(R.string.ok)
.onPositive(singleButtonCallback)
.typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf")
@@ -247,7 +247,7 @@ public class DialogHelper {
.title(R.string.app_name)
.content(R.string.password_reset)
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(R.string.ok)
.positiveColor(ContextCompat.getColor(context, R.color.colorPrimary))
.cancelable(false)
@@ -270,7 +270,7 @@ public class DialogHelper {
.title(R.string.app_name)
.content(R.string.profile_updated)
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.positiveText(R.string.ok)
.cancelable(false)
.onPositive(singleButtonCallback)
@@ -283,7 +283,7 @@ public class DialogHelper {
new MaterialDialog.Builder(BaseActivity.currentActivity)
.title(R.string.choose)
.titleColorRes(R.color.red)
.contentColorRes(R.color.navy)
.contentColorRes(R.color.black)
.items(itemList)
.itemsCallback(listCallback)
.typeface("Quicksand-Medium.ttf", "Quicksand-Regular.ttf")

View File

@@ -39,6 +39,6 @@ public class DisplayHelper {
Window window = BaseActivity.currentActivity.getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.navy));
window.setStatusBarColor(ContextCompat.getColor(BaseActivity.currentActivity, R.color.main_black));
}
}