From c7dae95b532ee20ecc5dd5eac8850a3004c84921 Mon Sep 17 00:00:00 2001 From: JGMelon22 Date: Fri, 19 Jan 2024 22:21:37 -0300 Subject: [PATCH 1/4] chore: updating package androidx.lifecycle:lifecycle-runtime-ktx (2.7.0) --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 88cbf89..48d6429 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.webkit:webkit:1.9.0' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' implementation 'androidx.activity:activity-compose:1.8.2' implementation platform('androidx.compose:compose-bom:2022.10.00') implementation 'androidx.compose.ui:ui' From 2a956af12646796099385801406ade0d628738c8 Mon Sep 17 00:00:00 2001 From: JGMelon22 Date: Fri, 19 Jan 2024 22:23:08 -0300 Subject: [PATCH 2/4] chore: removing lost index.html file --- index.html | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 index.html diff --git a/index.html b/index.html deleted file mode 100644 index d01f779..0000000 --- a/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - Document - - - - - \ No newline at end of file From 48dc841e997a1627a8f23a35c6f3f8bc7fa78057 Mon Sep 17 00:00:00 2001 From: JGMelon22 Date: Fri, 9 Feb 2024 10:04:11 -0300 Subject: [PATCH 3/4] chore: updating packages androidx.webkit:webkit (1.10.0), androidx.navigation:navigation-fragment-ktx (2.7.7), androidx.navigation:navigation-ui-ktx (2.7.7) and AGP to 8.2.2 --- app/build.gradle | 6 +++--- build.gradle | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 48d6429..72a38f2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.11.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - implementation 'androidx.webkit:webkit:1.9.0' + implementation 'androidx.webkit:webkit:1.10.0' implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0' implementation 'androidx.activity:activity-compose:1.8.2' implementation platform('androidx.compose:compose-bom:2022.10.00') @@ -59,8 +59,8 @@ dependencies { implementation 'androidx.compose.ui:ui-graphics' implementation 'androidx.compose.ui:ui-tooling-preview' implementation 'androidx.compose.material3:material3' - implementation 'androidx.navigation:navigation-fragment-ktx:2.7.6' - implementation 'androidx.navigation:navigation-ui-ktx:2.7.6' + implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7' + implementation 'androidx.navigation:navigation-ui-ktx:2.7.7' androidTestImplementation platform('androidx.compose:compose-bom:2022.10.00') debugImplementation 'androidx.compose.ui:ui-tooling' debugImplementation 'androidx.compose.ui:ui-test-manifest' diff --git a/build.gradle b/build.gradle index 90cb18f..172c92b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.2.1' apply false - id 'com.android.library' version '8.2.1' apply false + id 'com.android.application' version '8.2.2' apply false + id 'com.android.library' version '8.2.2' apply false id 'org.jetbrains.kotlin.android' version '1.7.20' apply false } \ No newline at end of file From be05987208ae50a04cd9303e2d3eb8e589a61181 Mon Sep 17 00:00:00 2001 From: JGMelon22 Date: Fri, 9 Feb 2024 10:10:01 -0300 Subject: [PATCH 4/4] chore: removing student card window alert message --- app/build.gradle | 2 +- .../main/java/com/example/appuva/MainActivity.java | 1 - .../appuva/services/JavaScriptInjectionService.java | 12 ------------ 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 72a38f2..4897e13 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ android { minSdk 28 targetSdk 34 versionCode 1 - versionName "1.0.89" + versionName "1.0.90" vectorDrawables { useSupportLibrary true diff --git a/app/src/main/java/com/example/appuva/MainActivity.java b/app/src/main/java/com/example/appuva/MainActivity.java index e9a52b7..a928acc 100644 --- a/app/src/main/java/com/example/appuva/MainActivity.java +++ b/app/src/main/java/com/example/appuva/MainActivity.java @@ -78,7 +78,6 @@ public void onPageFinished(WebView view, String url) { javaScriptInjectionService.pseudoDarkTheme(view); javaScriptInjectionService.beautyTools(view); javaScriptInjectionService.removeElement(view); - javaScriptInjectionService.carterinhaAluno(view); }); // Aplica um pouco de delay para que minimize o efeito gráfico da injeção de tema via JS diff --git a/app/src/main/java/com/example/appuva/services/JavaScriptInjectionService.java b/app/src/main/java/com/example/appuva/services/JavaScriptInjectionService.java index e9a96a8..1132383 100644 --- a/app/src/main/java/com/example/appuva/services/JavaScriptInjectionService.java +++ b/app/src/main/java/com/example/appuva/services/JavaScriptInjectionService.java @@ -86,16 +86,4 @@ public void beautyTools(@NonNull WebView webView) { // Muda cor texto botão entrar e buscar na tela de recuperação de senha webView.loadUrl("javascript:(function() { document.querySelector('.btn-style').style.color = 'white'; })()"); } - - // Avisa ao usuário para considerar em bater um print da carteirinha do aluno - public void carterinhaAluno(@NonNull WebView webView) { - String avisoCarterinha = "function avisoCarterinha() { window.alert('Considere tirar um print da carterinha!'); }"; - String botaoCarterinha = "var button = document.getElementById('btn_acionar_carterinha').querySelector('button');"; - String cliqueCarterinha = "button.onclick = () => { avisoCarterinha(); chamarCarterinha(); };"; - - webView.loadUrl("javascript:" + avisoCarterinha); - webView.loadUrl("javascript:" + botaoCarterinha); - webView.loadUrl("javascript:" + cliqueCarterinha); - } - } \ No newline at end of file