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
a64b37ec
Commit
a64b37ec
authored
Oct 11, 2018
by
Preetam Ozarde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated Minor Issues
parent
143b9855
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
59 additions
and
76 deletions
+59
-76
app/src/main/java/app/insti/adapter/CommentsAdapter.java
app/src/main/java/app/insti/adapter/CommentsAdapter.java
+8
-2
app/src/main/java/app/insti/adapter/ComplaintDetailsPagerAdapter.java
.../java/app/insti/adapter/ComplaintDetailsPagerAdapter.java
+2
-2
app/src/main/java/app/insti/adapter/ComplaintFragmentViewPagerAdapter.java
.../app/insti/adapter/ComplaintFragmentViewPagerAdapter.java
+1
-1
app/src/main/java/app/insti/adapter/ImageViewPagerAdapter.java
...rc/main/java/app/insti/adapter/ImageViewPagerAdapter.java
+1
-1
app/src/main/java/app/insti/adapter/UpVotesAdapter.java
app/src/main/java/app/insti/adapter/UpVotesAdapter.java
+5
-5
app/src/main/java/app/insti/api/LocationAPIUtils.java
app/src/main/java/app/insti/api/LocationAPIUtils.java
+0
-3
app/src/main/java/app/insti/api/model/Venter.java
app/src/main/java/app/insti/api/model/Venter.java
+7
-13
app/src/main/java/app/insti/fragment/ComplaintDetailsFragment.java
...ain/java/app/insti/fragment/ComplaintDetailsFragment.java
+3
-5
app/src/main/java/app/insti/fragment/ComplaintsFragment.java
app/src/main/java/app/insti/fragment/ComplaintsFragment.java
+7
-11
app/src/main/java/app/insti/fragment/ComplaintsHomeFragment.java
.../main/java/app/insti/fragment/ComplaintsHomeFragment.java
+4
-4
app/src/main/java/app/insti/fragment/ComplaintsMeFragment.java
...rc/main/java/app/insti/fragment/ComplaintsMeFragment.java
+1
-1
app/src/main/java/app/insti/fragment/FileComplaintFragment.java
...c/main/java/app/insti/fragment/FileComplaintFragment.java
+13
-18
app/src/main/java/app/insti/fragment/ImageFragment.java
app/src/main/java/app/insti/fragment/ImageFragment.java
+1
-1
app/src/main/java/app/insti/fragment/RelevantComplaintsFragment.java
...n/java/app/insti/fragment/RelevantComplaintsFragment.java
+6
-9
No files found.
app/src/main/java/app/insti/adapter/CommentsAdapter.java
View file @
a64b37ec
...
@@ -43,8 +43,8 @@ public class CommentsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
...
@@ -43,8 +43,8 @@ public class CommentsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
private
Context
context
;
private
Context
context
;
private
LayoutInflater
inflater
;
private
LayoutInflater
inflater
;
private
String
sessionId
,
userId
;
private
String
sessionId
,
userId
;
Activity
activity
;
private
Activity
activity
;
TextView
textViewCommentLabel
;
private
TextView
textViewCommentLabel
;
private
Fragment
fragment
;
private
Fragment
fragment
;
private
List
<
Venter
.
Comment
>
commentList
=
new
ArrayList
<>();
private
List
<
Venter
.
Comment
>
commentList
=
new
ArrayList
<>();
...
@@ -136,6 +136,12 @@ public class CommentsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
...
@@ -136,6 +136,12 @@ public class CommentsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
}
}
});
});
break
;
break
;
default
:
clipboardManager
=
(
ClipboardManager
)
context
.
getSystemService
(
context
.
CLIPBOARD_SERVICE
);
clipData
=
ClipData
.
newPlainText
(
"Text Copied"
,
textViewComment
.
getText
().
toString
());
clipboardManager
.
setPrimaryClip
(
clipData
);
Toast
.
makeText
(
context
,
"Comment Copied"
,
Toast
.
LENGTH_SHORT
).
show
();
}
}
return
true
;
return
true
;
}
}
...
...
app/src/main/java/app/insti/adapter/ComplaintDetailsPagerAdapter.java
View file @
a64b37ec
...
@@ -14,8 +14,8 @@ import app.insti.fragment.ComplaintDetailsFragment;
...
@@ -14,8 +14,8 @@ import app.insti.fragment.ComplaintDetailsFragment;
public
class
ComplaintDetailsPagerAdapter
extends
FragmentPagerAdapter
{
public
class
ComplaintDetailsPagerAdapter
extends
FragmentPagerAdapter
{
Venter
.
Complaint
detailedComplaint
;
private
Venter
.
Complaint
detailedComplaint
;
Context
context
;
private
Context
context
;
private
String
sessionid
,
complaintid
,
userid
,
userProfileUrl
;
private
String
sessionid
,
complaintid
,
userid
,
userProfileUrl
;
public
ComplaintDetailsPagerAdapter
(
FragmentManager
fm
,
Venter
.
Complaint
detailedComplaint
,
Context
context
,
String
sessionid
,
String
complaintid
,
String
userid
,
String
userProfileUrl
)
{
public
ComplaintDetailsPagerAdapter
(
FragmentManager
fm
,
Venter
.
Complaint
detailedComplaint
,
Context
context
,
String
sessionid
,
String
complaintid
,
String
userid
,
String
userProfileUrl
)
{
...
...
app/src/main/java/app/insti/adapter/ComplaintFragmentViewPagerAdapter.java
View file @
a64b37ec
...
@@ -15,7 +15,7 @@ import app.insti.fragment.ComplaintsMeFragment;
...
@@ -15,7 +15,7 @@ import app.insti.fragment.ComplaintsMeFragment;
public
class
ComplaintFragmentViewPagerAdapter
extends
FragmentStatePagerAdapter
{
public
class
ComplaintFragmentViewPagerAdapter
extends
FragmentStatePagerAdapter
{
Context
context
;
private
Context
context
;
private
String
userID
,
sessionID
,
userProfileUrl
;
private
String
userID
,
sessionID
,
userProfileUrl
;
public
ComplaintFragmentViewPagerAdapter
(
FragmentManager
fm
,
Context
context
,
String
userID
,
String
sessionID
,
String
userProfileUrl
)
{
public
ComplaintFragmentViewPagerAdapter
(
FragmentManager
fm
,
Context
context
,
String
userID
,
String
sessionID
,
String
userProfileUrl
)
{
...
...
app/src/main/java/app/insti/adapter/ImageViewPagerAdapter.java
View file @
a64b37ec
...
@@ -20,7 +20,7 @@ public class ImageViewPagerAdapter extends FragmentPagerAdapter {
...
@@ -20,7 +20,7 @@ public class ImageViewPagerAdapter extends FragmentPagerAdapter {
private
static
final
String
TAG
=
ImageViewPagerAdapter
.
class
.
getSimpleName
();
private
static
final
String
TAG
=
ImageViewPagerAdapter
.
class
.
getSimpleName
();
private
List
<
String
>
images
=
new
ArrayList
<>();
private
List
<
String
>
images
=
new
ArrayList
<>();
Venter
.
Complaint
detailedComplaint
;
private
Venter
.
Complaint
detailedComplaint
;
public
ImageViewPagerAdapter
(
FragmentManager
fragmentManager
,
List
<
String
>
images
)
{
public
ImageViewPagerAdapter
(
FragmentManager
fragmentManager
,
List
<
String
>
images
)
{
super
(
fragmentManager
);
super
(
fragmentManager
);
...
...
app/src/main/java/app/insti/adapter/UpVotesAdapter.java
View file @
a64b37ec
...
@@ -24,13 +24,13 @@ public class UpVotesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
...
@@ -24,13 +24,13 @@ public class UpVotesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
private
static
final
String
TAG
=
CommentsAdapter
.
class
.
getSimpleName
();
private
static
final
String
TAG
=
CommentsAdapter
.
class
.
getSimpleName
();
Context
context
;
private
Context
context
;
private
LayoutInflater
inflater
;
private
LayoutInflater
inflater
;
String
sessionId
,
userId
;
private
String
sessionId
,
userId
;
Activity
activity
;
private
Activity
activity
;
TextView
textViewUserUpVoteName
;
private
TextView
textViewUserUpVoteName
;
private
Fragment
fragment
;
private
Fragment
fragment
;
LinearLayout
layoutUpVote
;
private
LinearLayout
layoutUpVote
;
private
List
<
User
>
userList
=
new
ArrayList
<>();
private
List
<
User
>
userList
=
new
ArrayList
<>();
...
...
app/src/main/java/app/insti/api/LocationAPIUtils.java
View file @
a64b37ec
package
app.insti.api
;
package
app.insti.api
;
import
android.app.Activity
;
import
android.content.Context
;
import
android.util.Log
;
import
android.util.Log
;
import
com.google.android.gms.maps.CameraUpdateFactory
;
import
com.google.android.gms.maps.CameraUpdateFactory
;
import
com.google.android.gms.maps.GoogleMap
;
import
com.google.android.gms.maps.GoogleMap
;
import
com.google.android.gms.maps.MapView
;
import
com.google.android.gms.maps.MapView
;
...
...
app/src/main/java/app/insti/api/model/Venter.java
View file @
a64b37ec
...
@@ -4,9 +4,6 @@ import android.support.annotation.NonNull;
...
@@ -4,9 +4,6 @@ import android.support.annotation.NonNull;
import
com.google.gson.annotations.SerializedName
;
import
com.google.gson.annotations.SerializedName
;
import
java.util.List
;
import
java.util.List
;
import
app.insti.api.model.User
;
import
app.insti.interfaces.Browsable
;
/**
/**
* Created by Shivam Sharma on 04-09-2018.
* Created by Shivam Sharma on 04-09-2018.
*/
*/
...
@@ -14,11 +11,10 @@ import app.insti.interfaces.Browsable;
...
@@ -14,11 +11,10 @@ import app.insti.interfaces.Browsable;
public
class
Venter
{
public
class
Venter
{
public
static
class
Complaint
{
public
static
class
Complaint
{
@NonNull
@SerializedName
(
"id"
)
@SerializedName
(
"id"
)
private
String
complaintID
;
private
String
complaintID
;
@SerializedName
(
"created_by"
)
@SerializedName
(
"created_by"
)
User
complaintCreatedBy
;
private
User
complaintCreatedBy
;
@SerializedName
(
"description"
)
@SerializedName
(
"description"
)
private
String
description
;
private
String
description
;
@SerializedName
(
"report_date"
)
@SerializedName
(
"report_date"
)
...
@@ -163,11 +159,10 @@ public class Venter {
...
@@ -163,11 +159,10 @@ public class Venter {
}
}
public
static
class
TagUri
{
public
static
class
TagUri
{
@NonNull
@SerializedName
(
"id"
)
@SerializedName
(
"id"
)
String
id
;
private
String
id
;
@SerializedName
(
"tag_uri"
)
@SerializedName
(
"tag_uri"
)
String
tagUri
;
private
String
tagUri
;
@NonNull
@NonNull
public
String
getId
()
{
public
String
getId
()
{
...
@@ -189,15 +184,14 @@ public class Venter {
...
@@ -189,15 +184,14 @@ public class Venter {
public
static
class
Comment
{
public
static
class
Comment
{
@NonNull
@SerializedName
(
"id"
)
@SerializedName
(
"id"
)
String
id
;
private
String
id
;
@SerializedName
(
"time"
)
@SerializedName
(
"time"
)
String
time
;
private
String
time
;
@SerializedName
(
"text"
)
@SerializedName
(
"text"
)
String
text
;
private
String
text
;
@SerializedName
(
"commented_by"
)
@SerializedName
(
"commented_by"
)
User
commented_by
;
private
User
commented_by
;
@NonNull
@NonNull
public
String
getId
()
{
public
String
getId
()
{
...
...
app/src/main/java/app/insti/fragment/ComplaintDetailsFragment.java
View file @
a64b37ec
...
@@ -46,8 +46,6 @@ public class ComplaintDetailsFragment extends Fragment {
...
@@ -46,8 +46,6 @@ public class ComplaintDetailsFragment extends Fragment {
private
final
String
TAG
=
ComplaintDetailsFragment
.
class
.
getSimpleName
();
private
final
String
TAG
=
ComplaintDetailsFragment
.
class
.
getSimpleName
();
private
Venter
.
Complaint
detailedComplaint
;
private
Venter
.
Complaint
detailedComplaint
;
private
MapView
mMapView
;
private
MapView
mMapView
;
private
GoogleMap
googleMap
;
private
TextView
textViewUserName
;
private
TextView
textViewUserName
;
private
TextView
textViewReportDate
;
private
TextView
textViewReportDate
;
private
TextView
textViewLocation
;
private
TextView
textViewLocation
;
...
@@ -69,8 +67,8 @@ public class ComplaintDetailsFragment extends Fragment {
...
@@ -69,8 +67,8 @@ public class ComplaintDetailsFragment extends Fragment {
private
List
<
Venter
.
Comment
>
commentList
;
private
List
<
Venter
.
Comment
>
commentList
;
private
List
<
User
>
upVotesList
;
private
List
<
User
>
upVotesList
;
private
LinearLayout
linearLayoutTags
;
private
LinearLayout
linearLayoutTags
;
TextView
textViewUserUpVoteName
;
private
TextView
textViewUserUpVoteName
;
List
<
String
>
tagsList
;
private
List
<
String
>
tagsList
;
public
static
ComplaintDetailsFragment
getInstance
(
String
sessionid
,
String
complaintid
,
String
userid
,
String
userProfileUrl
)
{
public
static
ComplaintDetailsFragment
getInstance
(
String
sessionid
,
String
complaintid
,
String
userid
,
String
userProfileUrl
)
{
sId
=
sessionid
;
sId
=
sessionid
;
...
@@ -189,7 +187,7 @@ public class ComplaintDetailsFragment extends Fragment {
...
@@ -189,7 +187,7 @@ public class ComplaintDetailsFragment extends Fragment {
mMapView
.
getMapAsync
(
new
OnMapReadyCallback
()
{
mMapView
.
getMapAsync
(
new
OnMapReadyCallback
()
{
@Override
@Override
public
void
onMapReady
(
GoogleMap
mGoogleMap
)
{
public
void
onMapReady
(
GoogleMap
mGoogleMap
)
{
googleMap
=
mGoogleMap
;
GoogleMap
googleMap
=
mGoogleMap
;
// For dropping a marker at a point on the Map
// For dropping a marker at a point on the Map
LatLng
loc
=
new
LatLng
(
detailedComplaint
.
getLatitude
(),
detailedComplaint
.
getLongitude
());
LatLng
loc
=
new
LatLng
(
detailedComplaint
.
getLatitude
(),
detailedComplaint
.
getLongitude
());
...
...
app/src/main/java/app/insti/fragment/ComplaintsFragment.java
View file @
a64b37ec
...
@@ -21,16 +21,12 @@ import app.insti.adapter.ComplaintFragmentViewPagerAdapter;
...
@@ -21,16 +21,12 @@ import app.insti.adapter.ComplaintFragmentViewPagerAdapter;
public
class
ComplaintsFragment
extends
BaseFragment
{
public
class
ComplaintsFragment
extends
BaseFragment
{
String
userID
,
userProfileUrl
;
private
String
userID
,
userProfileUrl
;
Context
context
;
private
Context
context
;
Button
buttonVentIssues
;
private
Button
buttonVentIssues
;
ViewPager
viewPager
;
private
ViewPager
viewPager
;
private
TabLayout
slidingTabLayout
;
private
TabLayout
slidingTabLayout
;
CollapsingToolbarLayout
collapsingToolbarLayout
;
private
CollapsingToolbarLayout
collapsingToolbarLayout
;
public
ComplaintsFragment
()
{
// Required empty public constructor
}
@Override
@Override
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
...
@@ -116,12 +112,12 @@ public class ComplaintsFragment extends BaseFragment {
...
@@ -116,12 +112,12 @@ public class ComplaintsFragment extends BaseFragment {
@Override
@Override
public
void
onTabUnselected
(
TabLayout
.
Tab
tab
)
{
public
void
onTabUnselected
(
TabLayout
.
Tab
tab
)
{
//On Tab Unselected
}
}
@Override
@Override
public
void
onTabReselected
(
TabLayout
.
Tab
tab
)
{
public
void
onTabReselected
(
TabLayout
.
Tab
tab
)
{
//On Tab Reselected
}
}
});
});
...
...
app/src/main/java/app/insti/fragment/ComplaintsHomeFragment.java
View file @
a64b37ec
...
@@ -24,15 +24,15 @@ import retrofit2.Response;
...
@@ -24,15 +24,15 @@ import retrofit2.Response;
public
class
ComplaintsHomeFragment
extends
Fragment
{
public
class
ComplaintsHomeFragment
extends
Fragment
{
Activity
activity
;
private
Activity
activity
;
ComplaintsAdapter
homeListAdapter
;
private
ComplaintsAdapter
homeListAdapter
;
RecyclerView
recyclerViewHome
;
private
RecyclerView
recyclerViewHome
;
private
SwipeRefreshLayout
swipeContainer
;
private
SwipeRefreshLayout
swipeContainer
;
private
static
String
TAG
=
ComplaintsHomeFragment
.
class
.
getSimpleName
();
private
static
String
TAG
=
ComplaintsHomeFragment
.
class
.
getSimpleName
();
private
boolean
isCalled
=
false
;
private
boolean
isCalled
=
false
;
private
TextView
error_message_home
;
private
TextView
error_message_home
;
static
String
sID
,
uID
,
uProfileUrl
;
private
static
String
sID
,
uID
,
uProfileUrl
;
public
static
ComplaintsHomeFragment
getInstance
(
String
sessionID
,
String
userID
,
String
userProfileUrl
)
{
public
static
ComplaintsHomeFragment
getInstance
(
String
sessionID
,
String
userID
,
String
userProfileUrl
)
{
sID
=
sessionID
;
sID
=
sessionID
;
...
...
app/src/main/java/app/insti/fragment/ComplaintsMeFragment.java
View file @
a64b37ec
...
@@ -26,7 +26,7 @@ public class ComplaintsMeFragment extends Fragment {
...
@@ -26,7 +26,7 @@ public class ComplaintsMeFragment extends Fragment {
private
static
String
uID
,
sID
,
uProfileUrl
;
private
static
String
uID
,
sID
,
uProfileUrl
;
private
Activity
activity
;
private
Activity
activity
;
RecyclerView
recyclerViewMe
;
private
RecyclerView
recyclerViewMe
;
private
ComplaintsAdapter
meListAdapter
;
private
ComplaintsAdapter
meListAdapter
;
private
TextView
error_message_me
;
private
TextView
error_message_me
;
private
SwipeRefreshLayout
swipeContainer
;
private
SwipeRefreshLayout
swipeContainer
;
...
...
app/src/main/java/app/insti/fragment/FileComplaintFragment.java
View file @
a64b37ec
...
@@ -90,6 +90,7 @@ import retrofit2.Response;
...
@@ -90,6 +90,7 @@ import retrofit2.Response;
import
static
app
.
insti
.
Constants
.
MY_PERMISSIONS_REQUEST_LOCATION
;
import
static
app
.
insti
.
Constants
.
MY_PERMISSIONS_REQUEST_LOCATION
;
import
static
app
.
insti
.
Constants
.
MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE
;
import
static
app
.
insti
.
Constants
.
MY_PERMISSIONS_REQUEST_READ_EXTERNAL_STORAGE
;
import
static
app
.
insti
.
Constants
.
REQUEST_CAMERA_INT_ID
;
import
static
app
.
insti
.
Constants
.
RESULT_LOAD_IMAGE
;
import
static
app
.
insti
.
Constants
.
RESULT_LOAD_IMAGE
;
public
class
FileComplaintFragment
extends
Fragment
{
public
class
FileComplaintFragment
extends
Fragment
{
...
@@ -97,44 +98,36 @@ public class FileComplaintFragment extends Fragment {
...
@@ -97,44 +98,36 @@ public class FileComplaintFragment extends Fragment {
private
static
final
String
TAG
=
FileComplaintFragment
.
class
.
getSimpleName
();
private
static
final
String
TAG
=
FileComplaintFragment
.
class
.
getSimpleName
();
private
static
FileComplaintFragment
mainactivity
;
private
static
FileComplaintFragment
mainactivity
;
private
Button
buttonSubmit
;
private
Button
buttonSubmit
;
private
ImageButton
imageActionButton
;
private
CustomAutoCompleteTextView
autoCompleteTextView
;
private
CustomAutoCompleteTextView
autoCompleteTextView
;
private
EditText
editTextSuggestions
;
private
EditText
editTextSuggestions
;
private
EditText
editTextTags
;
private
EditText
editTextTags
;
private
EditText
editTextLocationDetails
;
private
EditText
editTextLocationDetails
;
private
MapView
mMapView
;
private
MapView
mMapView
;
GoogleMap
googleMap
;
private
GoogleMap
googleMap
;
private
TagView
tagView
;
private
TagView
tagView
;
private
TagView
tagViewPopulate
;
private
TagView
tagViewPopulate
;
private
ScrollView
tagsLayout
;
private
ScrollView
tagsLayout
;
private
LatLng
Location
;
private
LatLng
Location
;
private
String
Name
;
private
String
Address
;
private
String
Address
;
private
List
<
String
>
Tags
;
private
List
<
String
>
Tags
;
private
ArrayList
<
ComplaintTag
>
tagList
;
private
ArrayList
<
ComplaintTag
>
tagList
;
private
List
<
String
>
uploadedImagesUrl
=
new
ArrayList
<>();
private
List
<
String
>
uploadedImagesUrl
=
new
ArrayList
<>();
private
int
cursor
=
1
;
private
int
cursor
=
1
;
private
List
<
ComplaintTag
>
tagList2
=
new
ArrayList
<>();
private
List
<
ComplaintTag
>
tagList2
=
new
ArrayList
<>();
private
String
base64Image
;
private
String
base64Image
;
private
ImageViewPagerAdapter
imageViewPagerAdapter
;
private
ImageViewPagerAdapter
imageViewPagerAdapter
;
private
ViewPager
viewPager
;
private
ViewPager
viewPager
;
private
CircleIndicator
indicator
;
private
CircleIndicator
indicator
;
private
Button
buttonAnalysis
;
private
RelativeLayout
layout_buttons
;
private
RelativeLayout
layout_buttons
;
String
userId
;
private
String
userId
;
View
view
;
private
View
view
;
NestedScrollView
nestedScrollView
;
private
NestedScrollView
nestedScrollView
;
private
boolean
GPSIsSetup
=
false
;
private
boolean
GPSIsSetup
=
false
;
private
ProgressDialog
progressDialog
;
private
ProgressDialog
progressDialog
;
private
CollapsingToolbarLayout
collapsing_toolbar
;
private
CollapsingToolbarLayout
collapsing_toolbar
;
LinearLayout
linearLayoutAnalyse
;
private
LinearLayout
linearLayoutAnalyse
;
private
LinearLayout
linearLayoutScrollTags
;
private
LinearLayout
linearLayoutScrollTags
;
public
FileComplaintFragment
()
{
// Required empty public constructor
}
public
static
FileComplaintFragment
getMainActivity
()
{
public
static
FileComplaintFragment
getMainActivity
()
{
return
mainactivity
;
return
mainactivity
;
}
}
...
@@ -196,7 +189,7 @@ public class FileComplaintFragment extends Fragment {
...
@@ -196,7 +189,7 @@ public class FileComplaintFragment extends Fragment {
buttonSubmit
.
setVisibility
(
View
.
INVISIBLE
);
buttonSubmit
.
setVisibility
(
View
.
INVISIBLE
);
buttonSubmit
.
setVisibility
(
View
.
GONE
);
buttonSubmit
.
setVisibility
(
View
.
GONE
);
buttonAnalysis
=
view
.
findViewById
(
R
.
id
.
button_analysis
);
Button
buttonAnalysis
=
view
.
findViewById
(
R
.
id
.
button_analysis
);
buttonAnalysis
.
setVisibility
(
View
.
INVISIBLE
);
buttonAnalysis
.
setVisibility
(
View
.
INVISIBLE
);
buttonAnalysis
.
setVisibility
(
View
.
GONE
);
buttonAnalysis
.
setVisibility
(
View
.
GONE
);
...
@@ -209,7 +202,7 @@ public class FileComplaintFragment extends Fragment {
...
@@ -209,7 +202,7 @@ public class FileComplaintFragment extends Fragment {
viewPager
=
view
.
findViewById
(
R
.
id
.
complaint_image_view_pager
);
viewPager
=
view
.
findViewById
(
R
.
id
.
complaint_image_view_pager
);
indicator
=
view
.
findViewById
(
R
.
id
.
indicator
);
indicator
=
view
.
findViewById
(
R
.
id
.
indicator
);
imageActionButton
=
view
.
findViewById
(
R
.
id
.
fabButton
);
ImageButton
imageActionButton
=
view
.
findViewById
(
R
.
id
.
fabButton
);
imageActionButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
imageActionButton
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
@Override
public
void
onClick
(
View
v
)
{
public
void
onClick
(
View
v
)
{
...
@@ -320,7 +313,7 @@ public class FileComplaintFragment extends Fragment {
...
@@ -320,7 +313,7 @@ public class FileComplaintFragment extends Fragment {
@Override
@Override
public
void
onPlaceSelected
(
com
.
google
.
android
.
gms
.
location
.
places
.
Place
place
)
{
public
void
onPlaceSelected
(
com
.
google
.
android
.
gms
.
location
.
places
.
Place
place
)
{
Location
=
place
.
getLatLng
();
Location
=
place
.
getLatLng
();
Name
=
place
.
getName
().
toString
();
String
Name
=
place
.
getName
().
toString
();
Address
=
place
.
getAddress
().
toString
();
Address
=
place
.
getAddress
().
toString
();
updateMap
(
Location
,
Name
,
Address
,
cursor
);
//on selecting the place will automatically shows the Details on the map.
updateMap
(
Location
,
Name
,
Address
,
cursor
);
//on selecting the place will automatically shows the Details on the map.
cursor
++;
cursor
++;
...
@@ -529,6 +522,8 @@ public class FileComplaintFragment extends Fragment {
...
@@ -529,6 +522,8 @@ public class FileComplaintFragment extends Fragment {
case
LocationSettingsStatusCodes
.
SETTINGS_CHANGE_UNAVAILABLE
:
case
LocationSettingsStatusCodes
.
SETTINGS_CHANGE_UNAVAILABLE
:
Toast
.
makeText
(
getContext
(),
getString
(
R
.
string
.
GPS_not_enables
),
Toast
.
LENGTH_LONG
).
show
();
Toast
.
makeText
(
getContext
(),
getString
(
R
.
string
.
GPS_not_enables
),
Toast
.
LENGTH_LONG
).
show
();
break
;
break
;
default
:
Toast
.
makeText
(
getContext
(),
getString
(
R
.
string
.
GPS_not_enables
),
Toast
.
LENGTH_LONG
).
show
();
}
}
}
}
}
}
...
@@ -784,7 +779,7 @@ public class FileComplaintFragment extends Fragment {
...
@@ -784,7 +779,7 @@ public class FileComplaintFragment extends Fragment {
public
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
public
void
onActivityResult
(
int
requestCode
,
int
resultCode
,
Intent
data
)
{
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
if
(
resultCode
==
Activity
.
RESULT_OK
&&
requestCode
==
Constants
.
REQUEST_CAMERA_INT_ID
&&
data
!=
null
)
{
if
(
resultCode
==
Activity
.
RESULT_OK
&&
requestCode
==
REQUEST_CAMERA_INT_ID
&&
data
!=
null
)
{
progressDialog
.
setIndeterminate
(
true
);
progressDialog
.
setIndeterminate
(
true
);
progressDialog
.
setCancelable
(
false
);
progressDialog
.
setCancelable
(
false
);
progressDialog
.
show
();
progressDialog
.
show
();
...
@@ -794,7 +789,7 @@ public class FileComplaintFragment extends Fragment {
...
@@ -794,7 +789,7 @@ public class FileComplaintFragment extends Fragment {
collapsing_toolbar
.
setVisibility
(
View
.
VISIBLE
);
collapsing_toolbar
.
setVisibility
(
View
.
VISIBLE
);
sendImage
();
sendImage
();
}
else
if
(
resultCode
==
Activity
.
RESULT_OK
&&
requestCode
==
Constants
.
RESULT_LOAD_IMAGE
&&
data
!=
null
)
{
}
else
if
(
resultCode
==
Activity
.
RESULT_OK
&&
requestCode
==
RESULT_LOAD_IMAGE
&&
data
!=
null
)
{
progressDialog
.
setIndeterminate
(
true
);
progressDialog
.
setIndeterminate
(
true
);
progressDialog
.
setCancelable
(
false
);
progressDialog
.
setCancelable
(
false
);
progressDialog
.
show
();
progressDialog
.
show
();
...
...
app/src/main/java/app/insti/fragment/ImageFragment.java
View file @
a64b37ec
...
@@ -16,7 +16,7 @@ public class ImageFragment extends BaseFragment {
...
@@ -16,7 +16,7 @@ public class ImageFragment extends BaseFragment {
private
static
final
String
TAG
=
ImageFragment
.
class
.
getSimpleName
();
private
static
final
String
TAG
=
ImageFragment
.
class
.
getSimpleName
();
private
String
image
;
private
String
image
;
int
indexChosen
;
private
int
indexChosen
;
public
static
ImageFragment
newInstance
(
String
image
,
int
index
)
{
public
static
ImageFragment
newInstance
(
String
image
,
int
index
)
{
ImageFragment
fragment
=
new
ImageFragment
();
ImageFragment
fragment
=
new
ImageFragment
();
...
...
app/src/main/java/app/insti/fragment/RelevantComplaintsFragment.java
View file @
a64b37ec
...
@@ -19,15 +19,12 @@ import app.insti.api.model.Venter;
...
@@ -19,15 +19,12 @@ import app.insti.api.model.Venter;
public
class
RelevantComplaintsFragment
extends
Fragment
{
public
class
RelevantComplaintsFragment
extends
Fragment
{
Activity
activity
;
private
Activity
activity
;
ComplaintsAdapter
relevantComplaintsAdapter
;
private
ComplaintsAdapter
relevantComplaintsAdapter
;
RecyclerView
recyclerViewRelevantComplaints
;
private
RecyclerView
recyclerViewRelevantComplaints
;
private
SwipeRefreshLayout
swipeContainer
;
private
SwipeRefreshLayout
swipeContainer
;
private
static
String
TAG
=
RelevantComplaintsFragment
.
class
.
getSimpleName
();
private
boolean
isCalled
=
false
;
private
boolean
isCalled
=
false
;
private
TextView
error_message_relevant_complaints
;
private
static
String
sID
,
uID
;
static
String
sID
,
uID
;
public
static
RelevantComplaintsFragment
getInstance
(
String
sessionID
,
String
userID
)
{
public
static
RelevantComplaintsFragment
getInstance
(
String
sessionID
,
String
userID
)
{
sID
=
sessionID
;
sID
=
sessionID
;
...
@@ -60,7 +57,7 @@ public class RelevantComplaintsFragment extends Fragment {
...
@@ -60,7 +57,7 @@ public class RelevantComplaintsFragment extends Fragment {
recyclerViewRelevantComplaints
=
(
RecyclerView
)
view
.
findViewById
(
R
.
id
.
recyclerViewRelevantComplaints
);
recyclerViewRelevantComplaints
=
(
RecyclerView
)
view
.
findViewById
(
R
.
id
.
recyclerViewRelevantComplaints
);
relevantComplaintsAdapter
=
new
ComplaintsAdapter
(
getActivity
(),
sID
,
uID
,
""
);
//Change userProfileUrl to the current user Profile Pic
relevantComplaintsAdapter
=
new
ComplaintsAdapter
(
getActivity
(),
sID
,
uID
,
""
);
//Change userProfileUrl to the current user Profile Pic
swipeContainer
=
(
SwipeRefreshLayout
)
view
.
findViewById
(
R
.
id
.
swipeContainer
);
swipeContainer
=
(
SwipeRefreshLayout
)
view
.
findViewById
(
R
.
id
.
swipeContainer
);
error_message_relevant_complaints
=
view
.
findViewById
(
R
.
id
.
error_message_relevant_complaints
);
TextView
error_message_relevant_complaints
=
view
.
findViewById
(
R
.
id
.
error_message_relevant_complaints
);
LinearLayoutManager
llm
=
new
LinearLayoutManager
(
activity
);
LinearLayoutManager
llm
=
new
LinearLayoutManager
(
activity
);
recyclerViewRelevantComplaints
.
setLayoutManager
(
llm
);
recyclerViewRelevantComplaints
.
setLayoutManager
(
llm
);
...
@@ -92,7 +89,7 @@ public class RelevantComplaintsFragment extends Fragment {
...
@@ -92,7 +89,7 @@ public class RelevantComplaintsFragment extends Fragment {
}
}
private
void
callServerToGetRelevantComplaints
(){
private
void
callServerToGetRelevantComplaints
(){
//Get Relevant Complaints from Server
}
}
private
void
initialiseRecyclerView
(
List
<
Venter
.
Complaint
>
list
)
{
private
void
initialiseRecyclerView
(
List
<
Venter
.
Complaint
>
list
)
{
...
...
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