Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #12

Merged
merged 4 commits into from
Feb 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ android {
minSdk 28
targetSdk 34
versionCode 1
versionName "1.0.89"
versionName "1.0.90"

vectorDrawables {
useSupportLibrary true
Expand Down Expand Up @@ -51,16 +51,16 @@ 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.lifecycle:lifecycle-runtime-ktx:2.6.2'
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')
implementation 'androidx.compose.ui:ui'
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'
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/example/appuva/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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
}
11 changes: 0 additions & 11 deletions index.html

This file was deleted.