diff --git a/app/build.gradle b/app/build.gradle index 5628100130..8ca14a6870 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -228,3 +228,4 @@ protobuf { } apply plugin: 'com.google.gms.google-services' + diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/drawer/DrawerMenuHelper.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/drawer/DrawerMenuHelper.kt index d2c04274d0..f8ece2fafb 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/drawer/DrawerMenuHelper.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/other/generic/drawer/DrawerMenuHelper.kt @@ -15,8 +15,8 @@ import de.tum.`in`.tumcampusapp.component.tumui.lectures.fragment.LecturesFragme import de.tum.`in`.tumcampusapp.component.tumui.tutionfees.TuitionFeesFragment import de.tum.`in`.tumcampusapp.component.ui.barrierfree.BarrierFreeInfoFragment import de.tum.`in`.tumcampusapp.component.ui.cafeteria.fragment.CafeteriaFragment -import de.tum.`in`.tumcampusapp.component.ui.cafeteriarating.CreateCafeteriaRatingFragment -import de.tum.`in`.tumcampusapp.component.ui.cafeteriarating.ShowCafeteriaRatingsFragment +import de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating.CreateCafeteriaRatingFragment +import de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating.ShowCafeteriaRatingsFragment import de.tum.`in`.tumcampusapp.component.ui.chat.ChatRoomsFragment import de.tum.`in`.tumcampusapp.component.ui.news.NewsFragment import de.tum.`in`.tumcampusapp.component.ui.openinghour.OpeningHoursListFragment diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/CafeteriaMenuCard.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/CafeteriaMenuCard.kt index 4575948940..5b1e11b0ee 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/CafeteriaMenuCard.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/CafeteriaMenuCard.kt @@ -73,7 +73,7 @@ class CafeteriaMenuCard(context: Context, private val cafeteria: CafeteriaWithMe @JvmStatic fun inflateViewHolder(parent: ViewGroup, interactionListener: CardInteractionListener): CardViewHolder { val view = LayoutInflater.from(parent.context).inflate(R.layout.card_cafeteria_menu, parent, false) - return CafeteriaMenuViewHolder(view, interactionListener) + return CafeteriaMenuViewHolder(view, interactionListener)//,requireA) } } } diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/CafeteriaMenuViewHolder.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/CafeteriaMenuViewHolder.kt index 13b9c672e9..556a338fd2 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/CafeteriaMenuViewHolder.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/CafeteriaMenuViewHolder.kt @@ -1,9 +1,9 @@ package de.tum.`in`.tumcampusapp.component.ui.cafeteria -import android.content.Intent import android.view.View import android.widget.TextView -import androidx.core.content.ContentProviderCompat.requireContext +import androidx.appcompat.app.AppCompatActivity +import androidx.fragment.app.Fragment import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -11,7 +11,7 @@ import de.tum.`in`.tumcampusapp.R import de.tum.`in`.tumcampusapp.component.ui.cafeteria.details.CafeteriaMenusAdapter import de.tum.`in`.tumcampusapp.component.ui.cafeteria.details.OpenHoursHelper import de.tum.`in`.tumcampusapp.component.ui.cafeteria.model.CafeteriaWithMenus -import de.tum.`in`.tumcampusapp.component.ui.cafeteriarating.CreateCafeteriaRatingActivity +import de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating.CreateCafeteriaRatingFragment import de.tum.`in`.tumcampusapp.component.ui.overview.CardInteractionListener import de.tum.`in`.tumcampusapp.component.ui.overview.card.CardViewHolder import org.joda.time.format.DateTimeFormat @@ -44,10 +44,20 @@ class CafeteriaMenuViewHolder( menusRecyclerView.layoutManager = LinearLayoutManager(context) menusRecyclerView.itemAnimator = DefaultItemAnimator() - /* adapter = CafeteriaMenusAdapter(context, false) { /*performClick()*/ - val intent = Intent(requireContext, CreateCafeteriaRatingActivity::class.java) - context.startActivity(intent) - }*/ + val lambda= { /*performClick()*/ + // val intent = Intent(requireContext, CreateCafeteriaRatingActivity::class.java) + // context.startActivity(intent) + val nextFrag = CreateCafeteriaRatingFragment() + val help= itemView.context + + (context as Fragment).requireActivity().supportFragmentManager.beginTransaction() + .replace(R.id.contentFrame, nextFrag, "cafeteriaRating") + .addToBackStack(null) + .commit() + } + + adapter = CafeteriaMenusAdapter(context, false)//,lambda) + menusRecyclerView.adapter = adapter } diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaDetailsSectionFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaDetailsSectionFragment.kt index b778a767e2..3ad270984d 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaDetailsSectionFragment.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaDetailsSectionFragment.kt @@ -14,6 +14,8 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding import de.tum.`in`.tumcampusapp.R import de.tum.`in`.tumcampusapp.component.ui.cafeteria.model.CafeteriaMenu +import de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating.CreateCafeteriaRatingFragment +import de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating.ShowCafeteriaRatingsFragment import de.tum.`in`.tumcampusapp.databinding.FragmentCafeteriadetailsSectionBinding import de.tum.`in`.tumcampusapp.di.ViewModelFactory import de.tum.`in`.tumcampusapp.di.injector @@ -70,7 +72,15 @@ class CafeteriaDetailsSectionFragment : Fragment() { menusRecyclerView.layoutManager = LinearLayoutManager(requireContext()) menusRecyclerView.itemAnimator = DefaultItemAnimator() - val adapter = CafeteriaMenusAdapter(requireContext(), true, null) + val adapter = CafeteriaMenusAdapter(requireContext(), true + ) { + val nextFrag = ShowCafeteriaRatingsFragment() + + requireActivity().supportFragmentManager.beginTransaction() + .replace(R.id.contentFrame, nextFrag, "cafeteriaRating") + .addToBackStack(null) + .commit() + } menusRecyclerView.adapter = adapter cafeteriaViewModel.cafeteriaMenus.observe(viewLifecycleOwner, Observer> { adapter.update(it) }) diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaMenuAdapterItem.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaMenuAdapterItem.kt index 23dfade118..e9b74d84a4 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaMenuAdapterItem.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaMenuAdapterItem.kt @@ -3,11 +3,13 @@ package de.tum.`in`.tumcampusapp.component.ui.cafeteria.details import android.view.View import android.widget.ImageView import android.widget.TextView +import androidx.fragment.app.Fragment import de.tum.`in`.tumcampusapp.R import de.tum.`in`.tumcampusapp.component.ui.cafeteria.CafeteriaMenuFormatter import de.tum.`in`.tumcampusapp.component.ui.cafeteria.FavoriteDishDao import de.tum.`in`.tumcampusapp.component.ui.cafeteria.model.CafeteriaMenu import de.tum.`in`.tumcampusapp.component.ui.cafeteria.model.FavoriteDish +import de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating.CreateCafeteriaRatingFragment import org.joda.time.DateTime import org.joda.time.format.DateTimeFormat @@ -32,7 +34,16 @@ sealed class CafeteriaMenuAdapterItem { val headerTextView = findViewById(R.id.headerTextView) headerTextView.text = menu.typeLong.replace("[0-9]", "").trim() - setOnClickListener { listener?.invoke() } + setOnClickListener { + listener?.invoke() +/* val nextFrag = CreateCafeteriaRatingFragment() + val help= it.context + + (context as Fragment).requireActivity().supportFragmentManager.beginTransaction() + .replace(R.id.contentFrame, nextFrag, "cafeteriaRating") + .addToBackStack(null) + .commit()*/ + } } } diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaMenusAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaMenusAdapter.kt index 7b967cda12..2588b74001 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaMenusAdapter.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/details/CafeteriaMenusAdapter.kt @@ -2,6 +2,7 @@ package de.tum.`in`.tumcampusapp.component.ui.cafeteria.details import android.content.Context import android.content.Intent +import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -94,9 +95,10 @@ class CafeteriaMenusAdapter( class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { init { + itemView.setBackgroundColor(0x80808) itemView.setOnClickListener({ // itemView.findViewById(R.id.nameTextView).text = "clicked" - + Log.d("help", "test: ") }) } } diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt index 24482c6a97..2bdfec44c2 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/fragment/CafeteriaFragment.kt @@ -19,6 +19,7 @@ import de.tum.`in`.tumcampusapp.component.ui.cafeteria.controller.CafeteriaManag import de.tum.`in`.tumcampusapp.component.ui.cafeteria.details.CafeteriaDetailsSectionsPagerAdapter import de.tum.`in`.tumcampusapp.component.ui.cafeteria.details.CafeteriaViewModel import de.tum.`in`.tumcampusapp.component.ui.cafeteria.model.Cafeteria +import de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating.CreateCafeteriaRatingFragment import de.tum.`in`.tumcampusapp.databinding.FragmentCafeteriaBinding import de.tum.`in`.tumcampusapp.di.ViewModelFactory import de.tum.`in`.tumcampusapp.di.injector @@ -26,6 +27,7 @@ import de.tum.`in`.tumcampusapp.service.DownloadWorker import de.tum.`in`.tumcampusapp.utils.Const import de.tum.`in`.tumcampusapp.utils.Utils import de.tum.`in`.tumcampusapp.utils.observeNonNull +import org.jetbrains.anko.sdk27.coroutines.onClick import org.joda.time.DateTime import javax.inject.Inject import javax.inject.Provider @@ -84,6 +86,14 @@ class CafeteriaFragment : FragmentForDownloadingExternal( binding.spinnerToolbar.adapter = adapter binding.spinnerToolbar.onItemSelectedListener = this + binding.floatingActionButton.onClick { + val nextFrag = CreateCafeteriaRatingFragment() + requireActivity().supportFragmentManager.beginTransaction() + .replace(R.id.contentFrame, nextFrag, "cafeteriaRating") + .addToBackStack(null) + .commit() + } + cafeteriaViewModel.cafeterias.observeNonNull(this) { updateCafeterias(it) } cafeteriaViewModel.selectedCafeteria.observeNonNull(this) { onNewCafeteriaSelected(it) } cafeteriaViewModel.menuDates.observeNonNull(this) { updateSectionsPagerAdapter(it) } diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateCafeteriaRatingFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/CreateCafeteriaRatingFragment.kt similarity index 98% rename from app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateCafeteriaRatingFragment.kt rename to app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/CreateCafeteriaRatingFragment.kt index bcf3f810f4..2579f95e83 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateCafeteriaRatingFragment.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/CreateCafeteriaRatingFragment.kt @@ -1,4 +1,4 @@ -package de.tum.`in`.tumcampusapp.component.ui.cafeteriarating +package de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating import android.Manifest @@ -19,14 +19,12 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding import de.tum.`in`.tumcampusapp.R import de.tum.`in`.tumcampusapp.component.other.generic.fragment.FragmentForAccessingTumCabe -import de.tum.`in`.tumcampusapp.component.tumui.feedback.FeedbackContract import de.tum.`in`.tumcampusapp.component.tumui.feedback.FeedbackPresenter import de.tum.`in`.tumcampusapp.databinding.FragmentCafeteriaRatingBinding import de.tum.`in`.tumcampusapp.utils.ImageUtils import de.tum.`in`.tumcampusapp.utils.Utils import java.io.File import java.io.IOException -import javax.inject.Inject class CreateCafeteriaRatingFragment : FragmentForAccessingTumCabe>( diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateRatingAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/CreateRatingAdapter.kt similarity index 94% rename from app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateRatingAdapter.kt rename to app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/CreateRatingAdapter.kt index 9413416954..980a7277e2 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateRatingAdapter.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/CreateRatingAdapter.kt @@ -1,4 +1,4 @@ -package de.tum.`in`.tumcampusapp.component.ui.cafeteriarating +package de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateTagRatingElement.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/CreateTagRatingElement.kt similarity index 72% rename from app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateTagRatingElement.kt rename to app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/CreateTagRatingElement.kt index 36d02cf07c..b0527d4532 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateTagRatingElement.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/CreateTagRatingElement.kt @@ -1,4 +1,4 @@ -package de.tum.`in`.tumcampusapp.component.ui.cafeteriarating +package de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating class CreateTagRatingElement { var tagLabel: String="label" diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowCafeteriaRatingsFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowCafeteriaRatingsFragment.kt similarity index 97% rename from app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowCafeteriaRatingsFragment.kt rename to app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowCafeteriaRatingsFragment.kt index dd2815a5b4..cd1ad220a7 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowCafeteriaRatingsFragment.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowCafeteriaRatingsFragment.kt @@ -1,8 +1,7 @@ -package de.tum.`in`.tumcampusapp.component.ui.cafeteriarating +package de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating import android.os.Bundle import android.view.View -import android.widget.AdapterView import android.widget.ArrayAdapter import androidx.recyclerview.widget.LinearLayoutManager import com.zhuinden.fragmentviewbindingdelegatekt.viewBinding diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowRatingAdapter.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowRatingAdapter.kt similarity index 98% rename from app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowRatingAdapter.kt rename to app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowRatingAdapter.kt index e6bc2e44ed..ada8198c04 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowRatingAdapter.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowRatingAdapter.kt @@ -1,4 +1,4 @@ -package de.tum.`in`.tumcampusapp.component.ui.cafeteriarating +package de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating import android.content.Context import android.content.res.ColorStateList diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowRatingAverage.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowRatingAverage.kt similarity index 76% rename from app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowRatingAverage.kt rename to app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowRatingAverage.kt index 61f49a3fd3..3c323cef35 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowRatingAverage.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowRatingAverage.kt @@ -1,4 +1,4 @@ -package de.tum.`in`.tumcampusapp.component.ui.cafeteriarating +package de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating class ShowRatingAverage( var img: Boolean, diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowTagRatingAverage.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowTagRatingAverage.kt similarity index 69% rename from app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowTagRatingAverage.kt rename to app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowTagRatingAverage.kt index daec346eb4..69c3d4e65c 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowTagRatingAverage.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteria/rating/ShowTagRatingAverage.kt @@ -1,4 +1,4 @@ -package de.tum.`in`.tumcampusapp.component.ui.cafeteriarating +package de.tum.`in`.tumcampusapp.component.ui.cafeteria.rating class ShowTagRatingAverage( var tagLabel: String, diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateCafeteriaRatingActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateCafeteriaRatingActivity.kt deleted file mode 100644 index bee5620e88..0000000000 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/CreateCafeteriaRatingActivity.kt +++ /dev/null @@ -1,20 +0,0 @@ -package de.tum.`in`.tumcampusapp.component.ui.cafeteriarating - -import android.os.Bundle -import de.tum.`in`.tumcampusapp.R -import de.tum.`in`.tumcampusapp.component.other.generic.activity.BaseActivity - - -class CreateCafeteriaRatingActivity : BaseActivity(R.layout.activity_cafeteria_rating) { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - if (savedInstanceState == null) { - supportFragmentManager - .beginTransaction() - .replace(R.id.contentFrame, CreateCafeteriaRatingFragment.newInstance()) - .commit() - } - } -} \ No newline at end of file diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowCafeteriaRatingsActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowCafeteriaRatingsActivity.kt deleted file mode 100644 index ce4108fe1b..0000000000 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/cafeteriarating/ShowCafeteriaRatingsActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package de.tum.`in`.tumcampusapp.component.ui.cafeteriarating - -import androidx.appcompat.app.AppCompatActivity -import android.os.Bundle -import de.tum.`in`.tumcampusapp.R - -class ShowCafeteriaRatingsActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_show_cafeteria_ratings) - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_cafeteria_rating.xml b/app/src/main/res/layout/activity_cafeteria_rating.xml deleted file mode 100644 index 9be431d1b0..0000000000 --- a/app/src/main/res/layout/activity_cafeteria_rating.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_show_cafeteria_ratings.xml b/app/src/main/res/layout/activity_show_cafeteria_ratings.xml deleted file mode 100644 index 28fa25394d..0000000000 --- a/app/src/main/res/layout/activity_show_cafeteria_ratings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_cafeteria.xml b/app/src/main/res/layout/fragment_cafeteria.xml index 0f76381290..c5ad7cabee 100644 --- a/app/src/main/res/layout/fragment_cafeteria.xml +++ b/app/src/main/res/layout/fragment_cafeteria.xml @@ -1,13 +1,17 @@ - + android:layout_width="match_parent" + android:layout_height="match_parent"> + android:layout_height="wrap_content" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + + + + diff --git a/app/src/main/res/layout/fragment_cafeteria_rating.xml b/app/src/main/res/layout/fragment_cafeteria_rating.xml index 7a8d344409..14bc6dddf7 100644 --- a/app/src/main/res/layout/fragment_cafeteria_rating.xml +++ b/app/src/main/res/layout/fragment_cafeteria_rating.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".component.ui.cafeteriarating.CreateCafeteriaRatingFragment"> + tools:context=".component.ui.cafeteria.rating.CreateCafeteriaRatingFragment"> - - + tools:context=".component.ui.cafeteria.rating.CreateCafeteriaRatingFragment">