diff --git a/.gitignore b/.gitignore index 7b4488887552c17e14c5dc15716961f09c224a09..ef95bd1f4ef8002db4e75bd577218e5d768542e1 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,9 @@ proguard/ # Log Files *.log +# Android Studio +.idea/ + # Android Studio Navigation editor temp files .navigation/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3abde7f9f9db60e6b812e21c676a99d45305bf02..67aae7855832ee68c0a0fa17d4b15e4f0adf6f89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:legacy" +image: registry.gitlab.e.foundation/e/apps/docker-android-apps-cicd:latest stages: - build diff --git a/.gitmodules b/.gitmodules index 14b82f0ab17ce27ba7afdf7f3415047377f5e05b..6334f0ddb4339c9628eac4a5f936c4c0af4c7f43 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,23 +2,24 @@ path = external/colorpicker url = https://github.com/Etar-Group/android_frameworks_opt_colorpicker.git branch = rebase -[submodule "external/datetimepicker"] - path = external/datetimepicker - url = https://github.com/Etar-Group/android_frameworks_opt_datetimepicker.git - branch = rebase + ignore = untracked [submodule "external/timezonepicker"] path = external/timezonepicker url = https://github.com/Etar-Group/standalone-calendar-timezonepicker.git branch = rebase + ignore = untracked [submodule "external/calendar"] path = external/calendar url = https://github.com/Etar-Group/android_frameworks_opt_calendar.git branch = master + ignore = untracked [submodule "external/ex"] path = external/ex url = https://github.com/Etar-Group/standalone-calendar-frameworks-ex.git branch = master + ignore = untracked [submodule "external/chips"] path = external/chips url = https://github.com/Etar-Group/android_frameworks_opt_chips.git branch = rebase + ignore = untracked diff --git a/AndroidManifest.xml b/AndroidManifest.xml index fdcd8518a2f9d2ff90e5170abcc0d45539e12db8..9d8d2f2402858640a1bb36be994acec0af718116 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,17 +18,8 @@ */ --> - - - + package="ws.xsoh.etar" + android:installLocation="auto"> @@ -39,10 +30,32 @@ + + + + + + + + + + + + + + + + + + + + + @@ -122,6 +136,7 @@ @@ -176,6 +191,7 @@ @@ -185,6 +201,7 @@ + @@ -198,9 +215,9 @@ android:resource="@xml/provider_paths"/> - + android:authorities="${applicationId}.CalendarRecentSuggestionsProvider" /> - + @@ -241,6 +259,17 @@ + + + + + + + + + + @@ -248,7 +277,8 @@ - + diff --git a/README.md b/README.md index b0674309c7ea96d2e81ca99ad6788f4b4ba64ad6..651dc24134a95fa5333bf7d1828626e4e8c2d2e2 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,9 @@ this app would be just a dream. So thanks to them! - Week, day & agenda view. - Uses Android calendar sync. Works with Google Calendar, Exchange, etc. - Material designed. -- Support offline calendar -- -Agenda widget.- (disabled until #373 and #374 are fixed. Use [Calendar Widget](https://f-droid.org/de/packages/com.plusonelabs.calendar/) as an alternative.) +- Support offline calendar. +- Agenda widget. +- Multilingual UI. ## How to use Etar Store your calendar on the phone only: @@ -47,7 +48,8 @@ an event to which calendar it should be added. ### Important permissions Etar requires - READ_EXTERNAL_STORAGE & WRITE_EXTERNAL_STORAGE ->import and export ics calendar files -- READ_CONTACTS +- READ_CONTACTS(optional) + Is queried the first time an appointment is created and can be rejected. But then search and location suggestions no longer work. ->allows search and location suggestions when adding guests to an event - READ_CALENDAR & WRITE_CALENDAR ->read and create calendar events diff --git a/assets/backward b/assets/backward index 51e10f4ce4289460b24373b3ca5159852adf24b4..7685c7429c5090a5e2106bc6b552bff2abbafecd 100644 --- a/assets/backward +++ b/assets/backward @@ -3,8 +3,10 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. -# This file provides links between current names for timezones -# and their old names. Many names changed in late 1993. +# This file provides links from old or merged timezone names to current ones. +# Many names changed in late 1993. Several of these names are +# also present in the file 'backzone', which has data important only +# for pre-1970 timestamps and so is out of scope for tzdb proper. # Link TARGET LINK-NAME Link Africa/Nairobi Africa/Asmera @@ -13,10 +15,11 @@ Link America/Argentina/Catamarca America/Argentina/ComodRivadavia Link America/Adak America/Atka Link America/Argentina/Buenos_Aires America/Buenos_Aires Link America/Argentina/Catamarca America/Catamarca -Link America/Atikokan America/Coral_Harbour +Link America/Panama America/Coral_Harbour Link America/Argentina/Cordoba America/Cordoba Link America/Tijuana America/Ensenada Link America/Indiana/Indianapolis America/Fort_Wayne +Link America/Nuuk America/Godthab Link America/Indiana/Indianapolis America/Indianapolis Link America/Argentina/Jujuy America/Jujuy Link America/Indiana/Knox America/Knox_IN @@ -27,7 +30,7 @@ Link America/Rio_Branco America/Porto_Acre Link America/Argentina/Cordoba America/Rosario Link America/Tijuana America/Santa_Isabel Link America/Denver America/Shiprock -Link America/Port_of_Spain America/Virgin +Link America/Puerto_Rico America/Virgin Link Pacific/Auckland Antarctica/South_Pole Link Asia/Ashgabat Asia/Ashkhabad Link Asia/Kolkata Asia/Calcutta @@ -48,6 +51,7 @@ Link Atlantic/Faroe Atlantic/Faeroe Link Europe/Oslo Atlantic/Jan_Mayen Link Australia/Sydney Australia/ACT Link Australia/Sydney Australia/Canberra +Link Australia/Hobart Australia/Currie Link Australia/Lord_Howe Australia/LHI Link Australia/Sydney Australia/NSW Link Australia/Darwin Australia/North @@ -77,6 +81,7 @@ Link Pacific/Easter Chile/EasterIsland Link America/Havana Cuba Link Africa/Cairo Egypt Link Europe/Dublin Eire +Link Etc/UTC Etc/UCT Link Europe/London Europe/Belfast Link Europe/Chisinau Europe/Tiraspol Link Europe/London GB @@ -100,6 +105,7 @@ Link Pacific/Auckland NZ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo Link Asia/Shanghai PRC +Link Pacific/Kanton Pacific/Enderbury Link Pacific/Honolulu Pacific/Johnston Link Pacific/Pohnpei Pacific/Ponape Link Pacific/Pago_Pago Pacific/Samoa @@ -111,7 +117,7 @@ Link Asia/Taipei ROC Link Asia/Seoul ROK Link Asia/Singapore Singapore Link Europe/Istanbul Turkey -Link Etc/UCT UCT +Link Etc/UTC UCT Link America/Anchorage US/Alaska Link America/Adak US/Aleutian Link America/Phoenix US/Arizona diff --git a/assets/dummy b/assets/dummy deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/assets/zone.tab b/assets/zone.tab index 27e1dee61efc5cbb95ced0b3c7d8c3ec4251b75f..086458fb20739bda8be479089f05271c20472ed8 100644 --- a/assets/zone.tab +++ b/assets/zone.tab @@ -3,7 +3,7 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # -# From Paul Eggert (2018-06-27): +# From Paul Eggert (2021-09-20): # This file is intended as a backward-compatibility aid for older programs. # New programs should use zone1970.tab. This file is like zone1970.tab (see # zone1970.tab's comments), but with the following additional restrictions: @@ -16,6 +16,9 @@ # clocks have agreed since 1970; this is a narrower definition than # that of zone1970.tab. # +# Unlike zone1970.tab, a row's third column can be a Link from +# 'backward' instead of a Zone. +# # This table is intended as an aid for users, to help them select timezones # appropriate for their practical needs. It is not intended to take or # endorse any position on legal or territorial claims. @@ -56,8 +59,7 @@ AS -1416-17042 Pacific/Pago_Pago AT +4813+01620 Europe/Vienna AU -3133+15905 Australia/Lord_Howe Lord Howe Island AU -5430+15857 Antarctica/Macquarie Macquarie Island -AU -4253+14719 Australia/Hobart Tasmania (most areas) -AU -3956+14352 Australia/Currie Tasmania (King Island) +AU -4253+14719 Australia/Hobart Tasmania AU -3749+14458 Australia/Melbourne Victoria AU -3352+15113 Australia/Sydney New South Wales (most areas) AU -3157+14127 Australia/Broken_Hill New South Wales (Yancowinna) @@ -130,9 +132,9 @@ CA +682059-1334300 America/Inuvik Mountain - NT (west) CA +4906-11631 America/Creston MST - BC (Creston) CA +5946-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) CA +5848-12242 America/Fort_Nelson MST - BC (Ft Nelson) +CA +6043-13503 America/Whitehorse MST - Yukon (east) +CA +6404-13925 America/Dawson MST - Yukon (west) CA +4916-12307 America/Vancouver Pacific - BC (most areas) -CA +6043-13503 America/Whitehorse Pacific - Yukon (south) -CA +6404-13925 America/Dawson Pacific - Yukon (north) CC -1210+09655 Indian/Cocos CD -0418+01518 Africa/Kinshasa Dem. Rep. of Congo (west) CD -1140+02728 Africa/Lubumbashi Dem. Rep. of Congo (east) @@ -189,7 +191,7 @@ GF +0456-05220 America/Cayenne GG +492717-0023210 Europe/Guernsey GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Godthab Greenland (most areas) +GL +6411-05144 America/Nuuk Greenland (most areas) GL +7646-01840 America/Danmarkshavn National Park (east coast) GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit GL +7634-06847 America/Thule Thule/Pituffik @@ -229,7 +231,7 @@ KE -0117+03649 Africa/Nairobi KG +4254+07436 Asia/Bishkek KH +1133+10455 Asia/Phnom_Penh KI +0125+17300 Pacific/Tarawa Gilbert Islands -KI -0308-17105 Pacific/Enderbury Phoenix Islands +KI -0247-17143 Pacific/Kanton Phoenix Islands KI +0152-15720 Pacific/Kiritimati Line Islands KM -1141+04316 Indian/Comoro KN +1718-06243 America/St_Kitts @@ -332,10 +334,13 @@ RO +4426+02606 Europe/Bucharest RS +4450+02030 Europe/Belgrade RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area -RU +4457+03406 Europe/Simferopol MSK+00 - Crimea +# The obsolescent zone.tab format cannot represent Europe/Simferopol well. +# Put it in RU section and list as UA. See "territorial claims" above. +# Programs should use zone1970.tab instead; see above. +UA +4457+03406 Europe/Simferopol Crimea RU +5836+04939 Europe/Kirov MSK+00 - Kirov +RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd RU +4621+04803 Europe/Astrakhan MSK+01 - Astrakhan -RU +4844+04425 Europe/Volgograd MSK+01 - Volgograd RU +5134+04602 Europe/Saratov MSK+01 - Saratov RU +5420+04824 Europe/Ulyanovsk MSK+01 - Ulyanovsk RU +5312+05009 Europe/Samara MSK+01 - Samara, Udmurtia @@ -389,15 +394,15 @@ TK -0922-17114 Pacific/Fakaofo TL -0833+12535 Asia/Dili TM +3757+05823 Asia/Ashgabat TN +3648+01011 Africa/Tunis -TO -2110-17510 Pacific/Tongatapu +TO -210800-1751200 Pacific/Tongatapu TR +4101+02858 Europe/Istanbul TT +1039-06131 America/Port_of_Spain TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei TZ -0648+03917 Africa/Dar_es_Salaam UA +5026+03031 Europe/Kiev Ukraine (most areas) -UA +4837+02218 Europe/Uzhgorod Ruthenia -UA +4750+03510 Europe/Zaporozhye Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east) +UA +4837+02218 Europe/Uzhgorod Transcarpathia +UA +4750+03510 Europe/Zaporozhye Zaporozhye and east Lugansk UG +0019+03225 Africa/Kampala UM +2813-17722 Pacific/Midway Midway Islands UM +1917+16637 Pacific/Wake Wake Island diff --git a/build.gradle b/build.gradle index 7a040e8156de9dc8390ec14c74f3cd6082f02824..8442e2d6e00c4be3d6043597ac99e501ca3a0454 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,21 @@ buildscript { - ext.kotlin_version = '1.3.61' + ext.kotlin_version = '1.6.10' + ext.kotlin_coroutines_version = '1.5.2' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:7.0.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" } } allprojects { repositories { google() - jcenter() + mavenCentral() } } @@ -23,12 +23,12 @@ project(':external:calendar') { apply plugin: 'com.android.library' android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + compileSdkVersion 31 + buildToolsVersion '31.0.0' defaultConfig { - minSdkVersion 19 - targetSdkVersion 29 + minSdkVersion 21 + targetSdkVersion 31 } sourceSets { @@ -54,12 +54,12 @@ project(':external:colorpicker') { apply plugin: 'com.android.library' android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + compileSdkVersion 31 + buildToolsVersion '31.0.0' defaultConfig { - minSdkVersion 19 - targetSdkVersion 29 + minSdkVersion 21 + targetSdkVersion 31 } sourceSets { @@ -88,12 +88,12 @@ project(':external:timezonepicker') { } android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + compileSdkVersion 31 + buildToolsVersion '31.0.0' defaultConfig { - minSdkVersion 19 - targetSdkVersion 29 + minSdkVersion 21 + targetSdkVersion 31 } sourceSets { @@ -117,12 +117,12 @@ project(':external:chips') { apply plugin: 'com.android.library' android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + compileSdkVersion 31 + buildToolsVersion '31.0.0' defaultConfig { - minSdkVersion 19 - targetSdkVersion 29 + minSdkVersion 21 + targetSdkVersion 31 } sourceSets { @@ -146,17 +146,16 @@ project(':external:chips') { apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.2.1" - implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version" + implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version" - implementation 'androidx.preference:preference:1.1.0' - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.appcompat:appcompat:1.4.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.2' + implementation 'com.google.android.material:material:1.4.0' implementation project(':external:calendar') implementation project(':external:colorpicker') @@ -167,16 +166,15 @@ dependencies { } android { - compileSdkVersion 29 - buildToolsVersion '29.0.2' + compileSdkVersion 31 + buildToolsVersion '31.0.0' defaultConfig { - minSdkVersion 19 - targetSdkVersion 29 - versionCode 23 - versionName "1.0.21" + minSdkVersion 21 + targetSdkVersion 31 + versionCode 31 + versionName "1.0.29" applicationId "foundation.e.calendar" - vectorDrawables.useSupportLibrary = true } useLibrary 'org.apache.http.legacy' @@ -195,16 +193,23 @@ android { buildTypes { release { + // TODO: could be enabled for ProGuard minimization minifyEnabled false + resValue "string", "search_authority", defaultConfig.applicationId + '.CalendarRecentSuggestionsProvider' } debug { minifyEnabled false applicationIdSuffix ".debug" + resValue "string", "search_authority", defaultConfig.applicationId + '.debug.CalendarRecentSuggestionsProvider' } } + buildFeatures { + viewBinding true + } + /* * To sign release build, create file gradle.properties in ~/.gradle/ with this content: * diff --git a/external/calendar b/external/calendar index 1aea8315ebe9cca6e9462ab02e9f4caf20c8cd58..907ed0923b996d5ad5b20f39b7d37529761fb48d 160000 --- a/external/calendar +++ b/external/calendar @@ -1 +1 @@ -Subproject commit 1aea8315ebe9cca6e9462ab02e9f4caf20c8cd58 +Subproject commit 907ed0923b996d5ad5b20f39b7d37529761fb48d diff --git a/external/chips b/external/chips index 929f04789cc52a6cb6219615ae78781fcadecdd9..0898c9352d160525b06de09a6335228f2109c9b3 160000 --- a/external/chips +++ b/external/chips @@ -1 +1 @@ -Subproject commit 929f04789cc52a6cb6219615ae78781fcadecdd9 +Subproject commit 0898c9352d160525b06de09a6335228f2109c9b3 diff --git a/external/colorpicker b/external/colorpicker index 7890ecd4bc418a422f02c0ab32406049b9117707..6ddaf73e74078a7c4d7bc0dcd3bc585880e7402d 160000 --- a/external/colorpicker +++ b/external/colorpicker @@ -1 +1 @@ -Subproject commit 7890ecd4bc418a422f02c0ab32406049b9117707 +Subproject commit 6ddaf73e74078a7c4d7bc0dcd3bc585880e7402d diff --git a/external/datetimepicker b/external/datetimepicker deleted file mode 160000 index 76c4c4ed90f3ccf8c4a269d7907cef121d484d6c..0000000000000000000000000000000000000000 --- a/external/datetimepicker +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76c4c4ed90f3ccf8c4a269d7907cef121d484d6c diff --git a/external/ex b/external/ex index bd0809dbb4344ee9cbb99ec49fc78d63f79d240c..4d7b558121a328135e161208731db97881a8dbfe 160000 --- a/external/ex +++ b/external/ex @@ -1 +1 @@ -Subproject commit bd0809dbb4344ee9cbb99ec49fc78d63f79d240c +Subproject commit 4d7b558121a328135e161208731db97881a8dbfe diff --git a/external/timezonepicker b/external/timezonepicker index 4eaa0c1f55ea4cf75759a6d3fc7bbfeaf1bfc541..888fee6ffba497e87c5a5691da52844593ddb901 160000 --- a/external/timezonepicker +++ b/external/timezonepicker @@ -1 +1 @@ -Subproject commit 4eaa0c1f55ea4cf75759a6d3fc7bbfeaf1bfc541 +Subproject commit 888fee6ffba497e87c5a5691da52844593ddb901 diff --git a/fix_strings_and_import.py b/fix_strings_and_import.py deleted file mode 100644 index c5c08e2b6ab963f429a308eea9fee2ac1f6c5913..0000000000000000000000000000000000000000 --- a/fix_strings_and_import.py +++ /dev/null @@ -1,21 +0,0 @@ -import os, fnmatch, re - -def findReplace(directory, find, replace, filePattern): - for path, dirs, files in os.walk(os.path.abspath(directory)): - for filename in fnmatch.filter(files, filePattern): - filepath = os.path.join(path, filename) - print(filepath) - with open(filepath) as f: - s = f.read() - s = re.sub(find, replace, s) - with open(filepath, "w") as f: - f.write(s) - -# gradle can't compile if two strings are defined with the same name, this removes one useless occurence -findReplace("res", r"().*()", r"", "strings.xml") - -# change import of generated R file to fix packagename -findReplace("src", r"import com.android.calendar.R;", r"import foundation.e.calendar.R;", "*.java") - -# add R import to com.android.calendar -findReplace("src", r"package com.android.calendar;", r"package com.android.calendar;\n\nimport foundation.e.calendar.R;", "*.java") diff --git a/gradle.properties b/gradle.properties index 2bd9388fafc1e6646929f58589c13ee9434d095b..65235981593a4e06edbdcd2c32eb90b0a73b3319 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,5 +12,6 @@ # org.gradle.parallel=true #Mon Sep 16 20:34:11 CEST 2019 android.enableJetifier=true -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4096M android.useAndroidX=true +org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100755 new mode 100644 index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100755 new mode 100644 index 36caafacb7188aea8285f81c6b2849870fbe005a..b52761d5f00f172d3f442c2c3b5194ec10de215e --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Jan 11 14:20:57 CET 2020 +#Tue Nov 16 03:59:46 GMT 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 83f2acfdc319a24e8766cca78f32474ad7a22dd6..4f906e0c811fc9e230eb44819f509cd0627f2600 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -175,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 24467a141f791695fc1009c78d913b2c849d1412..ac1b06f93825db68fb0c0b5150917f340eaa5d02 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -61,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/metadata/de-DE/changelogs/24.txt b/metadata/de-DE/changelogs/24.txt new file mode 100644 index 0000000000000000000000000000000000000000..9b9b23008db8c53c460b53ba4bf0241bed6aa7f8 --- /dev/null +++ b/metadata/de-DE/changelogs/24.txt @@ -0,0 +1,7 @@ +- Kleinere Schriftgröße in der Wochenansicht +- Anzeige kürzlicher Suchbegriffe +- Fehlerkorrektur Export zur SD-Karte +- Abgesagte Einträge werden durchgestrichen dargestellt +- Benutze Systemfarben für die Darstellung (ab Android 10) +- Neue Übersetzungen +- Fehlerbehebungen diff --git a/metadata/de-DE/changelogs/25.txt b/metadata/de-DE/changelogs/25.txt new file mode 100644 index 0000000000000000000000000000000000000000..97182a8dc082253ca87c9a856c939b0edef1926d --- /dev/null +++ b/metadata/de-DE/changelogs/25.txt @@ -0,0 +1,4 @@ +- Zeitzohnen sind wieder auswählbar +- SVG App-Icon +- Überarbeitung und Reaktivierung des Widgets +- Neue Übersetzungen diff --git a/metadata/de-DE/changelogs/26.txt b/metadata/de-DE/changelogs/26.txt new file mode 100644 index 0000000000000000000000000000000000000000..465941e0f845cd43fd98c4dd5177a5c149efbd15 --- /dev/null +++ b/metadata/de-DE/changelogs/26.txt @@ -0,0 +1,4 @@ +- Layout für Terminplanung überarbeitet +- Support für Android 4.4 eingestellt +- Allgemeine Fehlerbehebungen +- Neue Übersetzungen \ No newline at end of file diff --git a/metadata/de-DE/changelogs/27.txt b/metadata/de-DE/changelogs/27.txt new file mode 100644 index 0000000000000000000000000000000000000000..8fc2a063dccc5eeb5c12b980b276ba4be35f539f --- /dev/null +++ b/metadata/de-DE/changelogs/27.txt @@ -0,0 +1,2 @@ +- Allgemeine Fehlerbehebungen +- Neue Übersetzungen \ No newline at end of file diff --git a/metadata/de-DE/changelogs/28.txt b/metadata/de-DE/changelogs/28.txt new file mode 100644 index 0000000000000000000000000000000000000000..8fc2a063dccc5eeb5c12b980b276ba4be35f539f --- /dev/null +++ b/metadata/de-DE/changelogs/28.txt @@ -0,0 +1,2 @@ +- Allgemeine Fehlerbehebungen +- Neue Übersetzungen \ No newline at end of file diff --git a/metadata/de-DE/changelogs/29.txt b/metadata/de-DE/changelogs/29.txt new file mode 100644 index 0000000000000000000000000000000000000000..f01b990a0534cceed9e5d5a04f98d3b916bc3d2b --- /dev/null +++ b/metadata/de-DE/changelogs/29.txt @@ -0,0 +1,5 @@ +- Unterstützung für Android 12 +- Unterstütz das neue Material You Design +- Verknüpfung zum Android Service für ein Datenbank Backup entfernt (in den meisten Android Versionen kaputt) +- Allgemeine Fehlerbehebungen +- Neue Übersetzungen diff --git a/metadata/de-DE/changelogs/30.txt b/metadata/de-DE/changelogs/30.txt new file mode 100644 index 0000000000000000000000000000000000000000..5679ba4c4dc382e439a744b175fd6f78d19fc93e --- /dev/null +++ b/metadata/de-DE/changelogs/30.txt @@ -0,0 +1,2 @@ +- Bugfix für Benachrichtigungen auf Android 12 +- DecSync und Birthday Adapter als bekannte Apps hinzugefügt Crash bei anderen Apps abgefangen diff --git a/metadata/de-DE/changelogs/31.txt b/metadata/de-DE/changelogs/31.txt new file mode 100644 index 0000000000000000000000000000000000000000..26f7840b65ef061ce9a9fb450d9b0f0461f06833 --- /dev/null +++ b/metadata/de-DE/changelogs/31.txt @@ -0,0 +1,2 @@ +- Bugfix für Abstürze und Benachrichtigungen auf Android 12 +- Bugfix für MIME-Type beim Teilen von Kalendereinträgen diff --git a/metadata/en-US/changelogs/24.txt b/metadata/en-US/changelogs/24.txt new file mode 100644 index 0000000000000000000000000000000000000000..a22eaabc72052fef4fba0aa88d249fb69252ae2e --- /dev/null +++ b/metadata/en-US/changelogs/24.txt @@ -0,0 +1,7 @@ +- Reduce font size of event names in week view +- Activate recent search suggestions +- Fix export to SD card +- Strike through title of canceled events +- Make use of system theme setting on android 10 +- New translations +- Bugfixes diff --git a/metadata/en-US/changelogs/25.txt b/metadata/en-US/changelogs/25.txt new file mode 100644 index 0000000000000000000000000000000000000000..65f440865ad466950c2a4c611a66f2d949ab938b --- /dev/null +++ b/metadata/en-US/changelogs/25.txt @@ -0,0 +1,4 @@ +- Recover time zone database +- SVG app icon +- Rework and reactivate the widget +- New translations diff --git a/metadata/en-US/changelogs/26.txt b/metadata/en-US/changelogs/26.txt new file mode 100644 index 0000000000000000000000000000000000000000..78e50a612e810e7792275a07ecfd9ad9b93e9a10 --- /dev/null +++ b/metadata/en-US/changelogs/26.txt @@ -0,0 +1,4 @@ +- Rework edit event layout +- Drop support for Android 4.4 +- General bug fixes +- New translations \ No newline at end of file diff --git a/metadata/en-US/changelogs/27.txt b/metadata/en-US/changelogs/27.txt new file mode 100644 index 0000000000000000000000000000000000000000..5b9c7326e8aac960750e9d67a20bdbbeebf827c3 --- /dev/null +++ b/metadata/en-US/changelogs/27.txt @@ -0,0 +1,2 @@ +- General bug fixes +- New translations \ No newline at end of file diff --git a/metadata/en-US/changelogs/28.txt b/metadata/en-US/changelogs/28.txt new file mode 100644 index 0000000000000000000000000000000000000000..5b9c7326e8aac960750e9d67a20bdbbeebf827c3 --- /dev/null +++ b/metadata/en-US/changelogs/28.txt @@ -0,0 +1,2 @@ +- General bug fixes +- New translations \ No newline at end of file diff --git a/metadata/en-US/changelogs/29.txt b/metadata/en-US/changelogs/29.txt new file mode 100644 index 0000000000000000000000000000000000000000..9d7b191913c83dc064fa831fc2678337f271e0b5 --- /dev/null +++ b/metadata/en-US/changelogs/29.txt @@ -0,0 +1,5 @@ +- Support Android 12 +- Support Material You Design +- Remove connection to Android service for database backup (broken in most Android versions) +- General bug fixes +- New translations diff --git a/metadata/en-US/changelogs/30.txt b/metadata/en-US/changelogs/30.txt new file mode 100644 index 0000000000000000000000000000000000000000..329804b2716b7ccccd4fd318dbd40b5746a73461 --- /dev/null +++ b/metadata/en-US/changelogs/30.txt @@ -0,0 +1,2 @@ +- Fix notifications on Android 12 +- Add DecSync and Birthday Adapter to "known" apps and don't crash diff --git a/metadata/en-US/changelogs/31.txt b/metadata/en-US/changelogs/31.txt new file mode 100644 index 0000000000000000000000000000000000000000..2a715b76d6b0c269c1a3541f0c66d46eab3c27c7 --- /dev/null +++ b/metadata/en-US/changelogs/31.txt @@ -0,0 +1,2 @@ +- Fix crash and notifications on Android 12 +- Fix MIME type of shared event diff --git a/metadata/en-US/full_description.txt b/metadata/en-US/full_description.txt index 3990b0da62a3a525123b6832df82fb15c9f0d589..66a88f9ae08940bbe001a6a299d59dcb3b969804 100644 --- a/metadata/en-US/full_description.txt +++ b/metadata/en-US/full_description.txt @@ -1,11 +1,12 @@ Features: - Month view. -- Week, day & agenda view. -- Uses Android calendar sync. Works with Google Calendar, Exchange..etc. -- Material design. -- Dark & Light Theme. -- Free, open source and absolutely no Ads. -- Support sharing calendars via ics and the ability to import/export from sdcard. +- Week, day and agenda view. +- Uses Android calendar sync. Works with Google Calendar, Exchange, etc. +- Material Design. +- Dark and light theme. +- Free, open source and absolutely no ads. +- Support sharing calendars via ICS and the ability to import/export from SD card. +- Multilingual UI. -Bugs & feedback: https://github.com/Etar-Group/Etar-Calendar/issues -Source Code: https://github.com/Etar-Group/Etar-Calendar +Bugs and feedback: https://github.com/Etar-Group/Etar-Calendar/issues +Source code: https://github.com/Etar-Group/Etar-Calendar diff --git a/proguard.flags b/proguard.flags index 76eb5280683947c103400900a4a35303b327ca53..1dd6fd4366c3f95025813b9356128aea8253d21f 100644 --- a/proguard.flags +++ b/proguard.flags @@ -1,6 +1,7 @@ -keep class com.android.calendar.selectcalendars.SelectCalendarsSyncFragment -keep class com.android.calendar.OtherPreferences -keep class com.android.calendar.AboutPreferences +-keep class com.android.calendar.settings.QuickResponsePreferences -keepclassmembers class com.android.calendar.AllInOneActivity { *** setControlsOffset(...); } @@ -35,6 +36,10 @@ *** extractDomain(...); } +-keep public class * extends android.app.Fragment { + public (); +} + -keepclassmembers class * implements android.content.SharedPreferences$Editor { public *** apply(); } diff --git a/res/drawable-hdpi/bg_event_cal_widget_holo.9.png b/res/drawable-hdpi/bg_event_cal_widget_holo.9.png deleted file mode 100644 index 041ba288c61eade0175ac6744db082d2494efd1c..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/bg_event_cal_widget_holo.9.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_history_holo_light.webp b/res/drawable-hdpi/ic_history_holo_light.webp deleted file mode 100644 index 24671cd347b11496d1e2eacc4f1ce0a48738b365..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_history_holo_light.webp and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_today_holo_light.webp b/res/drawable-hdpi/ic_menu_today_holo_light.webp deleted file mode 100644 index ab8df57769047566ed27d3aeb231916758a3b13f..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_menu_today_holo_light.webp and /dev/null differ diff --git a/res/drawable-hdpi/ic_recurrence_bubble_disabled.webp b/res/drawable-hdpi/ic_recurrence_bubble_disabled.webp deleted file mode 100644 index 757ad5cb2e898dfdef277e4b49be6306b8cc47b5..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_recurrence_bubble_disabled.webp and /dev/null differ diff --git a/res/drawable-hdpi/ic_recurrence_bubble_fill.webp b/res/drawable-hdpi/ic_recurrence_bubble_fill.webp deleted file mode 100644 index fb42046297545a02e1f0002c255e664a4b2a1d0e..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_recurrence_bubble_fill.webp and /dev/null differ diff --git a/res/drawable-hdpi/ic_recurrence_bubble_outline.webp b/res/drawable-hdpi/ic_recurrence_bubble_outline.webp deleted file mode 100644 index 72b8c1b2ff9735485728de9903151f824380a52f..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_recurrence_bubble_outline.webp and /dev/null differ diff --git a/res/drawable-hdpi/ic_recurrence_bubble_outline_disabled.webp b/res/drawable-hdpi/ic_recurrence_bubble_outline_disabled.webp deleted file mode 100644 index 704724a93e1aaf131d35a730ef15c238065cea26..0000000000000000000000000000000000000000 Binary files a/res/drawable-hdpi/ic_recurrence_bubble_outline_disabled.webp and /dev/null differ diff --git a/res/drawable-mdpi/bg_event_cal_widget_holo.9.png b/res/drawable-mdpi/bg_event_cal_widget_holo.9.png deleted file mode 100644 index d9a37a49995b5e8b85c9b51abd02c7b7b44b568d..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/bg_event_cal_widget_holo.9.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_history_holo_light.webp b/res/drawable-mdpi/ic_history_holo_light.webp deleted file mode 100644 index 03e0e63101056ca90c90ce6338223ece14811f2d..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_history_holo_light.webp and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_today_holo_light.webp b/res/drawable-mdpi/ic_menu_today_holo_light.webp deleted file mode 100644 index 9c9a5bed236b2eb458b1c765e3c476230cfebf0c..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_menu_today_holo_light.webp and /dev/null differ diff --git a/res/drawable-mdpi/ic_recurrence_bubble_disabled.webp b/res/drawable-mdpi/ic_recurrence_bubble_disabled.webp deleted file mode 100644 index 9cb9ecbdb37dc8eaf70f9f2b68f64faf53cd501c..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_recurrence_bubble_disabled.webp and /dev/null differ diff --git a/res/drawable-mdpi/ic_recurrence_bubble_fill.webp b/res/drawable-mdpi/ic_recurrence_bubble_fill.webp deleted file mode 100644 index 58ed8fc84d72d6c527df528b79e05e262cefab1c..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_recurrence_bubble_fill.webp and /dev/null differ diff --git a/res/drawable-mdpi/ic_recurrence_bubble_outline.webp b/res/drawable-mdpi/ic_recurrence_bubble_outline.webp deleted file mode 100644 index 739171474d7eceea07e98fd15929d616057b2e19..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_recurrence_bubble_outline.webp and /dev/null differ diff --git a/res/drawable-mdpi/ic_recurrence_bubble_outline_disabled.webp b/res/drawable-mdpi/ic_recurrence_bubble_outline_disabled.webp deleted file mode 100644 index ef5f79af0dcab261f7962a709c5d1a9a119e455e..0000000000000000000000000000000000000000 Binary files a/res/drawable-mdpi/ic_recurrence_bubble_outline_disabled.webp and /dev/null differ diff --git a/res/drawable-xhdpi/bg_event_cal_widget_holo.9.png b/res/drawable-xhdpi/bg_event_cal_widget_holo.9.png deleted file mode 100644 index 2a76c00e22b60560fd38f55eeb3d3d1b83e17055..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/bg_event_cal_widget_holo.9.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_history_holo_light.webp b/res/drawable-xhdpi/ic_history_holo_light.webp deleted file mode 100644 index ddfe505edeea470dacd8fa4323e9c89f443f020d..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_history_holo_light.webp and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_today_holo_light.webp b/res/drawable-xhdpi/ic_menu_today_holo_light.webp deleted file mode 100644 index 432ce2af93fbfa31f438325b36e140357cfe097e..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_menu_today_holo_light.webp and /dev/null differ diff --git a/res/drawable-xhdpi/ic_recurrence_bubble_disabled.webp b/res/drawable-xhdpi/ic_recurrence_bubble_disabled.webp deleted file mode 100644 index f754dc065650813d8370f3575f30f58ae2d7dd8c..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_recurrence_bubble_disabled.webp and /dev/null differ diff --git a/res/drawable-xhdpi/ic_recurrence_bubble_fill.webp b/res/drawable-xhdpi/ic_recurrence_bubble_fill.webp deleted file mode 100644 index 614bad5f6139cd6b758320e1508df819941acecc..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_recurrence_bubble_fill.webp and /dev/null differ diff --git a/res/drawable-xhdpi/ic_recurrence_bubble_outline.webp b/res/drawable-xhdpi/ic_recurrence_bubble_outline.webp deleted file mode 100644 index b38c017124a3d5fd518bbc49fed0ca5021cae784..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_recurrence_bubble_outline.webp and /dev/null differ diff --git a/res/drawable-xhdpi/ic_recurrence_bubble_outline_disabled.webp b/res/drawable-xhdpi/ic_recurrence_bubble_outline_disabled.webp deleted file mode 100644 index 98daee05db5d7f3c401892ba3201efc1c3c9189c..0000000000000000000000000000000000000000 Binary files a/res/drawable-xhdpi/ic_recurrence_bubble_outline_disabled.webp and /dev/null differ diff --git a/res/drawable/actionbar_cursor.xml b/res/drawable/actionbar_cursor.xml index 3876839ef576989132ed3ca0ecff7e59f7f82d26..571cdc6f6b71035ed1cf29aa5c7ae2243e57af87 100644 --- a/res/drawable/actionbar_cursor.xml +++ b/res/drawable/actionbar_cursor.xml @@ -3,4 +3,4 @@ android:shape="rectangle" > - \ No newline at end of file + diff --git a/res/drawable/agenda_item_bg_primary.xml b/res/drawable/agenda_item_bg_primary.xml old mode 100644 new mode 100755 diff --git a/res/drawable/agenda_item_bg_secondary.xml b/res/drawable/agenda_item_bg_secondary.xml old mode 100644 new mode 100755 diff --git a/res/drawable/calendar_color_square.xml b/res/drawable/calendar_color_square.xml index 7be33333427b85c283dbae0b795e0dfcb2b85eae..1b9ded14639ad8051ae1120dd488904ba4537c14 100644 --- a/res/drawable/calendar_color_square.xml +++ b/res/drawable/calendar_color_square.xml @@ -13,4 +13,4 @@ See the License for the specific language governing permissions and limitations under the License. --> - \ No newline at end of file + diff --git a/res/drawable/circle.xml b/res/drawable/circle.xml index 2af16fdf43b8a2697f115bfd8c99e6c26cd156ed..abed2ea09b8d681d4bb8653b080ca6be33c1085f 100644 --- a/res/drawable/circle.xml +++ b/res/drawable/circle.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/res/drawable/circle_outline.xml b/res/drawable/circle_outline.xml index e902972369a25e095c5911e88748af3600a6f009..b3f35538ad6d148df655dfbe06884fa4571e28e8 100644 --- a/res/drawable/circle_outline.xml +++ b/res/drawable/circle_outline.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/res/drawable/ic_account_circle.xml b/res/drawable/ic_account_circle.xml new file mode 100644 index 0000000000000000000000000000000000000000..c85bb90b16a989dc1598ff66a860cad15dc30a28 --- /dev/null +++ b/res/drawable/ic_account_circle.xml @@ -0,0 +1,5 @@ + + + diff --git a/res/drawable/ic_add.xml b/res/drawable/ic_add.xml new file mode 100644 index 0000000000000000000000000000000000000000..fe7c5414eafc724f16145ad2b4c10cdbc399ea80 --- /dev/null +++ b/res/drawable/ic_add.xml @@ -0,0 +1,5 @@ + + + diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml index 9f11146e2a4c8a9121ad6149e97decabe2c7c4c2..65eedbc3c9e3fe3b8fabf8967c0bdd66ff19f988 100644 --- a/res/drawable/ic_arrow_back.xml +++ b/res/drawable/ic_arrow_back.xml @@ -1,6 +1,5 @@ - + diff --git a/res/drawable/ic_baseline_account_circle.xml b/res/drawable/ic_baseline_account_circle.xml new file mode 100644 index 0000000000000000000000000000000000000000..1ccfed17d70d9dd78e0490de97bbe23a32c56234 --- /dev/null +++ b/res/drawable/ic_baseline_account_circle.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/res/drawable/ic_baseline_calendar_dayofmonth.xml b/res/drawable/ic_baseline_calendar_dayofmonth.xml new file mode 100644 index 0000000000000000000000000000000000000000..fd08d39ef8f0d2672b0ad01333851356250869dd --- /dev/null +++ b/res/drawable/ic_baseline_calendar_dayofmonth.xml @@ -0,0 +1,5 @@ + + + diff --git a/res/drawable/ic_baseline_calendar_today_24.xml b/res/drawable/ic_baseline_calendar_today.xml similarity index 90% rename from res/drawable/ic_baseline_calendar_today_24.xml rename to res/drawable/ic_baseline_calendar_today.xml index eab951f114aab35a0a1d0709ba26d6cc3e7a6848..1cf969c70fd10febdda2e7507bb7c9157a4d0033 100644 --- a/res/drawable/ic_baseline_calendar_today_24.xml +++ b/res/drawable/ic_baseline_calendar_today.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="@color/colorAccent"> + android:tint="?attr/colorControlNormal"> diff --git a/res/drawable/ic_baseline_history.xml b/res/drawable/ic_baseline_history.xml new file mode 100644 index 0000000000000000000000000000000000000000..88134862e1ce8e029328fcc2d8e51898dd335bc2 --- /dev/null +++ b/res/drawable/ic_baseline_history.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/res/drawable/ic_create_dark.xml b/res/drawable/ic_create.xml similarity index 82% rename from res/drawable/ic_create_dark.xml rename to res/drawable/ic_create.xml index 46462b57260d4227f22b10e58562ea2e1030a681..7edd0d24b48486acc17dcbcfa422f673a4ded417 100644 --- a/res/drawable/ic_create_dark.xml +++ b/res/drawable/ic_create.xml @@ -1,4 +1,4 @@ - diff --git a/res/drawable/ic_description_dark.xml b/res/drawable/ic_description.xml similarity index 82% rename from res/drawable/ic_description_dark.xml rename to res/drawable/ic_description.xml index 302bb4af1a03b4caa9d72991fa03ee540606b6e8..9a8032321896234b6d1248420c87cc93e0f0a278 100644 --- a/res/drawable/ic_description_dark.xml +++ b/res/drawable/ic_description.xml @@ -1,4 +1,4 @@ - diff --git a/res/drawable/ic_info_outline_dark.xml b/res/drawable/ic_info_outline.xml similarity index 82% rename from res/drawable/ic_info_outline_dark.xml rename to res/drawable/ic_info_outline.xml index af0d4d067a587ea43697027863688b6cead6b5e2..8f6eec51634b52df0d5f9d6c007f50cfe128dd1c 100755 --- a/res/drawable/ic_info_outline_dark.xml +++ b/res/drawable/ic_info_outline.xml @@ -1,4 +1,4 @@ - diff --git a/res/drawable/ic_info_outline_light.xml b/res/drawable/ic_info_outline_light.xml deleted file mode 100755 index f52a15fb6200729bc53e049f69d7b8a9aae5af27..0000000000000000000000000000000000000000 --- a/res/drawable/ic_info_outline_light.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000000000000000000000000000000000000..8659cacedcf211b6f425afd692e6d4c23597ff8a --- /dev/null +++ b/res/drawable/ic_launcher_background.xml @@ -0,0 +1,17 @@ + + + + + + diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000000000000000000000000000000000000..a93768503fa2dfc398e32b7491617ee12c0c21bd --- /dev/null +++ b/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + diff --git a/res/drawable/ic_outline_business_center.xml b/res/drawable/ic_outline_business_center.xml new file mode 100644 index 0000000000000000000000000000000000000000..aa41c0c7a6c9dd3a29c00d99591411f92d98835b --- /dev/null +++ b/res/drawable/ic_outline_business_center.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_outline_lock.xml b/res/drawable/ic_outline_lock.xml new file mode 100644 index 0000000000000000000000000000000000000000..cda5f52e49bcc00f370baab1a2f4fe6239ab8c9c --- /dev/null +++ b/res/drawable/ic_outline_lock.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_arrow_down.xml b/res/drawable/ic_outline_notes.xml similarity index 52% rename from res/drawable/ic_arrow_down.xml rename to res/drawable/ic_outline_notes.xml index 005f1eb21f48bf9a412b289a834ebe78afe84be3..e10ad1e15fe48da1d35bbe1ff467b21c13d2a08e 100644 --- a/res/drawable/ic_arrow_down.xml +++ b/res/drawable/ic_outline_notes.xml @@ -3,8 +3,8 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="@color/month_other_month_day_number"> + android:tint="?attr/colorControlNormal"> + android:fillColor="@android:color/white" + android:pathData="M21,11.01L3,11v2h18zM3,16h12v2H3zM21,6H3v2.01L21,8z"/> diff --git a/res/drawable/ic_outline_notifications.xml b/res/drawable/ic_outline_notifications.xml new file mode 100644 index 0000000000000000000000000000000000000000..6cd3b4273d47f04105a3b065a5342fa6457faf84 --- /dev/null +++ b/res/drawable/ic_outline_notifications.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_outline_person_add.xml b/res/drawable/ic_outline_person_add.xml new file mode 100644 index 0000000000000000000000000000000000000000..a2a0572a9ad1066674cd30a8d0e150f1c6bb8cd3 --- /dev/null +++ b/res/drawable/ic_outline_person_add.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_outline_place.xml b/res/drawable/ic_outline_place.xml new file mode 100644 index 0000000000000000000000000000000000000000..9772ca2aee6c8eb45f14205e2477d4b6c0560f28 --- /dev/null +++ b/res/drawable/ic_outline_place.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_outline_public.xml b/res/drawable/ic_outline_public.xml new file mode 100644 index 0000000000000000000000000000000000000000..ee0f06db4b6c6bd7c138b38e4b57c69834c9733e --- /dev/null +++ b/res/drawable/ic_outline_public.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_outline_repeat.xml b/res/drawable/ic_outline_repeat.xml new file mode 100644 index 0000000000000000000000000000000000000000..f2be45bab56e26271c11b81287d16d329ce45537 --- /dev/null +++ b/res/drawable/ic_outline_repeat.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_outline_schedule.xml b/res/drawable/ic_outline_schedule.xml new file mode 100644 index 0000000000000000000000000000000000000000..28e127d54b769e0adbf3fd8e773efbb6da359e5d --- /dev/null +++ b/res/drawable/ic_outline_schedule.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_recurrence_bubble_fill.xml b/res/drawable/ic_recurrence_bubble_fill.xml new file mode 100644 index 0000000000000000000000000000000000000000..f274a2232b3b5b2ad38bd481205c13da8b512e7f --- /dev/null +++ b/res/drawable/ic_recurrence_bubble_fill.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_recurrence_bubble_fill_disabled.xml b/res/drawable/ic_recurrence_bubble_fill_disabled.xml new file mode 100644 index 0000000000000000000000000000000000000000..7759cc426b31184a4aedb2ede1449e8eaa3a370d --- /dev/null +++ b/res/drawable/ic_recurrence_bubble_fill_disabled.xml @@ -0,0 +1,9 @@ + + + diff --git a/res/drawable/ic_recurrence_bubble_outline.xml b/res/drawable/ic_recurrence_bubble_outline.xml new file mode 100644 index 0000000000000000000000000000000000000000..f53e685531de76ac23082b5b5775c560378ebd76 --- /dev/null +++ b/res/drawable/ic_recurrence_bubble_outline.xml @@ -0,0 +1,6 @@ + + + diff --git a/res/drawable/ic_recurrence_bubble_outline_disabled.xml b/res/drawable/ic_recurrence_bubble_outline_disabled.xml new file mode 100644 index 0000000000000000000000000000000000000000..36ec79d01de641ab94cd8124a31a9e1d45473e06 --- /dev/null +++ b/res/drawable/ic_recurrence_bubble_outline_disabled.xml @@ -0,0 +1,6 @@ + + + diff --git a/res/drawable/ic_recurrence_bubble_solid.xml b/res/drawable/ic_recurrence_bubble_solid.xml deleted file mode 100644 index 35f4c3e45879c9476d1770550bcdca489b06d415..0000000000000000000000000000000000000000 --- a/res/drawable/ic_recurrence_bubble_solid.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/drawable/ic_recurrence_bubble_stroke.xml b/res/drawable/ic_recurrence_bubble_stroke.xml deleted file mode 100644 index a748e212ff37ba7111cc574342fbf98b0fa80eb6..0000000000000000000000000000000000000000 --- a/res/drawable/ic_recurrence_bubble_stroke.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/res/drawable/ic_settings.xml b/res/drawable/ic_settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..fc42a77b06f0d17b3b530021c5f14de1a2e5d583 --- /dev/null +++ b/res/drawable/ic_settings.xml @@ -0,0 +1,5 @@ + + + diff --git a/res/drawable/ic_sync_off_dark.xml b/res/drawable/ic_sync_off_dark.xml index 965a592a8658e295796342b7687a0c4258ebe116..5cd316a8ecfa186afa0953bdb37d3702ad311d9e 100644 --- a/res/drawable/ic_sync_off_dark.xml +++ b/res/drawable/ic_sync_off_dark.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/res/drawable/ic_sync_off_light.xml b/res/drawable/ic_sync_off_light.xml index d677bc209225327c90fc4d1b526139a31721e2ae..c5049da46405ee80c2707c5bfa8486889f11f1fc 100644 --- a/res/drawable/ic_sync_off_light.xml +++ b/res/drawable/ic_sync_off_light.xml @@ -7,4 +7,4 @@ - \ No newline at end of file + diff --git a/res/drawable/recurrence_bubble_fill.xml b/res/drawable/recurrence_bubble_fill.xml index 17c58be2fd739c40c34cf032a01a727e936cc760..69399eb39dec9026abe88114768a5419f172308e 100644 --- a/res/drawable/recurrence_bubble_fill.xml +++ b/res/drawable/recurrence_bubble_fill.xml @@ -20,11 +20,11 @@ + android:drawable="@drawable/ic_recurrence_bubble_fill_disabled" /> + android:drawable="@drawable/ic_recurrence_bubble_fill"/> + android:drawable="@drawable/ic_recurrence_bubble_fill"/> + android:drawable="@drawable/ic_recurrence_bubble_outline"/> diff --git a/res/drawable/recurrence_day_view_text_color.xml b/res/drawable/recurrence_day_view_text_color.xml deleted file mode 100644 index 147fdee010ccf68beb905b8dd375767472180585..0000000000000000000000000000000000000000 --- a/res/drawable/recurrence_day_view_text_color.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/res/drawable/switch_thumb.xml b/res/drawable/switch_thumb.xml deleted file mode 100644 index f843d5325cf526065b03b8f2f20d863e7cb482e7..0000000000000000000000000000000000000000 --- a/res/drawable/switch_thumb.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/drawable/today_icon.xml b/res/drawable/today_icon.xml index 98be66e82be1c8f2114aad1f1a037cbfdf00f747..87b7d69f10b7016563b3e8773a590aa53aa4a259 100644 --- a/res/drawable/today_icon.xml +++ b/res/drawable/today_icon.xml @@ -17,10 +17,12 @@ + android:drawable="@drawable/ic_baseline_calendar_dayofmonth" + android:gravity="center" + android:bottom="4dp"/> + android:drawable="@drawable/ic_baseline_calendar_dayofmonth" + android:gravity="center" + android:bottom="4dp"/> diff --git a/res/layout-land/all_in_one.xml b/res/layout-land/all_in_one.xml index 9daa95de9ecb6bb908f1aa3fd3d6d8448dc504d8..a9ba119046c777b2fde459d0840b11e45a9aaf70 100644 --- a/res/layout-land/all_in_one.xml +++ b/res/layout-land/all_in_one.xml @@ -58,6 +58,22 @@ android:layout_height="0dip" android:visibility="gone"/> + + + - - - + android:layout_width="match_parent" /> + android:layout_marginBottom="8dip" + android:layout_marginLeft="16dip" + android:layout_marginRight="8dip" /> + android:textStyle="bold" + android:ellipsize="marquee" + android:textColor="@color/agenda_item_standard_color" + style="?android:attr/textAppearanceMediumInverse" /> + style="?android:attr/textAppearanceSmallInverse" /> + style="?android:attr/textAppearanceSmallInverse" /> - + android:background="@drawable/list_multi_left_activated_holo" /> diff --git a/res/layout-sw600dp/edit_event.xml b/res/layout-sw600dp/edit_event.xml deleted file mode 100644 index 319b8a1c18cb0641b60066d277472361c321b4a8..0000000000000000000000000000000000000000 --- a/res/layout-sw600dp/edit_event.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/layout-sw600dp/edit_event_1.xml b/res/layout-sw600dp/edit_event_1.xml deleted file mode 100644 index f3d8f00aa80232731dd5061f82ccfc7d85266820..0000000000000000000000000000000000000000 --- a/res/layout-sw600dp/edit_event_1.xml +++ /dev/null @@ -1,471 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -