Commit c8059613464db0432f4d6db3c801c745c431b032
1 parent
4abf4602
Re-fonte de l'app et elle marche
Showing
32 changed files
with
527 additions
and
135 deletions
Show diff stats
PremiereActivite/.idea/gradle.xml
... | ... | @@ -3,18 +3,19 @@ |
3 | 3 | <component name="GradleSettings"> |
4 | 4 | <option name="linkedExternalProjectsSettings"> |
5 | 5 | <GradleProjectSettings> |
6 | - <option name="distributionType" value="DEFAULT_WRAPPED" /> | |
6 | + <option name="distributionType" value="LOCAL" /> | |
7 | 7 | <option name="externalProjectPath" value="$PROJECT_DIR$" /> |
8 | + <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.10" /> | |
8 | 9 | <option name="modules"> |
9 | 10 | <set> |
10 | - <option value="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite" /> | |
11 | - <option value="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/app" /> | |
11 | + <option value="$PROJECT_DIR$" /> | |
12 | + <option value="$PROJECT_DIR$/app" /> | |
12 | 13 | </set> |
13 | 14 | </option> |
14 | 15 | <option name="myModules"> |
15 | 16 | <set> |
16 | - <option value="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite" /> | |
17 | - <option value="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/app" /> | |
17 | + <option value="$PROJECT_DIR$" /> | |
18 | + <option value="$PROJECT_DIR$/app" /> | |
18 | 19 | </set> |
19 | 20 | </option> |
20 | 21 | </GradleProjectSettings> | ... | ... |
PremiereActivite/.idea/inspectionProfiles/Project_Default.xml
0 → 100644
... | ... | @@ -0,0 +1,6 @@ |
1 | +<component name="InspectionProjectProfileManager"> | |
2 | + <profile version="1.0"> | |
3 | + <option name="myName" value="Project Default" /> | |
4 | + <inspection_tool class="AndroidLintPrivateResource" enabled="false" level="WARNING" enabled_by_default="false" /> | |
5 | + </profile> | |
6 | +</component> | |
0 | 7 | \ No newline at end of file | ... | ... |
PremiereActivite/.idea/inspectionProfiles/profiles_settings.xml
0 → 100644
... | ... | @@ -0,0 +1,7 @@ |
1 | +<component name="InspectionProjectProfileManager"> | |
2 | + <settings> | |
3 | + <option name="PROJECT_PROFILE" value="Project Default" /> | |
4 | + <option name="USE_PROJECT_PROFILE" value="true" /> | |
5 | + <version value="1.0" /> | |
6 | + </settings> | |
7 | +</component> | |
0 | 8 | \ No newline at end of file | ... | ... |
PremiereActivite/.idea/modules.xml
... | ... | @@ -2,8 +2,8 @@ |
2 | 2 | <project version="4"> |
3 | 3 | <component name="ProjectModuleManager"> |
4 | 4 | <modules> |
5 | - <module fileurl="file://$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/PremiereActivite.iml" filepath="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/PremiereActivite.iml" /> | |
6 | - <module fileurl="file://$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/app/app.iml" filepath="$USER_HOME$/Documents/Polytech/Club Info/2016/10p5-android/PremiereActivite/app/app.iml" /> | |
5 | + <module fileurl="file://$PROJECT_DIR$/PremiereActivite.iml" filepath="$PROJECT_DIR$/PremiereActivite.iml" /> | |
6 | + <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> | |
7 | 7 | </modules> |
8 | 8 | </component> |
9 | 9 | </project> |
10 | 10 | \ No newline at end of file | ... | ... |
PremiereActivite/app/build.gradle
... | ... | @@ -5,8 +5,8 @@ android { |
5 | 5 | buildToolsVersion "23.0.3" |
6 | 6 | |
7 | 7 | defaultConfig { |
8 | - applicationId "com.example.florian.premiereactivite" | |
9 | - minSdkVersion 15 | |
8 | + applicationId "com.example.app_10p5" | |
9 | + minSdkVersion 20 | |
10 | 10 | targetSdkVersion 23 |
11 | 11 | versionCode 1 |
12 | 12 | versionName "1.0" |
... | ... | @@ -24,4 +24,5 @@ dependencies { |
24 | 24 | testCompile 'junit:junit:4.12' |
25 | 25 | compile 'com.android.support:appcompat-v7:23.2.1' |
26 | 26 | compile 'com.android.support:design:23.2.1' |
27 | + | |
27 | 28 | } | ... | ... |
PremiereActivite/app/src/main/AndroidManifest.xml
1 | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
3 | - package="com.example.florian.premiereactivite"> | |
3 | + package="com.example.app_10p5"> | |
4 | 4 | |
5 | 5 | <application |
6 | 6 | android:allowBackup="true" |
... | ... | @@ -9,15 +9,23 @@ |
9 | 9 | android:supportsRtl="true" |
10 | 10 | android:theme="@style/AppTheme"> |
11 | 11 | <activity |
12 | - android:name=".Menu" | |
13 | - android:label="@string/app_name" | |
14 | - android:theme="@style/AppTheme.NoActionBar"> | |
12 | + android:name="com.example.app_10p5.MainActivite" | |
13 | + android:label="10p5"> | |
15 | 14 | <intent-filter> |
16 | 15 | <action android:name="android.intent.action.MAIN" /> |
17 | 16 | |
18 | 17 | <category android:name="android.intent.category.LAUNCHER" /> |
19 | 18 | </intent-filter> |
20 | 19 | </activity> |
20 | + <activity | |
21 | + android:name="com.example.app_10p5.CarteActivite" | |
22 | + android:label="CarteActivite" | |
23 | + android:parentActivityName="com.example.app_10p5.MainActivite" > | |
24 | + <meta-data | |
25 | + android:name="android.support.PARENT_ACTIVITY" | |
26 | + android:value="com.example.app_10p5.MainActivite" /> | |
27 | + </activity> | |
28 | + | |
21 | 29 | </application> |
22 | 30 | |
23 | 31 | -</manifest> |
32 | +</manifest> | |
24 | 33 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/java/com/example/app_10p5/CarteActivite.java
0 → 100644
... | ... | @@ -0,0 +1,16 @@ |
1 | +package com.example.app_10p5; | |
2 | + | |
3 | +import android.app.Activity; | |
4 | +import android.os.Bundle; | |
5 | + | |
6 | +/** | |
7 | + * Created by beaus on 24/04/2016. | |
8 | + */ | |
9 | +public class CarteActivite extends Activity { | |
10 | + @Override | |
11 | + protected void onCreate(Bundle savedInstanceState) { | |
12 | + super.onCreate(savedInstanceState); | |
13 | + setContentView(R.layout.layout_carte); | |
14 | + } | |
15 | + | |
16 | +} | ... | ... |
PremiereActivite/app/src/main/java/com/example/app_10p5/MainActivite.java
0 → 100644
... | ... | @@ -0,0 +1,58 @@ |
1 | +package com.example.app_10p5; | |
2 | + | |
3 | +import android.content.Intent; | |
4 | +import android.os.Bundle; | |
5 | +import android.support.design.widget.TabLayout; | |
6 | +import android.support.v4.app.FragmentActivity; | |
7 | +import android.support.v4.app.FragmentManager; | |
8 | +import android.support.v4.app.Fragment; | |
9 | +import android.support.v4.view.ViewPager; | |
10 | +import android.view.View; | |
11 | + | |
12 | +/** | |
13 | + * Created by beaus on 24/04/2016. | |
14 | + */ | |
15 | +public class MainActivite extends FragmentActivity { | |
16 | + | |
17 | + @Override | |
18 | + protected void onCreate(Bundle savedInstanceState){ | |
19 | + super.onCreate(savedInstanceState); | |
20 | + setContentView(R.layout.layout_main); | |
21 | + TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout); | |
22 | + tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); | |
23 | + tabLayout.addTab(tabLayout.newTab().setText("Commande")); | |
24 | + tabLayout.addTab(tabLayout.newTab().setText("Rechargement")); | |
25 | + tabLayout.addTab(tabLayout.newTab().setText("Création")); | |
26 | + tabLayout.addTab(tabLayout.newTab().setText("Vidange")); | |
27 | + tabLayout.addTab(tabLayout.newTab().setText("Admin")); | |
28 | + tabLayout.setTabGravity(TabLayout.GRAVITY_FILL); | |
29 | + | |
30 | + final ViewPager viewPager = (ViewPager) findViewById(R.id.pager); | |
31 | + final PagerAdapter adapter = new PagerAdapter | |
32 | + (getSupportFragmentManager(), tabLayout.getTabCount()); | |
33 | + viewPager.setAdapter(adapter); | |
34 | + viewPager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(tabLayout)); | |
35 | + tabLayout.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() { | |
36 | + @Override | |
37 | + public void onTabSelected(TabLayout.Tab tab) { | |
38 | + viewPager.setCurrentItem(tab.getPosition()); | |
39 | + } | |
40 | + | |
41 | + @Override | |
42 | + public void onTabUnselected(TabLayout.Tab tab) { | |
43 | + | |
44 | + } | |
45 | + | |
46 | + @Override | |
47 | + public void onTabReselected(TabLayout.Tab tab) { | |
48 | + | |
49 | + } | |
50 | + }); | |
51 | + } | |
52 | + | |
53 | + public void valideCommande(View v) | |
54 | + { | |
55 | + Intent intent = new Intent(this, CarteActivite.class); | |
56 | + startActivity(intent); | |
57 | + } | |
58 | +} | ... | ... |
PremiereActivite/app/src/main/java/com/example/app_10p5/PagerAdapter.java
0 → 100644
... | ... | @@ -0,0 +1,46 @@ |
1 | +package com.example.app_10p5; | |
2 | + | |
3 | +/** | |
4 | + * Created by beaus on 24/04/2016. | |
5 | + */ | |
6 | +import android.support.v4.app.Fragment; | |
7 | +import android.support.v4.app.FragmentManager; | |
8 | +import android.support.v4.app.FragmentStatePagerAdapter; | |
9 | + | |
10 | +public class PagerAdapter extends FragmentStatePagerAdapter { | |
11 | + int mNumOfTabs; | |
12 | + | |
13 | + public PagerAdapter(FragmentManager fm, int NumOfTabs) { | |
14 | + super(fm); | |
15 | + this.mNumOfTabs = NumOfTabs; | |
16 | + } | |
17 | + | |
18 | + @Override | |
19 | + public Fragment getItem(int position) { | |
20 | + | |
21 | + switch (position) { | |
22 | + case 0: | |
23 | + TabFragment1 tab1 = new TabFragment1(); | |
24 | + return tab1; | |
25 | + case 1: | |
26 | + TabFragment2 tab2 = new TabFragment2(); | |
27 | + return tab2; | |
28 | + case 2: | |
29 | + TabFragment3 tab3 = new TabFragment3(); | |
30 | + return tab3; | |
31 | + case 3: | |
32 | + TabFragment4 tab4 = new TabFragment4(); | |
33 | + return tab4; | |
34 | + case 4: | |
35 | + TabFragment5 tab5 = new TabFragment5(); | |
36 | + return tab5; | |
37 | + default: | |
38 | + return null; | |
39 | + } | |
40 | + } | |
41 | + | |
42 | + @Override | |
43 | + public int getCount() { | |
44 | + return mNumOfTabs; | |
45 | + } | |
46 | +} | ... | ... |
PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment1.java
0 → 100644
... | ... | @@ -0,0 +1,14 @@ |
1 | +package com.example.app_10p5; | |
2 | + | |
3 | +import android.os.Bundle; | |
4 | +import android.support.v4.app.Fragment; | |
5 | +import android.view.LayoutInflater; | |
6 | +import android.view.View; | |
7 | +import android.view.ViewGroup; | |
8 | + | |
9 | +public class TabFragment1 extends Fragment { | |
10 | + @Override | |
11 | + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | |
12 | + return inflater.inflate(R.layout.tab_fragment_1, container, false); | |
13 | + } | |
14 | +} | |
0 | 15 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment2.java
0 → 100644
... | ... | @@ -0,0 +1,15 @@ |
1 | +package com.example.app_10p5; | |
2 | + | |
3 | +import android.os.Bundle; | |
4 | +import android.support.v4.app.Fragment; | |
5 | +import android.view.LayoutInflater; | |
6 | +import android.view.View; | |
7 | +import android.view.ViewGroup; | |
8 | + | |
9 | +public class TabFragment2 extends Fragment { | |
10 | + | |
11 | + @Override | |
12 | + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | |
13 | + return inflater.inflate(R.layout.tab_fragment_2, container, false); | |
14 | + } | |
15 | +} | ... | ... |
PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment3.java
0 → 100644
... | ... | @@ -0,0 +1,16 @@ |
1 | +package com.example.app_10p5; | |
2 | + | |
3 | + | |
4 | +import android.os.Bundle; | |
5 | +import android.support.v4.app.Fragment; | |
6 | +import android.view.LayoutInflater; | |
7 | +import android.view.View; | |
8 | +import android.view.ViewGroup; | |
9 | + | |
10 | +public class TabFragment3 extends Fragment { | |
11 | + | |
12 | + @Override | |
13 | + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | |
14 | + return inflater.inflate(R.layout.tab_fragment_3, container, false); | |
15 | + } | |
16 | +} | ... | ... |
PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment4.java
0 → 100644
... | ... | @@ -0,0 +1,14 @@ |
1 | +package com.example.app_10p5; | |
2 | + | |
3 | +import android.os.Bundle; | |
4 | +import android.support.v4.app.Fragment; | |
5 | +import android.view.LayoutInflater; | |
6 | +import android.view.View; | |
7 | +import android.view.ViewGroup; | |
8 | + | |
9 | +public class TabFragment4 extends Fragment { | |
10 | + @Override | |
11 | + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | |
12 | + return inflater.inflate(R.layout.tab_fragment_4, container, false); | |
13 | + } | |
14 | +} | |
0 | 15 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/java/com/example/app_10p5/TabFragment5.java
0 → 100644
... | ... | @@ -0,0 +1,14 @@ |
1 | +package com.example.app_10p5; | |
2 | + | |
3 | +import android.os.Bundle; | |
4 | +import android.support.v4.app.Fragment; | |
5 | +import android.view.LayoutInflater; | |
6 | +import android.view.View; | |
7 | +import android.view.ViewGroup; | |
8 | + | |
9 | +public class TabFragment5 extends Fragment { | |
10 | + @Override | |
11 | + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | |
12 | + return inflater.inflate(R.layout.tab_fragment_5, container, false); | |
13 | + } | |
14 | +} | |
0 | 15 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/java/com/example/florian/premiereactivite/Menu.java deleted
... | ... | @@ -1,49 +0,0 @@ |
1 | -package com.example.florian.premiereactivite; | |
2 | - | |
3 | - | |
4 | -import android.os.Bundle; | |
5 | -import android.support.v7.app.AppCompatActivity; | |
6 | -import android.text.InputType; | |
7 | -import android.view.View; | |
8 | -import android.widget.Button; | |
9 | -import android.widget.EditText; | |
10 | -import android.widget.TextView; | |
11 | -import android.view.MotionEvent; | |
12 | -import android.view.View.OnTouchListener; | |
13 | -import android.view.View.OnClickListener; | |
14 | - | |
15 | -public class Menu extends AppCompatActivity implements View.OnTouchListener, View.OnClickListener { | |
16 | - private Button valider = null; | |
17 | - @Override | |
18 | - protected void onCreate(Bundle savedInstanceState) { | |
19 | - super.onCreate(savedInstanceState); | |
20 | - setContentView(R.layout.activity_menu); | |
21 | - TextView text = new TextView(this); | |
22 | - text.setText("Veuillez entrer les informations suivantes:"); | |
23 | - setContentView(text); | |
24 | - // l'utilisateur entre un identifiant | |
25 | - EditText identifiant = new EditText(this); | |
26 | - identifiant.setHint(R.string.identifiant); | |
27 | - identifiant.setInputType(InputType.TYPE_TEXT_FLAG_MULTI_LINE); | |
28 | - identifiant.setLines(2); | |
29 | - // l'utilisateur entre un mot de passe | |
30 | - EditText password = new EditText(this); | |
31 | - password.setHint(R.string.password); | |
32 | - password.setInputType(InputType.TYPE_TEXT_FLAG_MULTI_LINE); | |
33 | - password.setLines(2); | |
34 | - //element de validation | |
35 | - valider = (Button) findViewById(R.id.boutton); | |
36 | - valider.setOnTouchListener(this); | |
37 | - valider.setOnClickListener(this); | |
38 | - } | |
39 | - @Override | |
40 | - public boolean onTouch(View v, MotionEvent event){ | |
41 | - /*reagir au toucher */ | |
42 | - return true; | |
43 | - } | |
44 | - @Override | |
45 | - public void onClick(View v){ | |
46 | - /* reagir au clic */ | |
47 | - } | |
48 | - | |
49 | -} |
PremiereActivite/app/src/main/res/layout/activity_menu.xml deleted
... | ... | @@ -1,34 +0,0 @@ |
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="com.example.florian.premiereactivite.Menu"> | |
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_menu" /> | |
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> |
PremiereActivite/app/src/main/res/layout/content_menu.xml deleted
... | ... | @@ -1,19 +0,0 @@ |
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="com.example.florian.premiereactivite.Menu" | |
13 | - tools:showIn="@layout/activity_menu"> | |
14 | - | |
15 | - <TextView | |
16 | - android:layout_width="wrap_content" | |
17 | - android:layout_height="wrap_content" | |
18 | - android:text="Hello World!" /> | |
19 | -</RelativeLayout> |
PremiereActivite/app/src/main/res/layout/layout_carte.xml
0 → 100644
... | ... | @@ -0,0 +1,20 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + xmlns:tools="http://schemas.android.com/tools" | |
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | |
5 | + android:layout_width="match_parent" | |
6 | + android:layout_height="match_parent" | |
7 | + android:orientation="vertical"> | |
8 | + | |
9 | + <TextView | |
10 | + android:layout_width="wrap_content" | |
11 | + android:layout_height="wrap_content" | |
12 | + android:text="@string/passCarte" | |
13 | + android:id="@+id/textView2" | |
14 | + android:layout_gravity="center_horizontal" | |
15 | + android:enabled="true" | |
16 | + android:inputType="text" | |
17 | + android:textAlignment="center" | |
18 | + android:textSize="50dp" | |
19 | + android:layout_marginTop="40dp" /> | |
20 | +</LinearLayout> | |
0 | 21 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/layout/layout_commande.xml
0 → 100644
... | ... | @@ -0,0 +1,68 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + android:orientation="vertical" android:layout_width="match_parent" | |
4 | + android:layout_height="match_parent" | |
5 | + android:baselineAligned="false" | |
6 | + android:weightSum="1" | |
7 | + android:nestedScrollingEnabled="true"> | |
8 | + | |
9 | + | |
10 | + <EditText | |
11 | + android:layout_width="wrap_content" | |
12 | + android:layout_height="wrap_content" | |
13 | + android:inputType="number" | |
14 | + android:ems="15" | |
15 | + android:id="@+id/nb" | |
16 | + android:editable="true" | |
17 | + android:elegantTextHeight="true" | |
18 | + android:enabled="true" | |
19 | + android:focusableInTouchMode="true" | |
20 | + android:focusable="true" | |
21 | + android:numeric="integer" | |
22 | + android:width="300dp" | |
23 | + android:hint="@string/quant" | |
24 | + android:textAlignment="center" | |
25 | + android:layout_gravity="center_horizontal" | |
26 | + android:layout_marginTop="30dp" | |
27 | + android:allowUndo="false" | |
28 | + android:height="150dp" | |
29 | + android:minHeight="30dp" | |
30 | + android:maxHeight="500dp" | |
31 | + android:minWidth="120dp" | |
32 | + android:layout_weight="0.04" /> | |
33 | + | |
34 | + <EditText | |
35 | + android:layout_width="wrap_content" | |
36 | + android:layout_height="58dp" | |
37 | + android:inputType="number" | |
38 | + android:ems="10" | |
39 | + android:id="@+id/editText2" | |
40 | + android:editable="true" | |
41 | + android:elegantTextHeight="true" | |
42 | + android:enabled="true" | |
43 | + android:focusableInTouchMode="true" | |
44 | + android:focusable="true" | |
45 | + android:numeric="decimal" | |
46 | + android:width="300dp" | |
47 | + android:hint="@string/prix" | |
48 | + android:textAlignment="center" | |
49 | + android:layout_gravity="center_horizontal" | |
50 | + android:layout_marginTop="50dp" | |
51 | + android:allowUndo="false" | |
52 | + android:height="250dp" | |
53 | + android:minHeight="80dp" | |
54 | + android:maxHeight="500dp" /> | |
55 | + | |
56 | + <Button | |
57 | + android:layout_width="wrap_content" | |
58 | + android:layout_height="wrap_content" | |
59 | + android:text="@string/validate" | |
60 | + android:id="@+id/button" | |
61 | + android:layout_gravity="center_horizontal" | |
62 | + android:layout_marginTop="40dp" | |
63 | + android:width="150dp" | |
64 | + android:height="80dp" | |
65 | + android:onClick="valideCommande" | |
66 | + android:nestedScrollingEnabled="false" /> | |
67 | + | |
68 | +</LinearLayout> | |
0 | 69 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/layout/premiere.xml renamed to PremiereActivite/app/src/main/res/layout/layout_connection.xml
1 | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | 2 | <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" |
3 | - xmlns:tools="http://schemas.android.com/tools" | |
4 | 3 | android:orientation="vertical" android:layout_width="match_parent" |
5 | - android:layout_height="match_parent" | |
6 | - tools:context="com.example.florian.premiereactivite.Menu"> | |
4 | + android:layout_height="match_parent"> | |
7 | 5 | |
8 | - <EditText | |
9 | - android:layout_width="match_parent" | |
6 | + <TextView | |
7 | + android:layout_width="wrap_content" | |
10 | 8 | android:layout_height="wrap_content" |
11 | - android:id="@+id/principale" | |
12 | - android:text="Bonjours, veuillez entrez les informations suivantes" /> | |
9 | + android:text="Bonjours, veuillez entrez les informations suivantes" | |
10 | + android:id="@+id/mainText" | |
11 | + android:inputType="none" | |
12 | + android:textAlignment="center" | |
13 | + android:textAppearance="@android:color/primary_text_light" | |
14 | + android:textColor="@color/abc_input_method_navigation_guard" | |
15 | + android:textSize="@dimen/abc_text_size_large_material" | |
16 | + android:textStyle="bold" /> | |
13 | 17 | |
14 | 18 | <AutoCompleteTextView |
15 | 19 | android:layout_width="match_parent" |
16 | 20 | android:layout_height="wrap_content" |
17 | - android:text="identifiant" | |
21 | + android:text="Identifiant" | |
18 | 22 | android:id="@+id/identifiant_principal" /> |
19 | 23 | |
20 | 24 | <MultiAutoCompleteTextView | ... | ... |
PremiereActivite/app/src/main/res/layout/layout_creation.xml
0 → 100644
... | ... | @@ -0,0 +1,42 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + android:orientation="vertical" android:layout_width="match_parent" | |
4 | + android:layout_height="match_parent"> | |
5 | + | |
6 | + <EditText | |
7 | + android:layout_width="wrap_content" | |
8 | + android:layout_height="wrap_content" | |
9 | + android:inputType="numberDecimal" | |
10 | + android:ems="10" | |
11 | + android:id="@+id/editText" | |
12 | + android:layout_gravity="center_horizontal" | |
13 | + android:editable="true" | |
14 | + android:elegantTextHeight="true" | |
15 | + android:enabled="true" | |
16 | + android:focusable="true" | |
17 | + android:focusableInTouchMode="true" | |
18 | + android:minHeight="80dp" | |
19 | + android:minWidth="200dp" | |
20 | + android:numeric="decimal" | |
21 | + android:width="250dp" | |
22 | + android:layout_marginTop="80dp" | |
23 | + android:hint="@string/montant" | |
24 | + android:textAlignment="center" /> | |
25 | + | |
26 | + <Button | |
27 | + android:layout_width="wrap_content" | |
28 | + android:layout_height="wrap_content" | |
29 | + android:text="@string/validate" | |
30 | + android:id="@+id/button3" | |
31 | + android:layout_gravity="center_horizontal" | |
32 | + android:layout_marginTop="80dp" | |
33 | + android:elegantTextHeight="true" | |
34 | + android:enabled="true" | |
35 | + android:focusable="true" | |
36 | + android:focusableInTouchMode="true" | |
37 | + android:height="80dp" | |
38 | + android:minHeight="80dp" | |
39 | + android:minWidth="150dp" | |
40 | + android:textAlignment="center" | |
41 | + android:width="200dp" /> | |
42 | +</LinearLayout> | |
0 | 43 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/layout/layout_main.xml
0 → 100644
... | ... | @@ -0,0 +1,37 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + xmlns:tools="http://schemas.android.com/tools" | |
4 | + xmlns:app="http://schemas.android.com/apk/res-auto" | |
5 | + android:layout_width="match_parent" | |
6 | + android:layout_height="match_parent" | |
7 | + tools:context=".MainActivite" | |
8 | + android:orientation="vertical"> | |
9 | + | |
10 | + <android.support.v7.widget.Toolbar | |
11 | + android:id="@+id/toolbar" | |
12 | + android:layout_width="match_parent" | |
13 | + android:layout_height="wrap_content" | |
14 | + android:layout_alignParentTop="true" | |
15 | + android:background="?attr/colorPrimary" | |
16 | + android:elevation="6dp" | |
17 | + android:minHeight="?attr/actionBarSize" | |
18 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | |
19 | + app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/> | |
20 | + | |
21 | + <android.support.design.widget.TabLayout | |
22 | + android:id="@+id/tab_layout" | |
23 | + android:layout_width="match_parent" | |
24 | + android:layout_height="wrap_content" | |
25 | + android:layout_below="@+id/toolbar" | |
26 | + android:background="?attr/colorPrimary" | |
27 | + android:elevation="6dp" | |
28 | + android:minHeight="?attr/actionBarSize" | |
29 | + android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/> | |
30 | + | |
31 | + <android.support.v4.view.ViewPager | |
32 | + android:id="@+id/pager" | |
33 | + android:layout_width="match_parent" | |
34 | + android:layout_height="fill_parent" | |
35 | + android:layout_below="@id/tab_layout"/> | |
36 | + | |
37 | +</LinearLayout> | |
0 | 38 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/layout/layout_rechargement.xml
0 → 100644
... | ... | @@ -0,0 +1,47 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + android:orientation="vertical" android:layout_width="match_parent" | |
4 | + android:layout_height="match_parent" | |
5 | + android:gravity="center_horizontal"> | |
6 | + | |
7 | + <EditText | |
8 | + android:layout_width="wrap_content" | |
9 | + android:layout_height="wrap_content" | |
10 | + android:inputType="numberDecimal" | |
11 | + android:ems="10" | |
12 | + android:id="@+id/montant" | |
13 | + android:layout_gravity="center_horizontal" | |
14 | + android:layout_marginTop="80dp" | |
15 | + android:editable="true" | |
16 | + android:elegantTextHeight="true" | |
17 | + android:enabled="true" | |
18 | + android:focusable="true" | |
19 | + android:focusableInTouchMode="true" | |
20 | + android:height="200dp" | |
21 | + android:maxHeight="500dp" | |
22 | + android:maxLength="10" | |
23 | + android:maxWidth="600dp" | |
24 | + android:minHeight="80dp" | |
25 | + android:numeric="decimal" | |
26 | + android:width="300dp" | |
27 | + android:hint="@string/montant" | |
28 | + android:textAlignment="center" /> | |
29 | + | |
30 | + <Button | |
31 | + android:layout_width="wrap_content" | |
32 | + android:layout_height="wrap_content" | |
33 | + android:text="@string/validate" | |
34 | + android:id="@+id/button2" | |
35 | + android:layout_alignParentTop="true" | |
36 | + android:layout_centerHorizontal="true" | |
37 | + android:layout_marginTop="80dp" | |
38 | + android:layout_gravity="center_horizontal" | |
39 | + android:minWidth="150dp" | |
40 | + android:minHeight="50dp" | |
41 | + android:textAlignment="center" | |
42 | + android:width="150dp" | |
43 | + android:elegantTextHeight="true" | |
44 | + android:enabled="true" | |
45 | + android:focusable="true" | |
46 | + android:focusableInTouchMode="true" /> | |
47 | +</LinearLayout> | |
0 | 48 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/layout/layout_vidange.xml
0 → 100644
... | ... | @@ -0,0 +1,13 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + android:orientation="vertical" android:layout_width="match_parent" | |
4 | + android:layout_height="match_parent"> | |
5 | + | |
6 | + <TextView | |
7 | + android:layout_width="wrap_content" | |
8 | + android:layout_height="wrap_content" | |
9 | + android:text="@string/vidange" | |
10 | + android:id="@+id/textView" | |
11 | + android:layout_gravity="center_horizontal" | |
12 | + android:layout_marginTop="50dp" /> | |
13 | +</LinearLayout> | |
0 | 14 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/layout/tab_fragment_1.xml
0 → 100644
... | ... | @@ -0,0 +1,9 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + android:layout_width="match_parent" | |
4 | + android:layout_height="match_parent" | |
5 | + android:orientation="vertical"> | |
6 | + | |
7 | + <include layout="@layout/layout_commande"></include> | |
8 | + | |
9 | +</RelativeLayout> | |
0 | 10 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/layout/tab_fragment_2.xml
0 → 100644
... | ... | @@ -0,0 +1,9 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + android:layout_width="match_parent" | |
4 | + android:layout_height="match_parent" | |
5 | + android:orientation="vertical"> | |
6 | + | |
7 | + <include layout="@layout/layout_rechargement"></include> | |
8 | + | |
9 | +</RelativeLayout> | |
0 | 10 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/layout/tab_fragment_3.xml
0 → 100644
... | ... | @@ -0,0 +1,9 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + android:layout_width="match_parent" | |
4 | + android:layout_height="match_parent" | |
5 | + android:orientation="vertical"> | |
6 | + | |
7 | + <include layout="@layout/layout_creation"></include> | |
8 | + | |
9 | +</RelativeLayout> | |
0 | 10 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/layout/tab_fragment_4.xml
0 → 100644
... | ... | @@ -0,0 +1,9 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + android:layout_width="match_parent" | |
4 | + android:layout_height="match_parent" | |
5 | + android:orientation="vertical"> | |
6 | + | |
7 | + <include layout="@layout/layout_vidange"></include> | |
8 | + | |
9 | +</RelativeLayout> | |
0 | 10 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/layout/tab_fragment_5.xml
0 → 100644
... | ... | @@ -0,0 +1,9 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + android:layout_width="match_parent" | |
4 | + android:layout_height="match_parent" | |
5 | + android:orientation="vertical"> | |
6 | + | |
7 | + <include layout="@layout/layout_connection"></include> | |
8 | + | |
9 | +</RelativeLayout> | |
0 | 10 | \ No newline at end of file | ... | ... |
PremiereActivite/app/src/main/res/menu/menu_menu.xml deleted
... | ... | @@ -1,10 +0,0 @@ |
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="com.example.florian.premiereactivite.Menu"> | |
5 | - <item | |
6 | - android:id="@+id/action_settings" | |
7 | - android:orderInCategory="100" | |
8 | - android:title="@string/action_settings" | |
9 | - app:showAsAction="never" /> | |
10 | -</menu> |
PremiereActivite/app/src/main/res/values/colors.xml
PremiereActivite/app/src/main/res/values/strings.xml
... | ... | @@ -3,4 +3,16 @@ |
3 | 3 | <string name="action_settings">Settings</string> |
4 | 4 | <string name="identifiant" /> |
5 | 5 | <string name="password" /> |
6 | + <string name="menu_search">Test1</string> | |
7 | + <string name="menu_refresh">Test2</string> | |
8 | + <string name="menu_about">Test4</string> | |
9 | + <string name="menu_settings">Test5</string> | |
10 | + <string name="menu_help">Test3</string> | |
11 | + <string name="validate">Valider</string> | |
12 | + <string name="quant">Quantité</string> | |
13 | + <string name="montant">Montant</string> | |
14 | + <string name="prix">Prix</string> | |
15 | + <string name="vidange">Vidange</string> | |
16 | + <string name="passCarte">Passez la carte</string> | |
17 | + | |
6 | 18 | </resources> | ... | ... |