Skip to content

Commit 129ae45

Browse files
authored
Bump to SDK36, support Edge-to-Edge (#144)
* Bump to SDK36, support Edge-to-Edge * Use enableEdgeToEdge everywhere, so status bar colors are applied on Android<15 too * Fix linting errors/warnings
1 parent 5e1bae7 commit 129ae45

30 files changed

+433
-183
lines changed

pretixscan/app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ apply from: '../libpretixsync-repo/libpretixsync/versions.gradle'
1717
android {
1818
namespace 'eu.pretix.pretixscan.droid'
1919

20-
compileSdk 34
20+
compileSdk 36
2121

2222
defaultConfig {
2323
applicationId "eu.pretix.pretixscan.droid"
2424
minSdkVersion 21
25-
targetSdkVersion 34
25+
targetSdkVersion 35
2626
versionCode 100
2727
versionName "2.11.0"
2828
vectorDrawables.useSupportLibrary = true
@@ -131,8 +131,8 @@ repositories {
131131
}
132132

133133
dependencies {
134-
implementation 'androidx.appcompat:appcompat:1.7.0'
135-
implementation 'com.google.android.material:material:1.6.1'
134+
implementation 'androidx.appcompat:appcompat:1.7.1'
135+
implementation 'com.google.android.material:material:1.12.0'
136136
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
137137
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
138138
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
@@ -166,7 +166,7 @@ dependencies {
166166
implementation(project(':libpretixui-android')) {
167167
transitive = true
168168
}
169-
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
169+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
170170

171171
// libpretixsync
172172
kapt 'io.requery:requery-processor:1.6.0'

pretixscan/app/src/main/AndroidManifest.xml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
android:name=".ui.MainActivity"
4848
android:exported="true"
4949
android:label="@string/title_activity_main"
50-
android:theme="@style/AppTheme.NoActionBar">
50+
android:theme="@style/AppTheme.NoActionBar.Dark">
5151
<intent-filter>
5252
<action android:name="android.intent.action.MAIN" />
5353

@@ -67,23 +67,27 @@
6767
<activity
6868
android:name=".ui.WelcomeActivity"
6969
android:label="@string/headline_setup"
70-
android:theme="@style/AppTheme.NoActionBar" />
70+
android:theme="@style/AppTheme.NoActionBar.Dark" />
7171
<activity
7272
android:name=".ui.SetupActivity"
73-
android:label="@string/headline_setup" />
73+
android:label="@string/headline_setup"
74+
android:theme="@style/AppTheme.NoActionBar.Dark" />
7475
<activity
7576
android:name=".ui.info.EventinfoActivity"
7677
android:label="@string/action_label_statistics"
77-
android:parentActivityName=".ui.MainActivity" />
78+
android:parentActivityName=".ui.MainActivity"
79+
android:theme="@style/AppTheme.NoActionBar" />
7880
<activity
7981
android:name=".ui.SettingsActivity"
8082
android:label="@string/action_label_settings"
81-
android:parentActivityName=".ui.MainActivity" />
83+
android:parentActivityName=".ui.MainActivity"
84+
android:theme="@style/AppTheme.NoActionBar" />
8285
<activity
8386
android:name=".ui.EventConfigActivity"
8487
android:configChanges="keyboardHidden|orientation|screenSize"
8588
android:exported="false"
86-
android:label="@string/operation_select_events" />
89+
android:label="@string/operation_select_events"
90+
android:theme="@style/AppTheme.NoActionBar" />
8791
<activity
8892
android:name=".ui.EventSelectActivity"
8993
android:label="@string/operation_select_event"

pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/anim/MorphDialogToView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
import android.animation.Animator;
2020
import android.animation.AnimatorSet;
2121
import android.animation.ObjectAnimator;
22-
import android.annotation.TargetApi;
2322
import android.content.Context;
2423
import android.graphics.Color;
2524
import android.graphics.drawable.ColorDrawable;
26-
import android.os.Build;
2725
import android.transition.ChangeBounds;
2826
import android.transition.TransitionValues;
2927
import android.util.AttributeSet;
@@ -37,7 +35,6 @@
3735
/**
3836
* A transition that morphs a rectangle into a circle, changing it's background color.
3937
*/
40-
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
4138
public class MorphDialogToView extends ChangeBounds {
4239

4340
private static final String PROPERTY_COLOR = "rectMorph:color";

pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/anim/MorphDrawable.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616

1717
package eu.pretix.pretixscan.droid.anim;
1818

19-
import android.annotation.TargetApi;
2019
import android.graphics.Canvas;
2120
import android.graphics.ColorFilter;
2221
import android.graphics.Outline;
2322
import android.graphics.Paint;
2423
import android.graphics.drawable.Drawable;
25-
import android.os.Build;
2624
import android.util.Property;
2725

2826
import androidx.annotation.ColorInt;
@@ -31,7 +29,6 @@
3129
* A drawable that can morph size, shape (via it's corner radius) and color. Specifically this is
3230
* useful for animating between a FAB and a dialog.
3331
*/
34-
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
3532
public class MorphDrawable extends Drawable {
3633

3734
private Paint paint;
@@ -90,7 +87,7 @@ public void setColor(int color) {
9087
@Override
9188
public void draw(Canvas canvas) {
9289
canvas.drawRoundRect(getBounds().left, getBounds().top, getBounds().right, getBounds()
93-
.bottom, cornerRadius, cornerRadius, paint);//hujiawei
90+
.bottom, cornerRadius, cornerRadius, paint);
9491
}
9592

9693
@Override

pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/anim/MorphTransition.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
import android.animation.Animator;
44
import android.animation.AnimatorSet;
55
import android.animation.ObjectAnimator;
6-
import android.annotation.TargetApi;
76
import android.content.Context;
87
import android.graphics.Color;
9-
import android.os.Build;
108
import android.transition.ChangeBounds;
119
import android.transition.TransitionValues;
1210
import android.util.AttributeSet;
@@ -17,7 +15,6 @@
1715
/**
1816
* A transition that morphs a circle into a rectangle, changing it's background color.
1917
*/
20-
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
2118
public class MorphTransition extends ChangeBounds {
2219

2320
private static final String PROPERTY_COLOR = "color";

pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/anim/MorphViewToDialog.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import android.animation.Animator;
2020
import android.animation.AnimatorSet;
2121
import android.animation.ObjectAnimator;
22-
import android.annotation.TargetApi;
2322
import android.content.Context;
24-
import android.os.Build;
2523
import android.transition.ChangeBounds;
2624
import android.transition.TransitionValues;
2725
import android.util.AttributeSet;
@@ -35,7 +33,6 @@
3533
/**
3634
* A transition that morphs a circle into a rectangle, changing it's background color.
3735
*/
38-
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
3936
public class MorphViewToDialog extends ChangeBounds {
4037

4138
private static final String PROPERTY_COLOR = "circleMorph:color";

pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/anim/MorphingDialogActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package eu.pretix.pretixpos.anim
22

3-
import android.os.Build
43
import android.transition.ArcMotion
54
import android.view.View
65
import android.view.animation.AnimationUtils
@@ -36,6 +35,7 @@ abstract class MorphingDialogActivity : AppCompatActivity() {
3635
}
3736

3837
override fun onBackPressed() {
38+
super.onBackPressed()
3939
supportFinishAfterTransition()
4040
}
4141
}

pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/CheckInListAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ internal class CheckInListAdapter(var selectedList: CheckInList?) :
6666
}
6767
}
6868

69-
override fun onCheckedChanged(v: CompoundButton?, checked: Boolean) {
70-
onClick(v?.parent as View)
69+
override fun onCheckedChanged(v: CompoundButton, checked: Boolean) {
70+
onClick(v.parent as View)
7171
}
7272

7373
override fun submitList(list: List<CheckInList>?) {

pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/CheckInListSelectActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,6 @@ class CheckInListSelectActivity : MorphingDialogActivity() {
171171

172172
override fun onBackPressed() {
173173
setResult(RESULT_CANCELED)
174-
supportFinishAfterTransition()
174+
super.onBackPressed()
175175
}
176176
}

pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/EventAdapter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ internal class EventAdapter(var selectedEvent: RemoteEvent?) :
6868
}
6969
}
7070

71-
override fun onCheckedChanged(v: CompoundButton?, checked: Boolean) {
72-
onClick(v?.parent as View)
71+
override fun onCheckedChanged(v: CompoundButton, checked: Boolean) {
72+
onClick(v.parent as View)
7373
}
7474

7575
override fun submitList(list: List<RemoteEvent>?) {

0 commit comments

Comments
 (0)