Skip to content

Commit 43faf80

Browse files
hej2010hej2010
committed
Fixes, update version
1 parent cacf411 commit 43faf80

File tree

6 files changed

+14
-28
lines changed

6 files changed

+14
-28
lines changed

‎.idea/modules.xml‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "se.swecookie.valthorens"
77
minSdkVersion 21
88
targetSdkVersion 35
9-
versionCode 36
10-
versionName "3.4.2"
9+
versionCode 37
10+
versionName "3.6"
1111
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildFeatures {
@@ -39,7 +39,6 @@ dependencies {
3939
implementation 'androidx.recyclerview:recyclerview:1.3.2'
4040
implementation 'androidx.cardview:cardview:1.0.0'
4141
implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
42-
implementation platform("org.jetbrains.kotlin:kotlin-bom:1.8.22")
4342
}
4443

4544
configurations.implementation {

‎app/src/main/java/se/swecookie/valthorens/ImageDownloader.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -131,19 +131,6 @@ protected Void doInBackground(Void... voids) {
131131
}
132132

133133
} else {
134-
switch (imageDownloader.webcam) {
135-
case LA_TYROLIENNE:
136-
imageDownloader.currentURL = "https://www.trinum.com/ibox/ftpcam/mega_val_thorens_tyrolienne.jpg";
137-
break;
138-
case PLAN_BOUCHET:
139-
imageDownloader.currentURL = "https://www.trinum.com/ibox/ftpcam/original_orelle_sommet-tc-orelle.jpg";
140-
break;
141-
case PLEIN_SUD:
142-
imageDownloader.currentURL = "https://www.trinum.com/ibox/ftpcam/mega_val_thorens_funitel-bouquetin.jpg";
143-
break;
144-
case CIME_CARON:
145-
imageDownloader.currentURL = "https://www.trinum.com/ibox/ftpcam/mega_val_thorens_cime-caron.jpg";
146-
break;
147134
imageDownloader.currentURL = imageDownloader.webcam.staticImageUrl;
148135
if (imageDownloader.currentURL == null) {
149136
imageDownloader.currentURL = imageDownloader.webcam.url;

‎app/src/main/java/se/swecookie/valthorens/data/Webcam.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
public enum Webcam {
44
CHOOSE_FROM_MAP(0, true, null, null),
5-
LIVECAM_360(1, false, "Livecam 360\u00B0", "http://www.skaping.com/valthorens/station"),
5+
LIVECAM_360(1, false, "Livecam 360°", "http://www.skaping.com/valthorens/station"),
66
DE_LA_MAISON(2, false, "De La Maison", "http://www.skaping.com/valthorens/lamaison"),
77
LES_2_LACS(3, false, "Les 2 Lacs", "http://www.skaping.com/valthorens/2lacs"),
88
FUNITEL_DE_THORENS(4, false, "Funitel De Thorens", "http://www.skaping.com/valthorens/funitelthorens"),
99
FUNITEL_3_VALLEES(5, false, "Funitel 3 Vallées", "http://www.skaping.com/valthorens/3vallees"),
1010
STADE(6, false, "Stade", "http://www.skaping.com/valthorens/stade"),
1111
BOISMINT(7, false, "Boismint", "http://www.skaping.com/valthorens/boismint"),
12-
LA_TYROLIENNE(8, true, "La Tyrolienne", "http://www.valthorens.com/en/webcam/livecam-tyrolienne", "http://www.trinum.com/ibox/ftpcam/small_val_thorens_tyrolienne.jpg", "http://www.trinum.com/ibox/ftpcam/original_val_thorens_tyrolienne.jpg"),
13-
PLAN_BOUCHET(9, true, "Plan Bouchet", "http://www.valthorens.com/en/webcam/webcam-plan-bouchet", "http://www.trinum.com/ibox/ftpcam/small_orelle_sommet-tc-orelle.jpg", "http://www.trinum.com/ibox/ftpcam/original_orelle_sommet-tc-orelle.jpg"),
14-
PLEIN_SUD(10, true, "Plein Sud", "http://www.valthorens.com/en/webcam/livecam-la-folie-douce-plein-sud", "http://www.trinum.com/ibox/ftpcam/small_val_thorens_funitel-bouquetin.jpg"),
15-
CIME_CARON(11, true, "Cime Caron", "http://www.valthorens.com/en/webcam/livecam-cime-caron", "http://www.trinum.com/ibox/ftpcam/small_val_thorens_cime-caron.jpg", "http://www.trinum.com/ibox/ftpcam/original_val_thorens_cime-caron.jpg");
12+
LA_TYROLIENNE(8, true, "La Tyrolienne", "https://www.valthorens.com/en/webcam/webcam-pointe-du-bouchet-tyrolienne/", "http://www.trinum.com/ibox/ftpcam/small_val_thorens_tyrolienne.jpg", "http://www.trinum.com/ibox/ftpcam/original_val_thorens_tyrolienne.jpg"),
13+
PLAN_BOUCHET(9, true, "Plan Bouchet", "https://www.valthorens.com/en/webcam/webcam-plan-bouchet/", "http://www.trinum.com/ibox/ftpcam/small_orelle_sommet-tc-orelle.jpg", "http://www.trinum.com/ibox/ftpcam/original_orelle_sommet-tc-orelle.jpg"),
14+
PLEIN_SUD(10, true, "Plein Sud", "https://www.valthorens.com/en/webcam/livecam-la-folie-douce-plein-sud", "http://www.trinum.com/ibox/ftpcam/small_val_thorens_funitel-bouquetin.jpg"),
15+
CIME_CARON(11, true, "Cime Caron", "https://www.valthorens.com/en/webcam/webcam-cime-caron/", "http://www.trinum.com/ibox/ftpcam/small_val_thorens_cime-caron.jpg", "http://www.trinum.com/ibox/ftpcam/original_val_thorens_cime-caron.jpg");
1616

1717
public final int i;
1818
public final String name, url, previewUrl, staticImageUrl;

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?><resources>
22
<string name="app_name">Val Thorens Webcams</string>
3-
<string name="about_version">Version 3.5</string>
3+
<string name="about_version">Version 3.6</string>
44

55
<string name="main_title">Webcams à Val Thorens</string>
66
<string name="main_desc">Cliquez sur une image pour voir la webcam à cet endroit</string>

‎app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?><resources>
22
<string name="app_name">Val Thorens Webcams</string>
3-
<string name="about_version">Version 3.5</string>
3+
<string name="about_version">Version 3.6</string>
44

55
<string name="main_title">Webcams in Val Thorens</string>
66
<string name="main_desc">Click on an image to view the webcam at that location</string>

0 commit comments

Comments
 (0)