Skip to content

Commit b60744f

Browse files
committed
add friend different colours
1 parent 0943fdb commit b60744f

File tree

5 files changed

+48
-10
lines changed

5 files changed

+48
-10
lines changed

app/src/main/java/com/magnitudestudios/GameFace/network/NotificationService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ class NotificationService : FirebaseMessagingService() {
6161
}
6262
val builder = NotificationCompat.Builder(this, "CHANNEL123")
6363
.setSmallIcon(R.drawable.ic_add_friend)
64-
.setContentTitle("My notification")
65-
.setContentText("Hello World!")
64+
.setContentTitle("Friend Request")
65+
.setContentText("You have a new friend request!")
6666
.setPriority(NotificationCompat.PRIORITY_DEFAULT)
6767
.setContentIntent(resultPendingIntent)
6868
.addAction(R.drawable.ic_add_friend, "Add Friend",

app/src/main/java/com/magnitudestudios/GameFace/views/AddFriendViewHolder.kt

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ package com.magnitudestudios.GameFace.views
1010
import android.widget.ImageView
1111
import androidx.core.content.ContextCompat
1212
import androidx.recyclerview.widget.RecyclerView
13+
import com.magnitudestudios.GameFace.Constants
1314
import com.magnitudestudios.GameFace.R
1415
import com.magnitudestudios.GameFace.callbacks.RVButtonClick
1516
import com.magnitudestudios.GameFace.databinding.RowUsersBinding
1617
import com.magnitudestudios.GameFace.pojo.UserInfo.Profile
18+
import java.lang.IllegalStateException
1719

1820
class AddFriendViewHolder(bind: RowUsersBinding, listener: RVButtonClick) : RecyclerView.ViewHolder(bind.root) {
1921
private val mBinding = bind
2022
private val mListener = listener
23+
private var state = Constants.STATE_DEFAULT
2124
init {
2225
mBinding.sendRequest.setOnClickListener { mListener.onClick(adapterPosition) }
2326
mBinding.sendRequest.setOnLongClickListener {
@@ -33,14 +36,28 @@ class AddFriendViewHolder(bind: RowUsersBinding, listener: RVButtonClick) : Recy
3336
mBinding.profile.fullName.text = data.name
3437
}
3538

36-
//0 = default | 1 = request sent | 2 = Friends
39+
//0 = default | 1 = request sent | 2 = Friends | 3 = Own Profile
3740
fun setState(state: Int = 0) {
38-
if (state == 0) {
39-
mBinding.sendRequest.text = itemView.context.getText(R.string.users_send_request)
40-
mBinding.sendRequest.backgroundTintList = ContextCompat.getColorStateList(itemView.context, R.color.color_primary_selector)
41-
} else {
42-
mBinding.sendRequest.text = itemView.context.getText(R.string.users_request_sent)
43-
mBinding.sendRequest.backgroundTintList = ContextCompat.getColorStateList(itemView.context, R.color.color_accent_selector)
41+
when (state) {
42+
Constants.STATE_DEFAULT -> {
43+
mBinding.sendRequest.text = itemView.context.getText(R.string.users_send_request)
44+
mBinding.sendRequest.backgroundTintList = ContextCompat.getColorStateList(itemView.context, R.color.color_primary_selector)
45+
}
46+
Constants.STATE_REQUESTED -> {
47+
mBinding.sendRequest.text = itemView.context.getText(R.string.users_request_sent)
48+
mBinding.sendRequest.backgroundTintList = ContextCompat.getColorStateList(itemView.context, R.color.color_accent_selector)
49+
}
50+
Constants.STATE_FRIENDS -> {
51+
mBinding.sendRequest.text = itemView.context.getText(R.string.users_friend_profile)
52+
mBinding.sendRequest.backgroundTintList = ContextCompat.getColorStateList(itemView.context, R.color.blue_selector)
53+
}
54+
Constants.STATE_OWN_PROFILE -> {
55+
mBinding.sendRequest.text = itemView.context.getText(R.string.users_own_profile)
56+
mBinding.sendRequest.backgroundTintList = ContextCompat.getColorStateList(itemView.context, R.color.dark_grey_selector)
57+
}
58+
else -> {
59+
throw IllegalStateException("Unknown Type at AddFriend of: $state")
60+
}
4461
}
4562
}
4663

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
~ Copyright (c) 2020 - Magnitude Studios - All Rights Reserved
4+
~ Unauthorized copying of this file, via any medium is prohibited
5+
~ All software is proprietary and confidential
6+
~
7+
-->
8+
9+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
10+
<item android:color="@color/md_light_blue_900"/>
11+
</selector>

app/src/main/res/values/strings.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
<string name="done_button">Done</string>
5959
<string name="users_send_request">Send Request</string>
6060
<string name="users_request_sent">Request Sent</string>
61+
<string name="users_own_profile">You</string>
62+
<string name="users_friend_profile">Friend</string>
63+
6164
<string name="accept_request">Accept</string>
6265
<string name="deny_request">Delete</string>
6366
<string name="btn_edit_profile">Edit Profile</string>

app/src/main/res/values/styles.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626
<item name="android:background">@drawable/accent_button</item>
2727
</style>
2828

29+
<style name="morphable_accent_button_theme">
30+
<item name="textAllCaps">false</item>
31+
<item name="android:fontFamily">@font/raleway</item>
32+
<item name="android:textColor">@color/white</item>
33+
<item name="android:background">@drawable/morphable_btn_background</item>
34+
</style>
35+
2936
<style name="small_text">
3037
<item name="android:fontFamily">@font/raleway</item>
3138
<item name="android:textColor">@color/darkGray</item>
@@ -129,7 +136,7 @@
129136
<item name="android:padding">@dimen/padding_large</item>
130137
</style>
131138

132-
<style name="signup_button" parent="accent_button_theme">
139+
<style name="signup_button" parent="morphable_accent_button_theme">
133140
<item name="android:padding">@dimen/padding_medium</item>
134141
<item name="android:textSize">@dimen/text_size_medium</item>
135142
<item name="android:textAlignment">center</item>

0 commit comments

Comments
 (0)