Commit 031bf900 authored by charley.punshon's avatar charley.punshon

Navigation elements added.

parent 93c291f6
This diff is collapsed.
...@@ -119,6 +119,11 @@ public class build_playlist extends AppCompatActivity { ...@@ -119,6 +119,11 @@ public class build_playlist extends AppCompatActivity {
startActivity(intent); startActivity(intent);
} }
public void homeScreenViewOnClick(View view) {
Intent intent = new Intent(this, homeScreen.class);
startActivity(intent);
}
} }
package com.example.soulfood_assignment2; package com.example.soulfood_assignment2;
import android.content.Intent;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import android.widget.ListView; import android.widget.ListView;
import static com.example.soulfood_assignment2.databaseInterface.Cuisine.american; import static com.example.soulfood_assignment2.databaseInterface.Cuisine.american;
...@@ -92,4 +94,9 @@ public class playlistView extends AppCompatActivity { ...@@ -92,4 +94,9 @@ public class playlistView extends AppCompatActivity {
thaiAsyncTask.execute(); thaiAsyncTask.execute();
playlistView = thaiAsyncTask.listView; playlistView = thaiAsyncTask.listView;
} }
public void newSearchViewOnClick(View view) {
Intent intent = new Intent(this, build_playlist.class);
startActivity(intent);
}
} }
...@@ -119,5 +119,10 @@ public class searchScreen extends AppCompatActivity { ...@@ -119,5 +119,10 @@ public class searchScreen extends AppCompatActivity {
} }
public void homeScreenViewOnClick(View view) {
Intent intent = new Intent(this, homeScreen.class);
startActivity(intent);
}
} }
\ No newline at end of file
...@@ -56,6 +56,7 @@ ...@@ -56,6 +56,7 @@
android:layout_marginEnd="100dp" android:layout_marginEnd="100dp"
android:layout_marginRight="100dp" android:layout_marginRight="100dp"
android:layout_marginBottom="49dp" android:layout_marginBottom="49dp"
android:onClick="newSearchViewOnClick"
android:text="New Search" android:text="New Search"
app:layout_constraintBottom_toTopOf="@+id/playlistView" app:layout_constraintBottom_toTopOf="@+id/playlistView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
......
...@@ -6,6 +6,21 @@ ...@@ -6,6 +6,21 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".searchScreen"> tools:context=".searchScreen">
<Button
android:id="@+id/button2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="36dp"
android:layout_marginLeft="36dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="21dp"
android:onClick="homeScreenViewOnClick"
android:text="Back"
app:layout_constraintBottom_toTopOf="@+id/textView4"
app:layout_constraintEnd_toStartOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ListView <ListView
android:id="@+id/tagListView" android:id="@+id/tagListView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -29,8 +44,8 @@ ...@@ -29,8 +44,8 @@
android:typeface="sans" android:typeface="sans"
app:fontFamily="sans-serif" app:fontFamily="sans-serif"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintHorizontal_bias="0.207"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toEndOf="@+id/button2"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<SearchView <SearchView
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:id="@+id/songScreen" android:id="@+id/songScreen"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="500dp" android:layout_height="500dp"
android:layout_marginTop="52dp" android:layout_marginTop="36dp"
android:layout_marginBottom="71dp" android:layout_marginBottom="71dp"
android:visibility="visible" android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -23,11 +23,13 @@ ...@@ -23,11 +23,13 @@
android:layout_width="128dp" android:layout_width="128dp"
android:layout_height="41dp" android:layout_height="41dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginBottom="21dp"
android:text="SoulFood" android:text="SoulFood"
android:textColor="#000000" android:textColor="#000000"
android:textSize="30sp" android:textSize="30sp"
android:typeface="sans" android:typeface="sans"
app:fontFamily="sans-serif" app:fontFamily="sans-serif"
app:layout_constraintBottom_toTopOf="@+id/tagTextView"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
...@@ -36,11 +38,13 @@ ...@@ -36,11 +38,13 @@
android:id="@+id/tagTextView" android:id="@+id/tagTextView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="75dp" android:layout_marginTop="25dp"
android:layout_marginBottom="41dp"
android:text='Songs with "" Tag' android:text='Songs with "" Tag'
android:textColor="#000000" android:textColor="#000000"
android:textSize="24sp" android:textSize="24sp"
app:layout_constraintBottom_toTopOf="@+id/songScreen"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/textView5" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
\ No newline at end of file
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginEnd="150dp"
android:layout_marginRight="150dp"
android:layout_marginBottom="50dp" android:layout_marginBottom="50dp"
android:text="SoulFood" android:text="SoulFood"
android:textColor="#000000" android:textColor="#000000"
...@@ -51,8 +53,7 @@ ...@@ -51,8 +53,7 @@
app:fontFamily="sans-serif" app:fontFamily="sans-serif"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintStart_toEndOf="@+id/button"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" /> app:layout_constraintVertical_bias="0.0" />
...@@ -143,4 +144,21 @@ ...@@ -143,4 +144,21 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/cuisine_dropdown" /> app:layout_constraintTop_toBottomOf="@+id/cuisine_dropdown" />
<Button
android:id="@+id/button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="71dp"
android:layout_marginRight="71dp"
android:layout_marginBottom="21dp"
android:onClick="homeScreenViewOnClick"
android:text="Back"
app:layout_constraintBottom_toTopOf="@+id/textView4"
app:layout_constraintEnd_toStartOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment