Skip to content
Snippets Groups Projects
Commit 36a1c4f1 authored by MAUGEZ Emeline's avatar MAUGEZ Emeline
Browse files

Ajout d'un cocktail "random cocktail"

parent 39172ca5
No related branches found
No related tags found
No related merge requests found
......@@ -48,10 +48,6 @@ public class LoginActivity extends Activity {
Intent i = new Intent(getApplicationContext(), ListCocktailsActivity.class);
startActivity(i);
}
else if(mRandomWheel.isChecked()){
Intent i = new Intent(getApplicationContext(), WheelActivity.class);
startActivity(i);
}
else if (enable){
Intent i = new Intent(getApplicationContext(), AdminActivity.class);
startActivity(i);
......@@ -75,17 +71,6 @@ public class LoginActivity extends Activity {
mMdp.setVisibility(View.VISIBLE);
}
});
mRandomWheel = findViewById(R.id.random_cocktail);
mRandomWheel.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
mMdp.setVisibility(View.GONE);
}
});
}
}
......@@ -10,6 +10,7 @@ import android.widget.Spinner;
import androidx.annotation.NonNull;
import com.example.robotise.control.WheelActivity;
import com.example.robotise.model.CocktailItem;
import com.example.robotise.model.IngredientItem;
import com.example.robotise.control.PopUpCocktail;
......@@ -66,6 +67,9 @@ public class CocktailsListView extends GridView {
// On créé une page avec la description, l'image, le nom et les ingrédients du cocktail
Intent intent = new Intent(getContext(), PopUpCocktail.class);
cocktailItem.activity = intent;
if (cocktailItem.id == -1){
cocktailItem.activity = new Intent(getContext(), WheelActivity.class);
}
intent.putExtra("ressource", cocktailItem.image);
intent.putExtra("nom", cocktailItem.name);
intent.putExtra("id", cocktailItem.id);
......
......@@ -75,6 +75,7 @@ public class Recettes {
}
}
cocktailsItems.add(new CocktailItem(-1, "Random Cocktail", cocktailDefaultImages.get(0), null, new ArrayList<>()));
}
......
......@@ -77,13 +77,6 @@
android:text="Administrateur"
android:textSize="20dp"/>
<RadioButton
android:id="@+id/random_cocktail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Random"
android:textSize="20dp"/>
</RadioGroup>
<EditText
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment