Skip to content
This repository has been archived by the owner on Jan 10, 2024. It is now read-only.

chore(events-removal-1): Reoved events from all public places #1605

Merged
merged 5 commits into from
Sep 16, 2023
Merged
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
62 changes: 0 additions & 62 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -529,68 +529,6 @@
</intent-filter>
</receiver>

<activity
android:name=".component.ui.ticket.activity.ShowTicketActivity"
android:configChanges="keyboardHidden|screenSize"
android:label="@string/your_ticket"
android:launchMode="singleTop"
android:parentActivityName=".component.ui.tufilm.KinoActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".component.ui.overview.MainActivity" />
</activity>
<activity
android:name=".component.ui.ticket.activity.BuyTicketActivity"
android:configChanges="orientation|screenSize"
android:label="@string/order_summary"
android:launchMode="singleTop"
android:parentActivityName=".component.ui.tufilm.KinoActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".component.ui.overview.MainActivity" />
</activity>
<activity
android:name=".component.ui.ticket.activity.EventsActivity"
android:configChanges="orientation|screenSize"
android:label="@string/events_tickets"
android:launchMode="singleTop"
android:parentActivityName=".component.ui.overview.MainActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".component.ui.overview.MainActivity" />
</activity>
<activity
android:name=".component.ui.ticket.activity.EventDetailsActivity"
android:configChanges="orientation|screenSize"
android:label="@string/events"
android:launchMode="singleTop"
android:parentActivityName=".component.ui.ticket.activity.EventsActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".component.ui.ticket.activity.EventsActivity" />
</activity>
<activity
android:name=".component.ui.ticket.activity.StripePaymentActivity"
android:configChanges="orientation|screenSize"
android:label="@string/enter_card_info_title"
android:launchMode="singleTop"
android:parentActivityName=".component.ui.ticket.activity.BuyTicketActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".component.ui.overview.MainActivity" />
</activity>
<activity
android:name=".component.ui.ticket.activity.PaymentConfirmationActivity"
android:configChanges="orientation|screenSize"
android:label="@string/payment_confirmation"
android:launchMode="singleTop"
android:parentActivityName=".component.ui.ticket.activity.StripePaymentActivity"
android:theme="@style/AppTheme.NoDrawerLayout">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".component.ui.ticket.activity.StripePaymentActivity" />
</activity>

<receiver android:name=".component.notifications.receivers.NotificationReceiver" />
<receiver android:name=".component.notifications.receivers.NotificationAlarmReceiver" />
<receiver android:name=".component.tumui.grades.GradeNotificationDeleteReceiver" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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],
Expand Down Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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?,
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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?,
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/de/tum/in/tumcampusapp/di/AppComponent.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ object DownloadModule {
fun provideWorkerActions(
cafeteriaDownloadAction: CafeteriaDownloadAction,
locationImportAction: LocationImportAction,
eventsDownloadAction: EventsDownloadAction,
filmDownloadAction: FilmDownloadAction,
gradesDownloadAction: GradesDownloadAction,
idUploadAction: IdUploadAction,
Expand All @@ -112,7 +111,6 @@ object DownloadModule {
): DownloadWorker.WorkerActions = DownloadWorker.WorkerActions(
cafeteriaDownloadAction,
locationImportAction,
eventsDownloadAction,
filmDownloadAction,
gradesDownloadAction,
idUploadAction,
Expand Down
21 changes: 0 additions & 21 deletions app/src/main/res/drawable/ic_celebration.xml

This file was deleted.

1 change: 0 additions & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,6 @@
<string name="card_login_summary">Erlaubt dir dich mit TUMOnline zu verbinden</string>
<string name="card_news_summary">Schlägt ausgewählte News vor</string>
<string name="card_chat_summary">Benachrichtigt dich über neue Nachrichten</string>
<string name="card_events_summary">Zeigt anstehenden Events an</string>
<string name="card_update_summary">Gibt eine Übersicht über neue Features</string>
<string name="open_card_settings">Karte anpassen</string>
<string name="always_hide_card">Karte immer ausblenden</string>
Expand Down
1 change: 0 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,6 @@
<string name="card_login_summary">Allows you to connect to TUMOnline</string>
<string name="card_news_summary">Advertises selected news</string>
<string name="card_chat_summary">Notifies you about new messages</string>
<string name="card_events_summary">Shows upcoming events</string>
<string name="card_update_summary">Provides an overview about new features</string>
<string name="chat" translatable="false">Chat</string>
<string name="open_card_settings">Open card settings</string>
Expand Down
16 changes: 0 additions & 16 deletions app/src/main/res/xml/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -399,22 +399,6 @@
</androidx.preference.PreferenceScreen>

<!-- Event card -->
<androidx.preference.PreferenceScreen
android:icon="@drawable/ic_celebration"
android:key="@string/event_default_sharedpref_shown"
android:summary="@string/card_events_summary"
android:title="@string/events">

<androidx.preference.PreferenceCategory android:title="@string/display">

<androidx.preference.CheckBoxPreference
android:defaultValue="true"
android:key="@string/event_default_sharedpref_shown"
android:title="@string/startpage" />

</androidx.preference.PreferenceCategory>

</androidx.preference.PreferenceScreen>

<!-- Update card -->
<androidx.preference.PreferenceScreen
Expand Down