Merge pull request #14 from Escola-em-Casa/refactoring

Refactoring
Escola-em-Casa · Jun 29, 2020 · aa54445 · aa54445
2 parents 1b5def0 + fba5dd6
commit aa54445
Show file tree

Hide file tree

Showing 23 changed files with 604 additions and 1,066 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@
 .externalNativeBuild
 .cxx
 /.idea/jarRepositories.xml
+.vscode/*
diff --git a/app/src/androidTest/java/org/cordova/quasar/corona/app/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/cordova/quasar/corona/app/ExampleInstrumentedTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,17 +14,20 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:usesCleartextTraffic="true"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".WebviewActivity"
-                  android:configChanges="orientation|screenSize" />
-        <activity android:name=".WikipediaActivity" 
-                  android:configChanges="orientation|screenSize" />
-        <activity android:name=".AboutActivity" 
-                  android:configChanges="orientation|screenSize"/>
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true">
+
+        <activity
+            android:name=".WebviewActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="adjustPan"/>
+        <activity
+            android:name=".AboutActivity"
+            android:configChanges="orientation|screenSize"
+            android:windowSoftInputMode="adjustPan"/>
         <activity
             android:name=".SplashScreenActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -36,8 +39,11 @@
             </intent-filter>
         </activity>
         <activity android:name=".MyApplication" />
-        <activity android:name=".MainActivity"
-                  android:configChanges="orientation|screenSize" >
+        <activity
+            android:name=".MainActivity"
+            android:configChanges="orientation|screenSize"
+            android:noHistory="true"
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/org/cordova/quasar/corona/app/AboutActivity.java b/app/src/main/java/org/cordova/quasar/corona/app/AboutActivity.java
@@ -1,14 +1,11 @@
 package org.cordova.quasar.corona.app;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.MenuItem;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 public class AboutActivity extends AppCompatActivity {
@@ -18,65 +15,63 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.activity_about);
 
-        BottomNavigationView navigationView = (BottomNavigationView) findViewById(R.id.navigation);
+        BottomNavigationView navigationView = findViewById(R.id.navigation);
         navigationView.setSelectedItemId(R.id.about);
 
         navigationView.setOnNavigationItemSelectedListener(
-                new BottomNavigationView.OnNavigationItemSelectedListener() {
-                    @Override
-                    public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-                        switch (item.getItemId()) {
-                            case R.id.classroom:
-                                startActivity(new Intent(
-                                        getApplicationContext(),
-                                        MainActivity.class)
-                                );
-                                overridePendingTransition(0, 0);
-
-                                return true;
-                            case R.id.wikipedia:
-                                startActivity(new Intent(
-                                        getApplicationContext(),
-                                        WikipediaActivity.class)
-                                );
-                                overridePendingTransition(0, 0);
-
-                                return true;
-                            case R.id.about:
-                                return true;
-                        }
-                        return false;
+                item -> {
+                    switch (item.getItemId()) {
+                        case R.id.classroom:
+                            startActivity(new Intent(getApplicationContext(), WebviewActivity.class)
+                                    .putExtra("url", "http://classroom.google.com/a/edu.se.df.gov.br"));
+                            overridePendingTransition(0, 0);
+                            navigationView.getMenu().getItem(0).setChecked(true);
+                            return true;
+                        case R.id.wikipedia:
+                            startActivity(new Intent(getApplicationContext(), WebviewActivity.class)
+                                    .putExtra("url", "https://pt.wikipedia.org/"));
+                            overridePendingTransition(0, 0);
+                            navigationView.getMenu().getItem(1).setChecked(true);
+                            return true;
+                        case R.id.about:
+                            startActivity(new Intent(getApplicationContext(), AboutActivity.class));
+                            overridePendingTransition(0, 0);
+                            navigationView.getMenu().getItem(2).setChecked(true);
+                            return true;
                     }
+                    return false;
                 }
         );
     }
 
     public void myOnClick(View view) {
         String link = view.getResources().getResourceEntryName(view.getId());
 
-        if (link.equals("escola_em_casa_btn")) {
-            startActivity(new Intent(getApplicationContext(), WebviewActivity.class)
-                    .putExtra("url", "https://escolaemcasa.se.df.gov.br/"));
-            overridePendingTransition(0, 0);
-        }
-        else if (link.equals("como_acessar_btn")) {
-            startActivity(new Intent(getApplicationContext(), WebviewActivity.class)
-                    .putExtra("url",
-                            "https://escolaemcasa.se.df.gov.br/index.php/como-acessar/"));
-            overridePendingTransition(0, 0);
-        }
-        else if (link.equals("secretaria_site_btn")) {
-            startActivity(new Intent(getApplicationContext(), WebviewActivity.class)
-                    .putExtra("url", "http://www.se.df.gov.br/"));
-            overridePendingTransition(0, 0);
+        switch (link) {
+            case "escola_em_casa_btn":
+                startActivity(new Intent(getApplicationContext(), WebviewActivity.class)
+                        .putExtra("url", "https://escolaemcasa.se.df.gov.br/"));
+                overridePendingTransition(0, 0);
+                break;
+            case "como_acessar_btn":
+                startActivity(new Intent(getApplicationContext(), WebviewActivity.class)
+                        .putExtra("url",
+                                "https://escolaemcasa.se.df.gov.br/index.php/como-acessar/"));
+                overridePendingTransition(0, 0);
+                break;
+            case "secretaria_site_btn":
+                startActivity(new Intent(getApplicationContext(), WebviewActivity.class)
+                        .putExtra("url", "http://www.se.df.gov.br/"));
+                overridePendingTransition(0, 0);
+                break;
         }
 
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        BottomNavigationView navigationView = (BottomNavigationView) findViewById(R.id.navigation);
+        BottomNavigationView navigationView = findViewById(R.id.navigation);
         navigationView.getMenu().getItem(2).setChecked(true);
     }
 }