Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
hds
flexin
android-app
Commits
a63e1895
Commit
a63e1895
authored
Jan 12, 2018
by
Nastuzzi Samy
Browse files
Merge branch 'release/v0.11.9' into develop
parents
1b85d4b8
a87144ef
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
.idea/modules.xml
View file @
a63e1895
...
...
@@ -4,6 +4,7 @@
<modules>
<module
fileurl=
"file://$PROJECT_DIR$/PayUTC.iml"
filepath=
"$PROJECT_DIR$/PayUTC.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/app/app.iml"
filepath=
"$PROJECT_DIR$/app/app.iml"
/>
<module
fileurl=
"file://$PROJECT_DIR$/jessy.iml"
filepath=
"$PROJECT_DIR$/jessy.iml"
/>
</modules>
</component>
</project>
\ No newline at end of file
PayUTC 0.11.8.apk
deleted
100644 → 0
View file @
1b85d4b8
File deleted
PayUTC 0.11.9.apk
0 → 100644
View file @
a63e1895
File added
app/src/main/AndroidManifest.xml
View file @
a63e1895
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"fr.utc.simde.jessy"
android:versionCode=
"4
1
"
android:versionName=
"0.11.
8
"
>
android:versionCode=
"4
2
"
android:versionName=
"0.11.
9
"
>
<uses-permission
android:name=
"android.permission.NFC"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
...
...
app/src/main/java/fr/utc/simde/jessy/ArticleGroupActivity.java
View file @
a63e1895
...
...
@@ -177,14 +177,14 @@ public abstract class ArticleGroupActivity extends BaseActivity {
final
AlertDialog
.
Builder
alertDialogBuilder
=
new
AlertDialog
.
Builder
(
ArticleGroupActivity
.
this
);
alertDialogBuilder
.
setTitle
(
R
.
string
.
configuration
)
.
setView
(
popupView
)
.
setCancelable
(
false
)
.
setNegativeButton
(
R
.
string
.
cancel
,
new
DialogInterface
.
OnClickListener
()
{
public
void
onClick
(
DialogInterface
dialogInterface
,
int
id
)
{
config
.
setCanCancel
(
true
);
}
});
.
setTitle
(
R
.
string
.
configuration
)
.
setView
(
popupView
)
.
setCancelable
(
false
)
.
setNegativeButton
(
R
.
string
.
cancel
,
new
DialogInterface
.
OnClickListener
()
{
public
void
onClick
(
DialogInterface
dialogInterface
,
int
id
)
{
config
.
setCanCancel
(
true
);
}
});
dialog
.
createDialog
(
alertDialogBuilder
);
}
...
...
app/src/main/java/fr/utc/simde/jessy/QRCodeReaderActivity.java
View file @
a63e1895
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/dialog_api_info.xml
0 → 100644
View file @
a63e1895
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:orientation=
"vertical"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"25dp"
android:layout_marginRight=
"25dp"
android:orientation=
"horizontal"
>
<TextView
android:layout_width=
"100dp"
android:textColor=
"#000000"
android:layout_height=
"wrap_content"
android:text=
"@string/lastname"
/>
<TextView
android:id=
"@+id/text_name"
android:textColor=
"#000000"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"25dp"
android:layout_marginRight=
"25dp"
android:orientation=
"horizontal"
>
<TextView
android:layout_width=
"100dp"
android:textColor=
"#000000"
android:layout_height=
"wrap_content"
android:text=
"@string/type"
/>
<TextView
android:id=
"@+id/text_price"
android:textColor=
"#000000"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
<LinearLayout
android:id=
"@+id/more_info"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"25dp"
android:layout_marginRight=
"25dp"
android:orientation=
"horizontal"
>
<TextView
android:layout_width=
"100dp"
android:textColor=
"#000000"
android:layout_height=
"wrap_content"
android:text=
"@string/adult"
/>
<TextView
android:id=
"@+id/text_adult"
android:textColor=
"#000000"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"25dp"
android:layout_marginRight=
"25dp"
android:orientation=
"horizontal"
>
<TextView
android:layout_width=
"100dp"
android:textColor=
"#000000"
android:layout_height=
"wrap_content"
android:text=
"@string/cotisant"
/>
<TextView
android:id=
"@+id/text_cotisant"
android:textColor=
"#000000"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/dialog_tag.xml
0 → 100644
View file @
a63e1895
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:orientation=
"vertical"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<EditText
android:id=
"@+id/input_info"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"25dp"
android:layout_marginRight=
"25dp"
android:inputType=
"text|textEmailAddress"
android:hint=
"@string/info"
/>
<RadioGroup
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"25dp"
android:layout_marginRight=
"25dp"
android:orientation=
"horizontal"
>
<RadioButton
android:id=
"@+id/radio_tag"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:checked=
"true"
android:text=
"@string/short_tag"
/>
<RadioButton
android:id=
"@+id/radio_user"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_weight=
"1"
android:text=
"@string/username"
/>
</RadioGroup>
</LinearLayout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @
a63e1895
...
...
@@ -63,7 +63,8 @@
<string
name=
"solde"
>
Solde
</string>
<string
name=
"tag_id"
>
ID tag
</string>
<string
name=
"tag"
>
Numéro de badge
</string>
<string
name=
"short_tag"
>
Numéro raccourci
</string>
<string
name=
"short_tag"
>
Numéro du tag
</string>
<string
name=
"info"
>
Information
</string>
<string
name=
"type"
>
Type
</string>
<string
name=
"day_s_"
>
jour(s)
</string>
<string
name=
"update"
>
Mise à jour
</string>
...
...
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