Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
android-app
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
procom2022-robotise
android-app
Commits
ed41372e
Commit
ed41372e
authored
2 years ago
by
MAUGEZ Emeline
Browse files
Options
Downloads
Patches
Plain Diff
Replace nettoyerMachine by supprimercocktail
parent
2a8d9b05
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/com/example/robotise/control/AdminActivity.java
+4
-4
4 additions, 4 deletions
...main/java/com/example/robotise/control/AdminActivity.java
app/src/main/res/layout/admin_activity.xml
+2
-2
2 additions, 2 deletions
app/src/main/res/layout/admin_activity.xml
with
6 additions
and
6 deletions
app/src/main/java/com/example/robotise/control/AdminActivity.java
+
4
−
4
View file @
ed41372e
...
...
@@ -19,7 +19,7 @@ import com.example.robotise.model.Recettes;
public
class
AdminActivity
extends
Activity
{
Button
mCommanderCocktail
;
Button
mAjouterCocktail
;
Button
m
NettoyerMachine
;
Button
m
SupprimerCocktail
;
Button
mMajMachine
;
Button
mMajQuantite
;
Button
mMajListIngredients
;
...
...
@@ -49,10 +49,10 @@ public class AdminActivity extends Activity {
});
// Pour l'instant envoie un message au raspberry : "Nettoye la machine"
m
NettoyerMachine
=
findViewById
(
R
.
id
.
admin_
nettoyer_machine
);
m
NettoyerMachine
.
setOnClickListener
(
new
View
.
OnClickListener
(){
m
SupprimerCocktail
=
findViewById
(
R
.
id
.
admin_
supprimer_cocktail
);
m
SupprimerCocktail
.
setOnClickListener
(
new
View
.
OnClickListener
(){
public
void
onClick
(
View
view
)
{
Toast
.
makeText
(
getApplicationContext
(),
"
Nettoyer machine
"
,
Toast
.
LENGTH_LONG
).
show
();
Toast
.
makeText
(
getApplicationContext
(),
"
Supprimer Cocktail
"
,
Toast
.
LENGTH_LONG
).
show
();
//DeviceControl dc = DeviceControl.getInstance();
//dc.listenToTXCharacteristic();
...
...
This diff is collapsed.
Click to expand it.
app/src/main/res/layout/admin_activity.xml
+
2
−
2
View file @
ed41372e
...
...
@@ -69,11 +69,11 @@
<com.google.android.material.button.MaterialButton
android:theme =
"@style/Widget.Material3.Button.ElevatedButton"
android:id=
"@+id/admin_
nettoyer_machine
"
android:id=
"@+id/admin_
supprimer_cocktail
"
android:layout_width=
"match_parent"
android:layout_marginHorizontal=
"20dp"
android:layout_height=
"wrap_content"
android:text=
"
Nettoyer machine
"
android:text=
"
Supprimer_cocktail
"
android:textAlignment=
"center"
/>
<com.google.android.material.button.MaterialButton
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment