Skip to content

Add ACS NFC functionality #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pc-coholic merged 2 commits into from
May 8, 2026
Merged

Add ACS NFC functionality #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0c33c5
Add ACS NFC functionality
pc-coholic Apr 28, 2026
ad0c2c3
Bump libpretixui-repo
pc-coholic Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pretixscan/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"
tools:node="remove" />

<queries>
<package android:name="eu.pretix.pretixprint" />
Expand Down
9 changes: 9 additions & 0 deletions pretixscan/app/src/main/java/eu/pretix/pretixscan/droid/ui/Settings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import androidx.preference.ListPreference
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import eu.pretix.libpretixui.android.fragments.ForegroundNoticeDialogFragment
import eu.pretix.pretixscan.droid.AppConfig
import eu.pretix.pretixscan.droid.BuildConfig
import eu.pretix.pretixscan.droid.PretixScan
Expand Down Expand Up @@ -175,6 +176,14 @@ class SettingsFragment : PreferenceFragmentCompat() {
true
}
}

findPreference<ListPreference>("pref_nfc_type")?.setOnPreferenceChangeListener { preference, newValue ->
if (newValue == "acs") {
ForegroundNoticeDialogFragment.showConditionally(activity, "nfc_Acs")
}
return@setOnPreferenceChangeListener true
}

}

private fun asset_dialog(@RawRes htmlRes: Int, @StringRes title: Int) {
Expand Down
9 changes: 9 additions & 0 deletions pretixscan/app/src/main/res/xml/preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,15 @@
android:key="pref_ignore_questions"
android:title="@string/pref_ignore_questions" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/preference_nfc_head">
<ListPreference
android:defaultValue="native"
android:entries="@array/preference_nfc_type"
android:entryValues="@array/preference_nfc_type_values"
android:key="pref_nfc_type"
android:summary="%s"
android:title="@string/preference_nfc_type_label" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/settings_label_about">
<Preference
android:key="version"
Expand Down
2 changes: 1 addition & 1 deletion pretixscan/libpretixnfc-repo
Open in desktop
Submodule libpretixnfc-repo updated 10 files
+1 −1 libpretixnfc-android/build.gradle
+ − libpretixnfc-android/libs/acssmc-1.1.5.jar
+ − libpretixnfc-android/libs/acssmc-1.1.8.jar
+3 −3 libpretixnfc-android/src/main/java/eu/pretix/libpretixnfc/android/hardware/acs/AcsReaderService.kt
+6 −0 libpretixnfc-android/src/main/res/values-de/strings.xml
+2 −0 libpretixnfc-android/src/main/res/values-es/strings.xml
+2 −0 libpretixnfc-android/src/main/res/values-fr/strings.xml
+3 −0 libpretixnfc-android/src/main/res/values-nl/strings.xml
+7 −0 libpretixnfc-android/src/main/res/values/arrays.xml
+6 −0 libpretixnfc-android/src/main/res/values/strings.xml
2 changes: 1 addition & 1 deletion pretixscan/libpretixui-repo
Open in desktop
Submodule libpretixui-repo updated 13 files
+2 −0 libpretixui-android/build.gradle
+75 −0 libpretixui-android/src/main/java/eu/pretix/libpretixui/android/fragments/ForegroundNoticeDialogFragment.kt
+29 −0 libpretixui-android/src/main/java/eu/pretix/libpretixui/android/fragments/SelectDialogFragment.kt
+3 −0 libpretixui-android/src/main/res/anim/enter_short.xml
+3 −0 libpretixui-android/src/main/res/anim/exit_short.xml
+5 −0 libpretixui-android/src/main/res/drawable/ic_battery_profile_24.xml
+46 −0 libpretixui-android/src/main/res/layout/dialog_foreground_notice.xml
+3 −0 libpretixui-android/src/main/res/values-de/strings.xml
+3 −0 libpretixui-android/src/main/res/values-es/strings.xml
+3 −0 libpretixui-android/src/main/res/values-fr/strings.xml
+3 −0 libpretixui-android/src/main/res/values-nl/strings.xml
+3 −0 libpretixui-android/src/main/res/values/strings.xml
+7 −0 libpretixui-android/src/main/res/values/styles.xml
Loading