Skip to content

Commit

Permalink
test, fix, beta-v0.0.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@MuizZer07
MuizZer07 committed Dec 3, 2019
1 parent 34e2b49 commit c15a688
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 7 deletions.
Binary file added app/release/app-release.apk
View file
Binary file not shown.
1 change: 1 addition & 0 deletions app/release/output.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
1 change: 1 addition & 0 deletions app/src/main/java/com/muizzer07/thunderstormmessenger/auth/LoginActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ class LoginActivity: AppCompatActivity(){
}

private fun registerPage(){
registerText.isEnabled = false
val intent = Intent(this, RegisterActivity::class.java)
startActivity(intent)
finish()
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/java/com/muizzer07/thunderstormmessenger/auth/ProfileActivity.kt
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package com.muizzer07.thunderstormmessenger.auth

import android.content.Intent
import android.support.v7.app.AppCompatActivity
import android.os.Bundle
import com.muizzer07.thunderstormmessenger.R
import com.muizzer07.thunderstormmessenger.messages.LatestMessagesActivity
import com.muizzer07.thunderstormmessenger.messages.LatestMessagesActivity.Companion.currentUser
import com.muizzer07.thunderstormmessenger.messages.NewMessageActivity
import com.muizzer07.thunderstormmessenger.models.User
Expand All @@ -23,4 +25,11 @@ class ProfileActivity : AppCompatActivity() {
Picasso.get().load(uri).into(profileimageView)
profilenameText.text = currentUser!!.username
}

override fun onBackPressed() {
super.onBackPressed()
val intent = Intent(this, LatestMessagesActivity::class.java)
startActivity(intent)
finish()
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/muizzer07/thunderstormmessenger/auth/RegisterActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class RegisterActivity : AppCompatActivity() {
}

already_have_an_account_text.setOnClickListener {

already_have_an_account_text.isEnabled = false
val intent = Intent(this, LoginActivity::class.java)
startActivity(intent)
finish()
Expand Down
41 changes: 36 additions & 5 deletions app/src/main/java/com/muizzer07/thunderstormmessenger/messages/ChatLogActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,40 +33,63 @@ class ChatLogActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_chat_log)

Log.d("ChatlogActivity", "ChatlogActivity finished")

texts_recycleView.adapter = adapter

toUser = intent.getParcelableExtra<User>(NewMessageActivity.USER_KEY)
supportActionBar?.title = toUser!!.username

Log.d("ChatlogActivity", "To User: " + toUser!!.username)

supportActionBar?.title = toUser!!.username

listenForMessages()

sendBtn.setOnClickListener {
performSendMessage()
Log.d("ChatlogActivity", "Send Button clicked: " + messageText.text)
if(!messageText.text.toString().equals("")){
performSendMessage()
}
}

adapter.setOnItemClickListener { item, view ->
if(item.getItem(0).javaClass == ChatFromItem::class.java){
val visible = view.mesage_info_text.visibility

Log.d("ChatlogActivity", "From Message Info: " + visible)
if(visible == View.VISIBLE){
view.mesage_info_text.visibility = View.GONE
}else{
view.mesage_info_text.visibility = View.VISIBLE
}
}else{
Log.d("ChatlogActivity", "Message clicked; info visible:" + view.mesage_info_text.visibility)
}else if((item.getItem(0).javaClass == ChatToItem::class.java)){
val visible = view.mesage_info_text_to.visibility

Log.d("ChatlogActivity", "To Message Info: " + visible)
if(visible == View.VISIBLE){
view.mesage_info_text_to.visibility = View.GONE
}else{
Log.d("ChatlogActivity", "VISIBLE: " + view.mesage_info_text_to.text)
view.mesage_info_text_to.visibility = View.VISIBLE
}
Log.d("ChatlogActivity", "Message clicked; info visible:" + view.mesage_info_text_to.visibility)
}
}
}

override fun onBackPressed() {
super.onBackPressed()
Log.d("ChatlogActivity", "Back button clicked")
val intent = Intent(this, LatestMessagesActivity::class.java)
startActivity(intent)
finish()
}

private fun listenForMessages(){
Log.d("ChatlogActivity", "Listening for new messages")
val currentuser_uid = LatestMessagesActivity.currentUser!!.uid

Log.d("ChatlogActivity", "Current user uid: " + currentuser_uid)
val touser_uid = toUser!!.uid
val ref = FirebaseDatabase.getInstance().getReference("/user-messages/$currentuser_uid/$touser_uid")

Expand All @@ -75,11 +98,14 @@ class ChatLogActivity : AppCompatActivity() {
val textMessage = p0.getValue(TextMessage::class.java)

if(textMessage != null){
Log.d("ChatlogActivity", "Text Message: " + textMessage.text)
if(textMessage.fromId == FirebaseAuth.getInstance().uid){
adapter.add(ChatFromItem(textMessage, LatestMessagesActivity.currentUser!!))
}else{
adapter.add(ChatToItem(textMessage, toUser!!))
}
Log.d("ChatlogActivity", "Text Message From ID: " + textMessage.fromId)
Log.d("ChatlogActivity", "Text Message To ID: " + textMessage.toId)
texts_recycleView.scrollToPosition(adapter.itemCount - 1)
}
}
Expand Down Expand Up @@ -107,6 +133,8 @@ class ChatLogActivity : AppCompatActivity() {
val currentuser_uid = LatestMessagesActivity.currentUser!!.uid
val touser_uid = toUser!!.uid

Log.d("ChatlogActivity", "Send Message to " + toUser!!.username)

// all messages node
val ref = FirebaseDatabase.getInstance().getReference("/user-messages/$currentuser_uid/$touser_uid").push()
val to_ref = FirebaseDatabase.getInstance().getReference("/user-messages/$touser_uid/$currentuser_uid").push()
Expand All @@ -120,7 +148,8 @@ class ChatLogActivity : AppCompatActivity() {
texts_recycleView.scrollToPosition(adapter.itemCount - 1)
}

val incomingTextMessage = TextMessage(ref.key!!, newText, currentuser_uid, touser_uid, System.currentTimeMillis()/1000, "Incoming")
Log.d("ChatlogActivity", "Sent Text Message: " + messageText.text)
val incomingTextMessage = TextMessage(ref.key!!, newText, currentuser_uid, touser_uid, System.currentTimeMillis(), "Incoming")
to_ref.setValue(incomingTextMessage)

// update latest messages node
Expand All @@ -140,6 +169,7 @@ class ChatFromItem(val textMessage: TextMessage, val user: User): Item<ViewHolde
val time_stamp = "- sent " + TimeStampManagement().processTimeStamp(textMessage.timeStamp) + "\n- haven't seen yet"
viewHolder.itemView.mesage_info_text.text = time_stamp
viewHolder.itemView.mesage_info_text.visibility = View.GONE
Log.d("ChatlogActivity", "From Message Timestamp: " + time_stamp)
}

override fun getLayout(): Int {
Expand All @@ -158,6 +188,7 @@ class ChatToItem(val textMessage: TextMessage, val user: User): Item<ViewHolder>
val time_stamp = "- sent " + TimeStampManagement().processTimeStamp(textMessage.timeStamp) + "\n- haven't seen yet"
viewHolder.itemView.mesage_info_text_to.text = time_stamp
viewHolder.itemView.mesage_info_text_to.visibility = View.GONE
Log.d("ChatlogActivity", "To Message Timestamp: " + time_stamp)
}

override fun getLayout(): Int {
Expand Down
17 changes: 16 additions & 1 deletion app/src/main/java/com/muizzer07/thunderstormmessenger/messages/NewMessageActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,39 +22,52 @@ class NewMessageActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_new_message)
Log.d("NewMessageActivity", "NewMessageActivity started")

supportActionBar?.title = "New Message"
fetchUsers()
}

override fun onBackPressed() {
super.onBackPressed()
Log.d("NewMessageActivity", "Back Button Pressed")
val intent = Intent(this, LatestMessagesActivity::class.java)
startActivity(intent)
finish()
}

companion object {
val USER_KEY = "USER_KEY"
}

private fun fetchUsers(){
Log.d("NewMessageActivity", "Fetching users from firebase")
val db =FirebaseDatabase.getInstance().getReference("/users")
db.addListenerForSingleValueEvent(object: ValueEventListener{
override fun onDataChange(p0: DataSnapshot) {
val adapter = GroupAdapter<ViewHolder>()

p0.children.forEach{
Log.d("NewMessageActivity", it.toString())
Log.d("NewMessageActivity", "User: " + it.toString())

val user = it.getValue(User::class.java)
if(user != null){
adapter.add(UserItem(user))
Log.d("NewMessageActivity", "User added to adapter: " + user.username)
}
}
recycleview_new_message.adapter = adapter

adapter.setOnItemClickListener { item, view ->
view.isEnabled = false
val userItem = item as UserItem
Log.d("NewMessageActivity", "User clicked: " + userItem.toString())

val intent = Intent(view.context, ChatLogActivity::class.java)
intent.putExtra(USER_KEY, userItem.user)
startActivity(intent)

Log.d("NewMessageActivity", "NewMessageActivity finished")
finish()
}
}
Expand All @@ -70,6 +83,8 @@ class UserItem(val user: User): Item<ViewHolder>(){
override fun bind(viewHolder: ViewHolder, position: Int) {
viewHolder.itemView.usernameTextView.text = user.username
Picasso.get().load(user.profileImageUrl).into(viewHolder.itemView.profile_dp)

Log.d("NewMessageActivity", "Username and profile picture loaded")
}

override fun getLayout(): Int {
Expand Down

0 comments on commit c15a688

Please sign in to comment.