From 940377edd142dadd73e5b740bc55492ed828e1e3 Mon Sep 17 00:00:00 2001 From: Grammatopoulos Apostolos Date: Sat, 2 Feb 2019 03:37:49 +0000 Subject: [PATCH] 12/24h, bigger top button, all day duration --- .idea/caches/build_file_checksums.ser | Bin 541 -> 541 bytes .idea/caches/gradle_models.ser | Bin 32081 -> 32081 bytes app/build.gradle | 4 +- .../com/dinodevs/timelinewidget/widget.java | 89 ++++++++++-------- app/src/main/res/layout/widget_timeline.xml | 4 +- app/src/main/res/values/strings.xml | 4 + 6 files changed, 60 insertions(+), 41 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f44b41517772b1aca5481b838e0234b3503433d0..17cb62ff7cbc8abb1dde93402797b4ee518fa02a 100644 GIT binary patch delta 35 tcmV+;0Nnqb1f2wsm;|f!X&jN9cMu<>?7Iu|hrFGaz==Zfoeh&C0s1AN5dHuF delta 35 tcmV+;0Nnqb1f2wsm;{zx5c!ducMt|kdTdyK(dpuK>k};10a}wI0s0CN4@m$3 diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index be004ab162369d312bec6b1235c080c123bcef98..1ccbf3c68a0b36c8ba6b7e157a3404c4a1fdb3ef 100644 GIT binary patch delta 6349 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 OC8^jH7Wbf|qyGbf()Q*6 delta 6112 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 al!aW3m2hIyCm1~ti(bK#a0_J*1^y2f%z6O; diff --git a/app/build.gradle b/app/build.gradle index 58a416c..81dfe77 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { targetSdkVersion 27 multiDexEnabled true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - versionName '1.0.1' - versionCode 20190128 + versionName '1.0.2' + versionCode 20190202 } buildTypes { release { diff --git a/app/src/main/java/com/dinodevs/timelinewidget/widget.java b/app/src/main/java/com/dinodevs/timelinewidget/widget.java index d30fd36..bea2c74 100644 --- a/app/src/main/java/com/dinodevs/timelinewidget/widget.java +++ b/app/src/main/java/com/dinodevs/timelinewidget/widget.java @@ -51,6 +51,16 @@ public class widget extends AbstractPlugin { private long next_event; private String calendarEvents; + private String header_pattern; + private String time_pattern; + + // Constants + private static final String HEADER_PATTERN_12H = "hh:mm a\nEEEE, d MMMM"; + private static final String HEADER_PATTERN_24H = "HH:mm\nEEEE, d MMMM"; + private static final String ELEMENT_PATTERN = "EEEE, d MMMM"; + private static final String TIME_PATTERN_12H = "hh:mm a"; + private static final String TIME_PATTERN_24H = "HH:mm"; + private static final String DATE_PATTERN = "dd/MM/yyyy"; // Set up the widget's layout @@ -128,13 +138,29 @@ public void onClick(View v) { } private void refresh_time(){ + is24h(); TextView time = this.mView.findViewById(R.id.time); - time.setText( dateToString(Calendar.getInstance(),"hh:mm a\nEEEE, d MMMM") ); + time.setText( dateToString(Calendar.getInstance(),header_pattern) ); + } + + boolean is24h; + private void is24h(){ + is24h = Settings.System.getString(mContext.getContentResolver(), "time_12_24").equals("24"); + Log.d(TAG, "Timeline init is24h: " + is24h); + + if (is24h) { + header_pattern = HEADER_PATTERN_24H; + time_pattern = TIME_PATTERN_24H; + } else { + header_pattern = HEADER_PATTERN_12H; + time_pattern = TIME_PATTERN_12H; + } } private void loadCalendarEvents() { eventsList = new ArrayList<>(); next_event = 0; + is24h(); // Load data calendarEvents = Settings.System.getString(mContext.getContentResolver(), "CustomCalendarData"); @@ -179,14 +205,14 @@ private void loadCalendarEvents() { if( next_event==0 ) // Hence this is the next event next_event = calendar.getTimeInMillis(); - start = dateToString( calendar,"hh:mm a" ); + start = dateToString( calendar,time_pattern ); // Insert day separator, or not :P - if( !current_loop_date.equals(dateToString( calendar,"EEEE, d MMMM" )) ){ - current_loop_date = dateToString(calendar, "EEEE, d MMMM"); + if( !current_loop_date.equals(dateToString( calendar,ELEMENT_PATTERN )) ){ + current_loop_date = dateToString(calendar, ELEMENT_PATTERN); // Is it today? - if(current_loop_date.equals(dateToString(Calendar.getInstance(), "EEEE, d MMMM"))){ - current_loop_date = "Today"; + if(current_loop_date.equals(dateToString(Calendar.getInstance(), ELEMENT_PATTERN))){ + current_loop_date = mContext.getResources().getString(R.string.today); } HashMap date_elem = new HashMap<>(); date_elem.put("title", ""); @@ -198,13 +224,24 @@ private void loadCalendarEvents() { // Event has no date, go to next continue; } + + // No end if(!data.getString(3).equals("") && !data.getString(3).equals("null")) { calendar.setTimeInMillis(Long.parseLong(data.getString(3))); - end = " - "+ dateToString(calendar, "hh:mm a"); + end = " - "+ dateToString(calendar, time_pattern); } + + // All day events + if((start.startsWith("00") || start.startsWith("12")) && data.getString(3).equals("null")) { + start = mContext.getResources().getString(R.string.all_day); + end = ""; + } + + // Location if(!data.getString(4).equals("") && !data.getString(4).equals("null")) { location = "\n@ "+data.getString(4); } + event.put("subtitle", start+ end + location ); event.put("dot", mContext.getResources().getString(R.string.bull) ); // adding events to events list @@ -214,7 +251,7 @@ private void loadCalendarEvents() { } catch (JSONException e) { //default HashMap event = new HashMap<>(); - event.put("title", "No events"); + event.put("title", mContext.getResources().getString(R.string.no_events)); //event.put("description", "-"); //event.put("start", "-"); //event.put("end", "-"); @@ -227,8 +264,8 @@ private void loadCalendarEvents() { if(eventsList.isEmpty()){ HashMap elem = new HashMap<>(); - elem.put("title", "\nNo events"); - elem.put("subtitle", "Make sure you use Amazmod on your phone and that your stock calendar has events."); + elem.put("title", "\n"+mContext.getResources().getString(R.string.no_events)); + elem.put("subtitle", mContext.getResources().getString(R.string.no_events_description)); elem.put("dot", "" ); eventsList.add(elem); } @@ -248,7 +285,7 @@ private void toast (String message) { // Convert a date to format private String dateToString (Calendar date) { - return (new SimpleDateFormat("dd/MM/yyyy", Locale.US)).format(date.getTime()); + return (new SimpleDateFormat(DATE_PATTERN, Locale.US)).format(date.getTime()); } private String dateToString (Calendar date, String pattern) { return (new SimpleDateFormat(pattern, Locale.US)).format(date.getTime()); @@ -263,14 +300,12 @@ private String dateToString (Calendar date, String pattern) { private void onShow() { // If view loaded (and was inactive) if (this.mView != null && !this.isActive) { - refresh_time(); - - // If an event expired OR new events - if ( next_event+10*1000 < Calendar.getInstance().getTimeInMillis() || !calendarEvents.equals(Settings.System.getString(mContext.getContentResolver(), "CustomCalendarData")) ) { + // If an event expired OR new events OR changed 12/24h + if ( next_event+10*1000 < Calendar.getInstance().getTimeInMillis() || !calendarEvents.equals(Settings.System.getString(mContext.getContentResolver(), "CustomCalendarData")) || is24h != Settings.System.getString(mContext.getContentResolver(), "time_12_24").equals("24") ) { // Refresh timeline loadCalendarEvents(); } - + refresh_time(); } // Save state @@ -376,24 +411,4 @@ public void onDestroy() { } -} - -/* -abstract class doubleListLayoutAdapter extends SimpleAdapter { - private ArrayList types; - - private doubleListLayoutAdapter(Context context, List> data, int resource, String[] from, int[] to, ArrayList types) { - super(context, data, resource, from, to); - } - - @Override - public int getViewTypeCount() { - return 2; - } - - @Override - public int getItemViewType(int position) { - return getItem(position).; - } -} -*/ +} \ No newline at end of file diff --git a/app/src/main/res/layout/widget_timeline.xml b/app/src/main/res/layout/widget_timeline.xml index e0dd12a..ebf9a97 100644 --- a/app/src/main/res/layout/widget_timeline.xml +++ b/app/src/main/res/layout/widget_timeline.xml @@ -23,8 +23,8 @@ ⚫ ↺ ▲ + Today + All Day + No events + Make sure you use Amazmod on your phone and that your stock calendar has events.