Moving option to the prompt displayed when widged is added

federicoiosue · Jun 16, 2017 · aa8fbda · aa8fbda
1 parent bd53b83
commit aa8fbda
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 46 deletions.
diff --git a/etc/translations/strings.xml b/etc/translations/strings.xml
@@ -158,6 +158,7 @@
     <string name="widget_list_description">Scrolling list widget with buttons</string>
     <string name="notes">notes</string>
     <string name="show_thumbnails">Show attachment\'s thumbnails</string>
+    <string name="show_timestamps">Show \"Last updated\" timestamps</string>
     <string name="choose_action">Choose action</string>
     <string name="edit">Edit</string>
     <string name="reminders">reminders</string>

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/SettingsFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/SettingsFragment.java
@@ -369,17 +369,6 @@ public void onResume() {
 			});
 		}
 
-		// Update widget when last modification display for widget is toggled
-		final SwitchPreference widgetLastModification = (SwitchPreference) findPreference("settings_display_last_modified");
-		if (widgetLastModification != null) {
-			widgetLastModification.setOnPreferenceChangeListener((preference, newValue) -> {
-				widgetLastModification.setChecked((Boolean) newValue);
-				MainActivity.notifyAppWidgets(OmniNotes.getAppContext());
-				return false;
-			});
-		}
-
-
 		// Notification snooze delay
 		final EditTextPreference snoozeDelay = (EditTextPreference) findPreference
 				("settings_notification_snooze_delay");

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ConstantsBase.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ConstantsBase.java
@@ -96,7 +96,6 @@ public interface ConstantsBase {
 	String PREF_ENABLE_SWIPE = "settings_enable_swipe";
 	String PREF_SEND_ANALYTICS = "settings_send_analytics";
 	String PREF_PRETTIFIED_DATES = "settings_prettified_dates";
-	String PREF_DISPLAY_LAST_MODIFICATION = "settings_display_last_modified";
 
 	String MIME_TYPE_IMAGE = "image/jpeg";
 	String MIME_TYPE_AUDIO = "audio/amr";

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListRemoteViewsFactory.java b/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListRemoteViewsFactory.java
@@ -21,7 +21,6 @@
 import android.appwidget.AppWidgetManager;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -50,11 +49,11 @@ public class ListRemoteViewsFactory implements RemoteViewsFactory {
     private final int HEIGHT = 80;
 
     private static boolean showThumbnails = true;
+    private static boolean showTimestamps = true;
 
     private OmniNotes app;
     private int appWidgetId;
     private List<Note> notes;
-    private boolean show_last_modified;
     private int navigation;
 
 
@@ -67,25 +66,24 @@ public ListRemoteViewsFactory(Application app, Intent intent) {
     @Override
     public void onCreate() {
         Log.d(Constants.TAG, "Created widget " + appWidgetId);
-
-        SharedPreferences prefs = app.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_MULTI_PROCESS);
-        notes = DbHelper.getInstance().getNotes(
-                prefs.getString(Constants.PREF_WIDGET_PREFIX
-                        + String.valueOf(appWidgetId), ""), true);
-        show_last_modified = prefs.getBoolean(Constants.PREF_DISPLAY_LAST_MODIFICATION, true);
+        String condition = app.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_MULTI_PROCESS)
+                .getString(
+                        Constants.PREF_WIDGET_PREFIX
+                                + String.valueOf(appWidgetId), "");
+        notes = DbHelper.getInstance().getNotes(condition, true);
     }
 
 
     @Override
     public void onDataSetChanged() {
         Log.d(Constants.TAG, "onDataSetChanged widget " + appWidgetId);
         navigation = Navigation.getNavigation();
-
-        SharedPreferences prefs = app.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_MULTI_PROCESS);
-        notes = DbHelper.getInstance().getNotes(
-                prefs.getString(Constants.PREF_WIDGET_PREFIX
-                                + String.valueOf(appWidgetId), ""), true);
-        show_last_modified = prefs.getBoolean(Constants.PREF_DISPLAY_LAST_MODIFICATION, true);
+        
+        String condition = app.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_MULTI_PROCESS)
+                .getString(
+                        Constants.PREF_WIDGET_PREFIX
+                                + String.valueOf(appWidgetId), "");
+        notes = DbHelper.getInstance().getNotes(condition, true);
     }
 
 
@@ -118,17 +116,18 @@ public RemoteViews getViewAt(int position) {
         color(note, row);
 
         if (!note.isLocked() && showThumbnails && note.getAttachmentsList().size() > 0) {
-			Attachment mAttachment = note.getAttachmentsList().get(0);
-			Bitmap bmp = BitmapHelper.getBitmapFromAttachment(app, mAttachment, WIDTH, HEIGHT);
-			row.setBitmap(R.id.attachmentThumbnail, "setImageBitmap", bmp);
+      			Attachment mAttachment = note.getAttachmentsList().get(0);
+      			Bitmap bmp = BitmapHelper.getBitmapFromAttachment(app, mAttachment, WIDTH, HEIGHT);
+      			row.setBitmap(R.id.attachmentThumbnail, "setImageBitmap", bmp);
             row.setInt(R.id.attachmentThumbnail, "setVisibility", View.VISIBLE);
         } else {
             row.setInt(R.id.attachmentThumbnail, "setVisibility", View.GONE);
         }
-        if(show_last_modified)
-            row.setTextViewText(R.id.note_date, TextHelper.getDateText(app, note, navigation));
-        else
-            row.setTextViewText(R.id.note_date, "");
+        if(showTimestamps) {
+          row.setTextViewText(R.id.note_date, TextHelper.getDateText(app, note, navigation));
+        } else {
+          row.setTextViewText(R.id.note_date, "");
+        }
 
         // Next, set a fill-intent, which will be used to fill in the pending intent template
         // that is set on the collection view in StackWidgetProvider.
@@ -168,12 +167,13 @@ public boolean hasStableIds() {
     }
 
 
-    public static void updateConfiguration(Context mContext, int mAppWidgetId, String sqlCondition, 
-                                           boolean thumbnails) {
+    public static void updateConfiguration(Context mContext, int mAppWidgetId, String sqlCondition,
+                                           boolean thumbnails, boolean timestamps) {
         Log.d(Constants.TAG, "Widget configuration updated");
         mContext.getSharedPreferences(Constants.PREFS_NAME, Context.MODE_MULTI_PROCESS).edit()
                 .putString(Constants.PREF_WIDGET_PREFIX + String.valueOf(mAppWidgetId), sqlCondition).commit();
         showThumbnails = thumbnails;
+        showTimestamps = timestamps;
     }
 
 

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/widget/WidgetConfigurationActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/widget/WidgetConfigurationActivity.java
@@ -91,11 +91,12 @@ protected void onCreate(Bundle savedInstanceState) {
             }
 
             CheckBox showThumbnailsCheckBox = (CheckBox) findViewById(R.id.show_thumbnails);
+            CheckBox showTimestampsCheckBox = (CheckBox) findViewById(R.id.show_timestamps);
 
             // Updating the ListRemoteViewsFactory parameter to get the list
             // of notes
             ListRemoteViewsFactory.updateConfiguration(getApplicationContext(), mAppWidgetId,
-                    sqlCondition, showThumbnailsCheckBox.isChecked());
+                    sqlCondition, showThumbnailsCheckBox.isChecked(), showTimestampsCheckBox.isChecked());
 
             Intent resultValue = new Intent();
             resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID,

diff --git a/omniNotes/src/main/res/layout/activity_widget_configuration.xml b/omniNotes/src/main/res/layout/activity_widget_configuration.xml
@@ -62,6 +62,14 @@
         android:checked="true"
         android:text="@string/show_thumbnails" />
 
+    <CheckBox
+        android:id="@+id/show_timestamps"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:checked="true"
+        android:text="@string/show_timestamps" />
+
     <Button
         android:id="@+id/widget_config_confirm"
         style="@style/Button.Dialog"

diff --git a/omniNotes/src/main/res/values/strings.xml b/omniNotes/src/main/res/values/strings.xml
@@ -171,6 +171,7 @@
     <string name="widget_list_description">Scrolling list widget with buttons</string>
     <string name="notes">notes</string>
     <string name="show_thumbnails">Show attachment\'s thumbnails</string>
+    <string name="show_timestamps">Show \"Last updated\" timestamps</string>
     <string name="choose_action">Choose action</string>
     <string name="edit">Edit</string>
     <string name="reminders">reminders</string>
@@ -336,9 +337,6 @@
     <string name="settings_prettified_dates">Prettified dates</string>
     <string name="settings_prettified_dates_summary_on">Dates are shown in a simplier format</string>
     <string name="settings_prettified_dates_summary_off">Dates are shown in a more detailed format</string>
-    <string name="settings_display_last_modified">Last modification on widget</string>
-    <string name="settings_display_last_modified_summary_on">Last modified timestamp shown on notes</string>
-    <string name="settings_display_last_modified_summary_off">Last modified timestamp hidden</string>
     <string name="settings_screen_privacy">Privacy</string>
     <string name="settings_error_reporting">Error reporting</string>
     <string name="settings_error_reporting_summary_on">When app crashes developer will be informed to help you</string>

diff --git a/omniNotes/src/main/res/xml/settings_interface.xml b/omniNotes/src/main/res/xml/settings_interface.xml
@@ -65,11 +65,4 @@
             android:title="@string/settings_prettified_dates"
             android:defaultValue="true"/>
 
-    <SwitchPreference
-            android:key="settings_display_last_modified"
-            android:summaryOn="@string/settings_display_last_modified_summary_on"
-            android:summaryOff="@string/settings_display_last_modified_summary_off"
-            android:title="@string/settings_display_last_modified"
-            android:defaultValue="true"/>
-
 </PreferenceScreen>