From 1c469f7cd2e52b678607a3a820e822e8148a7063 Mon Sep 17 00:00:00 2001
From: Jan-Lukas Pagel <jlp4u@web.de>
Date: Thu, 2 Nov 2017 21:17:00 +0100
Subject: [PATCH] fixed bug with proxy

---
 app/build.gradle                              |  2 +-
 .../de/tysox/bs_elmshorn/MainActivity.java    |  4 +--
 .../main/java/de/tysox/bs_elmshorn/Tab1.java  |  4 +--
 app/src/main/res/layout/tab1.xml              | 14 +++++++---
 app/src/main/res/layout/tab2.xml              | 14 +++++++---
 app/src/main/res/layout/tab3.xml              | 27 +++++++------------
 build.gradle                                  |  2 +-
 7 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 40d7112..96c2f94 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    buildToolsVersion "26.0.0"
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "de.tysox.bs_elmshorn"
         minSdkVersion 16
diff --git a/app/src/main/java/de/tysox/bs_elmshorn/MainActivity.java b/app/src/main/java/de/tysox/bs_elmshorn/MainActivity.java
index 3549466..d05010f 100644
--- a/app/src/main/java/de/tysox/bs_elmshorn/MainActivity.java
+++ b/app/src/main/java/de/tysox/bs_elmshorn/MainActivity.java
@@ -105,7 +105,7 @@ public class MainActivity extends AppCompatActivity {
                     public void onClick(View view) {
                         WebView webView = findViewById(R.id.timetable);
                         currentWeek++;
-                        webView.loadUrl("http://www.bs-elmshorn.de/Stundenplan/Schueler/" + currentWeek + "/c/c00018.htm");
+                        webView.loadUrl("https://tysox.de/webapps/timetable.php?week="+ currentWeek);
 
                     }
                 });
@@ -114,7 +114,7 @@ public class MainActivity extends AppCompatActivity {
                     public void onClick(View view) {
                         WebView webView = findViewById(R.id.timetable);
                         currentWeek--;
-                        webView.loadUrl("http://www.bs-elmshorn.de/Stundenplan/Schueler/" + currentWeek + "/c/c00018.htm");
+                        webView.loadUrl("https://tysox.de/webapps/timetable.php?week="+ currentWeek);
 
                     }
                 });
diff --git a/app/src/main/java/de/tysox/bs_elmshorn/Tab1.java b/app/src/main/java/de/tysox/bs_elmshorn/Tab1.java
index 22a62b7..f16fdb2 100644
--- a/app/src/main/java/de/tysox/bs_elmshorn/Tab1.java
+++ b/app/src/main/java/de/tysox/bs_elmshorn/Tab1.java
@@ -52,9 +52,9 @@ public class Tab1 extends Fragment {
 
                 currentWeek = calendar.get(Calendar.WEEK_OF_YEAR);
 
-                webView.loadUrl("http://www.bs-elmshorn.de/Stundenplan/Schueler/"+currentWeek+"/c/c00018.htm");
+                webView.loadUrl("https://tysox.de/webapps/timetable.php?week="+ currentWeek);
                 // s5 mini 119 opx 170 xperia 113
-                webView.setInitialScale(170);
+                webView.setInitialScale(160);
             }
         },101);
 
diff --git a/app/src/main/res/layout/tab1.xml b/app/src/main/res/layout/tab1.xml
index 398f3fe..dd7da1f 100644
--- a/app/src/main/res/layout/tab1.xml
+++ b/app/src/main/res/layout/tab1.xml
@@ -8,8 +8,14 @@
 
     <WebView
         android:id="@+id/timetable"
-        android:layout_width="344dp"
-        android:layout_height="495dp"
-        tools:layout_editor_absoluteX="8dp"
-        tools:layout_editor_absoluteY="8dp" />
+        android:layout_width="385dp"
+        android:layout_height="576dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tab2.xml b/app/src/main/res/layout/tab2.xml
index 842fac2..73f5446 100644
--- a/app/src/main/res/layout/tab2.xml
+++ b/app/src/main/res/layout/tab2.xml
@@ -8,8 +8,14 @@
 
     <WebView
         android:id="@+id/vt1"
-        android:layout_width="344dp"
-        android:layout_height="495dp"
-        tools:layout_editor_absoluteX="8dp"
-        tools:layout_editor_absoluteY="8dp" />
+        android:layout_width="385dp"
+        android:layout_height="576dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tab3.xml b/app/src/main/res/layout/tab3.xml
index 5ad111a..4451fa1 100644
--- a/app/src/main/res/layout/tab3.xml
+++ b/app/src/main/res/layout/tab3.xml
@@ -6,24 +6,17 @@
     android:layout_height="match_parent"
     tools:context="de.tysox.bs_elmshorn.Tab3">
 
-    <TextView
-        android:id="@+id/section_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/activity_vertical_margin"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
-        android:layout_marginTop="@dimen/activity_vertical_margin"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/constraintLayout"
-        tools:layout_constraintLeft_creator="1"
-        tools:layout_constraintTop_creator="1" />
-
     <WebView
         android:id="@+id/vt2"
-        android:layout_width="344dp"
-        android:layout_height="495dp"
-        tools:layout_editor_absoluteX="8dp"
-        tools:layout_editor_absoluteY="8dp" />
+        android:layout_width="385dp"
+        android:layout_height="576dp"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8f56977..020eae2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         
 
         // NOTE: Do not place your application dependencies here; they belong