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
6d56cdf6
Commit
6d56cdf6
authored
Mar 17, 2018
by
Sajal Narang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement Image Upload API
parent
98899d23
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
179 additions
and
16 deletions
+179
-16
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/RetrofitInterface.java
...va/in/ac/iitb/gymkhana/iitbapp/api/RetrofitInterface.java
+6
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/ImageUploadRequest.java
...c/iitb/gymkhana/iitbapp/api/model/ImageUploadRequest.java
+20
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/ImageUploadResponse.java
.../iitb/gymkhana/iitbapp/api/model/ImageUploadResponse.java
+31
-0
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/AddEventFragment.java
...n/ac/iitb/gymkhana/iitbapp/fragment/AddEventFragment.java
+121
-16
No files found.
app/src/main/AndroidManifest.xml
View file @
6d56cdf6
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
<uses-permission
android:name=
"android.permission.ACCESS_FINE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.ACCESS_FINE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.ACCESS_COARSE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.ACCESS_COARSE_LOCATION"
/>
<uses-permission
android:name=
"android.permission.WAKE_LOCK"
/>
<uses-permission
android:name=
"android.permission.WAKE_LOCK"
/>
<uses-permission
android:name=
"android.permission.READ_EXTERNAL_STORAGE"
/>
<application
<application
android:allowBackup=
"true"
android:allowBackup=
"true"
...
...
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/RetrofitInterface.java
View file @
6d56cdf6
...
@@ -2,6 +2,8 @@ package in.ac.iitb.gymkhana.iitbapp.api;
...
@@ -2,6 +2,8 @@ package in.ac.iitb.gymkhana.iitbapp.api;
import
in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateRequest
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateRequest
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateResponse
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateResponse
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.ImageUploadRequest
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.ImageUploadResponse
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.LoginRequest
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.LoginRequest
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.LoginResponse
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.LoginResponse
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.NewsFeedResponse
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.NewsFeedResponse
;
...
@@ -12,6 +14,7 @@ import retrofit2.http.Body;
...
@@ -12,6 +14,7 @@ import retrofit2.http.Body;
import
retrofit2.http.GET
;
import
retrofit2.http.GET
;
import
retrofit2.http.POST
;
import
retrofit2.http.POST
;
import
retrofit2.http.Path
;
import
retrofit2.http.Path
;
import
retrofit2.http.Query
;
public
interface
RetrofitInterface
{
public
interface
RetrofitInterface
{
@POST
(
"login/"
)
@POST
(
"login/"
)
...
@@ -25,4 +28,7 @@ public interface RetrofitInterface {
...
@@ -25,4 +28,7 @@ public interface RetrofitInterface {
@POST
(
"getNotifications/"
)
@POST
(
"getNotifications/"
)
Call
<
NotificationsResponse
>
getNotifications
(
@Body
NotificationsRequest
notificationsRequest
);
Call
<
NotificationsResponse
>
getNotifications
(
@Body
NotificationsRequest
notificationsRequest
);
@POST
(
"upload"
)
Call
<
ImageUploadResponse
>
uploadImage
(
@Body
ImageUploadRequest
imageUploadRequest
);
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/ImageUploadRequest.java
0 → 100644
View file @
6d56cdf6
package
in.ac.iitb.gymkhana.iitbapp.api.model
;
import
com.google.gson.annotations.SerializedName
;
public
class
ImageUploadRequest
{
@SerializedName
(
"picture"
)
private
String
base64Image
;
public
ImageUploadRequest
(
String
base64Image
)
{
this
.
base64Image
=
base64Image
;
}
public
String
getBase64Image
()
{
return
base64Image
;
}
public
void
setBase64Image
(
String
base64Image
)
{
this
.
base64Image
=
base64Image
;
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/api/model/ImageUploadResponse.java
0 → 100644
View file @
6d56cdf6
package
in.ac.iitb.gymkhana.iitbapp.api.model
;
import
com.google.gson.annotations.SerializedName
;
public
class
ImageUploadResponse
{
@SerializedName
(
"id"
)
private
String
pictureID
;
@SerializedName
(
"picture"
)
private
String
pictureURL
;
public
ImageUploadResponse
(
String
pictureID
,
String
pictureURL
)
{
this
.
pictureID
=
pictureID
;
this
.
pictureURL
=
pictureURL
;
}
public
String
getPictureID
()
{
return
pictureID
;
}
public
void
setPictureID
(
String
pictureID
)
{
this
.
pictureID
=
pictureID
;
}
public
String
getPictureURL
()
{
return
pictureURL
;
}
public
void
setPictureURL
(
String
pictureURL
)
{
this
.
pictureURL
=
pictureURL
;
}
}
app/src/main/java/in/ac/iitb/gymkhana/iitbapp/fragment/AddEventFragment.java
View file @
6d56cdf6
package
in.ac.iitb.gymkhana.iitbapp.fragment
;
package
in.ac.iitb.gymkhana.iitbapp.fragment
;
import
android.app.DatePickerDialog
;
import
android.app.DatePickerDialog
;
import
android.app.ProgressDialog
;
import
android.app.TimePickerDialog
;
import
android.app.TimePickerDialog
;
import
android.media.Image
;
import
android.content.Intent
;
import
android.database.Cursor
;
import
android.graphics.Bitmap
;
import
android.graphics.BitmapFactory
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.provider.MediaStore
;
import
android.support.v4.app.Fragment
;
import
android.support.v4.app.Fragment
;
import
android.support.v7.widget.ListPopupWindow
;
import
android.util.Base64
;
import
android.util.Log
;
import
android.view.LayoutInflater
;
import
android.view.LayoutInflater
;
import
android.view.View
;
import
android.view.View
;
import
android.view.ViewGroup
;
import
android.view.ViewGroup
;
...
@@ -16,15 +23,14 @@ import android.widget.EditText;
...
@@ -16,15 +23,14 @@ import android.widget.EditText;
import
android.widget.ImageButton
;
import
android.widget.ImageButton
;
import
android.widget.ImageView
;
import
android.widget.ImageView
;
import
android.widget.RelativeLayout
;
import
android.widget.RelativeLayout
;
import
android.widget.Spinner
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
android.widget.TimePicker
;
import
android.widget.TimePicker
;
import
android.widget.Toast
;
import
android.widget.Toast
;
import
java.io.ByteArrayOutputStream
;
import
java.sql.Timestamp
;
import
java.sql.Timestamp
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Calendar
;
import
java.util.Calendar
;
import
java.util.List
;
import
butterknife.BindView
;
import
butterknife.BindView
;
import
butterknife.ButterKnife
;
import
butterknife.ButterKnife
;
...
@@ -33,15 +39,20 @@ import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
...
@@ -33,15 +39,20 @@ import in.ac.iitb.gymkhana.iitbapp.api.RetrofitInterface;
import
in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator
;
import
in.ac.iitb.gymkhana.iitbapp.api.ServiceGenerator
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateRequest
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateRequest
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateResponse
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.EventCreateResponse
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.ImageUploadRequest
;
import
in.ac.iitb.gymkhana.iitbapp.api.model.ImageUploadResponse
;
import
retrofit2.Call
;
import
retrofit2.Call
;
import
retrofit2.Callback
;
import
retrofit2.Callback
;
import
retrofit2.Response
;
import
retrofit2.Response
;
import
static
android
.
app
.
Activity
.
RESULT_OK
;
import
static
android
.
content
.
ContentValues
.
TAG
;
public
class
AddEventFragment
extends
Fragment
{
public
class
AddEventFragment
extends
Fragment
{
private
static
final
int
RESULT_LOAD_IMAGE
=
1
;
@BindView
(
R
.
id
.
button_createEvent
)
@BindView
(
R
.
id
.
button_createEvent
)
Button
createEvent
;
Button
createEvent
;
@BindView
(
R
.
id
.
tv_start
)
@BindView
(
R
.
id
.
tv_start
)
TextView
start
;
TextView
start
;
@BindView
(
R
.
id
.
et_eventName
)
@BindView
(
R
.
id
.
et_eventName
)
...
@@ -68,11 +79,14 @@ public class AddEventFragment extends Fragment {
...
@@ -68,11 +79,14 @@ public class AddEventFragment extends Fragment {
@BindView
(
R
.
id
.
map_location
)
@BindView
(
R
.
id
.
map_location
)
EditText
et_mapLocation
;
EditText
et_mapLocation
;
@BindView
(
R
.
id
.
open
)
@BindView
(
R
.
id
.
open
)
ImageView
open
;
ImageView
open
;
@BindView
(
R
.
id
.
close
)
@BindView
(
R
.
id
.
close
)
ImageView
close
;
ImageView
close
;
ImageView
eventPictureImageView
;
int
publicStatus
;
int
publicStatus
;
View
view
;
View
view
;
String
base64Image
;
ProgressDialog
progressDialog
;
public
AddEventFragment
()
{
public
AddEventFragment
()
{
...
@@ -88,6 +102,9 @@ public class AddEventFragment extends Fragment {
...
@@ -88,6 +102,9 @@ public class AddEventFragment extends Fragment {
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_add_event
,
container
,
false
);
view
=
inflater
.
inflate
(
R
.
layout
.
fragment_add_event
,
container
,
false
);
ButterKnife
.
bind
(
this
,
view
);
ButterKnife
.
bind
(
this
,
view
);
eventPictureImageView
=
view
.
findViewById
(
R
.
id
.
ib_eventImage
);
progressDialog
=
new
ProgressDialog
(
getContext
());
cb_permission
.
setVisibility
(
View
.
GONE
);
cb_permission
.
setVisibility
(
View
.
GONE
);
cb_public
.
setVisibility
(
View
.
GONE
);
cb_public
.
setVisibility
(
View
.
GONE
);
et_mapLocation
.
setVisibility
(
View
.
GONE
);
et_mapLocation
.
setVisibility
(
View
.
GONE
);
...
@@ -195,18 +212,17 @@ public class AddEventFragment extends Fragment {
...
@@ -195,18 +212,17 @@ public class AddEventFragment extends Fragment {
imageButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
imageButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
Toast
.
makeText
(
getContext
(),
"Add Image"
,
Toast
.
LENGTH_SHORT
).
show
(
);
Intent
i
=
new
Intent
(
Intent
.
ACTION_PICK
,
android
.
provider
.
MediaStore
.
Images
.
Media
.
EXTERNAL_CONTENT_URI
);
//TODO (1) upload image to server
startActivityForResult
(
i
,
RESULT_LOAD_IMAGE
);
}
}
});
});
createEvent
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
createEvent
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
progressDialog
.
setIndeterminate
(
true
);
Toast
.
makeText
(
getContext
(),
"Add Event"
,
Toast
.
LENGTH_SHORT
).
show
();
progressDialog
.
setCancelable
(
false
);
//TODO (2) save event
progressDialog
.
show
();
addEvent
();
sendImage
();
}
}
});
});
...
@@ -214,20 +230,109 @@ public class AddEventFragment extends Fragment {
...
@@ -214,20 +230,109 @@ public class AddEventFragment extends Fragment {
return
view
;
return
view
;
}
}
public
void
addEvent
()
{
private
void
sendImage
()
{
EventCreateRequest
eventCreateRequest
=
new
EventCreateRequest
(
eventName
.
getText
().
toString
(),
details
.
getText
().
toString
(),
"http://resources.wncc-iitb.org/logo_banner.png"
,
timestamp_start
.
toString
(),
timestamp_end
.
toString
(),
false
,
Arrays
.
asList
(
new
String
[]{
venue
.
getText
().
toString
()}),
Arrays
.
asList
(
new
String
[]{
"bde82d5e-f379-4b8a-ae38-a9f03e4f1c4a"
}));
progressDialog
.
setMessage
(
"Uploading Image"
);
ImageUploadRequest
imageUploadRequest
=
new
ImageUploadRequest
(
base64Image
);
RetrofitInterface
retrofitInterface
=
ServiceGenerator
.
createService
(
RetrofitInterface
.
class
);
retrofitInterface
.
uploadImage
(
imageUploadRequest
).
enqueue
(
new
Callback
<
ImageUploadResponse
>()
{
@Override
public
void
onResponse
(
Call
<
ImageUploadResponse
>
call
,
Response
<
ImageUploadResponse
>
response
)
{
if
(
response
.
isSuccessful
())
{
ImageUploadResponse
imageUploadResponse
=
response
.
body
();
String
imageURL
=
imageUploadResponse
.
getPictureURL
();
addEvent
(
imageURL
);
}
}
@Override
public
void
onFailure
(
Call
<
ImageUploadResponse
>
call
,
Throwable
t
)
{
progressDialog
.
dismiss
();
}
});
}
public
void
addEvent
(
String
eventImageURL
)
{
progressDialog
.
setMessage
(
"Creating Event"
);
EventCreateRequest
eventCreateRequest
=
new
EventCreateRequest
(
eventName
.
getText
().
toString
(),
details
.
getText
().
toString
(),
eventImageURL
,
timestamp_start
.
toString
(),
timestamp_end
.
toString
(),
false
,
Arrays
.
asList
(
new
String
[]{
venue
.
getText
().
toString
()}),
Arrays
.
asList
(
new
String
[]{
"bde82d5e-f379-4b8a-ae38-a9f03e4f1c4a"
}));
RetrofitInterface
retrofitInterface
=
ServiceGenerator
.
createService
(
RetrofitInterface
.
class
);
RetrofitInterface
retrofitInterface
=
ServiceGenerator
.
createService
(
RetrofitInterface
.
class
);
retrofitInterface
.
createEvent
(
eventCreateRequest
).
enqueue
(
new
Callback
<
EventCreateResponse
>()
{
retrofitInterface
.
createEvent
(
eventCreateRequest
).
enqueue
(
new
Callback
<
EventCreateResponse
>()
{
@Override
@Override
public
void
onResponse
(
Call
<
EventCreateResponse
>
call
,
Response
<
EventCreateResponse
>
response
)
{
public
void
onResponse
(
Call
<
EventCreateResponse
>
call
,
Response
<
EventCreateResponse
>
response
)
{
Toast
.
makeText
(
getContext
(),
"Event Created"
,
Toast
.
LENGTH_SHORT
).
show
();
Toast
.
makeText
(
getContext
(),
"Event Created"
,
Toast
.
LENGTH_SHORT
).
show
();
progressDialog
.
dismiss
();
}
}
@Override
@Override
public
void
onFailure
(
Call
<
EventCreateResponse
>
call
,
Throwable
t
)
{
public
void
onFailure
(
Call
<
EventCreateResponse
>
call
,
Throwable
t
)
{
Toast
.
makeText
(
getContext
(),
"Event Creation Failed"
,
Toast
.
LENGTH_SHORT
).
show
();
Toast
.
makeText
(
getContext
(),
"Event Creation Failed"
,
Toast
.
LENGTH_SHORT
).
show
();
progressDialog
.
dismiss
();
}
}
});
});
}
}
public
static
String
convertImageToString
(
Bitmap
imageBitmap
)
{
ByteArrayOutputStream
stream
=
new
ByteArrayOutputStream
();
if
(
imageBitmap
!=
null
)
{
imageBitmap
.
compress
(
Bitmap
.
CompressFormat
.
JPEG
,
60
,
stream
);
byte
[]
byteArray
=
stream
.
toByteArray
();
return
Base64
.
encodeToString
(
byteArray
,
Base64
.
DEFAULT
);
}
else
{
return
null
;
}
}
@Override
public
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
if
(
requestCode
==
RESULT_LOAD_IMAGE
&&
resultCode
==
RESULT_OK
&&
null
!=
data
)
{
Uri
selectedImage
=
data
.
getData
();
String
[]
filePathColumn
=
{
MediaStore
.
Images
.
Media
.
DATA
};
Cursor
cursor
=
getActivity
().
getContentResolver
().
query
(
selectedImage
,
filePathColumn
,
null
,
null
,
null
);
cursor
.
moveToFirst
();
int
columnIndex
=
cursor
.
getColumnIndex
(
filePathColumn
[
0
]);
String
picturePath
=
cursor
.
getString
(
columnIndex
);
cursor
.
close
();
eventPictureImageView
.
setImageBitmap
(
getScaledBitmap
(
picturePath
,
imageButton
.
getWidth
(),
imageButton
.
getHeight
()));
eventPictureImageView
.
setScaleType
(
ImageView
.
ScaleType
.
CENTER_CROP
);
base64Image
=
convertImageToString
(
getScaledBitmap
(
picturePath
,
800
,
800
));
Log
.
d
(
TAG
,
"onActivityResult: "
+
base64Image
);
}
}
private
Bitmap
getScaledBitmap
(
String
picturePath
,
int
width
,
int
height
)
{
BitmapFactory
.
Options
sizeOptions
=
new
BitmapFactory
.
Options
();
sizeOptions
.
inJustDecodeBounds
=
true
;
BitmapFactory
.
decodeFile
(
picturePath
,
sizeOptions
);
int
inSampleSize
=
calculateInSampleSize
(
sizeOptions
,
width
,
height
);
sizeOptions
.
inJustDecodeBounds
=
false
;
sizeOptions
.
inSampleSize
=
inSampleSize
;
return
BitmapFactory
.
decodeFile
(
picturePath
,
sizeOptions
);
}
private
int
calculateInSampleSize
(
BitmapFactory
.
Options
options
,
int
reqWidth
,
int
reqHeight
)
{
// Raw height and width of image
final
int
height
=
options
.
outHeight
;
final
int
width
=
options
.
outWidth
;
int
inSampleSize
=
1
;
if
(
height
>
reqHeight
||
width
>
reqWidth
)
{
// Calculate ratios of height and width to requested height and
// width
final
int
heightRatio
=
Math
.
round
((
float
)
height
/
(
float
)
reqHeight
);
final
int
widthRatio
=
Math
.
round
((
float
)
width
/
(
float
)
reqWidth
);
// Choose the smallest ratio as inSampleSize value, this will
// guarantee
// a final image with both dimensions larger than or equal to the
// requested height and width.
inSampleSize
=
heightRatio
<
widthRatio
?
heightRatio
:
widthRatio
;
}
return
inSampleSize
;
}
}
}
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