Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ dependencies {
implementation(libs.play.services.location)
implementation(libs.androidx.recyclerview)
implementation(libs.androidx.media3.ui)
implementation(libs.firebase.database.ktx)
val room_version = "2.6.1"
val lifecycle_version = "2.8.1"
val mediaVersion = "1.3.1"
Expand Down
106 changes: 0 additions & 106 deletions app/src/androidTest/java/com/example/trainhub/PostFireBaseModelTest.kt

This file was deleted.

124 changes: 0 additions & 124 deletions app/src/androidTest/java/com/example/trainhub/UserFirebaseModelTest.kt

This file was deleted.

4 changes: 1 addition & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,13 @@
tools:targetApi="34">
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="@string/google_api_key" />
android:value="${GOOGLE_API_KEY}" />
<activity
android:name=".MainActivity"
android:exported="true"
android:theme="@style/Theme.TrainHub">

<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
Expand Down
37 changes: 6 additions & 31 deletions app/src/main/java/com/example/trainhub/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import com.example.trainhub.fragments.LocationFragment
import com.example.trainhub.fragments.ProfileFragment
import com.google.android.material.bottomnavigation.BottomNavigationView


class MainActivity : AppCompatActivity() {
private var navController: NavController? = null
private val homeFragment = HomeFragment()
Expand All @@ -35,7 +34,6 @@ class MainActivity : AppCompatActivity() {
}



bottomNavigationView?.setOnItemSelectedListener {
when(it.itemId){
R.id.icHome -> replaceFragment(homeFragment)
Expand All @@ -44,6 +42,7 @@ class MainActivity : AppCompatActivity() {
R.id.icLocation -> replaceFragment(locationFragment)
R.id.icProfile -> replaceFragment(profileFragment)
}

true
}

Expand All @@ -57,43 +56,19 @@ class MainActivity : AppCompatActivity() {
}
}

bottomNavigationView?.setOnItemSelectedListener { item ->
when (item.itemId) {

R.id.icHome -> {

navController?.navigate(R.id.homeFragment)
true
}
R.id.icDiscover -> {

navController?.navigate(R.id.discoverFragment)
true
}
R.id.icAddPost -> {
navController?.navigate(R.id.addPostFragment)
true
}
R.id.icLocation -> {
navController?.navigate(R.id.locationFragment)
true
}
R.id.icProfile -> {
navController?.navigate(R.id.profileFragment)
true
}
else -> false

}
}

}

fun moveToHome(){
bottomNavigationView?.selectedItemId = R.id.icHome
replaceFragment(homeFragment)
}

fun replaceFragment(fragment: Fragment){
fun replaceFragment(fragment: Fragment,bundle: Bundle? = null){
if(bundle!=null){
fragment.arguments = bundle
}
if(fragment!=null){
val transaction = supportFragmentManager.beginTransaction()
transaction.replace(R.id.navHostMain,fragment)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@ import com.example.trainhub.viewModel.PostWithUser
import com.google.firebase.ktx.Firebase
import com.google.firebase.storage.ktx.storage

class PostRecyclerAdapter(var posts: List<PostWithUser>) :
class PostRecyclerAdapter(var posts: List<PostWithUser>, private var isClickable:Boolean) :

RecyclerView.Adapter<PostRecyclerAdapter.PostViewHolder>() {
val storage = Firebase.storage
inner class PostViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {

val profileImg: ImageFilterView = itemView.findViewById(R.id.ifPostProfileImg)
val titleTextView: TextView = itemView.findViewById(R.id.tvCardTitle)
val descriptionTextView: TextView = itemView.findViewById(R.id.tvDescription)
val postImg: ImageView = itemView.findViewById(R.id.ifPostImg)

}

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PostViewHolder {
Expand All @@ -45,6 +48,15 @@ class PostRecyclerAdapter(var posts: List<PostWithUser>) :
.load(currentItem.user?.profileImageUrl)
.into(holder.profileImg)
Log.d(TAG,"PROFILE IMAGE: profile_images/${currentItem.user?.profileImageUrl}")


if (isClickable) {
holder.itemView.setOnClickListener {
Log.d("post", "Item clicked: ${currentItem.post.title}")
}

}

}

override fun getItemCount(): Int {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import android.location.Location
import android.net.Uri
import android.os.Bundle
import android.provider.MediaStore
import android.util.Log
import androidx.fragment.app.Fragment
import android.view.LayoutInflater
import android.view.View
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class HomeFragment : Fragment() , SwipeRefreshLayout.OnRefreshListener{
}

postsRecyclerView?.layoutManager = LinearLayoutManager(context)
postAdapter = PostRecyclerAdapter(listOf())
postAdapter = PostRecyclerAdapter(listOf(), false)
postsRecyclerView?.adapter = postAdapter

return view
Expand Down
Loading