Skip to content

Commit c9b5c62

Browse files
videochat-java
- fixed google-services.json - added logic for fill userName in UsersAdapter - fixed item_opponents_list.xml
1 parent 5bb9dac commit c9b5c62

File tree

6 files changed

+42
-37
lines changed

6 files changed

+42
-37
lines changed

.github/ISSUE_TEMPLATE.md

-22
This file was deleted.

.github/PULL_REQUEST_TEMPLATE.md

-11
This file was deleted.

.github/workflows/main.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Release notifier
2+
3+
on:
4+
release:
5+
types: [ published ]
6+
7+
jobs:
8+
after-release:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Notify Slack
12+
run: |
13+
curl -X POST \
14+
--data-urlencode "payload={
15+
\"channel\": \"${{ secrets.SLACK_CHANNEL }}\",
16+
\"username\": \"${{ secrets.QB_PROJECT }} release bot\",
17+
\"text\": \"<!here>
18+
The ${{ secrets.QB_PROJECT }} version *${{ github.event.release.name }}* was released.
19+
>*Changelog:*
20+
\`\`\`${{ github.event.release.body }}\`\`\`
21+
>*Link:*
22+
${{ github.event.release.html_url }}\",
23+
\"icon_emoji\": \":rocket:\"}" \
24+
--url ${{ secrets.SLACK_WEBHOOK_URL }}

sample-videochat-java/app/google-services.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"client_info": {
1111
"mobilesdk_app_id": "Put here your value",
1212
"android_client_info": {
13-
"package_name": "com.quickblox.sample.videochat.kotlin"
13+
"package_name": "com.quickblox.sample.videochat.java"
1414
}
1515
},
1616
"oauth_client": [

sample-videochat-java/app/src/main/java/com/quickblox/sample/videochat/java/adapters/UsersAdapter.java

+16-3
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ public UsersAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int
4949
@Override
5050
public void onBindViewHolder(@NonNull UsersAdapter.ViewHolder holder, int position) {
5151
QBUser user = usersList.get(position);
52-
holder.opponentName.setText(user.getFullName());
52+
holder.opponentName.setText(getOpponentNameFrom(user));
5353
if (selectedUsers.contains(user)) {
5454
holder.rootLayout.setBackgroundResource(R.color.background_color_selected_user_item);
55-
holder.opponentIcon.setBackgroundDrawable(
56-
UiUtils.getColoredCircleDrawable(context.getResources().getColor(R.color.icon_background_color_selected_user)));
55+
holder.opponentIcon.setBackgroundDrawable(UiUtils.getColoredCircleDrawable(context.getResources().getColor(R.color.icon_background_color_selected_user)));
5756
holder.opponentIcon.setImageResource(R.drawable.ic_checkmark);
5857
} else {
5958
holder.rootLayout.setBackgroundResource(R.color.background_color_normal_user_item);
@@ -66,6 +65,20 @@ public void onBindViewHolder(@NonNull UsersAdapter.ViewHolder holder, int positi
6665
});
6766
}
6867

68+
private String getOpponentNameFrom(QBUser user) {
69+
boolean isFullNameAvailable = user.getFullName() != null && !user.getFullName().trim().isEmpty();
70+
if (isFullNameAvailable) {
71+
return user.getFullName();
72+
}
73+
74+
boolean isLoginAvailable = user.getLogin() != null && !user.getLogin().trim().isEmpty();
75+
if (isLoginAvailable) {
76+
return user.getLogin();
77+
}
78+
79+
return user.getId().toString();
80+
}
81+
6982
@Override
7083
public int getItemCount() {
7184
return usersList.size();

sample-videochat-java/app/src/main/res/layout/item_opponents_list.xml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
style="@style/MatchWidth"
1919
android:layout_marginStart="@dimen/padding_start"
2020
android:layout_marginLeft="@dimen/padding_start"
21+
android:singleLine="true"
2122
android:textAppearance="?android:attr/textAppearanceLarge"
2223
tools:text="User Name" />
2324
</LinearLayout>

0 commit comments

Comments
 (0)