Merge pull request #67 from Z3r0byte/dev

Dev
Z3r0byte · Oct 17, 2017 · 20a5d69 · 20a5d69
2 parents bda7a3b + 2cfdd07
commit 20a5d69
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 This is the github repository for my app Magis, an unofficial, free and open-source Magister 6 App.
 
-###### [Website](http://magis-app.nl)  (Temporary offline)
+###### [Website](https://z3r0byteapps.eu/magis)
 
 
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -24,8 +24,8 @@ android {
         applicationId "com.z3r0byte.magis"
         minSdkVersion 15
         targetSdkVersion 24
-        versionCode 162
-        versionName "1.6.2"
+        versionCode 163
+        versionName "1.6.3"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/z3r0byte/magis/Tasks/LoginTask.java b/app/src/main/java/com/z3r0byte/magis/Tasks/LoginTask.java
@@ -74,7 +74,7 @@ protected void onPreExecute() {
         dialogBuilder = new MaterialDialog.Builder(activity);
         dialogBuilder.title(R.string.msg_logging_in)
                 .content(R.string.msg_patience)
-                .positiveText(android.R.string.cancel)
+                .positiveText(R.string.msg_skip)
                 .onPositive(new MaterialDialog.SingleButtonCallback() {
                     @Override
                     public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
@@ -85,6 +85,7 @@ public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which)
                     }
                 })
                 .progress(true, 0);
+        dialogBuilder.canceledOnTouchOutside(false);
         dialog = dialogBuilder.build();
         dialog.show();
     }

diff --git a/app/src/main/java/com/z3r0byte/magis/Tasks/PresenceTask.java b/app/src/main/java/com/z3r0byte/magis/Tasks/PresenceTask.java
@@ -85,7 +85,7 @@ protected void onPostExecute(Presence[] presences) {
             Log.d(TAG, "onPostExecute: Valid appointments");
             activity.mPresences = presences;
             activity.mSwipeRefreshLayout.setRefreshing(false);
-            //activity.errorView.setVisibility(View.GONE);
+            activity.errorView.setVisibility(View.GONE);
 
             Log.d(TAG, "onPostExecute: Creating adapter");
             activity.mPresenceAdapter = new PresenceAdapter(activity, activity.mPresences);

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -128,6 +128,7 @@
     <string name="msg_search_school">School zoeken</string>
     <string name="msg_search">Zoek</string>
     <string name="msg_searching">Zoeken…</string>
+    <string name="msg_skip">Overslaan</string>
     <string name="msg_sponsor_title">Beste gebruiker,</string>
     <string name="msg_sponsor_content">Het ontwikkelen van apps zoals Magis kost geld. Zoals je weet is Magis gratis en bevat deze geen advertenties, ik heb dus alleen
         maar kosten, ongeveer 70 euro per jaar. Hierbij vraag ik je dan ook mij te steunen. Als elke gebruiker 1 keer op de advertentie zou klikken (en zou wachten tot de