Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
baby-monitoring-android-app
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
R24-145
baby-monitoring-android-app
Commits
e522cd6d
Commit
e522cd6d
authored
Oct 25, 2024
by
Ishankha K.C
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/chamod_dev' into 'master'
enable push notifications See merge request
!7
parents
061b8cca
65f7e087
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
163 additions
and
5 deletions
+163
-5
app/src/main/AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-0
app/src/main/java/com/kaluwa/enterprises/babycare/MainActivity.java
...in/java/com/kaluwa/enterprises/babycare/MainActivity.java
+13
-0
app/src/main/java/com/kaluwa/enterprises/babycare/activities/ActivityLogsActivity.java
...enterprises/babycare/activities/ActivityLogsActivity.java
+140
-4
app/src/main/java/com/kaluwa/enterprises/babycare/adapter/ActivityLogsAdapter.java
...uwa/enterprises/babycare/adapter/ActivityLogsAdapter.java
+1
-1
app/src/main/java/com/kaluwa/enterprises/babycare/dto/ActivityLogDto.java
...a/com/kaluwa/enterprises/babycare/dto/ActivityLogDto.java
+3
-0
app/src/main/java/com/kaluwa/enterprises/babycare/service/ActivityLogsApiService.java
.../enterprises/babycare/service/ActivityLogsApiService.java
+5
-0
No files found.
app/src/main/AndroidManifest.xml
View file @
e522cd6d
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.INTERNET"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.ACCESS_NETWORK_STATE"
/>
<uses-permission
android:name=
"android.permission.READ_MEDIA_IMAGES"
/>
<uses-permission
android:name=
"android.permission.READ_MEDIA_IMAGES"
/>
<uses-permission
android:name=
"android.permission.POST_NOTIFICATIONS"
/>
<application
<application
android:allowBackup=
"true"
android:allowBackup=
"true"
...
...
app/src/main/java/com/kaluwa/enterprises/babycare/MainActivity.java
View file @
e522cd6d
...
@@ -4,11 +4,15 @@ import static com.kaluwa.enterprises.babycare.config.TokenSaver.getToken;
...
@@ -4,11 +4,15 @@ import static com.kaluwa.enterprises.babycare.config.TokenSaver.getToken;
import
static
com
.
kaluwa
.
enterprises
.
babycare
.
utils
.
Utils
.
animationChanger
;
import
static
com
.
kaluwa
.
enterprises
.
babycare
.
utils
.
Utils
.
animationChanger
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.content.pm.PackageManager
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.core.app.ActivityCompat
;
import
androidx.core.content.ContextCompat
;
import
android.util.Log
;
import
android.util.Log
;
...
@@ -28,6 +32,15 @@ public class MainActivity extends AppCompatActivity {
...
@@ -28,6 +32,15 @@ public class MainActivity extends AppCompatActivity {
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
activity_main
);
setContentView
(
R
.
layout
.
activity_main
);
// Access request
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
TIRAMISU
)
{
if
(
ContextCompat
.
checkSelfPermission
(
this
,
android
.
Manifest
.
permission
.
POST_NOTIFICATIONS
)
!=
PackageManager
.
PERMISSION_GRANTED
)
{
ActivityCompat
.
requestPermissions
(
this
,
new
String
[]{
android
.
Manifest
.
permission
.
POST_NOTIFICATIONS
},
101
);
}
}
Button
startedBtn
=
findViewById
(
R
.
id
.
m_btn_get_started
);
Button
startedBtn
=
findViewById
(
R
.
id
.
m_btn_get_started
);
startedBtn
.
setOnClickListener
(
v
->
{
startedBtn
.
setOnClickListener
(
v
->
{
...
...
app/src/main/java/com/kaluwa/enterprises/babycare/activities/ActivityLogsActivity.java
View file @
e522cd6d
...
@@ -5,8 +5,16 @@ import static com.kaluwa.enterprises.babycare.config.TokenSaver.getToken;
...
@@ -5,8 +5,16 @@ import static com.kaluwa.enterprises.babycare.config.TokenSaver.getToken;
import
static
com
.
kaluwa
.
enterprises
.
babycare
.
utils
.
Utils
.
animationChanger
;
import
static
com
.
kaluwa
.
enterprises
.
babycare
.
utils
.
Utils
.
animationChanger
;
import
static
com
.
kaluwa
.
enterprises
.
babycare
.
utils
.
Utils
.
loader
;
import
static
com
.
kaluwa
.
enterprises
.
babycare
.
utils
.
Utils
.
loader
;
import
android.annotation.SuppressLint
;
import
android.app.NotificationChannel
;
import
android.app.NotificationManager
;
import
android.app.PendingIntent
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.content.pm.PackageManager
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.util.Log
;
import
android.util.Log
;
import
android.view.Gravity
;
import
android.view.Gravity
;
import
android.view.Menu
;
import
android.view.Menu
;
...
@@ -23,6 +31,8 @@ import androidx.annotation.NonNull;
...
@@ -23,6 +31,8 @@ import androidx.annotation.NonNull;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.appcompat.app.AppCompatActivity
;
import
androidx.appcompat.widget.PopupMenu
;
import
androidx.appcompat.widget.PopupMenu
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.core.app.ActivityCompat
;
import
androidx.core.app.NotificationCompat
;
import
androidx.core.content.ContextCompat
;
import
androidx.core.content.ContextCompat
;
import
androidx.core.graphics.Insets
;
import
androidx.core.graphics.Insets
;
import
androidx.core.view.ViewCompat
;
import
androidx.core.view.ViewCompat
;
...
@@ -43,10 +53,12 @@ import com.kaluwa.enterprises.babycare.config.ApiConfig;
...
@@ -43,10 +53,12 @@ import com.kaluwa.enterprises.babycare.config.ApiConfig;
import
com.kaluwa.enterprises.babycare.dto.ActivityLogDto
;
import
com.kaluwa.enterprises.babycare.dto.ActivityLogDto
;
import
com.kaluwa.enterprises.babycare.dto.BabyDto
;
import
com.kaluwa.enterprises.babycare.dto.BabyDto
;
import
com.kaluwa.enterprises.babycare.dto.responseDto.AuthenticationDto
;
import
com.kaluwa.enterprises.babycare.dto.responseDto.AuthenticationDto
;
import
com.kaluwa.enterprises.babycare.dto.responseDto.ResponseDto
;
import
com.kaluwa.enterprises.babycare.error.ErrorDto
;
import
com.kaluwa.enterprises.babycare.error.ErrorDto
;
import
com.kaluwa.enterprises.babycare.service.ActivityLogsApiService
;
import
com.kaluwa.enterprises.babycare.service.ActivityLogsApiService
;
import
com.kaluwa.enterprises.babycare.service.BabyApiService
;
import
com.kaluwa.enterprises.babycare.service.BabyApiService
;
import
java.time.LocalDateTime
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.List
;
...
@@ -66,12 +78,13 @@ public class ActivityLogsActivity extends AppCompatActivity {
...
@@ -66,12 +78,13 @@ public class ActivityLogsActivity extends AppCompatActivity {
private
ActivityLogsApiService
activityLogsApiService
;
private
ActivityLogsApiService
activityLogsApiService
;
private
ActivityLogsAdapter
adapter
;
private
ActivityLogsAdapter
adapter
;
private
List
<
ActivityLogDto
>
activityLogDtos
=
new
ArrayList
<>();
private
List
<
ActivityLogDto
>
activityLogDtos
=
new
ArrayList
<>();
private
Handler
handler
=
new
Handler
();
private
boolean
isActivityOpen
=
false
;
// Flag to track activity state
@Override
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
activity_logs
);
setContentView
(
R
.
layout
.
activity_logs
);
// define actionbar
// define actionbar
defineActionbar
();
defineActionbar
();
swipeToRefresh
();
swipeToRefresh
();
...
@@ -91,7 +104,8 @@ public class ActivityLogsActivity extends AppCompatActivity {
...
@@ -91,7 +104,8 @@ public class ActivityLogsActivity extends AppCompatActivity {
progressbar
=
findViewById
(
R
.
id
.
progress_bar
);
progressbar
=
findViewById
(
R
.
id
.
progress_bar
);
// load data
// load data
loadData
();
loadData
(
false
);
startNotificationPolling
();
adapter
=
new
ActivityLogsAdapter
(
this
,
activityLogDtos
);
adapter
=
new
ActivityLogsAdapter
(
this
,
activityLogDtos
);
recyclerView
.
setAdapter
(
adapter
);
recyclerView
.
setAdapter
(
adapter
);
...
@@ -122,15 +136,125 @@ public class ActivityLogsActivity extends AppCompatActivity {
...
@@ -122,15 +136,125 @@ public class ActivityLogsActivity extends AppCompatActivity {
clearIcon
.
setOnClickListener
(
v
->
{
clearIcon
.
setOnClickListener
(
v
->
{
// Handle the click action here
// Handle the click action here
// You can add your click handling logic here
// You can add your click handling logic here
clearNotification
();
});
});
}
private
void
clearNotification
()
{
Call
<
ResponseDto
>
call
=
activityLogsApiService
.
deleteAllActivityLogs
();
loader
(
overlay
,
progressbar
,
true
);
call
.
enqueue
(
new
Callback
<
ResponseDto
>()
{
@Override
public
void
onResponse
(
Call
<
ResponseDto
>
call
,
Response
<
ResponseDto
>
response
)
{
if
(
response
.
isSuccessful
())
{
Toast
.
makeText
(
ActivityLogsActivity
.
this
,
"All activity logs cleared successfully"
,
Toast
.
LENGTH_LONG
).
show
();
activityLogDtos
.
clear
();
adapter
.
notifyDataSetChanged
();
noContentCall
();
loader
(
overlay
,
progressbar
,
false
);
}
else
{
try
{
Gson
gson
=
new
Gson
();
assert
response
.
errorBody
()
!=
null
;
String
errorBodyString
=
response
.
errorBody
().
string
();
// Check if the error body is in JSON format
if
(
errorBodyString
.
startsWith
(
"{"
))
{
ErrorDto
errorDto
=
gson
.
fromJson
(
errorBodyString
,
ErrorDto
.
class
);
Toast
.
makeText
(
ActivityLogsActivity
.
this
,
errorDto
.
getMessage
(),
Toast
.
LENGTH_LONG
).
show
();
}
else
{
// If the error body is not in JSON format, display a generic error message
Log
.
e
(
TAG
,
errorBodyString
);
Toast
.
makeText
(
ActivityLogsActivity
.
this
,
"An unexpected error occurred"
,
Toast
.
LENGTH_LONG
).
show
();
}
}
catch
(
Exception
e
)
{
Log
.
e
(
TAG
,
"else-error: "
+
e
.
getMessage
());
Toast
.
makeText
(
ActivityLogsActivity
.
this
,
e
.
getMessage
(),
Toast
.
LENGTH_LONG
).
show
();
}
loader
(
overlay
,
progressbar
,
false
);
}
}
@Override
public
void
onFailure
(
Call
<
ResponseDto
>
call
,
Throwable
throwable
)
{
Log
.
e
(
TAG
,
throwable
.
getMessage
());
Toast
.
makeText
(
ActivityLogsActivity
.
this
,
"Error to Failure"
,
Toast
.
LENGTH_LONG
).
show
();
loader
(
overlay
,
progressbar
,
false
);
}
});
}
private
void
startNotificationPolling
()
{
// Define a Runnable task for periodic execution
Runnable
notificationPollingTask
=
new
Runnable
()
{
@Override
public
void
run
()
{
// Call the API to fetch unread notifications
loadData
(
true
);
Log
.
e
(
TAG
,
"Polling for new notifications..."
);
sendNotification
(
activityLogDtos
);
if
(
isActivityOpen
)
{
handler
.
postDelayed
(
this
,
5000
);
// 5 seconds delay
}
else
{
// Schedule the next execution after 30 seconds
handler
.
postDelayed
(
this
,
30000
);
// 30 seconds delay
}
}
};
// Start the polling task immediately
handler
.
post
(
notificationPollingTask
);
}
@SuppressLint
(
"NewApi"
)
private
void
sendNotification
(
List
<
ActivityLogDto
>
unreadNotifications
)
{
// Check if there are any notifications to send
if
(
unreadNotifications
.
isEmpty
())
return
;
// Extract notification details (assuming the first unread notification is shown)
ActivityLogDto
firstUnreadNotification
=
unreadNotifications
.
get
(
0
);
LocalDateTime
logTime
=
firstUnreadNotification
.
getLogTime
();
LocalDateTime
currentTime
=
LocalDateTime
.
now
();
String
notificationTitle
=
"New Baby Mood"
;
String
notificationMessage
=
firstUnreadNotification
.
getActivityLogDescription
();
// Create the Notification Channel (required for Android O and above)
String
channelId
=
"babycare_notifications_channel"
;
Log
.
e
(
TAG
,
"Notification sent: "
+
notificationMessage
);
NotificationManager
notificationManager
=
(
NotificationManager
)
getSystemService
(
Context
.
NOTIFICATION_SERVICE
);
if
(
android
.
os
.
Build
.
VERSION
.
SDK_INT
>=
android
.
os
.
Build
.
VERSION_CODES
.
O
)
{
NotificationChannel
channel
=
new
NotificationChannel
(
channelId
,
"Baby Care Notifications"
,
NotificationManager
.
IMPORTANCE_DEFAULT
);
channel
.
setDescription
(
"Notifications for baby activity logs"
);
notificationManager
.
createNotificationChannel
(
channel
);
}
// Create an Intent for the notification
Intent
intent
=
new
Intent
(
this
,
ActivityLogsActivity
.
class
);
intent
.
setFlags
(
Intent
.
FLAG_ACTIVITY_NEW_TASK
|
Intent
.
FLAG_ACTIVITY_CLEAR_TASK
);
PendingIntent
pendingIntent
=
PendingIntent
.
getActivity
(
this
,
0
,
intent
,
PendingIntent
.
FLAG_UPDATE_CURRENT
|
PendingIntent
.
FLAG_IMMUTABLE
);
// Build the notification
NotificationCompat
.
Builder
builder
=
new
NotificationCompat
.
Builder
(
this
,
channelId
)
.
setSmallIcon
(
R
.
mipmap
.
ic_launcher
)
// Use your notification icon
.
setContentTitle
(
notificationTitle
)
.
setContentText
(
notificationMessage
)
.
setPriority
(
NotificationCompat
.
PRIORITY_DEFAULT
)
.
setContentIntent
(
pendingIntent
)
.
setAutoCancel
(
true
);
// Automatically removes the notification when clicked
// Show the notification
notificationManager
.
notify
(
1
,
builder
.
build
());
// '1' is the notification ID, change if needed
}
}
private
void
loadData
()
{
private
void
loadData
(
boolean
isPolling
)
{
Call
<
List
<
ActivityLogDto
>>
call
=
activityLogsApiService
.
getAllActivityLogs
();
Call
<
List
<
ActivityLogDto
>>
call
=
activityLogsApiService
.
getAllActivityLogs
();
loader
(
overlay
,
progressbar
,
true
);
if
(
isPolling
)
{
loader
(
overlay
,
progressbar
,
false
);
}
noContentCall
();
noContentCall
();
call
.
enqueue
(
new
Callback
<
List
<
ActivityLogDto
>>()
{
call
.
enqueue
(
new
Callback
<
List
<
ActivityLogDto
>>()
{
@Override
@Override
...
@@ -190,6 +314,18 @@ public class ActivityLogsActivity extends AppCompatActivity {
...
@@ -190,6 +314,18 @@ public class ActivityLogsActivity extends AppCompatActivity {
});
});
}
}
@Override
protected
void
onResume
()
{
super
.
onResume
();
isActivityOpen
=
true
;
// Activity is in the foreground
}
@Override
protected
void
onPause
()
{
super
.
onPause
();
isActivityOpen
=
false
;
// Activity is in the background
}
private
void
defineActionbar
()
{
private
void
defineActionbar
()
{
Toolbar
toolbar
=
findViewById
(
R
.
id
.
b_care_action_bar
);
Toolbar
toolbar
=
findViewById
(
R
.
id
.
b_care_action_bar
);
setSupportActionBar
(
toolbar
);
setSupportActionBar
(
toolbar
);
...
...
app/src/main/java/com/kaluwa/enterprises/babycare/adapter/ActivityLogsAdapter.java
View file @
e522cd6d
...
@@ -52,7 +52,7 @@ public class ActivityLogsAdapter extends RecyclerView.Adapter<ActivityLogsAdapte
...
@@ -52,7 +52,7 @@ public class ActivityLogsAdapter extends RecyclerView.Adapter<ActivityLogsAdapte
holder
.
tvDescription
.
setText
(
activityLogDto
.
getActivityLogDescription
());
holder
.
tvDescription
.
setText
(
activityLogDto
.
getActivityLogDescription
());
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
O
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
O
)
{
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
);
DateTimeFormatter
formatter
=
DateTimeFormatter
.
ofPattern
(
"yyyy-MM-dd HH:mm:ss"
);
holder
.
tvLogTime
.
setText
(
LocalDateTime
.
now
().
format
(
formatter
));
holder
.
tvLogTime
.
setText
(
activityLogDto
.
getLogTime
().
format
(
formatter
));
}
}
}
}
...
...
app/src/main/java/com/kaluwa/enterprises/babycare/dto/ActivityLogDto.java
View file @
e522cd6d
package
com.kaluwa.enterprises.babycare.dto
;
package
com.kaluwa.enterprises.babycare.dto
;
import
java.time.LocalDateTime
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
...
@@ -11,4 +13,5 @@ public class ActivityLogDto {
...
@@ -11,4 +13,5 @@ public class ActivityLogDto {
private
Long
activityLogId
;
private
Long
activityLogId
;
private
String
activityLogType
;
private
String
activityLogType
;
private
String
activityLogDescription
;
private
String
activityLogDescription
;
private
LocalDateTime
logTime
;
}
}
app/src/main/java/com/kaluwa/enterprises/babycare/service/ActivityLogsApiService.java
View file @
e522cd6d
package
com.kaluwa.enterprises.babycare.service
;
package
com.kaluwa.enterprises.babycare.service
;
import
com.kaluwa.enterprises.babycare.dto.ActivityLogDto
;
import
com.kaluwa.enterprises.babycare.dto.ActivityLogDto
;
import
com.kaluwa.enterprises.babycare.dto.responseDto.ResponseDto
;
import
java.util.List
;
import
java.util.List
;
import
retrofit2.Call
;
import
retrofit2.Call
;
import
retrofit2.http.DELETE
;
import
retrofit2.http.GET
;
import
retrofit2.http.GET
;
public
interface
ActivityLogsApiService
{
public
interface
ActivityLogsApiService
{
...
@@ -12,4 +14,7 @@ public interface ActivityLogsApiService {
...
@@ -12,4 +14,7 @@ public interface ActivityLogsApiService {
@GET
(
"activity-logs"
)
@GET
(
"activity-logs"
)
Call
<
List
<
ActivityLogDto
>>
getAllActivityLogs
();
Call
<
List
<
ActivityLogDto
>>
getAllActivityLogs
();
@DELETE
(
"activity-logs"
)
Call
<
ResponseDto
>
deleteAllActivityLogs
();
}
}
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