Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 1d22fbf7 authored by LuK1337's avatar LuK1337
Browse files

Merge tag 'v1.0.51' of https://github.com/Etar-Group/Etar-Calendar into lineage-23.0 

* tag 'v1.0.51' of https://github.com/Etar-Group/Etar-Calendar:
  New version 1.0.51
  Bump gradle version
  Update time zone database to 2025b
  Fix Event date picker for end date always preselects start
  Bump org.jetbrains.gradle.plugin.idea-ext from 1.1.10 to 1.2
  Bump androidx.lifecycle:lifecycle-livedata-ktx from 2.9.1 to 2.9.2
  Bump agp from 8.11.0 to 8.11.1
  Translated using Weblate (Korean)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Latvian)
  Translated using Weblate (French)
  Translated using Weblate (French)
  Translated using Weblate (Dutch)
  Translated using Weblate (Japanese)
  Translated using Weblate (German)
  Translated using Weblate (Czech)
  Replace Activity with Context so that the function isSystemInDarkTheme() can be called with any context.
  Improve readability of "guest badge" and solve lint warnings
  Replace deprecated onBackPressed() with getOnBackPressedDispatcher()
  Improve guest selection style so that the colors match the different themes. Also added support for vectorDrawables.
  Replace baseline vector icon with the corresponding outline version.

Change-Id: Ife6a92d1c23ff8b7b200837805f7551786c52923
parents 7328e280 4ad343e3

app/build.gradle.kts

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ android { 
	defaultConfig {

		minSdk = 23

		targetSdk = 34

		versionCode = 50

		versionName = "1.0.50"

		versionCode = 51

		versionName = "1.0.51"

		applicationId = "ws.xsoh.etar"

		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

	}

app/src/main/assets/backward

+14 −2
Original line number Diff line number Diff line 
# tzdb links for backward compatibility

# Links and zones for backward compatibility



# This file is in the public domain, so clarified as of

# 2009-05-17 by Arthur David Olson.



# This file provides links from old or merged timezone names to current ones.

# It also provides a few zone entries for old naming conventions.

# Many names changed in 1993 and in 1995, and many merged names moved here

# in the period from 2013 through 2022.  Several of these names are

# also present in the file 'backzone', which has data important only
@@ -44,6 +45,8 @@ Link America/Rio_Branco Brazil/Acre #= America/Porto_Acre 
Link	America/Noronha		Brazil/DeNoronha

Link	America/Sao_Paulo	Brazil/East

Link	America/Manaus		Brazil/West

Link	Europe/Brussels		CET

Link	America/Chicago		CST6CDT

Link	America/Halifax		Canada/Atlantic

Link	America/Winnipeg	Canada/Central

# This line is commented out, as the name exceeded the 14-character limit
@@ -58,6 +61,9 @@ Link America/Whitehorse Canada/Yukon 
Link	America/Santiago	Chile/Continental

Link	Pacific/Easter		Chile/EasterIsland

Link	America/Havana		Cuba

Link	Europe/Athens		EET

Link	America/Panama		EST

Link	America/New_York	EST5EDT

Link	Africa/Cairo		Egypt

Link	Europe/Dublin		Eire

# Vanguard section, for most .zi parsers.
@@ -96,6 +102,9 @@ Link America/Jamaica Jamaica 
Link	Asia/Tokyo		Japan

Link	Pacific/Kwajalein	Kwajalein

Link	Africa/Tripoli		Libya

Link	Europe/Brussels		MET

Link	America/Phoenix		MST

Link	America/Denver		MST7MDT

Link	America/Tijuana		Mexico/BajaNorte

Link	America/Mazatlan	Mexico/BajaSur

Link	America/Mexico_City	Mexico/General
@@ -205,7 +214,6 @@ Link America/Puerto_Rico America/Tortola 
Link	Pacific/Port_Moresby	Antarctica/DumontDUrville

Link	Pacific/Auckland	Antarctica/McMurdo

Link	Asia/Riyadh		Antarctica/Syowa

Link	Asia/Urumqi		Antarctica/Vostok

Link	Europe/Berlin		Arctic/Longyearbyen

Link	Asia/Riyadh		Asia/Aden

Link	Asia/Qatar		Asia/Bahrain
@@ -276,6 +284,7 @@ Link America/Denver America/Shiprock 
Link	America/Toronto		America/Thunder_Bay

Link	America/Edmonton	America/Yellowknife

Link	Pacific/Auckland	Antarctica/South_Pole

Link	Asia/Ulaanbaatar	Asia/Choibalsan

Link	Asia/Shanghai		Asia/Chongqing

Link	Asia/Shanghai		Asia/Harbin

Link	Asia/Urumqi		Asia/Kashgar
@@ -290,6 +299,7 @@ Link Europe/Kyiv Europe/Zaporozhye 
Link	Pacific/Kanton		Pacific/Enderbury

Link	Pacific/Honolulu	Pacific/Johnston

Link	Pacific/Port_Moresby	Pacific/Yap

Link	Europe/Lisbon		WET





# Alternate names for the same location
@@ -315,5 +325,7 @@ Link Europe/Kyiv Europe/Kiev 
# Classically, Cyprus is in Asia; e.g. see Herodotus, Histories, I.72.

# However, for various reasons many users expect to find it under Europe.

Link	Asia/Nicosia		Europe/Nicosia

Link	Pacific/Honolulu	HST

Link	America/Los_Angeles	PST8PDT

Link	Pacific/Guadalcanal	Pacific/Ponape	#= Pacific/Pohnpei

Link	Pacific/Port_Moresby	Pacific/Truk	#= Pacific/Chuuk

app/src/main/assets/zone.tab

+16 −16
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ AR -3124-06411 America/Argentina/Cordoba Argentina (most areas: CB, CC, CN, ER, 
AR	-2447-06525	America/Argentina/Salta	Salta (SA, LP, NQ, RN)

AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)

AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)

AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT); Chubut (CH)

AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)

AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)

AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)

AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
@@ -87,7 +87,7 @@ BN +0456+11455 Asia/Brunei 
BO	-1630-06809	America/La_Paz

BQ	+120903-0681636	America/Kralendijk

BR	-0351-03225	America/Noronha	Atlantic islands

BR	-0127-04829	America/Belem	Para (east); Amapa

BR	-0127-04829	America/Belem	Para (east), Amapa

BR	-0343-03830	America/Fortaleza	Brazil (northeast: MA, PI, CE, RN, PB)

BR	-0803-03454	America/Recife	Pernambuco

BR	-0712-04812	America/Araguaina	Tocantins
@@ -107,21 +107,21 @@ BT +2728+08939 Asia/Thimphu 
BW	-2439+02555	Africa/Gaborone

BY	+5354+02734	Europe/Minsk

BZ	+1730-08812	America/Belize

CA	+4734-05243	America/St_Johns	Newfoundland; Labrador (southeast)

CA	+4439-06336	America/Halifax	Atlantic - NS (most areas); PE

CA	+4734-05243	America/St_Johns	Newfoundland, Labrador (SE)

CA	+4439-06336	America/Halifax	Atlantic - NS (most areas), PE

CA	+4612-05957	America/Glace_Bay	Atlantic - NS (Cape Breton)

CA	+4606-06447	America/Moncton	Atlantic - New Brunswick

CA	+5320-06025	America/Goose_Bay	Atlantic - Labrador (most areas)

CA	+5125-05707	America/Blanc-Sablon	AST - QC (Lower North Shore)

CA	+4339-07923	America/Toronto	Eastern - ON, QC (most areas)

CA	+4339-07923	America/Toronto	Eastern - ON & QC (most areas)

CA	+6344-06828	America/Iqaluit	Eastern - NU (most areas)

CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan); NU (Coral H)

CA	+4953-09709	America/Winnipeg	Central - ON (west); Manitoba

CA	+484531-0913718	America/Atikokan	EST - ON (Atikokan), NU (Coral H)

CA	+4953-09709	America/Winnipeg	Central - ON (west), Manitoba

CA	+744144-0944945	America/Resolute	Central - NU (Resolute)

CA	+624900-0920459	America/Rankin_Inlet	Central - NU (central)

CA	+5024-10439	America/Regina	CST - SK (most areas)

CA	+5017-10750	America/Swift_Current	CST - SK (midwest)

CA	+5333-11328	America/Edmonton	Mountain - AB; BC (E); NT (E); SK (W)

CA	+5333-11328	America/Edmonton	Mountain - AB, BC(E), NT(E), SK(W)

CA	+690650-1050310	America/Cambridge_Bay	Mountain - NU (west)

CA	+682059-1334300	America/Inuvik	Mountain - NT (west)

CA	+4906-11631	America/Creston	MST - BC (Creston)
@@ -139,7 +139,8 @@ CH +4723+00832 Europe/Zurich 
CI	+0519-00402	Africa/Abidjan

CK	-2114-15946	Pacific/Rarotonga

CL	-3327-07040	America/Santiago	most of Chile

CL	-5309-07055	America/Punta_Arenas	Region of Magallanes

CL	-4534-07204	America/Coyhaique	Aysen Region

CL	-5309-07055	America/Punta_Arenas	Magallanes Region

CL	-2709-10926	Pacific/Easter	Easter Island

CM	+0403+00942	Africa/Douala

CN	+3114+12128	Asia/Shanghai	Beijing Time
@@ -207,8 +208,8 @@ HT +1832-07220 America/Port-au-Prince 
HU	+4730+01905	Europe/Budapest

ID	-0610+10648	Asia/Jakarta	Java, Sumatra

ID	-0002+10920	Asia/Pontianak	Borneo (west, central)

ID	-0507+11924	Asia/Makassar	Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west)

ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya); Malukus/Moluccas

ID	-0507+11924	Asia/Makassar	Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west)

ID	-0232+14042	Asia/Jayapura	New Guinea (West Papua / Irian Jaya), Malukus/Moluccas

IE	+5320-00615	Europe/Dublin

IL	+314650+0351326	Asia/Jerusalem

IM	+5409-00428	Europe/Isle_of_Man
@@ -264,8 +265,7 @@ MK +4159+02126 Europe/Skopje 
ML	+1239-00800	Africa/Bamako

MM	+1647+09610	Asia/Yangon

MN	+4755+10653	Asia/Ulaanbaatar	most of Mongolia

MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan

MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar

MN	+4801+09139	Asia/Hovd	Bayan-Olgii, Hovd, Uvs

MO	+221150+1133230	Asia/Macau

MP	+1512+14545	Pacific/Saipan

MQ	+1436-06105	America/Martinique
@@ -311,7 +311,7 @@ PF -0900-13930 Pacific/Marquesas Marquesas Islands 
PF	-2308-13457	Pacific/Gambier	Gambier Islands

PG	-0930+14710	Pacific/Port_Moresby	most of Papua New Guinea

PG	-0613+15534	Pacific/Bougainville	Bougainville

PH	+1435+12100	Asia/Manila

PH	+143512+1205804	Asia/Manila

PK	+2452+06703	Asia/Karachi

PL	+5215+02100	Europe/Warsaw

PM	+4703-05620	America/Miquelon
@@ -355,7 +355,7 @@ RU +4310+13156 Asia/Vladivostok MSK+07 - Amur River 
RU	+643337+1431336	Asia/Ust-Nera	MSK+07 - Oymyakonsky

RU	+5934+15048	Asia/Magadan	MSK+08 - Magadan

RU	+4658+14242	Asia/Sakhalin	MSK+08 - Sakhalin Island

RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E); N Kuril Is

RU	+6728+15343	Asia/Srednekolymsk	MSK+08 - Sakha (E), N Kuril Is

RU	+5301+15839	Asia/Kamchatka	MSK+09 - Kamchatka

RU	+6445+17729	Asia/Anadyr	MSK+09 - Bering Sea

RW	-0157+03004	Africa/Kigali
@@ -418,7 +418,7 @@ US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) 
US	+465042-1012439	America/North_Dakota/New_Salem	Central - ND (Morton rural)

US	+471551-1014640	America/North_Dakota/Beulah	Central - ND (Mercer)

US	+394421-1045903	America/Denver	Mountain (most areas)

US	+433649-1161209	America/Boise	Mountain - ID (south); OR (east)

US	+433649-1161209	America/Boise	Mountain - ID (south), OR (east)

US	+332654-1120424	America/Phoenix	MST - AZ (except Navajo)

US	+340308-1181434	America/Los_Angeles	Pacific

US	+611305-1495401	America/Anchorage	Alaska (most areas)

app/src/main/java/com/android/calendar/DynamicTheme.java

+4 −4
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class DynamicTheme { 
        String theme = getTheme(context);

        switch (theme) {

            case SYSTEM:

                if (isSystemInDarkTheme((Activity) context)) {

                if (isSystemInDarkTheme(context)) {

                    return "_" + "dark";

                } else {

                    return "";
@@ -170,7 +170,7 @@ public class DynamicTheme { 
        String theme = getTheme(context);

        switch (theme) {

            case SYSTEM:

                if (isSystemInDarkTheme((Activity) context)) {

                if (isSystemInDarkTheme(context)) {

                    return android.R.style.Theme_DeviceDefault_Dialog;

                } else {

                    return android.R.style.Theme_DeviceDefault_Light_Dialog;
@@ -214,8 +214,8 @@ public class DynamicTheme { 
        return Build.VERSION.SDK_INT >= 29;

    }



    public static boolean isSystemInDarkTheme(@NonNull Activity activity) {

        return (activity.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;

    public static boolean isSystemInDarkTheme(@NonNull Context context) {

        return (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;

    }



    private static final class OverridePendingTransition {

app/src/main/java/com/android/calendar/chips/CircularImageView.java

+22 −6
Original line number Diff line number Diff line
@@ -12,14 +12,15 @@ import android.graphics.Shader; 
import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.StateListDrawable;

import android.graphics.drawable.VectorDrawable;

import android.util.AttributeSet;

import android.widget.ImageView;

import androidx.appcompat.widget.AppCompatImageView;



/**

 * An ImageView class with a circle mask so that all images are drawn in a

 * circle instead of a square.

 */

public class CircularImageView extends ImageView {

public class CircularImageView extends AppCompatImageView {

    private static float circularImageBorder = 1f;



    private final Matrix matrix;
@@ -58,12 +59,12 @@ public class CircularImageView extends ImageView { 
    @Override

    protected void onDraw(Canvas canvas) {

        Drawable drawable = getDrawable();

        BitmapDrawable bitmapDrawable = null;

        BitmapDrawable bitmapDrawable;

        // support state list drawable by getting the current state

        if (drawable instanceof StateListDrawable) {

            if (((StateListDrawable) drawable).getCurrent() != null) {

            bitmapDrawable = (BitmapDrawable) drawable.getCurrent();

            }

        } else if (drawable instanceof VectorDrawable) {

            bitmapDrawable = getBitmapDrawableFromVectorDrawable(drawable);

        } else {

            bitmapDrawable = (BitmapDrawable) drawable;

        }
@@ -111,4 +112,19 @@ public class CircularImageView extends ImageView { 
        canvas.drawCircle(dest.centerX(), dest.centerY(),

                dest.width() / 2f - circularImageBorder / 2, borderPaint);

    }



    private BitmapDrawable getBitmapDrawableFromVectorDrawable(Drawable drawable) {

        int width = drawable.getIntrinsicWidth();

        int height = drawable.getIntrinsicHeight();



        if (width <= 0) width = 1;

        if (height <= 0) height = 1;



        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);

        Canvas canvas = new Canvas(bitmap);

        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());

        drawable.draw(canvas);



        return new BitmapDrawable(getResources(), bitmap);

    }

}