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
15a88c3c
Commit
15a88c3c
authored
Nov 15, 2017
by
Nastuzzi Samy
Browse files
Merge branch 'release/v0.8.3' into develop
parents
005cf41f
101cf974
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/build.gradle
View file @
15a88c3c
...
...
@@ -7,8 +7,6 @@ android {
applicationId
"fr.utc.simde.payutc"
minSdkVersion
21
targetSdkVersion
26
versionCode
1
versionName
"1.0"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
}
buildTypes
{
...
...
app/src/main/AndroidManifest.xml
View file @
15a88c3c
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"fr.utc.simde.jessy"
>
package=
"fr.utc.simde.jessy"
android:versionCode=
"22"
android:versionName=
"0.8.6"
>
<uses-permission
android:name=
"android.permission.NFC"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
...
...
@@ -13,6 +15,8 @@
android:label=
"@string/app_name"
android:roundIcon=
"@mipmap/ic_launcher_round"
android:supportsRtl=
"true"
android:launchMode=
"singleTask"
android:stateNotNeeded=
"true"
android:theme=
"@style/AppTheme"
>
<activity
android:name=
"fr.utc.simde.jessy.MainActivity"
android:configChanges=
"orientation"
...
...
@@ -22,6 +26,8 @@
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
<category
android:name=
"android.intent.category.HOME"
/>
<category
android:name=
"android.intent.category.DEFAULT"
/>
</intent-filter>
</activity>
<activity
android:name=
"fr.utc.simde.jessy.FoundationsOptionsActivity"
...
...
app/src/main/java/fr/utc/simde/jessy/ArticleGroupActivity.java
View file @
15a88c3c
...
...
@@ -184,7 +184,7 @@ public class ArticleGroupActivity extends BaseActivity {
.
setTitle
(
R
.
string
.
configuration
)
.
setView
(
popupView
)
.
setCancelable
(
false
)
.
setPositiveButton
(
R
.
string
.
applicate
,
new
DialogInterface
.
OnClickListener
()
{
.
setPositiveButton
(
R
.
string
.
reload
,
new
DialogInterface
.
OnClickListener
()
{
public
void
onClick
(
DialogInterface
dialogInterface
,
int
id
)
{
config
.
setPrintCotisant
(
switchCotisant
.
isChecked
());
config
.
setPrint18
(
swtich18
.
isChecked
());
...
...
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