diff --git a/app/build.gradle b/app/build.gradle index 3d3965d..4f44e4a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,7 +6,7 @@ android { defaultConfig { applicationId "orgprivacy_friendly_apps.secuso.privacyfriendlybreakreminder" - minSdkVersion 14 + minSdkVersion 17 targetSdkVersion 23 versionCode 1 versionName "1.0" diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java index b42678b..aad0909 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/AppWidget.java @@ -18,7 +18,6 @@ public class AppWidget extends AppWidgetProvider { static String time = ""; static RemoteViews views = null; - //int[] appWidgetIds; static void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) { @@ -36,7 +35,7 @@ public class AppWidget extends AppWidgetProvider { // Construct the RemoteViews object if (views == null) - views = new RemoteViews(context.getPackageName(), R.layout.app_widget2x1); + onAppWidgetOptionsReset(context,appWidgetManager,appWidgetId,appWidgetManager.getAppWidgetOptions(appWidgetId)); views.setTextViewText(R.id.appwidget_text, widgetText); if (time.equals("")) @@ -58,7 +57,6 @@ public class AppWidget extends AppWidgetProvider { @Override public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { // There may be multiple widgets active, so update all of them - //this.appWidgetIds = appWidgetIds; for (int appWidgetId : appWidgetIds) { updateAppWidget(context, appWidgetManager, appWidgetId); @@ -88,6 +86,21 @@ public class AppWidget extends AppWidgetProvider { super.onReceive(context, intent); } + public static void onAppWidgetOptionsReset(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) { + + + System.out.println("Minimal width: " + newOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH) + " minimal height: " + newOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT)); + + // Get min width and height. + int minWidth = newOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_WIDTH); + int minHeight = newOptions.getInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT); + + + getRemoteViews(context, minWidth, minHeight); + + } + + @Override public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) { @@ -119,7 +132,7 @@ public class AppWidget extends AppWidgetProvider { super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions); } - private RemoteViews getRemoteViews(Context context, int minWidth, int minHeight) { + private static RemoteViews getRemoteViews(Context context, int minWidth, int minHeight) { // First find out rows and columns based on width provided. int rows = getCellsForSize(minHeight); int columns = getCellsForSize(minWidth); diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java index 35747f4..f45acc0 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SeekBarPreference.java @@ -107,7 +107,7 @@ public class SeekBarPreference extends DialogPreference implements SeekBar.OnSee { super.onSetInitialValue(restore, defaultValue); if (restore) - mValue = shouldPersist() ? getPersistedInt(mDefault) : 0; + mValue = shouldPersist() ? getPersistedInt(mDefault) : 1; else mValue = (Integer)defaultValue; } diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SettingsActivity.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SettingsActivity.java index 3bb6b1d..d615fde 100644 --- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SettingsActivity.java +++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/SettingsActivity.java @@ -140,6 +140,10 @@ public class SettingsActivity extends AppCompatPreferenceActivity { public boolean onMenuItemSelected(int featureId, MenuItem item) { int id = item.getItemId(); if (id == android.R.id.home) { + if(isXLargeTablet(this)) { + finish(); + return true; + } if (!super.onMenuItemSelected(featureId, item)) { NavUtils.navigateUpFromSameTask(this); } diff --git a/app/src/main/res/layout/new_profile.xml b/app/src/main/res/layout/new_profile.xml index 41ef4b6..63fb642 100644 --- a/app/src/main/res/layout/new_profile.xml +++ b/app/src/main/res/layout/new_profile.xml @@ -31,7 +31,9 @@ android:textSize="25sp" android:layout_alignParentTop="true" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" /> + android:layout_alignParentEnd="true" + android:layout_toEndOf="@+id/textView6" + android:layout_marginLeft="15dp"/> Ausführung der Übung Ausführung: Beschreibung der Übung: - Abbrechen Falls gesetzt, gibt es keine Möglichkeit die Pause zu überspringen Möchten Sie die Pause nehmen?