diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java index 78534e9c..89cda821 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java @@ -128,10 +128,10 @@ public class LoginActivity extends BaseActivity { protected void onPreExecute() { //Show a progress dialog until done btnLogin.setEnabled(false); //Login button shouldn't be pressed during this - progressDialog = new ProgressDialog(LoginActivity.this,R.style.MyProgressDialog); - progressDialog.setTitle("Please Wait"); - progressDialog.setMessage("Authenticating..."); + progressDialog = new ProgressDialog(LoginActivity.this,R.style.AppTheme_Dark_Dialog); + progressDialog.setCancelable(false); progressDialog.setIndeterminate(true); + progressDialog.setMessage("Authenticating..."); progressDialog.show(); } diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/MainActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/MainActivity.java index 8e2197a7..7f23e9c4 100644 --- a/app/src/main/java/gr/thmmy/mthmmy/activities/MainActivity.java +++ b/app/src/main/java/gr/thmmy/mthmmy/activities/MainActivity.java @@ -178,7 +178,8 @@ public class MainActivity extends BaseActivity implements RecentFragment.OnListF protected void onPreExecute() { //Show a progress dialog until done progressDialog = new ProgressDialog(MainActivity.this, - R.style.MyProgressDialog); + R.style.AppTheme_Dark_Dialog); + progressDialog.setCancelable(false); progressDialog.setIndeterminate(true); progressDialog.setMessage("Logging out..."); progressDialog.show(); diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 36a430fb..854e6cdf 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -41,10 +41,4 @@ @color/primary - - -