Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
InstiApp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
RAHUL SHARMA
InstiApp
Commits
ad2d39a9
Commit
ad2d39a9
authored
Jun 02, 2018
by
Sajal Narang
Committed by
GitHub
Jun 02, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #109 from MayuBhattu/master, fix #91
Event Website button ready
parents
12781e40
dfe57452
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
38 additions
and
3 deletions
+38
-3
.idea/caches/build_file_checksums.ser
.idea/caches/build_file_checksums.ser
+0
-0
README.md
README.md
+0
-1
app/src/main/ic_web_event-web.png
app/src/main/ic_web_event-web.png
+0
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Event.java
...src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Event.java
+1
-1
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
...a/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
+15
-0
app/src/main/res/drawable/ic_language_black_24dp.xml
app/src/main/res/drawable/ic_language_black_24dp.xml
+9
-0
app/src/main/res/layout/fragment_event.xml
app/src/main/res/layout/fragment_event.xml
+12
-0
build.gradle
build.gradle
+1
-1
No files found.
.idea/caches/build_file_checksums.ser
View file @
ad2d39a9
No preview for this file type
README.md
View file @
ad2d39a9
...
@@ -10,7 +10,6 @@ The IITB App features the Placement Blog, Upcoming Events and general informatio
...
@@ -10,7 +10,6 @@ The IITB App features the Placement Blog, Upcoming Events and general informatio
*
Events Directory
*
Events Directory
*
Placement Blog
*
Placement Blog
*
Mess Menus
*
Mess Menus
*
Placement Blog
*
Internship Blog
*
Internship Blog
*
Inter Hostel GC rankings
*
Inter Hostel GC rankings
*
Academic Timetable
*
Academic Timetable
...
...
app/src/main/ic_web_event-web.png
0 → 100644
View file @
ad2d39a9
30.7 KB
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/data/Event.java
View file @
ad2d39a9
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
View file @
ad2d39a9
...
@@ -2,6 +2,7 @@ package in.ac.iitb.gymkhana.iitbapp.fragment;
...
@@ -2,6 +2,7 @@ package in.ac.iitb.gymkhana.iitbapp.fragment;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.FragmentManager
;
import
android.support.v4.app.FragmentManager
;
...
@@ -49,6 +50,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
...
@@ -49,6 +50,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
Button
interestedButton
;
Button
interestedButton
;
Button
notGoingButton
;
Button
notGoingButton
;
ImageButton
shareEventButton
;
ImageButton
shareEventButton
;
ImageButton
webEventButton
;
String
TAG
=
"EventFragment"
;
String
TAG
=
"EventFragment"
;
public
EventFragment
()
{
public
EventFragment
()
{
...
@@ -85,6 +87,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
...
@@ -85,6 +87,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
interestedButton
=
getActivity
().
findViewById
(
R
.
id
.
interested_button
);
interestedButton
=
getActivity
().
findViewById
(
R
.
id
.
interested_button
);
notGoingButton
=
getActivity
().
findViewById
(
R
.
id
.
not_going_button
);
notGoingButton
=
getActivity
().
findViewById
(
R
.
id
.
not_going_button
);
shareEventButton
=
getActivity
().
findViewById
(
R
.
id
.
share_event_button
);
shareEventButton
=
getActivity
().
findViewById
(
R
.
id
.
share_event_button
);
webEventButton
=
getActivity
().
findViewById
(
R
.
id
.
web_event_button
);
Picasso
.
with
(
getContext
()).
load
(
event
.
getEventImageURL
()).
into
(
eventPicture
);
Picasso
.
with
(
getContext
()).
load
(
event
.
getEventImageURL
()).
into
(
eventPicture
);
eventTitle
.
setText
(
event
.
getEventName
());
eventTitle
.
setText
(
event
.
getEventName
());
...
@@ -127,6 +130,18 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
...
@@ -127,6 +130,18 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
startActivity
(
Intent
.
createChooser
(
i
,
"Share URL"
));
startActivity
(
Intent
.
createChooser
(
i
,
"Share URL"
));
}
}
});
});
if
(
event
.
getEventWebsiteURL
()
!=
null
)
{
webEventButton
.
setVisibility
(
View
.
VISIBLE
);
}
webEventButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
String
eventwebURL
=
event
.
getEventWebsiteURL
();
@Override
public
void
onClick
(
View
view
)
{
Intent
browserIntent
=
new
Intent
(
Intent
.
ACTION_VIEW
,
Uri
.
parse
(
eventwebURL
));
startActivity
(
browserIntent
);
}
});
}
}
@Override
@Override
...
...
app/src/main/res/drawable/ic_language_black_24dp.xml
0 → 100644
View file @
ad2d39a9
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"24.0"
android:viewportHeight=
"24.0"
>
<path
android:fillColor=
"#FF000000"
android:pathData=
"M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM18.92,8h-2.95c-0.32,-1.25 -0.78,-2.45 -1.38,-3.56 1.84,0.63 3.37,1.91 4.33,3.56zM12,4.04c0.83,1.2 1.48,2.53 1.91,3.96h-3.82c0.43,-1.43 1.08,-2.76 1.91,-3.96zM4.26,14C4.1,13.36 4,12.69 4,12s0.1,-1.36 0.26,-2h3.38c-0.08,0.66 -0.14,1.32 -0.14,2 0,0.68 0.06,1.34 0.14,2L4.26,14zM5.08,16h2.95c0.32,1.25 0.78,2.45 1.38,3.56 -1.84,-0.63 -3.37,-1.9 -4.33,-3.56zM8.03,8L5.08,8c0.96,-1.66 2.49,-2.93 4.33,-3.56C8.81,5.55 8.35,6.75 8.03,8zM12,19.96c-0.83,-1.2 -1.48,-2.53 -1.91,-3.96h3.82c-0.43,1.43 -1.08,2.76 -1.91,3.96zM14.34,14L9.66,14c-0.09,-0.66 -0.16,-1.32 -0.16,-2 0,-0.68 0.07,-1.35 0.16,-2h4.68c0.09,0.65 0.16,1.32 0.16,2 0,0.68 -0.07,1.34 -0.16,2zM14.59,19.56c0.6,-1.11 1.06,-2.31 1.38,-3.56h2.95c-0.96,1.65 -2.49,2.93 -4.33,3.56zM16.36,14c0.08,-0.66 0.14,-1.32 0.14,-2 0,-0.68 -0.06,-1.34 -0.14,-2h3.38c0.16,0.64 0.26,1.31 0.26,2s-0.1,1.36 -0.26,2h-3.38z"
/>
</vector>
app/src/main/res/layout/fragment_event.xml
View file @
ad2d39a9
...
@@ -55,6 +55,18 @@
...
@@ -55,6 +55,18 @@
android:textSize=
"21sp"
android:textSize=
"21sp"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
/>
<ImageButton
android:id=
"@+id/web_event_button"
android:layout_width=
"10dp"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_weight=
"1"
android:background=
"?attr/selectableItemBackgroundBorderless"
android:contentDescription=
"Event Website"
android:src=
"@drawable/ic_language_black_24dp"
android:tint=
"@color/colorWhite"
android:visibility=
"invisible"
/>
<ImageButton
<ImageButton
android:id=
"@+id/share_event_button"
android:id=
"@+id/share_event_button"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
...
...
build.gradle
View file @
ad2d39a9
...
@@ -9,7 +9,7 @@ buildscript {
...
@@ -9,7 +9,7 @@ buildscript {
}
}
dependencies
{
dependencies
{
classpath
'com.android.tools.build:gradle:3.1.
0
'
classpath
'com.android.tools.build:gradle:3.1.
2
'
classpath
'com.google.gms:google-services:3.1.0'
classpath
'com.google.gms:google-services:3.1.0'
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment