Skip to content

Commit

Permalink
🎨 Minor UI Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
adithya321 committed Mar 6, 2017
1 parent 9a74465 commit 97c6b9f
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 1 deletion.
26 changes: 26 additions & 0 deletions app/src/main/assets/events.json
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,32 @@
"info": "",
"contact1": "Krishna:9791140709",
"contact2": ""
},
{
"id": 57,
"name": "Choreo Night",
"startTime": "10-03-2017 17:00:00",
"endTime": "10-03-2017 19:00:00",
"location": "Main Stage",
"type": "Special",
"description": "It is that time of the year again when the best of dance teams share a stage, break a sweat and compete for that one elusive moment of glory. It's time for you to awe us with your effortless moves, panache and inimitable choreography that gets the audience going wild for an encore. So what are you waiting for? Strap on your sneakers, bring in your boomboxes and show us that you’ve got what it takes to be crowned the best team in town.",
"rules": "*Prelims video should be sent to [email protected]*\n\nA minimum of eight and a maximum of twenty five students ONSTAGE (+2 for off stage help) per team.\n\nCollege IDs is a must for all the participants.\n\nThe teams have to strictly do a WESTERN performance.\n\nFire, water, powder or any kind of other harmful props are prohibited.\n\nA maximum of 7 minutes will be allotted to each team.\n\nThe decision of the judges will be final.\n\nAny violation of the above rules will result in disqualification.",
"info": "",
"contact1": "Arjun S M:8754008373",
"contact2": ""
},
{
"id": 58,
"name": "Pro Show",
"startTime": "11-03-2017 17:00:00",
"endTime": "11-03-2017 19:00:00",
"location": "Main Stage",
"type": "Special",
"description": "The final night of Instincts is always to end the three day cultural extravaganza with a bang! Some of the leading singers from the cine industry are all set to mesmerize the crowd with their amazing voices and addictive music. Watch them perform live as they put together their best musical acts at Instincts 2017!",
"rules": "The playback singers from the cine industry are the ones leading the last night of Instincts – The ProShow! This much awaited event is set to enthral the crowd with some of the finest singers from Kollywood.\n\nNikhita Gandhi, the voice of ‘Ladio’ from the movie ‘I’ will be singing some of her popular hits.\n\nNext on the list is Sathya Prakash, who has made it big in the industry after winning runner up at Airtel Super Singer.\n\n‘Raasali’ is still ringing in our ears and now you have a chance to hear is live!\n\nWe there is still some more, Pradeep Kumar with some of his songs such as ‘Aagaayam Theepidicha’ and ‘Kadhal Kanave’ is one of the latest singing sensations in Kollywood who will be performing as part of the Pro Show.",
"info": "",
"contact1": "Kameshwar:8754934347",
"contact2": "Sai Veerya:9962780637"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {

TabLayout tabLayout = (TabLayout) findViewById(R.id.tabs);
tabLayout.setupWithViewPager(mViewPager);
tabLayout.getTabAt(1).select();
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/activity_hospitality.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme.PopupOverlay">
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="Hospitality">

</android.support.v7.widget.Toolbar>

Expand Down
13 changes: 13 additions & 0 deletions app/src/main/res/layout/item_event.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,13 @@
android:textStyle="bold"
tools:text="09:00" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="to"
android:textSize="12sp" />

<TextView
android:id="@+id/end_time"
android:layout_width="match_parent"
Expand Down Expand Up @@ -82,6 +89,12 @@
android:textStyle="bold"
tools:text="Title" />

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="12sp" />

<TextView
android:id="@+id/location"
android:layout_width="match_parent"
Expand Down

0 comments on commit 97c6b9f

Please sign in to comment.