diff --git a/app/Android.bp b/app/Android.bp index de39bace834447613988974bac9d9baee36d3910..74cb39a6122a5cd25a482617b4b3c0ab384758b7 100644 --- a/app/Android.bp +++ b/app/Android.bp @@ -17,6 +17,8 @@ android_app { product_specific: true, + certificate: "platform", + static_libs: [ // DO NOT EDIT THIS SECTION MANUALLY "androidx.core_core-ktx", diff --git a/app/org.lineageos.etar.allowlist.xml b/app/org.lineageos.etar.allowlist.xml index ad0c111c9a941ee04a0f5ddaaeb6508adcc46209..e1f47b48423970f67183c51b672664dac0de5ff3 100644 --- a/app/org.lineageos.etar.allowlist.xml +++ b/app/org.lineageos.etar.allowlist.xml @@ -1,5 +1,5 @@ - + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 291d959ad71d1fe8b6c47466ea0ff55e4f087920..73797201181d44076ca2fb54aa9c6a45c8f79d24 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,9 +19,10 @@ --> + @@ -60,7 +61,7 @@ android:hardwareAccelerated="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_label" - android:taskAffinity="org.lineageos.etar.task" + android:taskAffinity="foundation.e.calendar.task" android:requiredAccountType="*" android:usesCleartextTraffic="false" android:theme="@style/CalendarAppThemeLight"> @@ -91,6 +92,12 @@ + + + + + android:authorities="foundation.e.calendar.CalendarRecentSuggestionsProvider" /> 0) { StringBuilder builder = new StringBuilder(); diff --git a/app/src/main/java/com/android/calendar/Utils.java b/app/src/main/java/com/android/calendar/Utils.java index 930223108c23928d426abd2617493438bce51b0d..5c7b126aebc71014e80c6b0506b3235c36632236 100644 --- a/app/src/main/java/com/android/calendar/Utils.java +++ b/app/src/main/java/com/android/calendar/Utils.java @@ -248,26 +248,8 @@ public class Utils { * exist but cannot be configured by the user. */ public static boolean isMonetAvailable(Context context) { - if (Build.VERSION.SDK_INT < 31) { - return false; - } - - // Wallpaper-based theming requires a color extraction engine and is enabled when the `flag_monet` - // config flag is enabled in SystemUI. It's unclear how to access this information from a - // normal application. - // - // To determine whether Material You is available on the device, we use a naive heuristic which - // is to compare the palette against known default values in AOSP. - Resources resources = context.getResources(); - int probe1 = resources.getColor(android.R.color.system_accent1_500, context.getTheme()); - int probe2 = resources.getColor(android.R.color.system_accent2_500, context.getTheme()); - if (probe1 == Color.parseColor("#007fac") && probe2 == Color.parseColor("#657985")) { - // AOSP palette - Log.d(TAG, "Material You not available - Detected AOSP palette"); - return false; - } - return true; + return false; } public static int getViewTypeFromIntentAndSharedPref(Activity activity) { @@ -328,7 +310,7 @@ public class Utils { * Gets the intent action for telling the widget to update. */ public static String getSearchAuthority(Context context) { - return "org.lineageos.etar.CalendarRecentSuggestionsProvider"; + return "foundation.e.calendar.CalendarRecentSuggestionsProvider"; } /** diff --git a/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java b/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java index b2f0958d815865b5c609df9a3de32a4f3a49df40..5731932e00e53d247131ef4e11b894ddf74abf76 100644 --- a/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java +++ b/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java @@ -20,6 +20,7 @@ package com.android.calendar.alerts; import android.app.Notification; import android.app.PendingIntent; import android.app.Service; +import android.app.TaskStackBuilder; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.ContentUris; @@ -138,7 +139,7 @@ public class AlertReceiver extends BroadcastReceiver { if (Utils.isUpsideDownCakeOrLater() && !Utils.canScheduleAlarms(context)) { return; } - context.startForegroundService(intent); + context.startService(intent); } else { context.startService(intent); } @@ -685,6 +686,15 @@ public class AlertReceiver extends BroadcastReceiver { geoIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); // If this intent cannot be handled, do not create the map action if (isResolveIntent(context, geoIntent)) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(context); + geoIntent = createMapActivityIntent(context, urlSpans); + if (geoIntent != null) { + taskStackBuilder.addNextIntentWithParentStack(geoIntent); + return taskStackBuilder.getPendingIntent(0, + PendingIntent.FLAG_UPDATE_CURRENT | Utils.PI_FLAG_IMMUTABLE); + } + } Intent broadcastIntent = new Intent(MAP_ACTION); broadcastIntent.setClass(context, AlertReceiver.class); broadcastIntent.putExtra(EXTRA_EVENT_ID, eventId); diff --git a/app/src/main/java/com/android/calendar/alerts/AlertService.java b/app/src/main/java/com/android/calendar/alerts/AlertService.java index a7c0da7239e3924bf5f31513791a42efe78a660a..a45f129c59a616d49b4309d20d14e9d027581ee1 100644 --- a/app/src/main/java/com/android/calendar/alerts/AlertService.java +++ b/app/src/main/java/com/android/calendar/alerts/AlertService.java @@ -534,15 +534,13 @@ public class AlertService extends Service { int newState = -1; boolean newAlert = false; - // Uncomment for the behavior of clearing out alerts after the - // events ended. b/1880369 - // - // if (endTime < currentTime) { - // newState = CalendarAlerts.DISMISSED; - // } else + // clearing out alerts after the events ended. b/1880369 + if (endTime < currentTime) { + newState = CalendarAlerts.STATE_DISMISSED; + } // Remove declined events - boolean sendAlert = !declined; + boolean sendAlert = !declined && newState != CalendarAlerts.STATE_DISMISSED; // Check for experimental reminder settings. if (remindRespondedOnly) { // If the experimental setting is turned on, then only send @@ -930,27 +928,6 @@ public class AlertService extends Service { @Override public int onStartCommand(Intent intent, int flags, int startId) { if (intent != null) { - - if (Utils.isOreoOrLater()) { - createChannels(this); - Notification notification = new NotificationCompat.Builder(this, FOREGROUND_CHANNEL_ID) - .setContentTitle(getString(R.string.foreground_notification_title)) - .setSmallIcon(R.drawable.stat_notify_refresh_events) - .setShowWhen(false) - .build(); - if (Utils.isQOrLater()) { - int serviceType; - if (Utils.isUpsideDownCakeOrLater()) { - serviceType = FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED; - } else { - serviceType = FOREGROUND_SERVICE_TYPE_DATA_SYNC; - } - ServiceCompat.startForeground(this, 1337, notification, serviceType); - } else { - startForeground(1337, notification); - } - } - Message msg = mServiceHandler.obtainMessage(); msg.arg1 = startId; msg.obj = intent.getExtras(); diff --git a/app/src/main/java/com/android/calendar/icalendar/VCalendar.java b/app/src/main/java/com/android/calendar/icalendar/VCalendar.java index 7a93fecc940d12161836098fd94e62552b299810..8a4a4677bd2e1ed02594791561b8c5d9052e71df 100644 --- a/app/src/main/java/com/android/calendar/icalendar/VCalendar.java +++ b/app/src/main/java/com/android/calendar/icalendar/VCalendar.java @@ -33,7 +33,7 @@ public class VCalendar { public static String CALSCALE = "CALSCALE"; public static String METHOD = "METHOD"; - public final static String PRODUCT_IDENTIFIER = "-//Calendar//org.lineageos.etar"; + public final static String PRODUCT_IDENTIFIER = "-//Calendar//foundation.e.calendar"; // Stores the -arity of the attributes that this component can have private final static HashMap sPropertyList = new HashMap(); diff --git a/app/src/main/java/com/android/calendar/icalendar/VEvent.java b/app/src/main/java/com/android/calendar/icalendar/VEvent.java index 6aeea271fc3a273361f509b833c8196edfd7b6df..1bef91cd2ff27d8cee645be236a58b088603807b 100644 --- a/app/src/main/java/com/android/calendar/icalendar/VEvent.java +++ b/app/src/main/java/com/android/calendar/icalendar/VEvent.java @@ -45,6 +45,7 @@ public class VEvent { public static String DESCRIPTION = "DESCRIPTION"; public static String ATTENDEE = "ATTENDEE"; public static String CATEGORIES = "CATEGORIES"; + public static String RRULE = "RRULE"; // Recurrence rule, example: FREQ=WEEKLY;COUNT=10;BYDAY=MO // Stores the -arity of the attributes that this component can have private static HashMap sPropertyList = new HashMap(); @@ -66,10 +67,10 @@ public class VEvent { sPropertyList.put(DTSTAMP,1); sPropertyList.put(SUMMARY,1); sPropertyList.put(DESCRIPTION,1); - sPropertyList.put(ATTENDEE, Integer.MAX_VALUE); sPropertyList.put(CATEGORIES, Integer.MAX_VALUE); sPropertyList.put(CATEGORIES, Integer.MAX_VALUE); + sPropertyList.put(RRULE, 1); } // Stores attributes and their corresponding values belonging to the Event component @@ -88,7 +89,7 @@ public class VEvent { mAttendees = new LinkedList(); // Generate and add a unique identifier to this event - iCal requisite - addProperty(UID , UUID.randomUUID().toString() + "@org.lineageos.etar"); + addProperty(UID , UUID.randomUUID().toString() + "@foundation.e.calendar"); addTimeStamp(); } diff --git a/app/src/main/res/drawable/e_day_1.xml b/app/src/main/res/drawable/e_day_1.xml new file mode 100644 index 0000000000000000000000000000000000000000..2615cefb0633e22db8ba0da5bdebb17c4c9bbb1a --- /dev/null +++ b/app/src/main/res/drawable/e_day_1.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_10.xml b/app/src/main/res/drawable/e_day_10.xml new file mode 100644 index 0000000000000000000000000000000000000000..145c3f9289225e5cbc9f862210bd35e99cf30318 --- /dev/null +++ b/app/src/main/res/drawable/e_day_10.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_11.xml b/app/src/main/res/drawable/e_day_11.xml new file mode 100644 index 0000000000000000000000000000000000000000..293efbd24808ca01954ad79e0e99a1e4dca2aa74 --- /dev/null +++ b/app/src/main/res/drawable/e_day_11.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_12.xml b/app/src/main/res/drawable/e_day_12.xml new file mode 100644 index 0000000000000000000000000000000000000000..b5b31ecdf49cd79de2f3ba6ba29e3d1765f52d9b --- /dev/null +++ b/app/src/main/res/drawable/e_day_12.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_13.xml b/app/src/main/res/drawable/e_day_13.xml new file mode 100644 index 0000000000000000000000000000000000000000..65d6553055014603c345ca33b8ee2bcf64706d65 --- /dev/null +++ b/app/src/main/res/drawable/e_day_13.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_14.xml b/app/src/main/res/drawable/e_day_14.xml new file mode 100644 index 0000000000000000000000000000000000000000..1f9c341ef31f37bbc43e0db6a51a9cbb66d4d6cb --- /dev/null +++ b/app/src/main/res/drawable/e_day_14.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_15.xml b/app/src/main/res/drawable/e_day_15.xml new file mode 100644 index 0000000000000000000000000000000000000000..e67c43fc4cd6f44fbd15ab1c9b3301fd2988551d --- /dev/null +++ b/app/src/main/res/drawable/e_day_15.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_16.xml b/app/src/main/res/drawable/e_day_16.xml new file mode 100644 index 0000000000000000000000000000000000000000..ceecd0f5b17e7a396610c5858e9bc7bee05ab5fa --- /dev/null +++ b/app/src/main/res/drawable/e_day_16.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_17.xml b/app/src/main/res/drawable/e_day_17.xml new file mode 100644 index 0000000000000000000000000000000000000000..9417f7769d4a7704b28bb42d5962c44c891b02d2 --- /dev/null +++ b/app/src/main/res/drawable/e_day_17.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_18.xml b/app/src/main/res/drawable/e_day_18.xml new file mode 100644 index 0000000000000000000000000000000000000000..77e3a93a9a8730330f4a2de26590cc99d0bb3b28 --- /dev/null +++ b/app/src/main/res/drawable/e_day_18.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_19.xml b/app/src/main/res/drawable/e_day_19.xml new file mode 100644 index 0000000000000000000000000000000000000000..83ef274e9d7d0cf5e684323fc07e1f9e8525b60c --- /dev/null +++ b/app/src/main/res/drawable/e_day_19.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_2.xml b/app/src/main/res/drawable/e_day_2.xml new file mode 100644 index 0000000000000000000000000000000000000000..325e7842cee85804e49809803ad8b414feefd212 --- /dev/null +++ b/app/src/main/res/drawable/e_day_2.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_20.xml b/app/src/main/res/drawable/e_day_20.xml new file mode 100644 index 0000000000000000000000000000000000000000..1cb30c1bd22193e8f0a4dc42a23f093a306a0a49 --- /dev/null +++ b/app/src/main/res/drawable/e_day_20.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_21.xml b/app/src/main/res/drawable/e_day_21.xml new file mode 100644 index 0000000000000000000000000000000000000000..d42dfec1ca99759433b01fb537c4b26575c6c12f --- /dev/null +++ b/app/src/main/res/drawable/e_day_21.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_22.xml b/app/src/main/res/drawable/e_day_22.xml new file mode 100644 index 0000000000000000000000000000000000000000..37e939517150430e57a5d0d4398da7b01090d3e3 --- /dev/null +++ b/app/src/main/res/drawable/e_day_22.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_23.xml b/app/src/main/res/drawable/e_day_23.xml new file mode 100644 index 0000000000000000000000000000000000000000..2f0681024f7698cfd11500d40db27d4e9c798d57 --- /dev/null +++ b/app/src/main/res/drawable/e_day_23.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_24.xml b/app/src/main/res/drawable/e_day_24.xml new file mode 100644 index 0000000000000000000000000000000000000000..5f2c750c78f4da2a1d99e1b78f0dda9f8d2bc89f --- /dev/null +++ b/app/src/main/res/drawable/e_day_24.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_25.xml b/app/src/main/res/drawable/e_day_25.xml new file mode 100644 index 0000000000000000000000000000000000000000..13e270fa9de2fce8c1bf04b8a7399d2be366c2b5 --- /dev/null +++ b/app/src/main/res/drawable/e_day_25.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_26.xml b/app/src/main/res/drawable/e_day_26.xml new file mode 100644 index 0000000000000000000000000000000000000000..8c83d4348bd562e2190d86baa488b47ec47a6208 --- /dev/null +++ b/app/src/main/res/drawable/e_day_26.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_27.xml b/app/src/main/res/drawable/e_day_27.xml new file mode 100644 index 0000000000000000000000000000000000000000..d801bd5cf9a109d089fed9f1b59018b23dda7344 --- /dev/null +++ b/app/src/main/res/drawable/e_day_27.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_28.xml b/app/src/main/res/drawable/e_day_28.xml new file mode 100644 index 0000000000000000000000000000000000000000..feb57377fc1f6d6d16d63c98123b71f59c8ac30e --- /dev/null +++ b/app/src/main/res/drawable/e_day_28.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_29.xml b/app/src/main/res/drawable/e_day_29.xml new file mode 100644 index 0000000000000000000000000000000000000000..5704f10aee2aac31393fa245816e7903cc3ab621 --- /dev/null +++ b/app/src/main/res/drawable/e_day_29.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_3.xml b/app/src/main/res/drawable/e_day_3.xml new file mode 100644 index 0000000000000000000000000000000000000000..5dc2f3396c22d8ece9c4e5ea14ee7023624aff52 --- /dev/null +++ b/app/src/main/res/drawable/e_day_3.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_30.xml b/app/src/main/res/drawable/e_day_30.xml new file mode 100644 index 0000000000000000000000000000000000000000..2fc6176c4aa53039e66685bef3802f386690df98 --- /dev/null +++ b/app/src/main/res/drawable/e_day_30.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_31.xml b/app/src/main/res/drawable/e_day_31.xml new file mode 100644 index 0000000000000000000000000000000000000000..9a5ac3fc378342e6fee7f5ca883c9790dc3f536b --- /dev/null +++ b/app/src/main/res/drawable/e_day_31.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_4.xml b/app/src/main/res/drawable/e_day_4.xml new file mode 100644 index 0000000000000000000000000000000000000000..c61ba00710cd07a97d8a69d0eddf42f59f4c3629 --- /dev/null +++ b/app/src/main/res/drawable/e_day_4.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_5.xml b/app/src/main/res/drawable/e_day_5.xml new file mode 100644 index 0000000000000000000000000000000000000000..7d04e2d6e57d6fc916258579af3a13967fd342df --- /dev/null +++ b/app/src/main/res/drawable/e_day_5.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_6.xml b/app/src/main/res/drawable/e_day_6.xml new file mode 100644 index 0000000000000000000000000000000000000000..5024d1e08af9f2ffeb0a154982475ddba0fdb81a --- /dev/null +++ b/app/src/main/res/drawable/e_day_6.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_7.xml b/app/src/main/res/drawable/e_day_7.xml new file mode 100644 index 0000000000000000000000000000000000000000..b997ef30f99d85c2149c8f17a64d925805223106 --- /dev/null +++ b/app/src/main/res/drawable/e_day_7.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_8.xml b/app/src/main/res/drawable/e_day_8.xml new file mode 100644 index 0000000000000000000000000000000000000000..52c781f3a7cf0b7c468b31b288bdfb752442d683 --- /dev/null +++ b/app/src/main/res/drawable/e_day_8.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_day_9.xml b/app/src/main/res/drawable/e_day_9.xml new file mode 100644 index 0000000000000000000000000000000000000000..005054128149c9871f9c345d1a81e1eb1e69b647 --- /dev/null +++ b/app/src/main/res/drawable/e_day_9.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/app/src/main/res/drawable/e_month_april.xml b/app/src/main/res/drawable/e_month_april.xml new file mode 100644 index 0000000000000000000000000000000000000000..aabee11d1c10ab2f114ba6696f064d097f391a55 --- /dev/null +++ b/app/src/main/res/drawable/e_month_april.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_august.xml b/app/src/main/res/drawable/e_month_august.xml new file mode 100644 index 0000000000000000000000000000000000000000..6e389a6e9079a1e8d15fbff94429ada8cb2a7c77 --- /dev/null +++ b/app/src/main/res/drawable/e_month_august.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_december.xml b/app/src/main/res/drawable/e_month_december.xml new file mode 100644 index 0000000000000000000000000000000000000000..3c6c648e7a591ee6b9ad0acbe8a14c4c4603aaca --- /dev/null +++ b/app/src/main/res/drawable/e_month_december.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_february.xml b/app/src/main/res/drawable/e_month_february.xml new file mode 100644 index 0000000000000000000000000000000000000000..92fb99180b4cd668c4a577359e87382838110c0b --- /dev/null +++ b/app/src/main/res/drawable/e_month_february.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_january.xml b/app/src/main/res/drawable/e_month_january.xml new file mode 100644 index 0000000000000000000000000000000000000000..625c573501afb91304d6da86621be08c0688310e --- /dev/null +++ b/app/src/main/res/drawable/e_month_january.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_july.xml b/app/src/main/res/drawable/e_month_july.xml new file mode 100644 index 0000000000000000000000000000000000000000..05c9581728541a01f04c6e0f08e91eb2f820ca3d --- /dev/null +++ b/app/src/main/res/drawable/e_month_july.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_june.xml b/app/src/main/res/drawable/e_month_june.xml new file mode 100644 index 0000000000000000000000000000000000000000..9214d62157e5cc22832f879d52f9a2d02bec1b05 --- /dev/null +++ b/app/src/main/res/drawable/e_month_june.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_march.xml b/app/src/main/res/drawable/e_month_march.xml new file mode 100644 index 0000000000000000000000000000000000000000..dc99f42e2f5f1d6ac746760b9ba5c3b66eea2785 --- /dev/null +++ b/app/src/main/res/drawable/e_month_march.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_may.xml b/app/src/main/res/drawable/e_month_may.xml new file mode 100644 index 0000000000000000000000000000000000000000..6aaacd2dcdfd09bf6f8ec911c233306265b236eb --- /dev/null +++ b/app/src/main/res/drawable/e_month_may.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_november.xml b/app/src/main/res/drawable/e_month_november.xml new file mode 100644 index 0000000000000000000000000000000000000000..f1de93e55bc4597a46308c9f2016c6018254b3ad --- /dev/null +++ b/app/src/main/res/drawable/e_month_november.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_october.xml b/app/src/main/res/drawable/e_month_october.xml new file mode 100644 index 0000000000000000000000000000000000000000..ccc0a23d6de0ce62671a503f616d333fd3e45903 --- /dev/null +++ b/app/src/main/res/drawable/e_month_october.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/e_month_september.xml b/app/src/main/res/drawable/e_month_september.xml new file mode 100644 index 0000000000000000000000000000000000000000..0ea87d4777edd826b10b356b97019759ddfad97c --- /dev/null +++ b/app/src/main/res/drawable/e_month_september.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index cc2f6babf88e2d6082c951bdd4ee199e2fbac601..4d26f5bbbcac93f31b5c2e19538de16a4e278ce9 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -1,18 +1,40 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> + android:pathData="M0,0h108v108h-108z"> + + + + + + + + android:pathData="M0,0h108v38h-108z" + android:fillColor="#F83E54"/> diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 59a07bb4556d01fa16a84dcbc41a1190c7588614..80e8f47c9c1b8f85ca4a64340f535ab3a18d9e63 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,38 +1,34 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - - - - - - - - - - - + + + + diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml deleted file mode 100644 index ecfabb49ff1e469a6aa2ade9a97a2c875ab2b61e..0000000000000000000000000000000000000000 --- a/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi/ic_launcher.xml index b58c81ff94fc2cd9353409539d491f43b91966a5..81cae2c437d732dd6e154004fc19f228b8f9ecfc 100644 --- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml @@ -1,10 +1,20 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 5a645306605406a8f71ee9c23ebb563b8fa846b3..3f0ddacb2e0432b564bf6dac9c607b6e8b2e76ee 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -409,4 +409,54 @@ @drawable/logo_calendar_30_adaptive @drawable/logo_calendar_31_adaptive + + + + @drawable/e_month_january + @drawable/e_month_february + @drawable/e_month_march + @drawable/e_month_april + @drawable/e_month_may + @drawable/e_month_june + @drawable/e_month_july + @drawable/e_month_august + @drawable/e_month_september + @drawable/e_month_october + @drawable/e_month_november + @drawable/e_month_december + + + + @drawable/e_day_1 + @drawable/e_day_2 + @drawable/e_day_3 + @drawable/e_day_4 + @drawable/e_day_5 + @drawable/e_day_6 + @drawable/e_day_7 + @drawable/e_day_8 + @drawable/e_day_9 + @drawable/e_day_10 + @drawable/e_day_11 + @drawable/e_day_12 + @drawable/e_day_13 + @drawable/e_day_14 + @drawable/e_day_15 + @drawable/e_day_16 + @drawable/e_day_17 + @drawable/e_day_18 + @drawable/e_day_19 + @drawable/e_day_20 + @drawable/e_day_21 + @drawable/e_day_22 + @drawable/e_day_23 + @drawable/e_day_24 + @drawable/e_day_25 + @drawable/e_day_26 + @drawable/e_day_27 + @drawable/e_day_28 + @drawable/e_day_29 + @drawable/e_day_30 + @drawable/e_day_31 + diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml index eec1033c698174032b04b0539501210d0ba7e2c3..50b4c2b3603af387a1b6f0de49672da83e65b3bf 100644 --- a/app/src/main/res/xml-v25/shortcuts.xml +++ b/app/src/main/res/xml-v25/shortcuts.xml @@ -8,6 +8,6 @@ + android:targetPackage="foundation.e.calendar" /> diff --git a/app/src/main/res/xml-v26/general_preferences.xml b/app/src/main/res/xml-v26/general_preferences.xml index 18c0098f88c2d2f5e2e348803f8e81531e430f8b..486f7c8f19c29204f9afc1b15d558d6eb941de97 100644 --- a/app/src/main/res/xml-v26/general_preferences.xml +++ b/app/src/main/res/xml-v26/general_preferences.xml @@ -22,17 +22,20 @@ app:title="@string/preferences_theme" app:entries="@array/pref_theme_entries" app:entryValues="@array/pref_theme_values" - app:defaultValue="@string/pref_theme_default" /> + app:defaultValue="@string/pref_theme_default" + app:isPreferenceVisible="false" /> + app:title="@string/preferences_pure_black_night_mode" + app:isPreferenceVisible="false" /> + app:defaultValue="teal" + app:isPreferenceVisible="false" /> diff --git a/app/src_aosp/ws/xsoh/etar/BuildConfig.java b/app/src_aosp/ws/xsoh/etar/BuildConfig.java index 09551a5bc1138771fafd32d9c7f4fcd9dd1d4d26..ff3ea54e15e0e432503400b2c560273280007982 100644 --- a/app/src_aosp/ws/xsoh/etar/BuildConfig.java +++ b/app/src_aosp/ws/xsoh/etar/BuildConfig.java @@ -16,7 +16,7 @@ package ws.xsoh.etar; public final class BuildConfig { - public static final String APPLICATION_ID = "org.lineageos.etar"; + public static final String APPLICATION_ID = "foundation.e.calendar"; public static final boolean DEBUG = false; }