* remove login fragment

* fix auto switch to day in table

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "pl.vemu.zsme"
         minSdkVersion 23
         targetSdkVersion 30
-        versionCode 31
-        versionName "1.5"
+        versionCode 32
+        versionName "1.5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/pl/vemu/zsme/MainActivity.java

@@ -27,8 +27,6 @@
 import pl.vemu.zsme.databinding.ActivityMainBinding;
 import pl.vemu.zsme.newsFragment.NewsFragmentDirections;
 import pl.vemu.zsme.newsFragment.NewsWorker;
-import pl.vemu.zsme.timetableFragment.Login;
-import pl.vemu.zsme.timetableFragment.timetable.TimetableFragmentDirections;
 
 public class MainActivity extends AppCompatActivity implements NavController.OnDestinationChangedListener {
 
@@ -83,8 +81,6 @@ public void onDestinationChanged(@NonNull NavController controller, @NonNull Nav
             params.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL
                     | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS);
         else params.setScrollFlags(0);
-        if (!Login.INSTANCE.isLogged() && destination.getId() == R.id.timetableFragment)
-            controller.navigate(TimetableFragmentDirections.actionTimetableFragmentToLoginFragment());
     }
 
     private void createNotificationChannel() {

app/src/main/java/pl/vemu/zsme/moreFragment/contact/ContactItem.java

@@ -17,8 +17,8 @@ public enum ContactItem implements View.OnClickListener {
     PHONE(R.drawable.ic_phone, R.string.school_phone, R.string.school_phone_text, R.string.school_phone_text),
     FAX(R.drawable.ic_phone, R.string.school_phone_fax, R.string.school_phone_fax_text, R.string.school_phone_fax_text),
     HEADMASTER(R.drawable.ic_mail, R.string.school_principal, R.string.school_principal_text, R.string.school_principal_action),
-    VICE_HEADMASTER_1(R.drawable.ic_mail, R.string.school_vice_principal, R.string.school_vice1_text, R.string.school_vice1_text),
-    VICE_HEADMASTER_2(R.drawable.ic_mail, R.string.school_vice_principal, R.string.school_vice2_text, R.string.school_vice2_text),
+    VICE_HEADMASTER_1(R.drawable.ic_mail, R.string.school_vice_principal, R.string.school_vice1_text, R.string.school_vice1_action),
+    VICE_HEADMASTER_2(R.drawable.ic_mail, R.string.school_vice_principal, R.string.school_vice2_text, R.string.school_vice2_action),
     SOURCE_CODE(R.drawable.ic_github, R.string.source_code, R.string.source_code_text, R.string.github_url);
 
     @Getter

app/src/main/java/pl/vemu/zsme/timetableFragment/Login.java

@@ -7,27 +7,19 @@
 import java.io.IOException;
 
 import lombok.Getter;
-import lombok.Setter;
 
 @Getter
 public enum Login {
 
     INSTANCE;
 
-    @Setter
-    private String base64login;
-
-    private boolean logged;
-
     public Document login(String aurl) throws IOException {
         String url = "https://www.zsme.tarnow.pl/plan/" + aurl;
         Connection.Response response = Jsoup.connect(url)
                 .timeout(30000)
                 .method(Connection.Method.GET)
                 .userAgent("Mozilla/5.0 (Windows NT 10.0; WOW64; rv:41.0) Gecko/20100101 Firefox/41.0")
-                .header("Authorization", "Basic " + base64login)
                 .execute();
-        logged = true;
         return response.parse();
     }
 }

app/src/main/java/pl/vemu/zsme/timetableFragment/table/TableFragment.java

@@ -1,6 +1,5 @@
 package pl.vemu.zsme.timetableFragment.table;
 
-import android.icu.util.Calendar;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,6 +12,7 @@
 
 import com.google.android.material.tabs.TabLayoutMediator;
 
+import java.util.Calendar;
 import java.util.List;
 
 import pl.vemu.zsme.R;
@@ -47,15 +47,13 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         TableTimetableAdapter adapter = new TableTimetableAdapter(R.layout.item_table, (List) viewmodel.getList().getValue());
         binding.viewPager.setAdapter(adapter);
         String[] names = {getString(R.string.monday), getString(R.string.tuesday), getString(R.string.wednesday), getString(R.string.thursday), getString(R.string.friday)};
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
-            int day = Calendar.getInstance().get(Calendar.DAY_OF_WEEK);
-            day = (day == 1) || (day == 7) ? 0 : day - 2;
-            binding.viewPager.setCurrentItem(day);
-        }
         new TabLayoutMediator(binding.tabLayout, binding.viewPager, (tab, position) -> tab.setText(names[position])).attach();
         viewmodel.getList().observe(getViewLifecycleOwner(), lists -> {
             adapter.setList((List) lists);
             adapter.notifyDataSetChanged();
+            int day = Calendar.getInstance().get(Calendar.DAY_OF_WEEK);
+            day = (day == 1) || (day == 7) ? 0 : day - 2;
+            binding.viewPager.setCurrentItem(day);
         });
     }
 }

app/src/main/java/pl/vemu/zsme/timetableFragment/timetable/TimetableFragment.java

@@ -44,7 +44,7 @@ public void onDestroyView() {
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         TableTimetableAdapter adapter = new TableTimetableAdapter(R.layout.item_timetable, (List) viewmodel.getList().getValue());
         binding.viewPager.setAdapter(adapter);
-        String[] names = {getString(R.string.classes), getString(R.string.teachers), getString(R.string.classroom)};
+        String[] names = {getString(R.string.classes), getString(R.string.teachers)/*, getString(R.string.classroom)*/};
         new TabLayoutMediator(binding.tabLayout, binding.viewPager, (tab, position) -> tab.setText(names[position])).attach();
         viewmodel.getList().observe(getViewLifecycleOwner(), lists -> {
             adapter.setList((List) lists);

app/src/main/java/pl/vemu/zsme/timetableFragment/timetable/TimetableRepo.java

@@ -17,11 +17,11 @@ public enum TimetableRepo {
     public List<List<Timetable>> downloadTimetable() throws IOException {
         Document document = Login.INSTANCE.login("lista.html");
         List<Elements> elements = Arrays.asList(document.selectFirst("#oddzialy").children(),
-                document.selectFirst("#nauczyciele").children(),
-                document.selectFirst("#sale").children());
+                document.selectFirst("#nauczyciele").children()/*,
+                document.selectFirst("#sale").children()*/);
         List<List<Timetable>> maps = Arrays.asList(new ArrayList<>(),
-                new ArrayList<>(),
-                new ArrayList<>());
+                new ArrayList<>()/*,
+                new ArrayList<>()*/);
         for (int i = 0; i < elements.size(); i++) {
             for (Element element : elements.get(i)) {
                 maps.get(i).add(new Timetable(element.text(), element.child(0).attr("href")));