Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
android-app
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hds
flexin
android-app
Commits
dcdcb6b6
Commit
dcdcb6b6
authored
Dec 13, 2017
by
Nastuzzi Samy
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/v0.11.5' into develop
parents
58d12f7a
340c4717
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
158 additions
and
87 deletions
+158
-87
PayUTC 0.11.5.apk
PayUTC 0.11.5.apk
+0
-0
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+2
-2
app/src/main/java/fr/utc/simde/jessy/QRCodeReaderActivity.java
...rc/main/java/fr/utc/simde/jessy/QRCodeReaderActivity.java
+113
-60
app/src/main/java/fr/utc/simde/jessy/responses/APIResponse.java
...c/main/java/fr/utc/simde/jessy/responses/APIResponse.java
+4
-14
app/src/main/java/fr/utc/simde/jessy/responses/BottomatikResponse.java
...java/fr/utc/simde/jessy/responses/BottomatikResponse.java
+12
-3
app/src/main/java/fr/utc/simde/jessy/responses/GingerResponse.java
...ain/java/fr/utc/simde/jessy/responses/GingerResponse.java
+7
-7
app/src/main/java/fr/utc/simde/jessy/responses/QRCodeResponse.java
...ain/java/fr/utc/simde/jessy/responses/QRCodeResponse.java
+4
-0
app/src/main/java/fr/utc/simde/jessy/responses/ReservationResponse.java
...ava/fr/utc/simde/jessy/responses/ReservationResponse.java
+15
-0
app/src/main/res/layout/dialog_reservation_info.xml
app/src/main/res/layout/dialog_reservation_info.xml
+1
-1
No files found.
PayUTC 0.11.
4
.apk
→
PayUTC 0.11.
5
.apk
View file @
dcdcb6b6
No preview for this file type
app/src/main/AndroidManifest.xml
View file @
dcdcb6b6
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"fr.utc.simde.jessy"
android:versionCode=
"3
7
"
android:versionName=
"0.11.
4
"
>
android:versionCode=
"3
8
"
android:versionName=
"0.11.
5
"
>
<uses-permission
android:name=
"android.permission.NFC"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
...
...
app/src/main/java/fr/utc/simde/jessy/QRCodeReaderActivity.java
View file @
dcdcb6b6
This diff is collapsed.
Click to expand it.
app/src/main/java/fr/utc/simde/jessy/responses/APIResponse.java
View file @
dcdcb6b6
package
fr.utc.simde.jessy.responses
;
import
com.fasterxml.jackson.annotation.JsonIgnoreProperties
;
import
java.util.ArrayList
;
import
java.util.List
;
import
com.fasterxml.jackson.annotation.JsonProperty
;
/**
* Created by Samy on 10/11/2017.
*/
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
APIResponse
{
protected
String
id
;
protected
String
username
;
protected
String
type
;
protected
Integer
fun_id
;
protected
long
expires_at
;
protected
long
creation_date
;
protected
boolean
paid
;
protected
boolean
validated
;
protected
long
expires_at
;
public
String
getId
()
{
return
this
.
id
;
}
public
String
getUsername
()
{
return
this
.
username
;
}
public
String
getType
()
{
return
this
.
type
;
}
public
Integer
getFoundationId
()
{
return
this
.
fun_id
;
}
public
long
getExpiresAt
()
{
return
this
.
expires_at
;
}
public
long
getCreatedAt
()
{
return
this
.
creation_date
;
}
public
boolean
isPaid
()
{
return
this
.
paid
;
}
public
boolean
isValidated
()
{
return
this
.
validated
;
}
public
long
getCreation_date
()
{
return
this
.
creation_date
;
}
public
long
getExpires_at
()
{
return
this
.
expires_at
;
}
}
app/src/main/java/fr/utc/simde/jessy/responses/BottomatikResponse.java
View file @
dcdcb6b6
package
fr.utc.simde.jessy.responses
;
import
com.fasterxml.jackson.annotation.JsonIgnore
Properties
;
import
com.fasterxml.jackson.
databind.annotation.JsonDeserialize
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.
annotation.JsonProperty
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -10,10 +10,19 @@ import java.util.List;
* Created by Samy on 10/11/2017.
*/
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
BottomatikResponse
extends
APIResponse
{
protected
String
_id
;
protected
Integer
fun_id
;
protected
boolean
paid
;
protected
boolean
validated
;
protected
List
<
List
<
String
>>
articles
;
public
String
get_id
()
{
return
this
.
_id
;
}
public
Integer
getFun_id
()
{
return
this
.
fun_id
;
}
public
boolean
isPaid
()
{
return
this
.
paid
;
}
public
boolean
isValidated
()
{
return
this
.
validated
;
}
public
List
<
List
<
String
>>
getArticles
()
{
return
this
.
articles
;
}
public
List
<
List
<
Integer
>>
getArticleList
()
{
List
<
List
<
Integer
>>
articleList
=
new
ArrayList
<
List
<
Integer
>>();
...
...
app/src/main/java/fr/utc/simde/jessy/responses/GingerResponse.java
View file @
dcdcb6b6
...
...
@@ -17,12 +17,12 @@ public class GingerResponse {
protected
boolean
is_cotisant
;
protected
String
badge_uid
;
public
String
get
Username
()
{
return
login
;
}
public
String
get
Lastname
()
{
return
nom
;
}
public
String
get
Firstname
()
{
return
prenom
;
}
public
String
get
Em
ail
()
{
return
mail
;
}
public
String
get
Login
()
{
return
login
;
}
public
String
get
Nom
()
{
return
nom
;
}
public
String
get
Prenom
()
{
return
prenom
;
}
public
String
get
M
ail
()
{
return
mail
;
}
public
String
getType
()
{
return
type
;
}
public
boolean
getIs
Adult
()
{
return
is_adulte
;
}
public
boolean
getIs
Contributer
()
{
return
is_cotisant
;
}
public
String
getBadge
I
d
()
{
return
badge_uid
;
}
public
boolean
getIs
_adulte
()
{
return
is_adulte
;
}
public
boolean
getIs
_cotisant
()
{
return
is_cotisant
;
}
public
String
getBadge
_ui
d
()
{
return
badge_uid
;
}
}
app/src/main/java/fr/utc/simde/jessy/responses/QRCodeResponse.java
View file @
dcdcb6b6
...
...
@@ -12,6 +12,10 @@ public class QRCodeResponse {
protected
String
id
;
protected
String
system
;
public
void
setUsername
(
String
username
)
{
this
.
username
=
username
;
}
public
void
setId
(
String
id
)
{
this
.
id
=
id
;
}
public
void
setSystem
(
String
system
)
{
this
.
system
=
system
;
}
public
String
getUsername
()
{
return
this
.
username
;
}
public
String
getId
()
{
return
this
.
id
;
}
public
String
getSystem
()
{
return
this
.
system
;
}
...
...
app/src/main/java/fr/utc/simde/jessy/responses/
Comedmus
Response.java
→
app/src/main/java/fr/utc/simde/jessy/responses/
Reservation
Response.java
View file @
dcdcb6b6
package
fr.utc.simde.jessy.responses
;
import
com.fasterxml.jackson.annotation.Json
IgnoreProperties
;
import
com.fasterxml.jackson.annotation.Json
Property
;
/**
* Created by Samy on 10/11/2017.
*/
@JsonIgnoreProperties
(
ignoreUnknown
=
true
)
public
class
ComedmusResponse
extends
APIResponse
{
public
class
ReservationResponse
extends
APIResponse
{
protected
Integer
reservation_id
;
protected
String
seance
;
public
Integer
getReservation
I
d
()
{
return
this
.
reservation_id
;
}
public
Integer
getReservation
_i
d
()
{
return
this
.
reservation_id
;
}
public
String
getSeance
()
{
return
this
.
seance
;
}
}
app/src/main/res/layout/dialog_reservation_info.xml
View file @
dcdcb6b6
...
...
@@ -55,7 +55,7 @@
android:layout_width=
"100dp"
android:textColor=
"#000000"
android:layout_height=
"wrap_content"
android:text=
"@string/
pric
e"
/>
android:text=
"@string/
typ
e"
/>
<TextView
android:id=
"@+id/text_price"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment