Commit e3e40761feabc7391f112125b9a70ff8ea720b10
Merge remote-tracking branch 'refs/remotes/origin/nfc' into interface
Showing
39 changed files
with
866 additions
and
1 deletions
Show diff stats
.gitignore
... | ... | @@ -0,0 +1,22 @@ |
1 | +<?xml version="1.0" encoding="UTF-8"?> | |
2 | +<project version="4"> | |
3 | + <component name="CompilerConfiguration"> | |
4 | + <resourceExtensions /> | |
5 | + <wildcardResourcePatterns> | |
6 | + <entry name="!?*.java" /> | |
7 | + <entry name="!?*.form" /> | |
8 | + <entry name="!?*.class" /> | |
9 | + <entry name="!?*.groovy" /> | |
10 | + <entry name="!?*.scala" /> | |
11 | + <entry name="!?*.flex" /> | |
12 | + <entry name="!?*.kt" /> | |
13 | + <entry name="!?*.clj" /> | |
14 | + <entry name="!?*.aj" /> | |
15 | + </wildcardResourcePatterns> | |
16 | + <annotationProcessing> | |
17 | + <profile default="true" name="Default" enabled="false"> | |
18 | + <processorPath useClasspath="true" /> | |
19 | + </profile> | |
20 | + </annotationProcessing> | |
21 | + </component> | |
22 | +</project> | |
0 | 23 | \ No newline at end of file | ... | ... |
... | ... | @@ -0,0 +1,19 @@ |
1 | +<?xml version="1.0" encoding="UTF-8"?> | |
2 | +<project version="4"> | |
3 | + <component name="GradleSettings"> | |
4 | + <option name="linkedExternalProjectsSettings"> | |
5 | + <GradleProjectSettings> | |
6 | + <option name="distributionType" value="LOCAL" /> | |
7 | + <option name="externalProjectPath" value="$PROJECT_DIR$" /> | |
8 | + <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.8" /> | |
9 | + <option name="gradleJvm" value="1.7" /> | |
10 | + <option name="modules"> | |
11 | + <set> | |
12 | + <option value="$PROJECT_DIR$" /> | |
13 | + <option value="$PROJECT_DIR$/app" /> | |
14 | + </set> | |
15 | + </option> | |
16 | + </GradleProjectSettings> | |
17 | + </option> | |
18 | + </component> | |
19 | +</project> | |
0 | 20 | \ No newline at end of file | ... | ... |
... | ... | @@ -0,0 +1,46 @@ |
1 | +<?xml version="1.0" encoding="UTF-8"?> | |
2 | +<project version="4"> | |
3 | + <component name="EntryPointsManager"> | |
4 | + <entry_points version="2.0" /> | |
5 | + </component> | |
6 | + <component name="NullableNotNullManager"> | |
7 | + <option name="myDefaultNullable" value="android.support.annotation.Nullable" /> | |
8 | + <option name="myDefaultNotNull" value="android.support.annotation.NonNull" /> | |
9 | + <option name="myNullables"> | |
10 | + <value> | |
11 | + <list size="4"> | |
12 | + <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" /> | |
13 | + <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" /> | |
14 | + <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" /> | |
15 | + <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" /> | |
16 | + </list> | |
17 | + </value> | |
18 | + </option> | |
19 | + <option name="myNotNulls"> | |
20 | + <value> | |
21 | + <list size="4"> | |
22 | + <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" /> | |
23 | + <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" /> | |
24 | + <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" /> | |
25 | + <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" /> | |
26 | + </list> | |
27 | + </value> | |
28 | + </option> | |
29 | + </component> | |
30 | + <component name="ProjectLevelVcsManager" settingsEditedManually="false"> | |
31 | + <OptionsSetting value="true" id="Add" /> | |
32 | + <OptionsSetting value="true" id="Remove" /> | |
33 | + <OptionsSetting value="true" id="Checkout" /> | |
34 | + <OptionsSetting value="true" id="Update" /> | |
35 | + <OptionsSetting value="true" id="Status" /> | |
36 | + <OptionsSetting value="true" id="Edit" /> | |
37 | + <ConfirmationsSetting value="0" id="Add" /> | |
38 | + <ConfirmationsSetting value="0" id="Remove" /> | |
39 | + </component> | |
40 | + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK"> | |
41 | + <output url="file://$PROJECT_DIR$/build/classes" /> | |
42 | + </component> | |
43 | + <component name="ProjectType"> | |
44 | + <option name="id" value="Android" /> | |
45 | + </component> | |
46 | +</project> | |
0 | 47 | \ No newline at end of file | ... | ... |
... | ... | @@ -0,0 +1,9 @@ |
1 | +<?xml version="1.0" encoding="UTF-8"?> | |
2 | +<project version="4"> | |
3 | + <component name="ProjectModuleManager"> | |
4 | + <modules> | |
5 | + <module fileurl="file://$PROJECT_DIR$/App10p5.iml" filepath="$PROJECT_DIR$/App10p5.iml" /> | |
6 | + <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> | |
7 | + </modules> | |
8 | + </component> | |
9 | +</project> | |
0 | 10 | \ No newline at end of file | ... | ... |
... | ... | @@ -0,0 +1,12 @@ |
1 | +<?xml version="1.0" encoding="UTF-8"?> | |
2 | +<project version="4"> | |
3 | + <component name="RunConfigurationProducerService"> | |
4 | + <option name="ignoredProducers"> | |
5 | + <set> | |
6 | + <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" /> | |
7 | + <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" /> | |
8 | + <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" /> | |
9 | + </set> | |
10 | + </option> | |
11 | + </component> | |
12 | +</project> | |
0 | 13 | \ No newline at end of file | ... | ... |
... | ... | @@ -0,0 +1 @@ |
1 | +/build | ... | ... |
... | ... | @@ -0,0 +1,27 @@ |
1 | +apply plugin: 'com.android.application' | |
2 | + | |
3 | +android { | |
4 | + compileSdkVersion 23 | |
5 | + buildToolsVersion "23.0.3" | |
6 | + | |
7 | + defaultConfig { | |
8 | + applicationId "net.plil.clubinfo.app10p5" | |
9 | + minSdkVersion 15 | |
10 | + targetSdkVersion 23 | |
11 | + versionCode 1 | |
12 | + versionName "1.0" | |
13 | + } | |
14 | + buildTypes { | |
15 | + release { | |
16 | + minifyEnabled false | |
17 | + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | |
18 | + } | |
19 | + } | |
20 | +} | |
21 | + | |
22 | +dependencies { | |
23 | + compile fileTree(dir: 'libs', include: ['*.jar']) | |
24 | + testCompile 'junit:junit:4.12' | |
25 | + compile 'com.android.support:appcompat-v7:23.2.1' | |
26 | + compile 'com.android.support:design:23.2.1' | |
27 | +} | ... | ... |
... | ... | @@ -0,0 +1,17 @@ |
1 | +# Add project specific ProGuard rules here. | |
2 | +# By default, the flags in this file are appended to flags specified | |
3 | +# in /home/marianne/Applications/Android/sdk/tools/proguard/proguard-android.txt | |
4 | +# You can edit the include path and order by changing the proguardFiles | |
5 | +# directive in build.gradle. | |
6 | +# | |
7 | +# For more details, see | |
8 | +# http://developer.android.com/guide/developing/tools/proguard.html | |
9 | + | |
10 | +# Add any project specific keep options here: | |
11 | + | |
12 | +# If your project uses WebView with JS, uncomment the following | |
13 | +# and specify the fully qualified class name to the JavaScript interface | |
14 | +# class: | |
15 | +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { | |
16 | +# public *; | |
17 | +#} | ... | ... |
App10p5/app/src/androidTest/java/net/plil/clubinfo/app10p5/ApplicationTest.java
0 → 100644
... | ... | @@ -0,0 +1,13 @@ |
1 | +package net.plil.clubinfo.app10p5; | |
2 | + | |
3 | +import android.app.Application; | |
4 | +import android.test.ApplicationTestCase; | |
5 | + | |
6 | +/** | |
7 | + * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a> | |
8 | + */ | |
9 | +public class ApplicationTest extends ApplicationTestCase<Application> { | |
10 | + public ApplicationTest() { | |
11 | + super(Application.class); | |
12 | + } | |
13 | +} | |
0 | 14 | \ No newline at end of file | ... | ... |
... | ... | @@ -0,0 +1,40 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<manifest xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + package="net.plil.clubinfo.app10p5"> | |
4 | + | |
5 | + <!-- Nécessaire pour utiliser les cartes NFC --> | |
6 | + <uses-permission android:name="android.permission.NFC" /> | |
7 | + <uses-sdk android:minSdkVersion="15"/> | |
8 | + <uses-feature android:name="android.hardware.nfc" android:required="true" /> | |
9 | + | |
10 | + <application | |
11 | + android:allowBackup="true" | |
12 | + android:icon="@mipmap/ic_launcher" | |
13 | + android:label="@string/app_name" | |
14 | + android:supportsRtl="true" | |
15 | + android:theme="@style/AppTheme"> | |
16 | + <activity | |
17 | + android:name=".MainActivity" | |
18 | + android:launchMode="singleTask" | |
19 | + android:label="@string/app_name" | |
20 | + android:theme="@style/AppTheme.NoActionBar"> | |
21 | + <meta-data android:name="android.nfc.action.TECH_DISCOVERED" | |
22 | + android:resource="@xml/tech" /> | |
23 | + <intent-filter> <!-- Prioritaire mais je n'ai pas réussi à le faire fonctionner --> | |
24 | + <action android:name="android.nfc.action.NDEF_DISCOVERED"/> | |
25 | + <category android:name="android.intent.category.DEFAULT"/> | |
26 | + <data android:mimeType="text/plain" /> | |
27 | + </intent-filter> | |
28 | + <intent-filter> <!-- Regardé juste après les NDEF --> | |
29 | + <action android:name="android.nfc.action.TECH_DISCOVERED"/> | |
30 | + <category android:name="android.intent.category.DEFAULT"/> | |
31 | + </intent-filter> | |
32 | + <intent-filter> | |
33 | + <action android:name="android.intent.action.MAIN" /> | |
34 | + <category android:name="android.intent.category.LAUNCHER" /> | |
35 | + </intent-filter> | |
36 | + | |
37 | + </activity> | |
38 | + </application> | |
39 | + | |
40 | +</manifest> | ... | ... |
App10p5/app/src/main/java/net/plil/clubinfo/app10p5/MainActivity.java
0 → 100644
... | ... | @@ -0,0 +1,201 @@ |
1 | +package net.plil.clubinfo.app10p5; | |
2 | + | |
3 | +import android.app.PendingIntent; | |
4 | +import android.content.Intent; | |
5 | +import android.content.IntentFilter; | |
6 | +import android.nfc.NfcAdapter; | |
7 | +import android.nfc.Tag; | |
8 | +import android.nfc.tech.MifareClassic; | |
9 | +import android.nfc.tech.NfcA; | |
10 | +import android.os.Bundle; | |
11 | +import android.support.design.widget.FloatingActionButton; | |
12 | +import android.support.design.widget.Snackbar; | |
13 | +import android.support.v7.app.AppCompatActivity; | |
14 | +import android.support.v7.widget.Toolbar; | |
15 | +import android.util.Log; | |
16 | +import android.view.Menu; | |
17 | +import android.view.MenuItem; | |
18 | +import android.view.View; | |
19 | +import android.widget.Toast; | |
20 | + | |
21 | +import java.io.IOException; | |
22 | + | |
23 | +public class MainActivity extends AppCompatActivity { | |
24 | + | |
25 | + private NfcAdapter mNfcAdapter; | |
26 | + private PendingIntent mPendingIntent; | |
27 | + private IntentFilter[] mFilters; | |
28 | + private String[][] mTechLists; | |
29 | + private Toast mToast; | |
30 | + | |
31 | + public void onResume() { | |
32 | + super.onResume(); | |
33 | + if(mNfcAdapter != null) | |
34 | + mNfcAdapter.enableForegroundDispatch(this, mPendingIntent, mFilters, mTechLists); | |
35 | + } | |
36 | + | |
37 | + // Convertit l'array de byte en chaîne hexadécimale (si le byte = 0x63, str = "63"). | |
38 | + private String ByteArrayToHexString(byte [] inarray) { | |
39 | + int i, j, in; | |
40 | + String [] hex = {"0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F"}; | |
41 | + String out= ""; | |
42 | + for(j = 0 ; j < inarray.length ; ++j) | |
43 | + { | |
44 | + in = (int) inarray[j] & 0xff; | |
45 | + i = (in >> 4) & 0x0f; | |
46 | + out += hex[i]; | |
47 | + i = in & 0x0f; | |
48 | + out += hex[i]; | |
49 | + } | |
50 | + return out; | |
51 | + } | |
52 | + | |
53 | + //La fonction se lance une fois au démarrage de l'application. | |
54 | + @Override | |
55 | + protected void onCreate(Bundle savedInstanceState) { | |
56 | + super.onCreate(savedInstanceState); | |
57 | + setContentView(R.layout.activity_main); | |
58 | + Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); | |
59 | + setSupportActionBar(toolbar); | |
60 | + | |
61 | + FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); | |
62 | + fab.setOnClickListener(new View.OnClickListener() { | |
63 | + @Override | |
64 | + public void onClick(View view) { | |
65 | + Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG) | |
66 | + .setAction("Action", null).show(); | |
67 | + } | |
68 | + }); | |
69 | + | |
70 | + ////Code NFC -- Nécessaire | |
71 | + mNfcAdapter = NfcAdapter.getDefaultAdapter(this); | |
72 | + | |
73 | + mPendingIntent = PendingIntent.getActivity(this, 0, | |
74 | + new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0); | |
75 | + | |
76 | + IntentFilter ndef = new IntentFilter(NfcAdapter.ACTION_TECH_DISCOVERED); | |
77 | + | |
78 | + try { | |
79 | + ndef.addDataType("text/plain"); | |
80 | + } catch (IntentFilter.MalformedMimeTypeException e) { | |
81 | + throw new RuntimeException("fail", e); | |
82 | + } | |
83 | + mFilters = new IntentFilter[] { | |
84 | + ndef, | |
85 | + }; | |
86 | + | |
87 | + // Setup a tech list for all NfcF tags | |
88 | + mTechLists = new String[][]{new String[]{NfcA.class.getName(), MifareClassic.class.getName()}}; | |
89 | + } | |
90 | + | |
91 | + @Override | |
92 | + public void onNewIntent(Intent intent) { | |
93 | + if (NfcAdapter.ACTION_TECH_DISCOVERED.equals(intent.getAction())) { | |
94 | + String id_carte = ByteArrayToHexString(intent.getByteArrayExtra(NfcAdapter.EXTRA_ID)); | |
95 | + mToast = Toast.makeText(getApplicationContext(), "ID Carte : " + id_carte, Toast.LENGTH_SHORT); | |
96 | + mToast.show(); | |
97 | + System.out.println("ID Carte : " + id_carte); | |
98 | + | |
99 | + //Lecture des données | |
100 | + Tag tag = intent.getParcelableExtra(NfcAdapter.EXTRA_TAG); | |
101 | + MifareClassic mfc = MifareClassic.get(tag); | |
102 | + byte[] data; | |
103 | + String prenom = null, nom = null, login = null; | |
104 | + | |
105 | + if(mfc != null) { | |
106 | + try { | |
107 | + mfc.connect(); | |
108 | + String cardData = null; | |
109 | + | |
110 | + //Clé A | |
111 | + byte[] cleA = new byte[] { (byte)0xa0, (byte)0xa1, (byte)0xa2, | |
112 | + (byte)0xa3, (byte)0xa4, (byte)0xa5 }; | |
113 | + //On veut juste lire le secteur 12 | |
114 | + boolean estConnecte = mfc.authenticateSectorWithKeyA(12, cleA); | |
115 | + if (estConnecte) { | |
116 | + //Il y a 4 blocs dans le secteur 12 -> INE, numéro étudiant, prénom, nom | |
117 | + //On ne veut que prénom et nom, donc on passe les deux premiers | |
118 | + for (int i = 2, bIndex = mfc.sectorToBlock(12) + i; i < 4; i++, bIndex++) { | |
119 | + //sectorToBlock : Renvoie l'indice (global, parmis tous les blocs de | |
120 | + // tous les secteurs) du premier bloc du secteur 12 | |
121 | + //Lit les données du bloc | |
122 | + data = mfc.readBlock(bIndex); | |
123 | + | |
124 | + //Convertit les bytes en String | |
125 | + String dataStr = new String(data); | |
126 | + if (i == 2) //Prénom | |
127 | + prenom = dataStr; | |
128 | + else if (i == 3) //Nom | |
129 | + nom = dataStr; | |
130 | + mToast = Toast.makeText(getApplicationContext(), "Données lues : " + dataStr, Toast.LENGTH_SHORT); | |
131 | + mToast.show(); | |
132 | + System.out.println("Données lues : " + dataStr); | |
133 | + } | |
134 | + } else { | |
135 | + mToast = Toast.makeText(getApplicationContext(), "Erreur lors de la connection au secteur 12.", Toast.LENGTH_SHORT); | |
136 | + mToast.show(); | |
137 | + System.out.println("Erreur lors de la connection au secteur 12."); | |
138 | + } | |
139 | + mfc.close(); | |
140 | + } catch (IOException e) { | |
141 | + System.out.println(e.getLocalizedMessage()); | |
142 | + } | |
143 | + | |
144 | + //Concaténation des données récupérées en login | |
145 | + login = prenom; | |
146 | + login.concat("."); | |
147 | + login.concat(nom); | |
148 | + System.out.println("Prenom : " + prenom); | |
149 | + System.out.println("Nom : " + nom); | |
150 | + } | |
151 | + else | |
152 | + { | |
153 | + System.out.println("Pas de connection possible à la technologie Mifare Classic."); | |
154 | + mToast = Toast.makeText(getApplicationContext(), "Pas de connection possible à la technologie Mifare Classic.", Toast.LENGTH_SHORT); | |
155 | + mToast.show(); | |
156 | + } | |
157 | + | |
158 | + mToast = Toast.makeText(getApplicationContext(), "Login Lille 1 : " + login, Toast.LENGTH_SHORT); | |
159 | + mToast.show(); | |
160 | + System.out.println("Login Lille 1 : " + login); | |
161 | + | |
162 | + | |
163 | + //Éxécution de la fonction | |
164 | + taFonction(id_carte, login); | |
165 | + } | |
166 | + } | |
167 | + | |
168 | + public void taFonction(String id_carte, String login) | |
169 | + { | |
170 | + //code fonction | |
171 | + } | |
172 | + | |
173 | + @Override | |
174 | + public void onPause() { | |
175 | + super.onPause(); | |
176 | + if(mNfcAdapter != null) | |
177 | + mNfcAdapter.disableForegroundDispatch(this); | |
178 | + } | |
179 | + | |
180 | + @Override | |
181 | + public boolean onCreateOptionsMenu(Menu menu) { | |
182 | + // Inflate the menu; this adds items to the action bar if it is present. | |
183 | + getMenuInflater().inflate(R.menu.menu_main, menu); | |
184 | + return true; | |
185 | + } | |
186 | + | |
187 | + @Override | |
188 | + public boolean onOptionsItemSelected(MenuItem item) { | |
189 | + // Handle action bar item clicks here. The action bar will | |
190 | + // automatically handle clicks on the Home/Up button, so long | |
191 | + // as you specify a parent activity in AndroidManifest.xml. | |
192 | + int id = item.getItemId(); | |
193 | + | |
194 | + //noinspection SimplifiableIfStatement | |
195 | + if (id == R.id.action_settings) { | |
196 | + return true; | |
197 | + } | |
198 | + | |
199 | + return super.onOptionsItemSelected(item); | |
200 | + } | |
201 | +} | ... | ... |
... | ... | @@ -0,0 +1,34 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + xmlns:app="http://schemas.android.com/apk/res-auto" | |
4 | + xmlns:tools="http://schemas.android.com/tools" | |
5 | + android:layout_width="match_parent" | |
6 | + android:layout_height="match_parent" | |
7 | + android:fitsSystemWindows="true" | |
8 | + tools:context="net.plil.clubinfo.app10p5.MainActivity"> | |
9 | + | |
10 | + <android.support.design.widget.AppBarLayout | |
11 | + android:layout_width="match_parent" | |
12 | + android:layout_height="wrap_content" | |
13 | + android:theme="@style/AppTheme.AppBarOverlay"> | |
14 | + | |
15 | + <android.support.v7.widget.Toolbar | |
16 | + android:id="@+id/toolbar" | |
17 | + android:layout_width="match_parent" | |
18 | + android:layout_height="?attr/actionBarSize" | |
19 | + android:background="?attr/colorPrimary" | |
20 | + app:popupTheme="@style/AppTheme.PopupOverlay" /> | |
21 | + | |
22 | + </android.support.design.widget.AppBarLayout> | |
23 | + | |
24 | + <include layout="@layout/content_main" /> | |
25 | + | |
26 | + <android.support.design.widget.FloatingActionButton | |
27 | + android:id="@+id/fab" | |
28 | + android:layout_width="wrap_content" | |
29 | + android:layout_height="wrap_content" | |
30 | + android:layout_gravity="bottom|end" | |
31 | + android:layout_margin="@dimen/fab_margin" | |
32 | + android:src="@android:drawable/ic_dialog_email" /> | |
33 | + | |
34 | +</android.support.design.widget.CoordinatorLayout> | ... | ... |
... | ... | @@ -0,0 +1,19 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + xmlns:app="http://schemas.android.com/apk/res-auto" | |
4 | + xmlns:tools="http://schemas.android.com/tools" | |
5 | + android:layout_width="match_parent" | |
6 | + android:layout_height="match_parent" | |
7 | + android:paddingBottom="@dimen/activity_vertical_margin" | |
8 | + android:paddingLeft="@dimen/activity_horizontal_margin" | |
9 | + android:paddingRight="@dimen/activity_horizontal_margin" | |
10 | + android:paddingTop="@dimen/activity_vertical_margin" | |
11 | + app:layout_behavior="@string/appbar_scrolling_view_behavior" | |
12 | + tools:context="net.plil.clubinfo.app10p5.MainActivity" | |
13 | + tools:showIn="@layout/activity_main"> | |
14 | + | |
15 | + <TextView | |
16 | + android:layout_width="wrap_content" | |
17 | + android:layout_height="wrap_content" | |
18 | + android:text="Hello World!" /> | |
19 | +</RelativeLayout> | ... | ... |
... | ... | @@ -0,0 +1,10 @@ |
1 | +<menu xmlns:android="http://schemas.android.com/apk/res/android" | |
2 | + xmlns:app="http://schemas.android.com/apk/res-auto" | |
3 | + xmlns:tools="http://schemas.android.com/tools" | |
4 | + tools:context="net.plil.clubinfo.app10p5.MainActivity"> | |
5 | + <item | |
6 | + android:id="@+id/action_settings" | |
7 | + android:orderInCategory="100" | |
8 | + android:title="@string/action_settings" | |
9 | + app:showAsAction="never" /> | |
10 | +</menu> | ... | ... |
3.34 KB
2.15 KB
4.73 KB
7.54 KB
10.2 KB
... | ... | @@ -0,0 +1,9 @@ |
1 | +<resources>> | |
2 | + | |
3 | + <style name="AppTheme.NoActionBar"> | |
4 | + <item name="windowActionBar">false</item> | |
5 | + <item name="windowNoTitle">true</item> | |
6 | + <item name="android:windowDrawsSystemBarBackgrounds">true</item> | |
7 | + <item name="android:statusBarColor">@android:color/transparent</item> | |
8 | + </style> | |
9 | +</resources> | ... | ... |
... | ... | @@ -0,0 +1,6 @@ |
1 | +<resources> | |
2 | + <!-- Example customization of dimensions originally defined in res/values/dimens.xml | |
3 | + (such as screen margins) for screens with more than 820dp of available width. This | |
4 | + would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). --> | |
5 | + <dimen name="activity_horizontal_margin">64dp</dimen> | |
6 | +</resources> | ... | ... |
... | ... | @@ -0,0 +1,20 @@ |
1 | +<resources> | |
2 | + | |
3 | + <!-- Base application theme. --> | |
4 | + <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> | |
5 | + <!-- Customize your theme here. --> | |
6 | + <item name="colorPrimary">@color/colorPrimary</item> | |
7 | + <item name="colorPrimaryDark">@color/colorPrimaryDark</item> | |
8 | + <item name="colorAccent">@color/colorAccent</item> | |
9 | + </style> | |
10 | + | |
11 | + <style name="AppTheme.NoActionBar"> | |
12 | + <item name="windowActionBar">false</item> | |
13 | + <item name="windowNoTitle">true</item> | |
14 | + </style> | |
15 | + | |
16 | + <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> | |
17 | + | |
18 | + <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> | |
19 | + | |
20 | +</resources> | ... | ... |
... | ... | @@ -0,0 +1,13 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> | |
3 | + <tech-list> | |
4 | + <!-- Pour la carte Lille1 sur des tablettes non-compatibles Mifare Classic, | |
5 | + ie. les NEXUS 7 version 2013 --> | |
6 | + <tech>android.nfc.tech.NfcA</tech> | |
7 | + </tech-list> | |
8 | + <tech-list> | |
9 | + <!-- Pour la carte Lille1 sur des tablettes compatibles Mifare Classic --> | |
10 | + <tech>android.nfc.tech.NfcA</tech> | |
11 | + <tech>android.nfc.tech.MifareClassic</tech> | |
12 | + </tech-list> | |
13 | +</resources> | |
0 | 14 | \ No newline at end of file | ... | ... |
App10p5/app/src/test/java/net/plil/clubinfo/app10p5/ExampleUnitTest.java
0 → 100644
... | ... | @@ -0,0 +1,15 @@ |
1 | +package net.plil.clubinfo.app10p5; | |
2 | + | |
3 | +import org.junit.Test; | |
4 | + | |
5 | +import static org.junit.Assert.*; | |
6 | + | |
7 | +/** | |
8 | + * To work on unit tests, switch the Test Artifact in the Build Variants view. | |
9 | + */ | |
10 | +public class ExampleUnitTest { | |
11 | + @Test | |
12 | + public void addition_isCorrect() throws Exception { | |
13 | + assertEquals(4, 2 + 2); | |
14 | + } | |
15 | +} | |
0 | 16 | \ No newline at end of file | ... | ... |
... | ... | @@ -0,0 +1,23 @@ |
1 | +// Top-level build file where you can add configuration options common to all sub-projects/modules. | |
2 | + | |
3 | +buildscript { | |
4 | + repositories { | |
5 | + jcenter() | |
6 | + } | |
7 | + dependencies { | |
8 | + classpath 'com.android.tools.build:gradle:1.5.0' | |
9 | + | |
10 | + // NOTE: Do not place your application dependencies here; they belong | |
11 | + // in the individual module build.gradle files | |
12 | + } | |
13 | +} | |
14 | + | |
15 | +allprojects { | |
16 | + repositories { | |
17 | + jcenter() | |
18 | + } | |
19 | +} | |
20 | + | |
21 | +task clean(type: Delete) { | |
22 | + delete rootProject.buildDir | |
23 | +} | ... | ... |
... | ... | @@ -0,0 +1,18 @@ |
1 | +# Project-wide Gradle settings. | |
2 | + | |
3 | +# IDE (e.g. Android Studio) users: | |
4 | +# Gradle settings configured through the IDE *will override* | |
5 | +# any settings specified in this file. | |
6 | + | |
7 | +# For more details on how to configure your build environment visit | |
8 | +# http://www.gradle.org/docs/current/userguide/build_environment.html | |
9 | + | |
10 | +# Specifies the JVM arguments used for the daemon process. | |
11 | +# The setting is particularly useful for tweaking memory settings. | |
12 | +# Default value: -Xmx10248m -XX:MaxPermSize=256m | |
13 | +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 | |
14 | + | |
15 | +# When configured, Gradle will run in incubating parallel mode. | |
16 | +# This option should only be used with decoupled projects. More details, visit | |
17 | +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects | |
18 | +# org.gradle.parallel=true | |
0 | 19 | \ No newline at end of file | ... | ... |
No preview for this file type
... | ... | @@ -0,0 +1,160 @@ |
1 | +#!/usr/bin/env bash | |
2 | + | |
3 | +############################################################################## | |
4 | +## | |
5 | +## Gradle start up script for UN*X | |
6 | +## | |
7 | +############################################################################## | |
8 | + | |
9 | +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | |
10 | +DEFAULT_JVM_OPTS="" | |
11 | + | |
12 | +APP_NAME="Gradle" | |
13 | +APP_BASE_NAME=`basename "$0"` | |
14 | + | |
15 | +# Use the maximum available, or set MAX_FD != -1 to use that value. | |
16 | +MAX_FD="maximum" | |
17 | + | |
18 | +warn ( ) { | |
19 | + echo "$*" | |
20 | +} | |
21 | + | |
22 | +die ( ) { | |
23 | + echo | |
24 | + echo "$*" | |
25 | + echo | |
26 | + exit 1 | |
27 | +} | |
28 | + | |
29 | +# OS specific support (must be 'true' or 'false'). | |
30 | +cygwin=false | |
31 | +msys=false | |
32 | +darwin=false | |
33 | +case "`uname`" in | |
34 | + CYGWIN* ) | |
35 | + cygwin=true | |
36 | + ;; | |
37 | + Darwin* ) | |
38 | + darwin=true | |
39 | + ;; | |
40 | + MINGW* ) | |
41 | + msys=true | |
42 | + ;; | |
43 | +esac | |
44 | + | |
45 | +# Attempt to set APP_HOME | |
46 | +# Resolve links: $0 may be a link | |
47 | +PRG="$0" | |
48 | +# Need this for relative symlinks. | |
49 | +while [ -h "$PRG" ] ; do | |
50 | + ls=`ls -ld "$PRG"` | |
51 | + link=`expr "$ls" : '.*-> \(.*\)$'` | |
52 | + if expr "$link" : '/.*' > /dev/null; then | |
53 | + PRG="$link" | |
54 | + else | |
55 | + PRG=`dirname "$PRG"`"/$link" | |
56 | + fi | |
57 | +done | |
58 | +SAVED="`pwd`" | |
59 | +cd "`dirname \"$PRG\"`/" >/dev/null | |
60 | +APP_HOME="`pwd -P`" | |
61 | +cd "$SAVED" >/dev/null | |
62 | + | |
63 | +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar | |
64 | + | |
65 | +# Determine the Java command to use to start the JVM. | |
66 | +if [ -n "$JAVA_HOME" ] ; then | |
67 | + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then | |
68 | + # IBM's JDK on AIX uses strange locations for the executables | |
69 | + JAVACMD="$JAVA_HOME/jre/sh/java" | |
70 | + else | |
71 | + JAVACMD="$JAVA_HOME/bin/java" | |
72 | + fi | |
73 | + if [ ! -x "$JAVACMD" ] ; then | |
74 | + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME | |
75 | + | |
76 | +Please set the JAVA_HOME variable in your environment to match the | |
77 | +location of your Java installation." | |
78 | + fi | |
79 | +else | |
80 | + JAVACMD="java" | |
81 | + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | |
82 | + | |
83 | +Please set the JAVA_HOME variable in your environment to match the | |
84 | +location of your Java installation." | |
85 | +fi | |
86 | + | |
87 | +# Increase the maximum file descriptors if we can. | |
88 | +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then | |
89 | + MAX_FD_LIMIT=`ulimit -H -n` | |
90 | + if [ $? -eq 0 ] ; then | |
91 | + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then | |
92 | + MAX_FD="$MAX_FD_LIMIT" | |
93 | + fi | |
94 | + ulimit -n $MAX_FD | |
95 | + if [ $? -ne 0 ] ; then | |
96 | + warn "Could not set maximum file descriptor limit: $MAX_FD" | |
97 | + fi | |
98 | + else | |
99 | + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" | |
100 | + fi | |
101 | +fi | |
102 | + | |
103 | +# For Darwin, add options to specify how the application appears in the dock | |
104 | +if $darwin; then | |
105 | + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" | |
106 | +fi | |
107 | + | |
108 | +# For Cygwin, switch paths to Windows format before running java | |
109 | +if $cygwin ; then | |
110 | + APP_HOME=`cygpath --path --mixed "$APP_HOME"` | |
111 | + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` | |
112 | + JAVACMD=`cygpath --unix "$JAVACMD"` | |
113 | + | |
114 | + # We build the pattern for arguments to be converted via cygpath | |
115 | + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` | |
116 | + SEP="" | |
117 | + for dir in $ROOTDIRSRAW ; do | |
118 | + ROOTDIRS="$ROOTDIRS$SEP$dir" | |
119 | + SEP="|" | |
120 | + done | |
121 | + OURCYGPATTERN="(^($ROOTDIRS))" | |
122 | + # Add a user-defined pattern to the cygpath arguments | |
123 | + if [ "$GRADLE_CYGPATTERN" != "" ] ; then | |
124 | + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" | |
125 | + fi | |
126 | + # Now convert the arguments - kludge to limit ourselves to /bin/sh | |
127 | + i=0 | |
128 | + for arg in "$@" ; do | |
129 | + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` | |
130 | + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option | |
131 | + | |
132 | + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition | |
133 | + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` | |
134 | + else | |
135 | + eval `echo args$i`="\"$arg\"" | |
136 | + fi | |
137 | + i=$((i+1)) | |
138 | + done | |
139 | + case $i in | |
140 | + (0) set -- ;; | |
141 | + (1) set -- "$args0" ;; | |
142 | + (2) set -- "$args0" "$args1" ;; | |
143 | + (3) set -- "$args0" "$args1" "$args2" ;; | |
144 | + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; | |
145 | + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; | |
146 | + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; | |
147 | + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; | |
148 | + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; | |
149 | + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; | |
150 | + esac | |
151 | +fi | |
152 | + | |
153 | +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules | |
154 | +function splitJvmOpts() { | |
155 | + JVM_OPTS=("$@") | |
156 | +} | |
157 | +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS | |
158 | +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" | |
159 | + | |
160 | +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" | ... | ... |
... | ... | @@ -0,0 +1,90 @@ |
1 | +@if "%DEBUG%" == "" @echo off | |
2 | +@rem ########################################################################## | |
3 | +@rem | |
4 | +@rem Gradle startup script for Windows | |
5 | +@rem | |
6 | +@rem ########################################################################## | |
7 | + | |
8 | +@rem Set local scope for the variables with windows NT shell | |
9 | +if "%OS%"=="Windows_NT" setlocal | |
10 | + | |
11 | +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. | |
12 | +set DEFAULT_JVM_OPTS= | |
13 | + | |
14 | +set DIRNAME=%~dp0 | |
15 | +if "%DIRNAME%" == "" set DIRNAME=. | |
16 | +set APP_BASE_NAME=%~n0 | |
17 | +set APP_HOME=%DIRNAME% | |
18 | + | |
19 | +@rem Find java.exe | |
20 | +if defined JAVA_HOME goto findJavaFromJavaHome | |
21 | + | |
22 | +set JAVA_EXE=java.exe | |
23 | +%JAVA_EXE% -version >NUL 2>&1 | |
24 | +if "%ERRORLEVEL%" == "0" goto init | |
25 | + | |
26 | +echo. | |
27 | +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | |
28 | +echo. | |
29 | +echo Please set the JAVA_HOME variable in your environment to match the | |
30 | +echo location of your Java installation. | |
31 | + | |
32 | +goto fail | |
33 | + | |
34 | +:findJavaFromJavaHome | |
35 | +set JAVA_HOME=%JAVA_HOME:"=% | |
36 | +set JAVA_EXE=%JAVA_HOME%/bin/java.exe | |
37 | + | |
38 | +if exist "%JAVA_EXE%" goto init | |
39 | + | |
40 | +echo. | |
41 | +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% | |
42 | +echo. | |
43 | +echo Please set the JAVA_HOME variable in your environment to match the | |
44 | +echo location of your Java installation. | |
45 | + | |
46 | +goto fail | |
47 | + | |
48 | +:init | |
49 | +@rem Get command-line arguments, handling Windowz variants | |
50 | + | |
51 | +if not "%OS%" == "Windows_NT" goto win9xME_args | |
52 | +if "%@eval[2+2]" == "4" goto 4NT_args | |
53 | + | |
54 | +:win9xME_args | |
55 | +@rem Slurp the command line arguments. | |
56 | +set CMD_LINE_ARGS= | |
57 | +set _SKIP=2 | |
58 | + | |
59 | +:win9xME_args_slurp | |
60 | +if "x%~1" == "x" goto execute | |
61 | + | |
62 | +set CMD_LINE_ARGS=%* | |
63 | +goto execute | |
64 | + | |
65 | +:4NT_args | |
66 | +@rem Get arguments from the 4NT Shell from JP Software | |
67 | +set CMD_LINE_ARGS=%$ | |
68 | + | |
69 | +:execute | |
70 | +@rem Setup the command line | |
71 | + | |
72 | +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar | |
73 | + | |
74 | +@rem Execute Gradle | |
75 | +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% | |
76 | + | |
77 | +:end | |
78 | +@rem End local scope for the variables with windows NT shell | |
79 | +if "%ERRORLEVEL%"=="0" goto mainEnd | |
80 | + | |
81 | +:fail | |
82 | +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of | |
83 | +rem the _cmd.exe /c_ return code! | |
84 | +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 | |
85 | +exit /b 1 | |
86 | + | |
87 | +:mainEnd | |
88 | +if "%OS%"=="Windows_NT" endlocal | |
89 | + | |
90 | +:omega | ... | ... |
... | ... | @@ -0,0 +1 @@ |
1 | +include ':app' | ... | ... |