diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fc3b440..8242c35 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,9 @@ android:supportsRtl="true" android:theme="@style/Theme.DRP25" tools:targetApi="31"> + diff --git a/app/src/main/java/com/example/drp25/ChatActivity.kt b/app/src/main/java/com/example/drp25/ChatActivity.kt index e804e08..4f83fa6 100644 --- a/app/src/main/java/com/example/drp25/ChatActivity.kt +++ b/app/src/main/java/com/example/drp25/ChatActivity.kt @@ -145,6 +145,11 @@ class ChatActivity : AppCompatActivity() { startActivity(intent) } + binding.homeEventsButton.setOnClickListener { + val intent = Intent(this, UserEventsActivity::class.java) + startActivity(intent) + } + binding.channelListHeaderView.setOnUserAvatarClickListener{ val intent = Intent(this, UserProfileActivity::class.java) startActivity(intent) diff --git a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt index 4ab7cef..1f26201 100644 --- a/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt +++ b/app/src/main/java/com/example/drp25/CommitteeEventsActivity.kt @@ -4,10 +4,8 @@ import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.view.LayoutInflater -import android.view.View import android.widget.* import androidx.cardview.widget.CardView -import androidx.core.view.allViews import com.google.firebase.database.DataSnapshot import com.google.firebase.database.DatabaseError import com.google.firebase.database.FirebaseDatabase @@ -43,13 +41,9 @@ class CommitteeEventsActivity : AppCompatActivity() { val eventCard = inflater.inflate( R.layout.committee_event_view, eventsList, false ) as CardView - eventCard.findViewById(R.id.new_event_title).text = name + eventCard.findViewById(R.id.share_prompt).text = name eventCard.findViewById(R.id.new_event_descr).text = desc eventCard.findViewById(R.id.new_event_date).text = date - val broadcastBtn = eventCard.findViewById