Compare commits

..

2 Commits
1.1 ... master

Author SHA1 Message Date
1f7ba5e375 added screen scaling 2017-11-11 11:56:39 +01:00
1c469f7cd2 fixed bug with proxy 2017-11-02 21:17:00 +01:00
7 changed files with 48 additions and 31 deletions

View File

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android { android {
compileSdkVersion 26 compileSdkVersion 26
buildToolsVersion "26.0.0" buildToolsVersion '26.0.2'
defaultConfig { defaultConfig {
applicationId "de.tysox.bs_elmshorn" applicationId "de.tysox.bs_elmshorn"
minSdkVersion 16 minSdkVersion 16

View File

@ -105,7 +105,7 @@ public class MainActivity extends AppCompatActivity {
public void onClick(View view) { public void onClick(View view) {
WebView webView = findViewById(R.id.timetable); WebView webView = findViewById(R.id.timetable);
currentWeek++; 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) { public void onClick(View view) {
WebView webView = findViewById(R.id.timetable); WebView webView = findViewById(R.id.timetable);
currentWeek--; currentWeek--;
webView.loadUrl("http://www.bs-elmshorn.de/Stundenplan/Schueler/" + currentWeek + "/c/c00018.htm"); webView.loadUrl("https://tysox.de/webapps/timetable.php?week="+ currentWeek);
} }
}); });

View File

@ -1,11 +1,14 @@
package de.tysox.bs_elmshorn; package de.tysox.bs_elmshorn;
import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.view.Display;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager;
import android.webkit.WebSettings; import android.webkit.WebSettings;
import android.webkit.WebView; import android.webkit.WebView;
import android.webkit.WebViewClient; import android.webkit.WebViewClient;
@ -52,9 +55,10 @@ public class Tab1 extends Fragment {
currentWeek = calendar.get(Calendar.WEEK_OF_YEAR); 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 // s5 mini 119 opx 170 xperia 113
webView.setInitialScale(170); webView.setPadding(0,0,0,0);
webView.setInitialScale(getScale());
} }
},101); },101);
@ -62,6 +66,14 @@ public class Tab1 extends Fragment {
return rootView; return rootView;
} }
private int getScale(){
Display display = ((WindowManager) MainActivity.getInstance().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
int width = display.getWidth();
Double val = new Double(width)/new Double(690);
val = val * 100d;
return val.intValue();
}
@Override @Override
public void setUserVisibleHint(boolean isVisibleToUser) { public void setUserVisibleHint(boolean isVisibleToUser) {
super.setUserVisibleHint(isVisibleToUser); super.setUserVisibleHint(isVisibleToUser);

View File

@ -8,8 +8,14 @@
<WebView <WebView
android:id="@+id/timetable" android:id="@+id/timetable"
android:layout_width="344dp" android:layout_width="385dp"
android:layout_height="495dp" android:layout_height="576dp"
tools:layout_editor_absoluteX="8dp" android:layout_marginBottom="8dp"
tools:layout_editor_absoluteY="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> </android.support.constraint.ConstraintLayout>

View File

@ -8,8 +8,14 @@
<WebView <WebView
android:id="@+id/vt1" android:id="@+id/vt1"
android:layout_width="344dp" android:layout_width="385dp"
android:layout_height="495dp" android:layout_height="576dp"
tools:layout_editor_absoluteX="8dp" android:layout_marginBottom="8dp"
tools:layout_editor_absoluteY="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> </android.support.constraint.ConstraintLayout>

View File

@ -6,24 +6,17 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="de.tysox.bs_elmshorn.Tab3"> 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 <WebView
android:id="@+id/vt2" android:id="@+id/vt2"
android:layout_width="344dp" android:layout_width="385dp"
android:layout_height="495dp" android:layout_height="576dp"
tools:layout_editor_absoluteX="8dp" android:layout_marginBottom="8dp"
tools:layout_editor_absoluteY="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> </android.support.constraint.ConstraintLayout>

View File

@ -7,7 +7,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong