diff --git a/app/build.gradle b/app/build.gradle index 314935b0d..033b72ba9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,7 +78,6 @@ dependencies { implementation project(':info') implementation project(':audio') implementation project(':map') - implementation project(':events') implementation project(':analytics') implementation project(':media') implementation project(':media_ui') diff --git a/events/src/main/kotlin/edu/artic/events/AllEventsAdapter.kt b/content_listing/src/main/kotlin/edu/artic/events/AllEventsAdapter.kt similarity index 98% rename from events/src/main/kotlin/edu/artic/events/AllEventsAdapter.kt rename to content_listing/src/main/kotlin/edu/artic/events/AllEventsAdapter.kt index 4bc217f52..092b858a2 100644 --- a/events/src/main/kotlin/edu/artic/events/AllEventsAdapter.kt +++ b/content_listing/src/main/kotlin/edu/artic/events/AllEventsAdapter.kt @@ -6,6 +6,7 @@ import com.fuzz.rx.disposedBy import com.jakewharton.rxbinding2.widget.text import edu.artic.adapter.AutoHolderRecyclerViewAdapter import edu.artic.adapter.BaseViewHolder +import edu.artic.content.listing.R import edu.artic.image.GlideApp import kotlinx.android.synthetic.main.cell_all_events_layout.view.* diff --git a/events/src/main/kotlin/edu/artic/events/AllEventsFragment.kt b/content_listing/src/main/kotlin/edu/artic/events/AllEventsFragment.kt similarity index 99% rename from events/src/main/kotlin/edu/artic/events/AllEventsFragment.kt rename to content_listing/src/main/kotlin/edu/artic/events/AllEventsFragment.kt index 044a8a973..1469b121e 100644 --- a/events/src/main/kotlin/edu/artic/events/AllEventsFragment.kt +++ b/content_listing/src/main/kotlin/edu/artic/events/AllEventsFragment.kt @@ -12,6 +12,7 @@ import edu.artic.adapter.itemChanges import edu.artic.adapter.itemClicksWithPosition import edu.artic.analytics.ScreenName import edu.artic.base.utils.asDeepLinkIntent +import edu.artic.content.listing.R import edu.artic.events.recyclerview.AllEventsItemDecoration import edu.artic.navigation.NavigationConstants import edu.artic.viewmodel.BaseViewModelFragment diff --git a/events/src/main/kotlin/edu/artic/events/AllEventsViewModel.kt b/content_listing/src/main/kotlin/edu/artic/events/AllEventsViewModel.kt similarity index 100% rename from events/src/main/kotlin/edu/artic/events/AllEventsViewModel.kt rename to content_listing/src/main/kotlin/edu/artic/events/AllEventsViewModel.kt diff --git a/events/src/main/kotlin/edu/artic/events/EventsModule.kt b/content_listing/src/main/kotlin/edu/artic/events/EventsModule.kt similarity index 100% rename from events/src/main/kotlin/edu/artic/events/EventsModule.kt rename to content_listing/src/main/kotlin/edu/artic/events/EventsModule.kt diff --git a/events/src/main/kotlin/edu/artic/events/recyclerview/AllEventsItemDecoration.kt b/content_listing/src/main/kotlin/edu/artic/events/recyclerview/AllEventsItemDecoration.kt similarity index 98% rename from events/src/main/kotlin/edu/artic/events/recyclerview/AllEventsItemDecoration.kt rename to content_listing/src/main/kotlin/edu/artic/events/recyclerview/AllEventsItemDecoration.kt index 086d6d948..d98b0c944 100644 --- a/events/src/main/kotlin/edu/artic/events/recyclerview/AllEventsItemDecoration.kt +++ b/content_listing/src/main/kotlin/edu/artic/events/recyclerview/AllEventsItemDecoration.kt @@ -4,10 +4,10 @@ import android.content.Context import android.graphics.Rect import android.support.v7.widget.RecyclerView import android.view.View +import edu.artic.content.listing.R import edu.artic.events.AllEventsAdapter import edu.artic.events.AllEventsCellHeaderViewModel import edu.artic.events.AllEventsCellViewModel -import edu.artic.events.R class AllEventsItemDecoration( context: Context, diff --git a/events/src/main/res/drawable/shadow.xml b/content_listing/src/main/res/drawable/shadow.xml similarity index 100% rename from events/src/main/res/drawable/shadow.xml rename to content_listing/src/main/res/drawable/shadow.xml diff --git a/events/src/main/res/layout/cell_all_events_layout.xml b/content_listing/src/main/res/layout/cell_all_events_layout.xml similarity index 100% rename from events/src/main/res/layout/cell_all_events_layout.xml rename to content_listing/src/main/res/layout/cell_all_events_layout.xml diff --git a/events/src/main/res/layout/fragment_all_events.xml b/content_listing/src/main/res/layout/fragment_all_events.xml similarity index 100% rename from events/src/main/res/layout/fragment_all_events.xml rename to content_listing/src/main/res/layout/fragment_all_events.xml diff --git a/events/src/main/res/navigation/all_events_navigation_graph.xml b/content_listing/src/main/res/navigation/all_events_navigation_graph.xml similarity index 100% rename from events/src/main/res/navigation/all_events_navigation_graph.xml rename to content_listing/src/main/res/navigation/all_events_navigation_graph.xml diff --git a/events/src/main/res/navigation/event_details_navigation_graph.xml b/content_listing/src/main/res/navigation/event_details_navigation_graph.xml similarity index 100% rename from events/src/main/res/navigation/event_details_navigation_graph.xml rename to content_listing/src/main/res/navigation/event_details_navigation_graph.xml diff --git a/events/.gitignore b/events/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/events/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/events/build.gradle b/events/build.gradle deleted file mode 100644 index cc9152538..000000000 --- a/events/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -apply plugin: 'kotlin-android-extensions' -apply plugin: 'kotlin-kapt' - -dependencies { - kapt libs.dagger_compiler - kapt libs.dagger_android_compiler - kapt libs.glide_compiler - - api libs.design_support - implementation libs.glide - implementation libs.threeten - implementation project(':base') - implementation libs.constraint_layout - implementation project(':ui') - implementation project(':db') - implementation project(':viewmodel') - implementation project(':base') - implementation project(':adapter') - implementation project(':image') - implementation project(':details') -} diff --git a/events/proguard-rules.pro b/events/proguard-rules.pro deleted file mode 100644 index f1b424510..000000000 --- a/events/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/events/src/main/AndroidManifest.xml b/events/src/main/AndroidManifest.xml deleted file mode 100644 index b23eec4a3..000000000 --- a/events/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/events/src/main/res/values/dimens.xml b/events/src/main/res/values/dimens.xml deleted file mode 100644 index 7571f04e4..000000000 --- a/events/src/main/res/values/dimens.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 23dp - @dimen/marginDouble - 16dp - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index edc171f3d..de385155a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,7 +7,6 @@ include ':adapter', ':content_listing', ':db', ':details', - ':events', ':image', ':info', ':localization', diff --git a/welcome/build.gradle b/welcome/build.gradle index 3c177273e..6c15f0020 100644 --- a/welcome/build.gradle +++ b/welcome/build.gradle @@ -16,7 +16,6 @@ dependencies { implementation project(':media_ui') implementation project(':adapter') implementation project(':content_listing') - implementation project(':events') implementation project(':navigation') implementation project(':media') implementation project(':image')