From b51ab78f34d6faeb8051ca009df3d8cebd16ab90 Mon Sep 17 00:00:00 2001
From: Nitorac <nitorac.r@gmail.com>
Date: Thu, 8 Oct 2020 18:55:36 +0200
Subject: [PATCH] Fixed rotation reloading tabs Removed annoying bar from
CalendarFragment
---
app/src/main/AndroidManifest.xml | 1 +
.../fr/nitorac/aurionweb/fragments/AurionViewFragment.java | 3 ++-
.../aurionweb/fragments/calendar/CalendarFragment.java | 6 ++++++
.../fr/nitorac/aurionweb/fragments/home/HomeFragment.java | 5 +----
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f77c855..41febba 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
+ android:configChanges="orientation|screenSize"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/fr/nitorac/aurionweb/fragments/AurionViewFragment.java b/app/src/main/java/fr/nitorac/aurionweb/fragments/AurionViewFragment.java
index ed8390d..6442bc8 100644
--- a/app/src/main/java/fr/nitorac/aurionweb/fragments/AurionViewFragment.java
+++ b/app/src/main/java/fr/nitorac/aurionweb/fragments/AurionViewFragment.java
@@ -74,10 +74,11 @@ public abstract class AurionViewFragment extends Fragment {
webView.setWebViewClient(new WebViewClient() {
@Override
public void onPageFinished(WebView view, String url) {
- pageFinished(view, url);
if(url.contains("cas.ensiie.fr")){
initLoad();
+ return;
}
+ pageFinished(view, url);
super.onPageFinished(view, url);
}
diff --git a/app/src/main/java/fr/nitorac/aurionweb/fragments/calendar/CalendarFragment.java b/app/src/main/java/fr/nitorac/aurionweb/fragments/calendar/CalendarFragment.java
index 146258a..bcbb0b0 100644
--- a/app/src/main/java/fr/nitorac/aurionweb/fragments/calendar/CalendarFragment.java
+++ b/app/src/main/java/fr/nitorac/aurionweb/fragments/calendar/CalendarFragment.java
@@ -1,6 +1,7 @@
package fr.nitorac.aurionweb.fragments.calendar;
import android.util.Log;
+import android.webkit.WebView;
import android.widget.Toast;
import java.io.IOException;
@@ -16,6 +17,11 @@ public class CalendarFragment extends AurionViewFragment {
public static final String AURION_CAL_URL = "https://aurionweb.ensiie.fr/faces/Planning.xhtml";
private boolean failed = false;
+ @Override
+ public void pageFinished(WebView view, String url) {
+ view.evaluateJavascript("$('#form\\\\:headerSubview\\\\:header,.divCurrentUser,.CardBigTopic,.EmptyBox20.cacherImpression').remove(); $('#layout-container').css('padding-top', '0rem'); $('.CardBigTopic').remove();", paRes -> {});
+ }
+
@Override
public void networkInit(AurionSession session) {
try {
diff --git a/app/src/main/java/fr/nitorac/aurionweb/fragments/home/HomeFragment.java b/app/src/main/java/fr/nitorac/aurionweb/fragments/home/HomeFragment.java
index 6ade17e..e4b042e 100644
--- a/app/src/main/java/fr/nitorac/aurionweb/fragments/home/HomeFragment.java
+++ b/app/src/main/java/fr/nitorac/aurionweb/fragments/home/HomeFragment.java
@@ -1,6 +1,5 @@
package fr.nitorac.aurionweb.fragments.home;
-import android.util.Log;
import android.webkit.WebView;
import fr.nitorac.aurionweb.fragments.AurionViewFragment;
@@ -14,9 +13,7 @@ public class HomeFragment extends AurionViewFragment {
@Override
public void pageFinished(WebView view, String url) {
if(!hasLoaded){
- view.evaluateJavascript("$(\"#mobile-menu-btn\").click();", paRes -> {
- Log.e("JSSS", paRes);
- });
+ view.evaluateJavascript("$(\"#mobile-menu-btn\").click();", paRes -> {});
hasLoaded = true;
}
}
--
GitLab