Skip to content

Allow customising of styles #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+88 −37
Open

Allow customising of styles #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75d232e
Allow customising of styles
Jun 9, 2022
9076f8a
Add optional source text view
Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ useEffect(() => {
}, []);
```

In `index.js` or anywhere firebase background handler lies:
In `index.js` or anywhere firebase background handler lies:

```javascript
import messaging from '@react-native-firebase/messaging';
Expand All @@ -95,13 +95,13 @@ messaging().setBackgroundMessageHandler(async remoteMessage => {
// Receive remote message
if (remoteMessage?.notification?.title === 'Incoming Call') {
// Display incoming call activity.
IncomingCall.display(
'callUUIDv4', // Call UUID v4
'Quocs', // Username
'https://avatars3.githubusercontent.com/u/16166195', // Avatar URL
'Incomming Call', // Info text
20000 // Timeout for end call after 20s
);
IncomingCall.display({
uuid: 'callUUIDv4', // Call UUID v4
name: 'Quocs', // Username
avatar: 'https://avatars3.githubusercontent.com/u/16166195', // Avatar URL
info: 'Incomming Call', // Info text
timeout: 20000 // Timeout for end call after 20s
});
} else if (remoteMessage?.notification?.title === 'Missed Call') {
// Terminate incoming activity. Should be called when call expired.
IncomingCall.dismiss();
Expand Down
19 changes: 11 additions & 8 deletions android/src/main/java/com/incomingcall/IncomingCallModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.bridge.WritableNativeMap;

Expand All @@ -34,26 +35,28 @@ public String getName() {
}

@ReactMethod
public void display(String uuid, String name, String avatar, String info, int timeout) {
public void display(ReadableMap options) {
if (UnlockScreenActivity.active) {
return;
}
if (reactContext != null) {
Bundle bundle = new Bundle();
bundle.putString("uuid", uuid);
bundle.putString("name", name);
bundle.putString("avatar", avatar);
bundle.putString("info", info);
bundle.putInt("timeout", timeout);
bundle.putString("uuid", options.getString("uuid"));
bundle.putString("name", options.getString("name"));
bundle.putString("avatar", options.getString("avatar"));
bundle.putString("info", options.getString("info"));
bundle.putString("font", options.getString("font"));
bundle.putString("source", options.getString("source"));
bundle.putInt("timeout", options.getInt("timeout"));
Intent i = new Intent(reactContext, UnlockScreenActivity.class);
i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_SINGLE_TOP);
i.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED +
WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD +
WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);

i.putExtras(bundle);
reactContext.startActivity(i);

}
}

Expand Down
14 changes: 14 additions & 0 deletions android/src/main/java/com/incomingcall/UnlockScreenActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import android.content.Context;
import android.media.MediaPlayer;
import android.provider.Settings;
import android.graphics.Typeface;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
Expand All @@ -38,6 +39,7 @@ public class UnlockScreenActivity extends AppCompatActivity implements UnlockScr
private static final String TAG = "MessagingService";
private TextView tvName;
private TextView tvInfo;
private TextView tvSource;
private ImageView ivAvatar;
private Integer timeout = 0;
private String uuid = "";
Expand Down Expand Up @@ -81,6 +83,7 @@ protected void onCreate(Bundle savedInstanceState) {

tvName = findViewById(R.id.tvName);
tvInfo = findViewById(R.id.tvInfo);
tvSource = findViewById(R.id.tvSource);
ivAvatar = findViewById(R.id.ivAvatar);

Bundle bundle = getIntent().getExtras();
Expand All @@ -96,6 +99,17 @@ protected void onCreate(Bundle savedInstanceState) {
String info = bundle.getString("info");
tvInfo.setText(info);
}
if (bundle.containsKey("font")) {
String font = bundle.getString("font");
Typeface tf = Typeface.createFromAsset(getAssets(), font);
tvName.setTypeface(tf);
tvInfo.setTypeface(tf);
tvSource.setTypeface(tf);
}
if (bundle.containsKey("source")) {
String source = bundle.getString("source");
tvSource.setText(source);
}
if (bundle.containsKey("avatar")) {
String avatar = bundle.getString("avatar");
if (avatar != null) {
Expand Down
31 changes: 16 additions & 15 deletions android/src/main/res/layout/activity_call_incoming.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
>

<RelativeLayout
android:layout_width="170dp"
android:layout_height="170dp"
style="@style/avatarWrapper"
>
<ImageView
android:id="@+id/ivAvatar"
Expand Down Expand Up @@ -54,23 +53,27 @@
</RelativeLayout>

<TextView
android:id="@+id/tvName"
android:id="@+id/tvSource"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:textSize="22sp"
android:fontFamily="sans-serif"
android:textColor="#FFFFFF"
style="@style/tvSource"
/>

<TextView
android:id="@+id/tvName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
style="@style/tvName"
/>

<TextView
android:id="@+id/tvInfo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textSize="14sp"
android:fontFamily="sans-serif"
android:textColor="#ADADAD"
style="@style/tvInfo"
/>

</LinearLayout>
Expand All @@ -81,7 +84,7 @@
android:orientation="horizontal"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="60dp"
style="@style/buttonWrapper"
>

<LinearLayout
Expand All @@ -95,10 +98,9 @@
>
<com.incomingcall.AnimateImage
android:id="@+id/ivDeclineCall"
android:layout_width="60dp"
android:layout_height="60dp"
android:scaleType="centerInside"
android:src="@drawable/ic_decline_call"
style="@style/ivDeclineCall"
/>
<TextView
android:id="@+id/tvDecline"
Expand All @@ -123,10 +125,9 @@
>
<com.incomingcall.AnimateImage
android:id="@+id/ivAcceptCall"
android:layout_width="60dp"
android:layout_height="60dp"
android:scaleType="centerInside"
android:src="@drawable/ic_accept_call"
style="@style/ivAcceptCall"
/>
<TextView
android:id="@+id/tvAccept"
Expand All @@ -142,4 +143,4 @@
</LinearLayout>

</LinearLayout>
</RelativeLayout>
</RelativeLayout>
33 changes: 33 additions & 0 deletions android/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="avatarWrapper">
<item name="android:layout_width">170dp</item>
<item name="android:layout_height">170dp</item>
</style>
<style name="buttonWrapper">
<item name="android:layout_marginBottom">60dp</item>
</style>
<style name="tvName">
<item name="android:textSize">22sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textColor">#FFFFFF</item>
</style>
<style name="tvSource">
<item name="android:textSize">16sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textColor">#FFFFFF</item>
</style>
<style name="tvInfo">
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:textColor">#ADADAD</item>
</style>
<style name="ivAcceptCall">
<item name="android:layout_width">60sp</item>
<item name="android:layout_height">60sp</item>
</style>
<style name="ivDeclineCall">
<item name="android:layout_width">60sp</item>
<item name="android:layout_height">60sp</item>
</style>
</resources>
12 changes: 6 additions & 6 deletions example/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ export function handleRemoteMessage(remoteMessage, isHeadless) {
}
});
} else {
IncomingCall.display(
callUUID,
'Quocs',
'https://avatars3.githubusercontent.com/u/16166195',
'Incomming Call'
);
IncomingCall.display({
uuid: callUUID,
name: 'Quocs',
avatar: 'https://avatars3.githubusercontent.com/u/16166195',
info: 'Incomming Call'
});
DeviceEventEmitter.addListener('endCall', payload => {
// End call action here
console.log('endCall', payload);
Expand Down