Semikolon/BS-Elmshorn
1
0
Fork 0
Code Issues Pull Requests Releases 3 Activity

fixed bug with proxy

Browse Source
This commit is contained in:
Jan-Lukas Pagel 2017-11-02 21:17:00 +01:00
parent 8c393a36ec
commit 1c469f7cd2
7 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -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

4
app/src/main/java/de/tysox/bs_elmshorn/MainActivity.java
View File

@ -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);
}
});

4
app/src/main/java/de/tysox/bs_elmshorn/Tab1.java
View File

@ -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);

14
app/src/main/res/layout/tab1.xml
View File

@ -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>

14
app/src/main/res/layout/tab2.xml
View File

@ -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>

27
app/src/main/res/layout/tab3.xml
View File

@ -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>

2
build.gradle
View File

@ -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