Skip to content

Commit

Permalink
first commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@saytoonz
saytoonz committed Aug 29, 2019
1 parent 774d242 commit 558c6ab
Show file tree
Hide file tree
Showing 6 changed files with 246 additions and 178 deletions.
307 changes: 159 additions & 148 deletions .idea/workspace.xml
View file

Large diffs are not rendered by default.

32 changes: 28 additions & 4 deletions app/src/main/java/com/nsromapa/frenzapp/saytalk/activities/ForwardActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -874,7 +874,7 @@ class ForwardActivity : AppCompatActivity() {

override fun onDataChange(p0: DataSnapshot) {
//only available members will be returned
var isMeRemoved = false
var isMeRemoved: Boolean

isMeRemoved = if(!p0.exists())
true
Expand All @@ -887,10 +887,34 @@ class ForwardActivity : AppCompatActivity() {
Log.d("ForwardActivity", "onDataChange: removed = $isMeRemoved")

try {
FirebaseUtils.ref.channelMember(selectedChannelID,myUID)
.addValueEventListener(object : ValueEventListener {
override fun onCancelled(p0: DatabaseError) {
isMeRemoved = false
holder.itemView.isEnabled = !isMeRemoved
holder.itemView.isClickable = holder.itemView.isEnabled
holder.title.setTextColor(if(holder.itemView.isEnabled) Color.BLACK else Color.LTGRAY)
}

override fun onDataChange(p0: DataSnapshot) {

if(p0.exists()){
val member = p0.getValue(Models.ChannelMember::class.java)!!
if(!member.admin){
isMeRemoved = false
}

}else{
isMeRemoved = false
}

holder.itemView.isEnabled = !isMeRemoved
holder.itemView.isClickable = holder.itemView.isEnabled
holder.title.setTextColor(if(holder.itemView.isEnabled) Color.BLACK else Color.LTGRAY)

}
})

holder.itemView.isEnabled = !isMeRemoved
holder.itemView.isClickable = holder.itemView.isEnabled
holder.title.setTextColor(if(holder.itemView.isEnabled) Color.BLACK else Color.LTGRAY)

}
catch (e:Exception){}
Expand Down
24 changes: 12 additions & 12 deletions app/src/main/java/com/nsromapa/frenzapp/saytalk/activities/MessageActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,18 +131,13 @@ class MessageActivity : AppCompatActivity() {
var myUID : String = ""
var isGroup = false
var isChannel = false
var isMeRemoved = false
var isMeRemoved = true
var nameOrNumber = ""

var imageFile:File? = null
var cameraImagePath = ""
var cameraImageUri: Uri? = null

var user1 = "user---1"
var user2 = "user---2"

val storage_dir_initial = "/storage/"

var isBlockedByMe = false
var isBlockedByUser = false

Expand Down Expand Up @@ -371,7 +366,7 @@ class MessageActivity : AppCompatActivity() {
messageInputField.setAttachmentsListener {


if(isBlockedByUser || isBlockedByMe)
if(isBlockedByUser || isBlockedByMe || isMeRemoved)
return@setAttachmentsListener


Expand Down Expand Up @@ -1312,10 +1307,15 @@ class MessageActivity : AppCompatActivity() {

val viewType: Int

if(model.messageType == FirebaseUtils.EVENT_TYPE_REMOVED ||
model.messageType == FirebaseUtils.EVENT_TYPE_LEFT ||
model.messageType == FirebaseUtils.EVENT_TYPE_ADDED ||
model.messageType == FirebaseUtils.EVENT_TYPE_CREATED)
if (model.messageType == FirebaseUtils.EVENT_TYPE_REMOVED ||
model.messageType == FirebaseUtils.EVENT_TYPE_LEFT ||
model.messageType == FirebaseUtils.EVENT_TYPE_ADDED ||
model.messageType == FirebaseUtils.EVENT_TYPE_CREATED ||
model.messageType == FirebaseUtils.EVENT_TYPE_CALL_LOG_FROM ||
model.messageType == FirebaseUtils.EVENT_TYPE_CALL_LOG_TO ||
model.messageType == FirebaseUtils.EVENT_TYPE_CALL_LOG_JOINED ||
model.messageType == FirebaseUtils.EVENT_TYPE_CALL_LOG_LEAVED
)
return TYPE_EVENT


Expand Down Expand Up @@ -3207,7 +3207,7 @@ class MessageActivity : AppCompatActivity() {
try {
if (!isMeRemoved) {
members = members.trim().substring(0, members.lastIndex - 1)
user_online_status.text = members
user_online_status.text = "" + channelMembers.size + " Subscribers"
Log.d("MessageActivity", "onDataChange: member name = $members")
}
else user_online_status.visibility = View.GONE
Expand Down
42 changes: 32 additions & 10 deletions app/src/main/java/com/nsromapa/frenzapp/saytalk/utils/FirebaseUtils.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1242,16 +1242,38 @@ object FirebaseUtils {


//.replace("\n"," ")
when {
messageModel!!.messageType == EVENT_TYPE_LEFT -> textView.text =
"❗ A member left"
messageModel.messageType == EVENT_TYPE_ADDED -> textView.text =
"❗ A new member was added"
messageModel.messageType == EVENT_TYPE_CREATED -> textView.text =
"❗ Group was created"
messageModel.messageType == EVENT_TYPE_REMOVED -> textView.text =
"❗ A member was removed"
if (utils.isChannelID(targetUID)) {
when {
messageModel!!.messageType == FirebaseUtils.EVENT_TYPE_LEFT -> textView.text =
"❗ A member left"
messageModel.messageType == FirebaseUtils.EVENT_TYPE_ADDED -> textView.text =
"❗ A new member was added"
messageModel.messageType == FirebaseUtils.EVENT_TYPE_CREATED -> textView.text =
"❗ Channel was created"
messageModel.messageType == FirebaseUtils.EVENT_TYPE_REMOVED -> textView.text =
"❗ A member was removed"
messageModel.messageType == FirebaseUtils.EVENT_TYPE_CALL_LOG_FROM -> textView.text =
"☎ You made a call"
messageModel.messageType == FirebaseUtils.EVENT_TYPE_CALL_LOG_TO -> textView.text =
"\uD83D\uDCDE You had a call"

}
}else{
when {
messageModel!!.messageType == FirebaseUtils.EVENT_TYPE_LEFT -> textView.text =
"❗ A member left"
messageModel.messageType == FirebaseUtils.EVENT_TYPE_ADDED -> textView.text =
"❗ A new member was added"
messageModel.messageType == FirebaseUtils.EVENT_TYPE_CREATED -> textView.text =
"❗ Group was created"
messageModel.messageType == FirebaseUtils.EVENT_TYPE_REMOVED -> textView.text =
"❗ A member was removed"
messageModel.messageType == FirebaseUtils.EVENT_TYPE_CALL_LOG_FROM -> textView.text =
"☎ You made a call"
messageModel.messageType == FirebaseUtils.EVENT_TYPE_CALL_LOG_TO -> textView.text =
"\uD83D\uDCDE You had a call"

}
}

if (textView.text.isNotEmpty())
Expand Down Expand Up @@ -1513,7 +1535,7 @@ object FirebaseUtils {
)
}
userStatus.status.startsWith(VAL_TYPING) -> {
if (userStatus.status.endsWith(uid))
if (userStatus.status.endsWith(getUid()))
textView.text =
VAL_TYPING
else
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/res/layout/activity_jitsi_meet.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".saytalk.jitsi_sdk.JitsiMeetActivity">
<fragment
android:layout_width="match_parent"
android:layout_height="match_parent"
android:name="org.jitsi.meet.sdk.JitsiMeetFragment"
android:id="@+id/jitsiFragment"/>
</FrameLayout>
7 changes: 3 additions & 4 deletions app/src/main/res/layout/layout_include_message_activity_toolbar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,14 @@
android:background="?selectableItemBackground"
android:gravity="center_vertical"
android:orientation="vertical"

android:paddingLeft="20dp">
android:paddingStart="20dp">

<TextView
android:id="@+id/target_name_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="@font/roboto_medium"
android:text="Loading..."
android:text="@string/loading"
android:textColor="@color/white"
android:textSize="16sp" />

Expand All @@ -64,7 +63,7 @@
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/white"
android:textSize="11sp" />
android:textSize="12sp" />


</LinearLayout>
Expand Down

0 comments on commit 558c6ab

Please sign in to comment.