Skip to content

Commit

Permalink
Use appcompat's Dialogs instead of the platform ones
Browse files Browse the repository at this point in the history
  • Loading branch information
larsgrefer committed Oct 9, 2015
1 parent 38a67a9 commit f7f93b6
Show file tree
Hide file tree
Showing 21 changed files with 574 additions and 289 deletions.
3 changes: 0 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ dependencies {
compile 'com.viewpagerindicator:library:2.4.1@aar'
compile 'com.squareup.okio:okio:1.1.0'
compile 'com.squareup.retrofit:retrofit:1.9.0'
compile('com.afollestad.material-dialogs:core:0.8.0.1@aar') {
transitive = true
}
compile 'com.bugsnag:bugsnag-android:+'

//Self compiled .aar version of wishlist
Expand Down
31 changes: 13 additions & 18 deletions app/src/main/java/com/github/pockethub/accounts/AccountUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,18 @@
import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.text.TextUtils;
import android.util.Log;

import com.alorma.github.sdk.bean.dto.response.Organization;
import com.alorma.github.sdk.bean.dto.response.User;
import com.github.pockethub.R;
import com.github.pockethub.ui.LightAlertDialog;

import org.eclipse.egit.github.core.client.RequestException;

Expand All @@ -45,7 +44,6 @@
import java.util.concurrent.atomic.AtomicInteger;

import static android.accounts.AccountManager.KEY_ACCOUNT_NAME;
import static android.content.DialogInterface.BUTTON_POSITIVE;
import static android.util.Log.DEBUG;
import static com.github.pockethub.accounts.AccountConstants.ACCOUNT_TYPE;
import static java.net.HttpURLConnection.HTTP_UNAUTHORIZED;
Expand Down Expand Up @@ -319,26 +317,23 @@ public void run() {
* @param activity
*/
private static void showConflictMessage(final Activity activity) {
AlertDialog dialog = LightAlertDialog.create(activity);
dialog.setTitle(activity.getString(R.string.authenticator_conflict_title));
dialog.setMessage(activity
.getString(R.string.authenticator_conflict_message));
dialog.setOnCancelListener(new OnCancelListener() {

@Override
public void onCancel(DialogInterface dialog) {
activity.finish();
}
});
dialog.setButton(BUTTON_POSITIVE,
activity.getString(android.R.string.ok), new OnClickListener() {
new AlertDialog.Builder(activity)
.setTitle(activity.getString(R.string.authenticator_conflict_title))
.setMessage(R.string.authenticator_conflict_message)
.setOnCancelListener(new OnCancelListener() {

@Override
public void onCancel(DialogInterface dialog) {
activity.finish();
}
})
.setPositiveButton(android.R.string.ok, new OnClickListener() {

@Override
public void onClick(DialogInterface dialog, int which) {
activity.finish();
}
});
dialog.show();
}).show();
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import android.accounts.Account;
import android.accounts.AccountManager;
import android.app.AlertDialog;
import android.support.v7.app.AlertDialog;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.webkit.WebViewClient;

Expand All @@ -19,7 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {
WebView webView = new WebView(this);
webView.loadUrl(getIntent().getStringExtra(LoginActivity.INTENT_EXTRA_URL));
webView.setWebViewClient(new WebViewClient() {
LightProgressDialog dialog = (LightProgressDialog) LightProgressDialog.create(
AlertDialog dialog = LightProgressDialog.create(
LoginWebViewActivity.this, R.string.loading);

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.github.pockethub.ui;

import android.app.AlertDialog;
import android.support.v7.app.AlertDialog;
import android.content.Context;

public class BaseProgressDialog {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@
*/
package com.github.pockethub.ui;

import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
import static android.content.DialogInterface.BUTTON_NEGATIVE;
import static android.content.DialogInterface.BUTTON_POSITIVE;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import android.support.v7.app.AlertDialog;

import static android.app.Activity.RESULT_CANCELED;
import static android.app.Activity.RESULT_OK;
import static android.content.DialogInterface.BUTTON_NEGATIVE;
import static android.content.DialogInterface.BUTTON_POSITIVE;

/**
* Helper to display a confirmation dialog
Expand Down Expand Up @@ -66,16 +67,14 @@ public static void show(final FragmentActivity activity,
}

public Dialog onCreateDialog(final Bundle savedInstanceState) {
AlertDialog dialog = LightAlertDialog.create(getActivity());
dialog.setTitle(getTitle());
dialog.setMessage(getMessage());
dialog.setButton(BUTTON_POSITIVE,
getResources().getString(android.R.string.yes), this);
dialog.setButton(BUTTON_NEGATIVE,
getResources().getString(android.R.string.no), this);
dialog.setCancelable(true);
dialog.setOnCancelListener(this);
return dialog;
return new AlertDialog.Builder(getActivity())
.setTitle(getTitle())
.setMessage(getMessage())
.setPositiveButton(android.R.string.yes, this)
.setNegativeButton(android.R.string.no, this)
.setCancelable(true)
.setOnCancelListener(this)
.create();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,19 @@
*/
package com.github.pockethub.ui;

import static android.app.Activity.RESULT_CANCELED;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AlertDialog;

import roboguice.fragment.RoboDialogFragment;

import static android.app.Activity.RESULT_CANCELED;

/**
* Base dialog fragment helper
*/
Expand Down Expand Up @@ -130,12 +131,12 @@ public void onCancel(DialogInterface dialog) {
* @return dialog
*/
protected AlertDialog createDialog() {
final AlertDialog dialog = LightAlertDialog.create(getActivity());
dialog.setTitle(getTitle());
dialog.setMessage(getMessage());
dialog.setCancelable(true);
dialog.setOnCancelListener(this);
return dialog;
return new AlertDialog.Builder(getActivity())
.setTitle(getTitle())
.setMessage(getMessage())
.setCancelable(true)
.setOnCancelListener(this)
.create();
}

@Override
Expand Down
67 changes: 0 additions & 67 deletions app/src/main/java/com/github/pockethub/ui/LightAlertDialog.java

This file was deleted.

Loading

0 comments on commit f7f93b6

Please sign in to comment.