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

Quelques changements au niveau du style

parent fc57fddb
No related branches found
No related tags found
No related merge requests found
package com.example.robotise.control;
import android.app.Activity;
import android.app.ActivityOptions;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
......@@ -91,6 +92,12 @@ public class AdminActivity extends Activity {
}
});
}
public void startActivity(Intent i) {
ActivityOptions options =
ActivityOptions.makeSceneTransitionAnimation(this);
startActivity(i, options.toBundle());
}
}
......@@ -17,8 +17,6 @@ import java.util.ArrayList;
* Cette activité permet d'avoir plus de détail sur un cocktail spécifique et communique avec le raspberry
*/
public class AdminMajQuantityActivity extends Activity {
private Button mValider;
private Button majBD;
@Override
......@@ -33,7 +31,7 @@ public class AdminMajQuantityActivity extends Activity {
ListView lv =findViewById(R.id.majListViewQuantité);
majBD = findViewById(R.id.majBDQuantité);
Button majBD = findViewById(R.id.majBDQuantité);
majBD.setOnClickListener(new View.OnClickListener() {
@Override
......
......@@ -40,7 +40,7 @@ public class ListCocktailsActivity extends AppCompatActivity implements
Toolbar toolbar = binding.toolbar;
setSupportActionBar(toolbar);
CollapsingToolbarLayout toolBarLayout = binding.toolbarLayout;
toolBarLayout.setTitle(getTitle());
toolBarLayout.setTitle("Liste Cocktails");
......
......@@ -24,9 +24,9 @@ import java.util.ArrayList;
*/
public class PopUpCocktail extends Activity {
private Button mRetour;
//todo probleme affichage voir screen
// View name of the header image. Used for activity scene transitions
public static final String VIEW_NAME_HEADER_IMAGE = "detail:header:image";
public static final String VIEW_NAME_HEADER_NOM = "detail:header:button";
@Override
......@@ -49,6 +49,7 @@ public class PopUpCocktail extends Activity {
Button nom = findViewById(R.id.nomCocktail);
nom.setText(nomCocktail);
ViewCompat.setTransitionName(nom, VIEW_NAME_HEADER_NOM);
ListView lv =findViewById(R.id.listViewIngredients);
......
......@@ -2,7 +2,6 @@ package com.example.robotise.list;
import android.app.Activity;
import android.content.Context;
import android.util.Pair;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ArrayAdapter;
......@@ -20,6 +19,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
import androidx.core.app.ActivityOptionsCompat;
import androidx.core.util.Pair;
import com.example.robotise.R;
import com.example.robotise.control.PopUpCocktail;
......@@ -129,7 +129,8 @@ public class CocktailsArrayAdapter extends ArrayAdapter<CocktailItem> implements
// Now we provide a list of Pair items which contain the view we can transitioning
// from, and the name of the view it is transitioning to, in the launched activity
holder.cocktailImage, PopUpCocktail.VIEW_NAME_HEADER_IMAGE);
new Pair<>( holder.cocktailImage, PopUpCocktail.VIEW_NAME_HEADER_IMAGE),
new Pair<>(holder.cocktailName, PopUpCocktail.VIEW_NAME_HEADER_NOM));
// Now we can start the Activity, providing the activity options as a bundle
((Activity)getContext()).startActivity(currentCocktail.activity, activityOptions.toBundle());
......
......@@ -30,7 +30,7 @@
</style>
<style name="Theme.Robotise.NoActionBar">
<style name="Theme.Robotise.NoActionBar" parent="Theme.Robotise">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment