-
Notifications
You must be signed in to change notification settings - Fork 491
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1789 from fossasia/development
chore: Release v1.4.0
- Loading branch information
Showing
102 changed files
with
3,742 additions
and
1,494 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,3 +33,6 @@ UserInterfaceState.xcuserstate | |
|
|
||
| /app/build | ||
| *apk | ||
| .project | ||
| local.properties | ||
| .tool-versions | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
app/src/fdroid/java/com/eventyay/organizer/common/di/module/android/FlavorModule.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,13 @@ | ||
| package com.eventyay.organizer.common.di.module.android; | ||
|
|
||
| import com.eventyay.organizer.core.attendee.qrscan.ScanQRActivity; | ||
|
|
||
| import dagger.Module; | ||
| import dagger.android.ContributesAndroidInjector; | ||
|
|
||
| @Module | ||
| public abstract class FlavorModule { | ||
|
|
||
| @ContributesAndroidInjector(modules = BarcodeFragmentBuildersModule.class) | ||
| abstract ScanQRActivity contributeScanQRActivity(); | ||
| } |
26 changes: 26 additions & 0 deletions
26
app/src/fdroid/java/com/eventyay/organizer/core/attendee/ScanQRView.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package com.eventyay.organizer.core.attendee; | ||
|
|
||
| import androidx.annotation.NonNull; | ||
|
|
||
| import com.eventyay.organizer.data.attendee.Attendee; | ||
|
|
||
| public interface ScanQRView { | ||
|
|
||
| boolean hasCameraPermission(); | ||
|
|
||
| void requestCameraPermission(); | ||
|
|
||
| void showPermissionError(String error); | ||
|
|
||
| void onScannedAttendee(Attendee attendee); | ||
|
|
||
| void showBarcodePanel(boolean show); | ||
|
|
||
| void showMessage(@NonNull int stringRes); | ||
|
|
||
| void setTint(boolean matched); | ||
|
|
||
| void showProgress(boolean show); | ||
|
|
||
| void startScan(); | ||
| } |
9 changes: 6 additions & 3 deletions
9
app/src/fdroid/java/com/eventyay/organizer/core/attendee/ScanningDecider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,16 @@ | ||
| package com.eventyay.organizer.core.attendee; | ||
|
|
||
| import android.content.Context; | ||
| import android.widget.Toast; | ||
| import android.content.Intent; | ||
|
|
||
| import com.eventyay.organizer.R; | ||
| import com.eventyay.organizer.core.main.MainActivity; | ||
|
|
||
| public class ScanningDecider { | ||
|
|
||
| public void openScanQRActivity(Context context, long eventId) { | ||
| Toast.makeText(context, R.string.scanning_disabled_message, Toast.LENGTH_SHORT).show(); | ||
| Intent intent = new Intent(context, com.eventyay.organizer.core.attendee.qrscan.ScanQRActivity.class); | ||
| intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); | ||
| intent.putExtra(MainActivity.EVENT_KEY, eventId); | ||
| context.startActivity(intent); | ||
| } | ||
| } |
Oops, something went wrong.