-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changed interface. Floating button added. Few other changes
- Loading branch information
1 parent
83489c4
commit 8c029e0
Showing
17 changed files
with
51 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,86 +1,83 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
<android.support.design.widget.CoordinatorLayout 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:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
tools:context="com.example.android.nusevents.MainActivity" | ||
> | ||
|
||
<RelativeLayout | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
|
||
tools:layout_editor_absoluteY="0dp" | ||
tools:layout_editor_absoluteX="0dp"> | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
|
||
android:id="@+id/relativeLayout"> | ||
|
||
<ImageView | ||
android:id="@+id/nushome" | ||
android:layout_width="match_parent" | ||
android:layout_height="370dp" | ||
android:layout_weight="1" | ||
android:src="@drawable/homescreen" | ||
android:scaleType="centerCrop" | ||
android:layout_marginTop="50dp" | ||
/> | ||
|
||
<Button | ||
android:id="@+id/button" | ||
<ImageView | ||
android:id="@+id/nushome" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:text="CREATE AN EVENT" | ||
android:layout_centerHorizontal="true" | ||
android:layout_above="@+id/buttontwo" | ||
android:layout_marginTop="10dp" | ||
android:layout_height="370dp" | ||
|
||
android:src="@drawable/homescreen" | ||
android:scaleType="centerCrop" | ||
android:foregroundGravity="top" | ||
|
||
android:textSize="20sp" | ||
android:textStyle="bold" | ||
android:background="#ffffff" | ||
android:textColor="#000000" | ||
/> | ||
|
||
<Button | ||
android:id="@+id/buttontwo" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:text="VIEW EVENTS" | ||
android:layout_height="56dp" | ||
android:text="VIEW EVENTS @NUS" | ||
android:layout_centerHorizontal="true" | ||
android:background="#ffffff" | ||
android:layout_above="@+id/buttonthree" | ||
android:textSize="20sp" | ||
android:textStyle="bold" | ||
android:textColor="#000000" | ||
android:textColor="@color/colorPrimary" | ||
android:backgroundTint="@color/colorPrimaryDark" | ||
android:layout_below="@+id/nushome" | ||
/> | ||
|
||
<Button | ||
android:id="@+id/buttonthree" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:text="EVENTS INTERESTED IN" | ||
android:layout_alignParentBottom="true" | ||
android:layout_height="56dp" | ||
android:text="YOUR BOOKMARKED EVENTS" | ||
android:background="#ffffff" | ||
android:layout_below="@+id/button2" | ||
android:textSize="20sp" | ||
android:textStyle="bold" | ||
|
||
android:textColor="#000000" | ||
android:textColor="@color/colorPrimary" | ||
android:backgroundTint="@color/colorPrimaryDark" | ||
|
||
|
||
/> | ||
android:layout_below="@+id/buttontwo" | ||
android:layout_alignParentLeft="true" | ||
android:layout_alignParentStart="true" /> | ||
|
||
|
||
|
||
<android.support.v7.widget.Toolbar | ||
android:id="@+id/toolbar3" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:background="?attr/colorPrimary" | ||
android:minHeight="?attr/actionBarSize" | ||
android:theme="?attr/actionBarTheme" | ||
android:layout_centerHorizontal="true" /> | ||
|
||
|
||
</RelativeLayout> | ||
</android.support.constraint.ConstraintLayout> | ||
|
||
<android.support.design.widget.FloatingActionButton | ||
android:id="@+id/fab" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_alignParentEnd="true" | ||
android:layout_alignParentRight="true" | ||
android:layout_gravity="center_vertical|left" | ||
android:contentDescription="Add New Event" | ||
android:elevation="20dp" | ||
android:src="@android:drawable/ic_input_add" | ||
app:fabSize="normal" | ||
app:layout_anchor="@+id/relativeLayout" | ||
app:layout_anchorGravity="bottom|right" | ||
android:layout_marginBottom="8dp" | ||
android:layout_marginRight="8dp" | ||
android:clickable="true" | ||
|
||
|
||
/> | ||
</android.support.design.widget.CoordinatorLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<resources> | ||
<color name="colorPrimary">#3F51B5</color> | ||
<color name="colorPrimary">#FF5722</color> | ||
<color name="colorPrimaryDark">#303F9F</color> | ||
<color name="colorAccent">#FF4081</color> | ||
<color name="colorAccent">#FF3D00</color> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
<resources> | ||
<string name="app_name">NusEvents</string> | ||
<string name="app_name">NUSEvents</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters