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
5f7d129b
Commit
5f7d129b
authored
Apr 01, 2018
by
Sajal Narang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add share button in EventFragment, fix #85
parent
45d9e219
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
13 deletions
+43
-13
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/Constants.java
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/Constants.java
+0
-1
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/LoginActivity.java
.../main/java/in/ac/iitb/gymkhana/iitbapp/LoginActivity.java
+1
-2
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/ServiceGenerator.java
...ava/in/ac/iitb/gymkhana/iitbapp/api/ServiceGenerator.java
+1
-2
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
...a/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
+17
-2
app/src/main/res/layout/fragment_event.xml
app/src/main/res/layout/fragment_event.xml
+24
-6
No files found.
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/Constants.java
View file @
5f7d129b
...
...
@@ -15,7 +15,6 @@ public class Constants {
public
static
final
String
GCM_ID
=
"GcmId"
;
public
static
final
String
CURRENT_USER
=
"current_user"
;
public
static
final
String
SESSION_ID
=
"session_id"
;
public
static
final
int
STATUS_GOING
=
2
;
public
static
final
int
STATUS_INTERESTED
=
1
;
public
static
final
int
STATUS_NOT_GOING
=
0
;
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/LoginActivity.java
View file @
5f7d129b
...
...
@@ -42,8 +42,7 @@ import retrofit2.Response;
public
class
LoginActivity
extends
AppCompatActivity
{
private
static
final
String
TAG
=
"LoginActivity"
;
private
static
final
int
PLAY_SERVICES_RESOLUTION_REQUEST
=
9000
;
//TODO: Change this to production before launch
private
final
String
clientId
=
"vR1pU7wXWyve1rUkg0fMS6StL1Kr6paoSmRIiLXJ"
;
private
final
String
clientId
=
"u1eFlmRWUOY5Sh4yFeqeWD71OXR8M8PYc0xUK33D"
;
private
final
Uri
redirectUri
=
Uri
.
parse
(
"https://redirecturi"
);
private
final
Uri
mAuthEndpoint
=
Uri
.
parse
(
"http://gymkhana.iitb.ac.in/sso/oauth/authorize/"
);
private
final
Uri
mTokenEndpoint
=
Uri
.
parse
(
"http://gymkhana.iitb.ac.in/sso/oauth/token/"
);
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/ServiceGenerator.java
View file @
5f7d129b
...
...
@@ -6,8 +6,7 @@ import retrofit2.Retrofit;
import
retrofit2.converter.gson.GsonConverterFactory
;
public
class
ServiceGenerator
{
//TODO: Change BASE_URL once the server is hosted
private
static
final
String
BASE_URL
=
"https://temp-iitb.radialapps.com/api/"
;
private
static
final
String
BASE_URL
=
"https://instiapp.wncc-iitb.org/api/"
;
private
static
OkHttpClient
.
Builder
clientBuilder
=
new
OkHttpClient
.
Builder
();
private
static
Retrofit
.
Builder
retrofitBuilder
=
new
Retrofit
.
Builder
()
.
baseUrl
(
BASE_URL
)
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/EventFragment.java
View file @
5f7d129b
package
in.ac.iitb.gymkhana.iitbapp.fragment
;
import
android.content.Intent
;
import
android.os.Bundle
;
import
android.support.v4.app.Fragment
;
import
android.util.Log
;
...
...
@@ -8,6 +9,7 @@ import android.view.LayoutInflater;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.widget.Button
;
import
android.widget.ImageButton
;
import
android.widget.ImageView
;
import
android.widget.TextView
;
import
android.widget.Toast
;
...
...
@@ -38,6 +40,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
Button
goingButton
;
Button
interestedButton
;
Button
notGoingButton
;
ImageButton
shareEventButton
;
String
TAG
=
"EventFragment"
;
public
EventFragment
()
{
...
...
@@ -63,7 +66,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
inflateViews
(
event
);
}
private
void
inflateViews
(
Event
event
)
{
private
void
inflateViews
(
final
Event
event
)
{
ImageView
eventPicture
=
(
ImageView
)
getActivity
().
findViewById
(
R
.
id
.
event_picture_2
);
TextView
eventTitle
=
(
TextView
)
getActivity
().
findViewById
(
R
.
id
.
event_page_title
);
TextView
eventDate
=
(
TextView
)
getActivity
().
findViewById
(
R
.
id
.
event_page_date
);
...
...
@@ -73,6 +76,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
goingButton
=
getActivity
().
findViewById
(
R
.
id
.
going_button
);
interestedButton
=
getActivity
().
findViewById
(
R
.
id
.
interested_button
);
notGoingButton
=
getActivity
().
findViewById
(
R
.
id
.
not_going_button
);
shareEventButton
=
getActivity
().
findViewById
(
R
.
id
.
share_event_button
);
Picasso
.
with
(
getContext
()).
load
(
event
.
getEventImageURL
()).
into
(
eventPicture
);
eventTitle
.
setText
(
event
.
getEventName
());
...
...
@@ -93,6 +97,17 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
goingButton
.
setOnClickListener
(
this
);
interestedButton
.
setOnClickListener
(
this
);
notGoingButton
.
setOnClickListener
(
this
);
shareEventButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
String
shareUrl
=
"https://instiapp.wncc-iitb.org/event-details/"
+
event
.
getEventID
();
@Override
public
void
onClick
(
View
view
)
{
Intent
i
=
new
Intent
(
Intent
.
ACTION_SEND
);
i
.
setType
(
"text/plain"
);
i
.
putExtra
(
Intent
.
EXTRA_SUBJECT
,
"Sharing URL"
);
i
.
putExtra
(
Intent
.
EXTRA_TEXT
,
shareUrl
);
startActivity
(
Intent
.
createChooser
(
i
,
"Share URL"
));
}
});
}
@Override
...
...
@@ -118,7 +133,7 @@ public class EventFragment extends BaseFragment implements View.OnClickListener
@Override
public
void
onResponse
(
Call
<
Void
>
call
,
Response
<
Void
>
response
)
{
if
(
response
.
isSuccessful
())
{
//TODO: Set flag for details updated so as to not try again when connected
}
}
...
...
app/src/main/res/layout/fragment_event.xml
View file @
5f7d129b
...
...
@@ -29,20 +29,38 @@
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_marginBottom=
"12dp"
android:layout_marginStart=
"16dp"
android:layout_marginEnd=
"16dp"
android:layout_marginStart=
"16dp"
android:layout_marginTop=
"12dp"
android:layout_weight=
"3"
android:orientation=
"vertical"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"horizontal"
>
<TextView
android:id=
"@+id/event_page_title"
android:layout_width=
"match_parent
"
android:layout_width=
"0dp
"
android:layout_height=
"wrap_content"
android:layout_weight=
"10"
android:text=
"Event Title"
android:textColor=
"#fff"
android:textSize=
"28sp"
/>
<ImageButton
android:id=
"@+id/share_event_button"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center_vertical"
android:layout_weight=
"1"
android:background=
"?attr/selectableItemBackgroundBorderless"
android:contentDescription=
"Share Event"
android:src=
"@drawable/ic_menu_share"
android:tint=
"@color/colorWhite"
/>
</LinearLayout>
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
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