DigitalCampus#421: Updated all references to AlertDialog to use the s…

…upport one
jjoseba · Feb 29, 2016 · 7624f96 · 7624f96
1 parent 5cddfff
commit 7624f96
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 15 deletions.
diff --git a/src/org/digitalcampus/oppia/activity/CourseIndexActivity.java b/src/org/digitalcampus/oppia/activity/CourseIndexActivity.java
@@ -36,7 +36,6 @@
 import org.digitalcampus.oppia.utils.xmlreaders.CourseXMLReader;
 
 import android.animation.ValueAnimator;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -45,6 +44,7 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -281,7 +281,7 @@ private boolean isBaselineCompleted() {
     }
 
     private void showBaselineMessage(final String digest){
-        aDialog = new AlertDialog.Builder(this).create();
+        aDialog = new AlertDialog.Builder(this, R.style.Oppia_AlertDialogStyle).create();
         aDialog.setCancelable(false);
         aDialog.setTitle(R.string.alert_pretest);
         aDialog.setMessage(this.getString(R.string.alert_pretest_summary));

diff --git a/src/org/digitalcampus/oppia/activity/DownloadActivity.java b/src/org/digitalcampus/oppia/activity/DownloadActivity.java
@@ -153,7 +153,7 @@ protected void onSaveInstanceState(Bundle savedInstanceState) {
 
 	private void getCourseList() {
 		// show progress dialog
-		progressDialog = new ProgressDialog(this);
+		progressDialog = new ProgressDialog(this, R.style.Oppia_AlertDialogStyle);
 		progressDialog.setTitle(R.string.loading);
 		progressDialog.setMessage(getString(R.string.loading));
 		progressDialog.setCancelable(false);

diff --git a/src/org/digitalcampus/oppia/activity/OppiaMobileActivity.java b/src/org/digitalcampus/oppia/activity/OppiaMobileActivity.java
@@ -18,7 +18,7 @@
 package org.digitalcampus.oppia.activity;
 
 import android.animation.ValueAnimator;
-import android.app.AlertDialog;
+
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -30,6 +30,7 @@
 import android.support.design.widget.NavigationView;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 
@@ -391,7 +392,7 @@ public void onClick(DialogInterface dialog, int which) {
                 task.setOnDeleteCourseListener(OppiaMobileActivity.this);
                 task.execute(p);
 
-                progressDialog = new ProgressDialog(OppiaMobileActivity.this);
+                progressDialog = new ProgressDialog(OppiaMobileActivity.this, R.style.Oppia_AlertDialogStyle);
                 progressDialog.setMessage(getString(R.string.course_deleting));
                 progressDialog.setCancelable(false);
                 progressDialog.setCanceledOnTouchOutside(false);

diff --git a/src/org/digitalcampus/oppia/activity/PrefsActivity.java b/src/org/digitalcampus/oppia/activity/PrefsActivity.java
@@ -17,7 +17,6 @@
 
 package org.digitalcampus.oppia.activity;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -36,8 +35,6 @@
 import org.digitalcampus.oppia.utils.storage.StorageAccessStrategyFactory;
 
 import android.app.Activity;
-import android.app.ActionBar;
-import android.app.AlertDialog;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.app.ProgressDialog;
@@ -51,6 +48,7 @@
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;

diff --git a/src/org/digitalcampus/oppia/activity/StartUpActivity.java b/src/org/digitalcampus/oppia/activity/StartUpActivity.java
@@ -18,12 +18,12 @@
 package org.digitalcampus.oppia.activity;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -171,7 +171,7 @@ public void onAccessGranted(boolean isGranted) {
     private void afterUpgrade(Payload p){
         // set up local dirs
         if(!Storage.createFolderStructure(this)){
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.Oppia_AlertDialogStyle);
             builder.setCancelable(false);
             builder.setTitle(R.string.error);
             builder.setMessage(R.string.error_sdcard);

diff --git a/src/org/digitalcampus/oppia/activity/TagSelectActivity.java b/src/org/digitalcampus/oppia/activity/TagSelectActivity.java
@@ -34,7 +34,6 @@
 
 import com.splunk.mint.Mint;
 
-import android.app.ActionBar;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;

diff --git a/src/org/digitalcampus/oppia/fragments/PasswordDialogFragment.java b/src/org/digitalcampus/oppia/fragments/PasswordDialogFragment.java
@@ -17,10 +17,10 @@
 
 package org.digitalcampus.oppia.fragments;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;

diff --git a/src/org/digitalcampus/oppia/utils/UIUtils.java b/src/org/digitalcampus/oppia/utils/UIUtils.java
@@ -33,7 +33,6 @@
 import org.digitalcampus.oppia.model.User;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -42,6 +41,7 @@
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.Menu;
 import android.view.View;

diff --git a/src/org/digitalcampus/oppia/widgets/QuizWidget.java b/src/org/digitalcampus/oppia/widgets/QuizWidget.java
@@ -59,7 +59,6 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -68,6 +67,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -360,7 +360,7 @@ private boolean saveAnswer() {
 	}
 
 	private void showFeedback(String msg) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(super.getActivity());
+		AlertDialog.Builder builder = new AlertDialog.Builder(super.getActivity(), R.style.Oppia_AlertDialogStyle);
 		builder.setTitle(super.getActivity().getString(R.string.feedback));
 		builder.setMessage(msg);
 		try {