Skip to content

Commit

Permalink
Merge branch 'fix-release-2024.4.6' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
UweTrottmann committed Nov 1, 2024
2 parents 27e0c60 + d801ab9 commit 7359416
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 4 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ Releases marked with 🧪 (or previously with the "beta" suffix) were released o
* 🔧 Display more options of list items on touch and hold and right click (for example in Samsung
Dex) as well.

### 2024.4.6 - 2024-11-01

* 🔨 Trakt: do not crash when opening Connect Trakt screen on Android 6 or older.
* 📝 Latest user interface translations from Crowdin.

### 2024.4.5 - 2024-10-23

* 🔧 Trakt: use new logo.
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/dialog_checkin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -84,7 +85,7 @@
android:layout_marginLeft="@dimen/default_padding"
android:layout_marginRight="@dimen/default_padding"
android:contentDescription="@null"
android:src="@drawable/ic_trakt_control_24dp" />
app:srcCompat="@drawable/ic_trakt_control_24dp" />

<Button
android:id="@+id/buttonCheckIn"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true">

<!-- Use app:srcCompat to use compat loading of vector drawable to support gradient before API 23 -->
<ImageView
android:id="@+id/imageViewTraktIcon"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="8dp"
android:src="@drawable/ic_trakt_gradient_48dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_trakt_gradient_48dp"
tools:ignore="ContentDescription" />

<TextView
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ buildscript {
// YYYY.<release-of-year>.<build> - like 2024.1.0
// - allows to more easily judge how old a release is
// - allows multiple releases per month (though currently unlikely)
val sgVersionName by extra("2024.4.5")
val sgVersionName by extra("2024.4.6")
// version 21yyrrbb -> min SDK 21, year yy, release rr, build bb
val sgVersionCode by extra(21240406)
val sgVersionCode by extra(21240407)

val isCiBuild by extra { System.getenv("CI") == "true" }

Expand Down

0 comments on commit 7359416

Please sign in to comment.