diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1895cfef01..2f547bd801 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -529,68 +529,6 @@ - - - - - - - - - - - - - - - - - - - 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 49d17bd3d5..e5b14788f2 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 @@ -23,7 +23,6 @@ import de.tum.`in`.tumcampusapp.component.ui.overview.InformationActivity import de.tum.`in`.tumcampusapp.component.ui.overview.MainFragment import de.tum.`in`.tumcampusapp.component.ui.search.SearchFragment import de.tum.`in`.tumcampusapp.component.ui.studyroom.StudyRoomsFragment -import de.tum.`in`.tumcampusapp.component.ui.ticket.activity.EventsFragment import de.tum.`in`.tumcampusapp.utils.Const import de.tum.`in`.tumcampusapp.utils.Utils import de.tum.`in`.tumcampusapp.utils.allItems @@ -75,8 +74,6 @@ class DrawerMenuHelper( englishContext.getString(GENERAL[3].titleRes) to GENERAL[3], germanContext.getString(GENERAL[4].titleRes) to GENERAL[4], englishContext.getString(GENERAL[4].titleRes) to GENERAL[4], - germanContext.getString(GENERAL[5].titleRes) to GENERAL[5], - englishContext.getString(GENERAL[5].titleRes) to GENERAL[5], // ABOUT germanContext.getString(ABOUT[0].titleRes) to ABOUT[0], englishContext.getString(ABOUT[0].titleRes) to ABOUT[0], @@ -196,7 +193,6 @@ class DrawerMenuHelper( NavItem.FragmentDestination(R.string.menues, R.drawable.ic_cutlery, CafeteriaFragment::class.java), NavItem.FragmentDestination(R.string.study_rooms, R.drawable.ic_outline_group_work_24px, StudyRoomsFragment::class.java), NavItem.FragmentDestination(R.string.news, R.drawable.ic_rss, NewsFragment::class.java), - NavItem.FragmentDestination(R.string.events_tickets, R.drawable.tickets, EventsFragment::class.java), NavItem.FragmentDestination(R.string.barrier_free, R.drawable.ic_outline_accessible_24px, BarrierFreeInfoFragment::class.java), NavItem.FragmentDestination( R.string.opening_hours, diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/BuyTicketActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/BuyTicketActivity.kt index 293810beb7..7f4a273bb7 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/BuyTicketActivity.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/BuyTicketActivity.kt @@ -82,11 +82,6 @@ class BuyTicketActivity : BaseActivity(R.layout.activity_buy_ticket), TicketAmou binding.totalPriceTextView.text = Utils.formatPrice(0) - injector.ticketsComponent() - .eventId(eventId) - .build() - .inject(this) - // Get ticket type information from API val disposable = ticketsRemoteRepo.fetchTicketTypesForEvent(eventId) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/ShowTicketActivity.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/ShowTicketActivity.kt index f92319fbab..8072b32bc4 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/ShowTicketActivity.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/activity/ShowTicketActivity.kt @@ -74,10 +74,6 @@ class ShowTicketActivity : BaseActivity(R.layout.activity_show_ticket) { setContentView(binding.root) val eventId = intent.getIntExtra(Const.KEY_EVENT_ID, 0) - injector.ticketsComponent() - .eventId(eventId) - .build() - .inject(this) initViews() loadTicketData(eventId) diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/di/EventsComponent.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/di/EventsComponent.kt deleted file mode 100644 index ce5348a343..0000000000 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/di/EventsComponent.kt +++ /dev/null @@ -1,21 +0,0 @@ -package de.tum.`in`.tumcampusapp.component.ui.ticket.di - -import dagger.BindsInstance -import dagger.Subcomponent -import de.tum.`in`.tumcampusapp.component.ui.ticket.fragment.EventsListFragment -import de.tum.`in`.tumcampusapp.component.ui.ticket.model.EventType - -@Subcomponent -interface EventsComponent { - - fun inject(eventsListFragment: EventsListFragment) - - @Subcomponent.Builder - interface Builder { - - @BindsInstance - fun eventType(eventType: EventType): Builder - - fun build(): EventsComponent - } -} diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/di/TicketsComponent.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/di/TicketsComponent.kt deleted file mode 100644 index a975c1eadf..0000000000 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/di/TicketsComponent.kt +++ /dev/null @@ -1,43 +0,0 @@ -package de.tum.`in`.tumcampusapp.component.ui.ticket.di - -import dagger.Binds -import dagger.BindsInstance -import dagger.Module -import dagger.Subcomponent -import de.tum.`in`.tumcampusapp.component.ui.ticket.EventsDownloadAction -import de.tum.`in`.tumcampusapp.component.ui.ticket.activity.BuyTicketActivity -import de.tum.`in`.tumcampusapp.component.ui.ticket.activity.EventsActivity -import de.tum.`in`.tumcampusapp.component.ui.ticket.activity.ShowTicketActivity -import de.tum.`in`.tumcampusapp.component.ui.ticket.activity.StripePaymentActivity -import de.tum.`in`.tumcampusapp.component.ui.ticket.fragment.EventDetailsFragment -import de.tum.`in`.tumcampusapp.service.DownloadWorker - -@Subcomponent(modules = [TicketsModule::class]) -interface TicketsComponent { - - fun inject(eventDetailsFragment: EventDetailsFragment) - - fun inject(eventsActivity: EventsActivity) - - fun inject(buyTicketActivity: BuyTicketActivity) - - fun inject(stripePaymentActivity: StripePaymentActivity) - - fun inject(showTicketActivity: ShowTicketActivity) - - @Subcomponent.Builder - interface Builder { - - @BindsInstance - fun eventId(@EventId eventId: Int): Builder - - fun build(): TicketsComponent - } -} - -@Module -interface TicketsModule { - - @Binds - fun bindEventsDownloadAction(impl: EventsDownloadAction): DownloadWorker.Action -} diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventDetailsFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventDetailsFragment.kt index b9cb0c3619..793265af65 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventDetailsFragment.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventDetailsFragment.kt @@ -1,6 +1,5 @@ package de.tum.`in`.tumcampusapp.component.ui.ticket.fragment -import android.content.Context import android.content.Intent import android.net.Uri import android.os.Bundle @@ -22,7 +21,6 @@ import de.tum.`in`.tumcampusapp.component.ui.ticket.model.Event import de.tum.`in`.tumcampusapp.component.ui.ticket.payload.TicketStatus import de.tum.`in`.tumcampusapp.databinding.FragmentEventDetailsBinding import de.tum.`in`.tumcampusapp.di.ViewModelFactory -import de.tum.`in`.tumcampusapp.di.injector import de.tum.`in`.tumcampusapp.utils.Const import de.tum.`in`.tumcampusapp.utils.Const.KEY_EVENT_ID import de.tum.`in`.tumcampusapp.utils.DateTimeUtils @@ -51,14 +49,6 @@ class EventDetailsFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener { private val binding by viewBinding(FragmentEventDetailsBinding::bind) - override fun onAttach(context: Context) { - super.onAttach(context) - injector.ticketsComponent() - .eventId(event.id) - .build() - .inject(this) - } - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, diff --git a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventsListFragment.kt b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventsListFragment.kt index 3bd78da5c7..7e9f8ae623 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventsListFragment.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/component/ui/ticket/fragment/EventsListFragment.kt @@ -1,6 +1,5 @@ package de.tum.`in`.tumcampusapp.component.ui.ticket.fragment -import android.content.Context import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -20,7 +19,6 @@ import de.tum.`in`.tumcampusapp.component.ui.ticket.adapter.EventsAdapter import de.tum.`in`.tumcampusapp.component.ui.ticket.model.EventType import de.tum.`in`.tumcampusapp.databinding.FragmentEventsListBinding import de.tum.`in`.tumcampusapp.di.ViewModelFactory -import de.tum.`in`.tumcampusapp.di.injector import de.tum.`in`.tumcampusapp.utils.Const.CHAT_MEMBER import de.tum.`in`.tumcampusapp.utils.Utils import de.tum.`in`.tumcampusapp.utils.observeNonNull @@ -44,14 +42,6 @@ class EventsListFragment : Fragment(), SwipeRefreshLayout.OnRefreshListener { private val binding by viewBinding(FragmentEventsListBinding::bind) - override fun onAttach(context: Context) { - super.onAttach(context) - injector.eventsComponent() - .eventType(eventType) - .build() - .inject(this) - } - override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, diff --git a/app/src/main/java/de/tum/in/tumcampusapp/di/AppComponent.kt b/app/src/main/java/de/tum/in/tumcampusapp/di/AppComponent.kt index 3c0d28a913..5d481c8462 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/di/AppComponent.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/di/AppComponent.kt @@ -13,8 +13,6 @@ import de.tum.`in`.tumcampusapp.component.ui.onboarding.di.OnboardingComponent import de.tum.`in`.tumcampusapp.component.ui.overview.MainActivity import de.tum.`in`.tumcampusapp.component.ui.overview.MainFragment import de.tum.`in`.tumcampusapp.component.ui.search.di.SearchComponent -import de.tum.`in`.tumcampusapp.component.ui.ticket.di.EventsComponent -import de.tum.`in`.tumcampusapp.component.ui.ticket.di.TicketsComponent import de.tum.`in`.tumcampusapp.component.ui.tufilm.di.KinoComponent import de.tum.`in`.tumcampusapp.service.di.DownloadComponent import javax.inject.Singleton @@ -25,12 +23,10 @@ interface AppComponent { fun cafeteriaComponent(): CafeteriaComponent fun downloadComponent(): DownloadComponent - fun eventsComponent(): EventsComponent.Builder fun feedbackComponent(): FeedbackComponent.Builder fun kinoComponent(): KinoComponent fun newsComponent(): NewsComponent fun onboardingComponent(): OnboardingComponent.Factory - fun ticketsComponent(): TicketsComponent.Builder fun roomFinderComponent(): RoomFinderComponent fun searchComponent(): SearchComponent fun navigationDetailsComponent(): NavigationDetailsComponent diff --git a/app/src/main/java/de/tum/in/tumcampusapp/service/di/DownloadModule.kt b/app/src/main/java/de/tum/in/tumcampusapp/service/di/DownloadModule.kt index 1de08f77e9..44b7f3fb34 100644 --- a/app/src/main/java/de/tum/in/tumcampusapp/service/di/DownloadModule.kt +++ b/app/src/main/java/de/tum/in/tumcampusapp/service/di/DownloadModule.kt @@ -102,7 +102,6 @@ object DownloadModule { fun provideWorkerActions( cafeteriaDownloadAction: CafeteriaDownloadAction, locationImportAction: LocationImportAction, - eventsDownloadAction: EventsDownloadAction, filmDownloadAction: FilmDownloadAction, gradesDownloadAction: GradesDownloadAction, idUploadAction: IdUploadAction, @@ -112,7 +111,6 @@ object DownloadModule { ): DownloadWorker.WorkerActions = DownloadWorker.WorkerActions( cafeteriaDownloadAction, locationImportAction, - eventsDownloadAction, filmDownloadAction, gradesDownloadAction, idUploadAction, diff --git a/app/src/main/res/drawable/ic_celebration.xml b/app/src/main/res/drawable/ic_celebration.xml deleted file mode 100644 index 10ceb08299..0000000000 --- a/app/src/main/res/drawable/ic_celebration.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 9f49168e26..e3be61a684 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -344,7 +344,6 @@ Erlaubt dir dich mit TUMOnline zu verbinden Schlägt ausgewählte News vor Benachrichtigt dich über neue Nachrichten - Zeigt anstehenden Events an Gibt eine Übersicht über neue Features Karte anpassen Karte immer ausblenden diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 59e294e49b..84f6ace960 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -413,7 +413,6 @@ Allows you to connect to TUMOnline Advertises selected news Notifies you about new messages - Shows upcoming events Provides an overview about new features Chat Open card settings diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index 905ba50332..1e9a9d44e5 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -399,22 +399,6 @@ - - - - - - - - -