diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java index d25df84..b94848e 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/DownloadActivity.java @@ -70,10 +70,13 @@ dayPicker = (SeekBar) findViewById(R.id.forecastNrOfDaysSeek); dayDisplay = (TextView) findViewById(R.id.forecastNrOfDays); customLocationInput = (EditText) findViewById(R.id.download_custom_location); + nrOfForecastDays = SettingsActivity.getDaysForecastFromPrefs(); + dayPicker.setProgress(nrOfForecastDays - WeatherHandler.MIN_DAYS_FORECAST); + dayDisplay.setText(String.valueOf(nrOfForecastDays)); dayPicker.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { @Override public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { - nrOfForecastDays = progress; + nrOfForecastDays = progress + WeatherHandler.MIN_DAYS_FORECAST; dayDisplay.setText(String.valueOf(nrOfForecastDays)); } @Override @@ -149,6 +152,10 @@ } else { l = customLocation; } + + Log.d(MainActivity.TAG, "currentSelected: " + currentSelected); + Log.d(MainActivity.TAG, "nrOfForecastDays: " + nrOfForecastDays); + if(currentSelected.equals(getString(R.string.download_forecast_key))) { weatherHandler.getForecast(l, nrOfForecastDays, DownloadActivity.this); } else if(currentSelected.equals(getString(R.string.download_current_key))) { diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java index 5fd0fff..678b970 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/SettingsActivity.java @@ -10,6 +10,8 @@ import android.preference.PreferenceCategory; import android.preference.PreferenceFragment; +import de.apps4ics.mountainnavigation.handlers.WeatherHandler; + /** * This file is part of MountainNavigation. * @@ -43,14 +45,26 @@ } + public static int getMaxColdFromPrefs() { + return getMaxColdFromPrefs(WeatherHandler.MAX_COLD_TEMP_DEFAULT); + } + public static int getMaxColdFromPrefs(int defaultValue) { return getIntWithMinFromPrefs(R.string.preferences_maximal_cold_temp_min, R.string.settings_hint_max_cold_temp_key, defaultValue); } + public static int getMinHotFromPrefs() { + return getMinHotFromPrefs(WeatherHandler.MIN_HOT_TEMP_DEFAULT); + } + public static int getMinHotFromPrefs(int defaultValue) { return getIntWithMinFromPrefs(R.string.preferences_minimal_hot_temp_min, R.string.settings_hint_min_hot_temp_key, defaultValue); } + public static int getDaysForecastFromPrefs() { + return getDaysForecastFromPrefs(WeatherHandler.MAX_DAYS_FORECAST_DEFAULT); + } + public static int getDaysForecastFromPrefs(int defaultValue) { return getIntWithMinFromPrefs(R.string.preferences_days_of_forecast_min, R.string.settings_weather_days_forecast_key, defaultValue); } diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java index 1bfeff6..a44ecfb 100644 --- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java +++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/WeatherHandler.java @@ -64,9 +64,10 @@ private HistoricalWeather histWeather; private DayForecast[] forecasts; private Weather[] weathers; - private final static int MIN_HOT_TEMP_DEFAULT = 30; - private final static int MAX_COLD_TEMP_DEFAULT = 10; - private final static int MAX_DAYS_FORECAST_DEFAULT = 3; + public final static int MIN_HOT_TEMP_DEFAULT = 30; + public final static int MAX_COLD_TEMP_DEFAULT = 10; + public final static int MAX_DAYS_FORECAST_DEFAULT = 3; + public final static int MIN_DAYS_FORECAST = 1; private static int MIN_HOT_TEMP; private static int MAX_COLD_TEMP; private static int MAX_DAYS_FORECAST; diff --git a/app/src/main/res/layout/activity_download.xml b/app/src/main/res/layout/activity_download.xml index 7ff2a7d..806e91e 100644 --- a/app/src/main/res/layout/activity_download.xml +++ b/app/src/main/res/layout/activity_download.xml @@ -43,7 +43,7 @@ android:layout_height="wrap_content" android:id="@+id/forecastNrOfDaysSeek" android:progress="2" - android:max="24"> + android:max="23">