Commit cff05a090c83a99566ce8ffb2e9bcd0752059e9d

Authored by rcavalie
1 parent af6964e6

Tout marche

.idea/modules.xml
... ... @@ -2,7 +2,7 @@
2 2 <project version="4">
3 3 <component name="ProjectModuleManager">
4 4 <modules>
5   - <module fileurl="file://$PROJECT_DIR$/AUTRE.iml" filepath="$PROJECT_DIR$/AUTRE.iml" />
  5 + <module fileurl="file://$PROJECT_DIR$/SSRMarcSautelet.iml" filepath="$PROJECT_DIR$/SSRMarcSautelet.iml" />
6 6 <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
7 7 </modules>
8 8 </component>
... ...
.idea/vcs.xml 0 → 100644
... ... @@ -0,0 +1,6 @@
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="4">
  3 + <component name="VcsDirectoryMappings">
  4 + <mapping directory="$PROJECT_DIR$" vcs="Git" />
  5 + </component>
  6 +</project>
0 7 \ No newline at end of file
... ...
app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/MainActivity.java
... ... @@ -42,50 +42,50 @@ public class MainActivity extends AppCompatActivity
42 42 "fiche_ane2.html",
43 43 "fiche_ane3.html",
44 44 "fiche_assist1.html",
45   - "fiche_assist2.html ",
46   - "fiche_assist3.html ",
47   - "fiche_educ1.html ",
48   - "fiche_educ2.html ",
49   - "fiche_educ3.html ",
50   - "fiche_ergo1.html ",
51   - "fiche_ergo2.html ",
52   - "fiche_ergo3.html ",
53   - "fiche_inf1.html ",
54   - "fiche_inf2.html ",
55   - "fiche_inf3.html ",
56   - "fiche_kine1.html ",
57   - "fiche_kine2.html ",
58   - "fiche_kine3.html ",
59   - "fiche_medecin1.html ",
60   - "fiche_medecin2.html ",
61   - "fiche_medecin3.html ",
62   - "fiche_ortho1.html ",
63   - "fiche_ortho2.html ",
64   - "fiche_ortho3.html ",
65   - "fiche_orthoptiste1.html ",
66   - "fiche_orthoptiste2.html ",
67   - "fiche_orthoptiste3.html ",
68   - "fiche_psycho1.html ",
69   - "fiche_psycho2.html ",
70   - "fiche_psycho3.html ",
71   - "fiche_secret1.html ",
72   - "fiche_secret2.html ",
73   - "fiche_secret3.html ",
74   - "google_map.html ",
75   - "orga_accueil.html ",
76   - "orga_apa.html ",
  45 + "fiche_assist2.html",
  46 + "fiche_assist3.html",
  47 + "fiche_educ1.html",
  48 + "fiche_educ2.html",
  49 + "fiche_educ3.html",
  50 + "fiche_ergo1.html",
  51 + "fiche_ergo2.html",
  52 + "fiche_ergo3.html",
  53 + "fiche_inf1.html",
  54 + "fiche_inf2.html",
  55 + "fiche_inf3.html",
  56 + "fiche_kine1.html",
  57 + "fiche_kine2.html",
  58 + "fiche_kine3.html",
  59 + "fiche_medecin1.html",
  60 + "fiche_medecin2.html",
  61 + "fiche_medecin3.html",
  62 + "fiche_ortho1.html",
  63 + "fiche_ortho2.html",
  64 + "fiche_ortho3.html",
  65 + "fiche_orthoptiste1.html",
  66 + "fiche_orthoptiste2.html",
  67 + "fiche_orthoptiste3.html",
  68 + "fiche_psycho1.html",
  69 + "fiche_psycho2.html",
  70 + "fiche_psycho3.html",
  71 + "fiche_secret1.html",
  72 + "fiche_secret2.html",
  73 + "fiche_secret3.html",
  74 + "google_map.html",
  75 + "orga_accueil.html",
  76 + "orga_apa.html",
77 77 "orga_appareilleur.html" ,
78   - "orga_assist.html ",
79   - "orga_cadre.html ",
80   - "orga_doc.html ",
81   - "orga_ergo.html ",
82   - "orga_grands.html ",
83   - "orga_inf.html ",
84   - "orga_kine.html ",
85   - "orga_moyens.html ",
86   - "orga_ortho.html ",
87   - "orga_orthoptiste.html ",
88   - "orga_petits.html ",
  78 + "orga_assist.html",
  79 + "orga_cadre.html",
  80 + "orga_doc.html",
  81 + "orga_ergo.html",
  82 + "orga_grands.html",
  83 + "orga_inf.html",
  84 + "orga_kine.html",
  85 + "orga_moyens.html",
  86 + "orga_ortho.html",
  87 + "orga_orthoptiste.html",
  88 + "orga_petits.html",
89 89 "orga_psy.html",
90 90 "orga_psychomo.html" ,
91 91 "orga_secret.html" ,
... ...
app/src/main/java/ssrmarcsautelet/automation/appli/ssrmarcsautelet/savoirplus.java
... ... @@ -3,7 +3,6 @@ package ssrmarcsautelet.automation.appli.ssrmarcsautelet;
3 3  
4 4 import android.annotation.SuppressLint;
5 5 import android.os.Bundle;
6   -import android.os.Environment;
7 6 import android.support.v7.app.AppCompatActivity;
8 7 import android.webkit.WebView;
9 8  
... ... @@ -19,7 +18,7 @@ public class savoirplus extends AppCompatActivity {
19 18  
20 19  
21 20 map = (WebView) findViewById(R.id.map);
22   - map.loadUrl("file:///sdcard/SSR_docs/SSR_docs/google_map.html");
  21 + map.loadUrl("file:///sdcard/SSR_docs/google_map.html");
23 22 map.getSettings().setJavaScriptEnabled(true);
24 23  
25 24 contact = (WebView) findViewById(R.id.contact);
... ...
app/src/main/res/layout/activity_age3.xml
1 1 <?xml version="1.0" encoding="utf-8"?>
  2 +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="fill_parent"
  4 + android:layout_height="fill_parent" >
2 5  
3 6 <LinearLayout
4 7 xmlns:android="http://schemas.android.com/apk/res/android"
... ... @@ -36,4 +39,5 @@
36 39 android:layout_marginLeft="20dp"
37 40 android:layout_marginRight="20dp" />
38 41  
39   -</LinearLayout>
40 42 \ No newline at end of file
  43 +</LinearLayout>
  44 +</ScrollView>
41 45 \ No newline at end of file
... ...