Skip to content

Commit

Permalink
Reverted changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@VodopaDev
VodopaDev committed Nov 17, 2018
1 parent efe14b2 commit 96da01b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 77 deletions.
4 changes: 1 addition & 3 deletions app/src/main/java/ch/epfl/sweng/zuluzulu/MainActivity.java
View file
Expand Up @@ -56,7 +56,6 @@ public class MainActivity extends AppCompatActivity implements OnFragmentInterac
// Const used to send a Increment or Decrement message
private DrawerLayout drawerLayout;
private NavigationView navigationView;
private DynamicToolbar toolbar;

private SuperFragment current_fragment;
private Stack<SuperFragment> previous_fragments;
Expand Down Expand Up @@ -89,7 +88,6 @@ protected void onCreate(Bundle savedInstanceState) {

navigationView = initNavigationView();
initDrawerContent();
toolbar.switchToBaseLayout();

Intent i = getIntent();

Expand Down Expand Up @@ -142,7 +140,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
*/
private NavigationView initNavigationView() {
NavigationView navigationView = findViewById(R.id.nav_view);
toolbar = findViewById(R.id.toolbar);
Toolbar toolbar = findViewById(R.id.toolbar);

setSupportActionBar(toolbar);
ActionBar actionBar = getSupportActionBar();
Expand Down
77 changes: 3 additions & 74 deletions app/src/main/res/layout/toolbar.xml
View file
@@ -1,84 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<ch.epfl.sweng.zuluzulu.DynamicToolbar xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_height="wrap_content"
android:background="@color/colorPrimaryDark"
android:fitsSystemWindows="true"
android:minHeight="?attr/actionBarSize"
android:theme="@style/Base.ThemeOverlay.AppCompat.Dark.ActionBar">

<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="50dp">

<TextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:textColor="@color/day_disabled_background_color"
android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<android.support.constraint.ConstraintLayout
android:id="@+id/toolbar_event"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:orientation="horizontal"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

</android.support.constraint.ConstraintLayout>

<android.support.constraint.ConstraintLayout
android:id="@+id/toolbar_association"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:orientation="horizontal"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

<ImageButton
android:id="@+id/toolbar_follow_asso"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:background="@android:color/transparent"
android:scaleType="fitCenter"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/fav_off" />
</android.support.constraint.ConstraintLayout>

<android.support.constraint.ConstraintLayout
android:id="@+id/toolbar_base"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:orientation="horizontal"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">

</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>

</ch.epfl.sweng.zuluzulu.DynamicToolbar>
</android.support.v7.widget.Toolbar>

0 comments on commit 96da01b

Please sign in to comment.