From ccc2e74f48f5f802e66c8492509570158dd839b9 Mon Sep 17 00:00:00 2001
From: Sebastian Barz <SebastianBarzDev@Gmail.com>
Date: Fri, 6 Sep 2019 22:54:44 +0200
Subject: [PATCH] Refactoring to more dedicated names with leading "Backdrop-"
 Updated build files

---
 app/build.gradle                              | 38 +++++++----
 .../main/java/de/si/backdrop/MainActivity.kt  | 14 ++--
 ...ragment.kt => BaseCardBackdropFragment.kt} | 14 ++--
 ...kt => FullscreenDialogBackdropFragment.kt} |  4 +-
 ...kt => FullscreenRevealBackdropFragment.kt} |  4 +-
 ...Fragment.kt => TopCardBackdropFragment.kt} | 10 +--
 .../java/de/si/backdrop/content/MainMenu.kt   | 21 +++---
 backdroplibrary/build.gradle                  | 47 +++++++++----
 .../{Component.kt => BackdropComponent.kt}    | 27 ++++----
 .../activity/ActivityEventHandling.kt         | 67 ++++++++++---------
 .../{Activity.kt => BackdropActivity.kt}      | 44 ++++++------
 .../{Fragment.kt => BackdropFragment.kt}      | 11 +--
 ...ardFragment.kt => CardBackdropFragment.kt} | 12 ++--
 ...gment.kt => FullscreenBackdropFragment.kt} |  8 +--
 ...kt => FullscreenRevealBackdropFragment.kt} |  8 +--
 .../{CardStack.kt => BackdropCardStack.kt}    | 21 +++---
 .../{Content.kt => BackdropContent.kt}        | 11 +--
 .../{Toolbar.kt => BackdropToolbar.kt}        | 27 ++++----
 ...{ToolbarItem.kt => BackdropToolbarItem.kt} |  2 +-
 .../components/FullscreenDialogs.kt           | 29 ++++----
 build.gradle                                  |  5 +-
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 22 files changed, 235 insertions(+), 193 deletions(-)
 rename app/src/main/java/de/si/backdrop/children/{BaseCardFragment.kt => BaseCardBackdropFragment.kt} (76%)
 rename app/src/main/java/de/si/backdrop/children/{FullscreenDialogFragment.kt => FullscreenDialogBackdropFragment.kt} (84%)
 rename app/src/main/java/de/si/backdrop/children/{FullscreenRevealFragment.kt => FullscreenRevealBackdropFragment.kt} (83%)
 rename app/src/main/java/de/si/backdrop/children/{TopCardFragment.kt => TopCardBackdropFragment.kt} (73%)
 rename backdroplibrary/src/main/java/de/si/backdroplibrary/{Component.kt => BackdropComponent.kt} (63%)
 rename backdroplibrary/src/main/java/de/si/backdroplibrary/activity/{Activity.kt => BackdropActivity.kt} (73%)
 rename backdroplibrary/src/main/java/de/si/backdroplibrary/children/{Fragment.kt => BackdropFragment.kt} (75%)
 rename backdroplibrary/src/main/java/de/si/backdroplibrary/children/{CardFragment.kt => CardBackdropFragment.kt} (91%)
 rename backdroplibrary/src/main/java/de/si/backdroplibrary/children/{FullscreenFragment.kt => FullscreenBackdropFragment.kt} (61%)
 rename backdroplibrary/src/main/java/de/si/backdroplibrary/children/{FullscreenRevealFragment.kt => FullscreenRevealBackdropFragment.kt} (50%)
 rename backdroplibrary/src/main/java/de/si/backdroplibrary/components/{CardStack.kt => BackdropCardStack.kt} (72%)
 rename backdroplibrary/src/main/java/de/si/backdroplibrary/components/{Content.kt => BackdropContent.kt} (88%)
 rename backdroplibrary/src/main/java/de/si/backdroplibrary/components/{Toolbar.kt => BackdropToolbar.kt} (80%)
 rename backdroplibrary/src/main/java/de/si/backdroplibrary/components/{ToolbarItem.kt => BackdropToolbarItem.kt} (84%)

diff --git a/app/build.gradle b/app/build.gradle
index 2573781..2761687 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "de.si.backdrop"
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
@@ -21,6 +21,16 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility = 1.8
+        targetCompatibility = 1.8
+    }
+
+    kotlinOptions {
+
+    }
+
+    buildToolsVersion = '29.0.2'
 }
 
 dependencies {
@@ -35,17 +45,17 @@ dependencies {
     implementation project(path: ':backdroplibrary')
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    testImplementation 'androidx.test.espresso:espresso-intents:3.1.1'
-    testImplementation 'androidx.test.ext:junit:1.1.0'
-    testImplementation 'androidx.test.ext:junit-ktx:1.1.0'
+    testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
+    testImplementation 'androidx.test.ext:junit:1.1.1'
+    testImplementation 'androidx.test.ext:junit-ktx:1.1.1'
     testImplementation 'org.robolectric:robolectric:4.2.1'
-    testImplementation 'androidx.test.ext:truth:1.1.0'
-
-    androidTestImplementation 'androidx.test:core:1.2.0-beta01'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.1'
+    testImplementation 'androidx.test.ext:truth:1.2.0'
+
+    androidTestImplementation 'androidx.test:core:1.2.1-alpha02'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
 }
diff --git a/app/src/main/java/de/si/backdrop/MainActivity.kt b/app/src/main/java/de/si/backdrop/MainActivity.kt
index 3256495..30b5060 100644
--- a/app/src/main/java/de/si/backdrop/MainActivity.kt
+++ b/app/src/main/java/de/si/backdrop/MainActivity.kt
@@ -3,17 +3,17 @@ package de.si.backdrop
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
-import de.si.backdrop.children.BaseCardFragment
-import de.si.backdrop.children.FullscreenRevealFragment
+import de.si.backdrop.children.BaseCardBackdropFragment
+import de.si.backdrop.children.FullscreenRevealBackdropFragment
 import de.si.backdrop.content.MainMenu
-import de.si.backdroplibrary.activity.Activity
-import de.si.backdroplibrary.children.CardFragment
+import de.si.backdroplibrary.activity.BackdropActivity
+import de.si.backdroplibrary.children.CardBackdropFragment
 import de.si.kotlinx.globalCenterPoint
 
-class MainActivity : Activity() {
+class MainActivity : BackdropActivity() {
     private var mainMenu: MainMenu? = null
 
-    override val baseCardFragment: CardFragment = BaseCardFragment()
+    override val baseCardFragment: CardBackdropFragment = BaseCardBackdropFragment()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -28,7 +28,7 @@ class MainActivity : Activity() {
             }
             R.id.layout_test_content -> {
                 view.findViewById<Button>(R.id.button_backdrop_content_test).setOnClickListener { button ->
-                    val fragment = FullscreenRevealFragment()
+                    val fragment = FullscreenRevealBackdropFragment()
                     fragment.revealEpiCenter = button.globalCenterPoint
                     revealFullscreenFragment(fragment)
                 }
diff --git a/app/src/main/java/de/si/backdrop/children/BaseCardFragment.kt b/app/src/main/java/de/si/backdrop/children/BaseCardBackdropFragment.kt
similarity index 76%
rename from app/src/main/java/de/si/backdrop/children/BaseCardFragment.kt
rename to app/src/main/java/de/si/backdrop/children/BaseCardBackdropFragment.kt
index c84f56d..7cc2d50 100644
--- a/app/src/main/java/de/si/backdrop/children/BaseCardFragment.kt
+++ b/app/src/main/java/de/si/backdrop/children/BaseCardBackdropFragment.kt
@@ -5,13 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.si.backdrop.R
-import de.si.backdroplibrary.children.CardFragment
-import de.si.backdroplibrary.components.ToolbarItem
+import de.si.backdroplibrary.children.CardBackdropFragment
+import de.si.backdroplibrary.components.BackdropToolbarItem
 import kotlin.random.Random
 
-class BaseCardFragment : CardFragment() {
-    override val toolbarItem: ToolbarItem
-        get() = ToolbarItem(
+class BaseCardBackdropFragment : CardBackdropFragment() {
+    override val toolbarItem: BackdropToolbarItem
+        get() = BackdropToolbarItem(
             title = "Backdrop",
             subtitle = "Demonstration",
             primaryAction = R.drawable.ic_add,
@@ -32,7 +32,7 @@ class BaseCardFragment : CardFragment() {
 
     override fun onPrimaryActionClicked(): Boolean {
         changeToolbarItem(
-            ToolbarItem(
+            BackdropToolbarItem(
                 title = "Title ${Random.nextInt(42)}",
                 primaryAction = toolbarItem.primaryAction,
                 moreActionEnabled = toolbarItem.moreActionEnabled
@@ -42,7 +42,7 @@ class BaseCardFragment : CardFragment() {
     }
 
     override fun onMoreActionClicked(): Boolean {
-        addCardFragment(TopCardFragment())
+        addCardFragment(TopCardBackdropFragment())
         return true
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/si/backdrop/children/FullscreenDialogFragment.kt b/app/src/main/java/de/si/backdrop/children/FullscreenDialogBackdropFragment.kt
similarity index 84%
rename from app/src/main/java/de/si/backdrop/children/FullscreenDialogFragment.kt
rename to app/src/main/java/de/si/backdrop/children/FullscreenDialogBackdropFragment.kt
index b9ed380..6b859fc 100644
--- a/app/src/main/java/de/si/backdrop/children/FullscreenDialogFragment.kt
+++ b/app/src/main/java/de/si/backdrop/children/FullscreenDialogBackdropFragment.kt
@@ -6,10 +6,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.si.backdrop.R
-import de.si.backdroplibrary.children.FullscreenFragment
+import de.si.backdroplibrary.children.FullscreenBackdropFragment
 import kotlinx.android.synthetic.main.fragment_fullscreen.view.*
 
-class FullscreenDialogFragment : FullscreenFragment() {
+class FullscreenDialogBackdropFragment : FullscreenBackdropFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_fullscreen, container, false)
     }
diff --git a/app/src/main/java/de/si/backdrop/children/FullscreenRevealFragment.kt b/app/src/main/java/de/si/backdrop/children/FullscreenRevealBackdropFragment.kt
similarity index 83%
rename from app/src/main/java/de/si/backdrop/children/FullscreenRevealFragment.kt
rename to app/src/main/java/de/si/backdrop/children/FullscreenRevealBackdropFragment.kt
index 5ed405a..4e7e8f5 100644
--- a/app/src/main/java/de/si/backdrop/children/FullscreenRevealFragment.kt
+++ b/app/src/main/java/de/si/backdrop/children/FullscreenRevealBackdropFragment.kt
@@ -6,10 +6,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.si.backdrop.R
-import de.si.backdroplibrary.children.FullscreenRevealFragment
+import de.si.backdroplibrary.children.FullscreenRevealBackdropFragment
 import kotlinx.android.synthetic.main.fragment_fullscreen.view.*
 
-class FullscreenRevealFragment : FullscreenRevealFragment() {
+class FullscreenRevealBackdropFragment : FullscreenRevealBackdropFragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.fragment_fullscreen, container, false)
     }
diff --git a/app/src/main/java/de/si/backdrop/children/TopCardFragment.kt b/app/src/main/java/de/si/backdrop/children/TopCardBackdropFragment.kt
similarity index 73%
rename from app/src/main/java/de/si/backdrop/children/TopCardFragment.kt
rename to app/src/main/java/de/si/backdrop/children/TopCardBackdropFragment.kt
index a352b2f..20904f1 100644
--- a/app/src/main/java/de/si/backdrop/children/TopCardFragment.kt
+++ b/app/src/main/java/de/si/backdrop/children/TopCardBackdropFragment.kt
@@ -5,12 +5,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import de.si.backdrop.R
-import de.si.backdroplibrary.children.CardFragment
-import de.si.backdroplibrary.components.ToolbarItem
+import de.si.backdroplibrary.children.CardBackdropFragment
+import de.si.backdroplibrary.components.BackdropToolbarItem
 
-class TopCardFragment : CardFragment() {
-    override val toolbarItem: ToolbarItem
-        get() = ToolbarItem(
+class TopCardBackdropFragment : CardBackdropFragment() {
+    override val toolbarItem: BackdropToolbarItem
+        get() = BackdropToolbarItem(
             title = "Mid card",
             moreActionEnabled = false,
             primaryAction = R.drawable.ic_add
diff --git a/app/src/main/java/de/si/backdrop/content/MainMenu.kt b/app/src/main/java/de/si/backdrop/content/MainMenu.kt
index 158750a..7456776 100644
--- a/app/src/main/java/de/si/backdrop/content/MainMenu.kt
+++ b/app/src/main/java/de/si/backdrop/content/MainMenu.kt
@@ -2,16 +2,13 @@ package de.si.backdrop.content
 
 import android.view.View
 import de.si.backdrop.R
-import de.si.backdrop.children.FullscreenDialogFragment
-import de.si.backdrop.children.FullscreenRevealFragment
-import de.si.backdroplibrary.Component
+import de.si.backdrop.children.FullscreenDialogBackdropFragment
+import de.si.backdrop.children.FullscreenRevealBackdropFragment
+import de.si.backdroplibrary.BackdropComponent
 import de.si.kotlinx.globalCenterPoint
 import kotlinx.android.synthetic.main.main_menu.view.*
 
-class MainMenu(
-    view: View,
-    private val backdropComponent: Component
-) {
+class MainMenu(view: View, private val backdropBackdropComponent: BackdropComponent) {
     companion object {
         internal const val resourceId = R.id.menu_main_layout
     }
@@ -26,19 +23,21 @@ class MainMenu(
         buttonFullscreenFragmentReveal.setOnClickListener(this::showFullscreenFragmentReveal)
     }
 
+    @Suppress("UNUSED_PARAMETER")
     private fun changeContent(view: View) {
-        backdropComponent.showBackdropContent(R.layout.test_content)
+        backdropBackdropComponent.showBackdropContent(R.layout.test_content)
     }
 
+    @Suppress("UNUSED_PARAMETER")
     private fun showFullscreenFragmentSlide(view: View) {
-        backdropComponent.showFullscreenFragment(FullscreenDialogFragment())
+        backdropBackdropComponent.showFullscreenFragment(FullscreenDialogBackdropFragment())
     }
 
     private fun showFullscreenFragmentReveal(view: View) {
         val centerPoint = view.globalCenterPoint
-        val fullscreenRevealFragment = FullscreenRevealFragment().apply {
+        val fullscreenRevealFragment = FullscreenRevealBackdropFragment().apply {
             revealEpiCenter = centerPoint
         }
-        backdropComponent.revealFullscreenFragment(fullscreenRevealFragment)
+        backdropBackdropComponent.revealFullscreenFragment(fullscreenRevealFragment)
     }
 }
\ No newline at end of file
diff --git a/backdroplibrary/build.gradle b/backdroplibrary/build.gradle
index eb497bd..9a11afe 100644
--- a/backdroplibrary/build.gradle
+++ b/backdroplibrary/build.gradle
@@ -2,19 +2,19 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'digital.wup.android-maven-publish'
 
 group='com.github.Str3l0k'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 1
         versionName "1.0"
 
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -31,6 +31,15 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+
     buildToolsVersion = '28.0.3'
 }
 
@@ -46,18 +55,30 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    testImplementation 'androidx.test.espresso:espresso-intents:3.1.1'
-    testImplementation 'androidx.test.ext:junit:1.1.0'
-    testImplementation 'androidx.test.ext:junit-ktx:1.1.0'
+    testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    testImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
+    testImplementation 'androidx.test.ext:junit:1.1.1'
+    testImplementation 'androidx.test.ext:junit-ktx:1.1.1'
     testImplementation 'org.robolectric:robolectric:4.2.1'
-    testImplementation 'androidx.test.ext:truth:1.1.0'
+    testImplementation 'androidx.test.ext:truth:1.2.0'
 
-    androidTestImplementation 'androidx.test:core:1.2.0-beta01'
-    androidTestImplementation 'androidx.test:runner:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.0'
+    androidTestImplementation 'androidx.test:core:1.2.1-alpha02'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.1'
+}
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            groupId = 'de.si.backdrop'
+            artifactId = 'core'
+            version = '0.2.1'
+
+            from components.android
+        }
+    }
 }
 
 repositories {
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/Component.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/BackdropComponent.kt
similarity index 63%
rename from backdroplibrary/src/main/java/de/si/backdroplibrary/Component.kt
rename to backdroplibrary/src/main/java/de/si/backdroplibrary/BackdropComponent.kt
index 4d1a4f3..1db1dcd 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/Component.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/BackdropComponent.kt
@@ -2,16 +2,17 @@ package de.si.backdroplibrary
 
 import android.view.View
 import androidx.annotation.LayoutRes
-import de.si.backdroplibrary.activity.Activity
-import de.si.backdroplibrary.children.CardFragment
-import de.si.backdroplibrary.children.FullscreenFragment
-import de.si.backdroplibrary.children.FullscreenRevealFragment
-import de.si.backdroplibrary.components.ToolbarItem
-
-interface Component {
-    val activity: Activity
+import de.si.backdroplibrary.activity.BackdropActivity
+import de.si.backdroplibrary.children.CardBackdropFragment
+import de.si.backdroplibrary.children.FullscreenBackdropFragment
+import de.si.backdroplibrary.children.FullscreenRevealBackdropFragment
+import de.si.backdroplibrary.components.BackdropToolbarItem
+
+interface BackdropComponent {
+    val backdropActivity: BackdropActivity
+
     val viewModel: BackdropViewModel
-        get() = BackdropViewModel.registeredInstance(activity)
+        get() = BackdropViewModel.registeredInstance(backdropActivity)
 
     fun prefetchBackdropContent(@LayoutRes layoutResId: Int) {
         viewModel.emit(Event.PREFETCH_BACKDROP_CONTENT_VIEW, layoutResId)
@@ -25,7 +26,7 @@ interface Component {
         viewModel.emit(Event.HIDE_BACKDROP_CONTENT)
     }
 
-    fun addCardFragment(cardFragment: CardFragment) {
+    fun addCardFragment(cardFragment: CardBackdropFragment) {
         viewModel.emit(Event.ADD_TOP_CARD, cardFragment)
     }
 
@@ -33,11 +34,11 @@ interface Component {
         viewModel.emit(Event.REMOVE_TOP_CARD)
     }
 
-    fun showFullscreenFragment(fragment: FullscreenFragment) {
+    fun showFullscreenFragment(fragment: FullscreenBackdropFragment) {
         viewModel.emit(Event.SHOW_FULLSCREEN_FRAGMENT, fragment)
     }
 
-    fun revealFullscreenFragment(parameters: FullscreenRevealFragment) {
+    fun revealFullscreenFragment(parameters: FullscreenRevealBackdropFragment) {
         viewModel.emit(Event.REVEAL_FULLSCREEN_FRAGMENT, parameters)
     }
 
@@ -45,7 +46,7 @@ interface Component {
         viewModel.emit(Event.HIDE_FULLSCREEN_FRAGMENT)
     }
 
-    fun changeToolbarItem(toolbarItem: ToolbarItem) {
+    fun changeToolbarItem(toolbarItem: BackdropToolbarItem) {
         viewModel.emit(Event.CHANGE_NAVIGATION_ITEM, toolbarItem)
     }
 
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/activity/ActivityEventHandling.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/activity/ActivityEventHandling.kt
index 41a0733..552466f 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/activity/ActivityEventHandling.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/activity/ActivityEventHandling.kt
@@ -2,12 +2,12 @@ package de.si.backdroplibrary.activity
 
 import android.view.View
 import de.si.backdroplibrary.Event
-import de.si.backdroplibrary.children.CardFragment
-import de.si.backdroplibrary.children.FullscreenFragment
-import de.si.backdroplibrary.children.FullscreenRevealFragment
-import de.si.backdroplibrary.components.ToolbarItem
+import de.si.backdroplibrary.children.CardBackdropFragment
+import de.si.backdroplibrary.children.FullscreenBackdropFragment
+import de.si.backdroplibrary.children.FullscreenRevealBackdropFragment
+import de.si.backdroplibrary.components.BackdropToolbarItem
 
-internal fun Activity.onEvent(event: Event, payload: Any?): Boolean {
+internal fun BackdropActivity.onEvent(event: Event, payload: Any?): Boolean {
     return when (event) {
         // content events
         Event.PREFETCH_BACKDROP_CONTENT_VIEW -> handlePrefetchBackdropContentEvent(payload as Int)
@@ -17,82 +17,85 @@ internal fun Activity.onEvent(event: Event, payload: Any?): Boolean {
         Event.BACKDROP_CONTENT_INVISIBLE -> onBackdropContentInvisible()
 
         // toolbar events
-        Event.CHANGE_NAVIGATION_ITEM -> handleToolbarItemChangedEvent(payload as ToolbarItem)
+        Event.CHANGE_NAVIGATION_ITEM -> handleToolbarItemChangedEvent(payload as BackdropToolbarItem)
         Event.PRIMARY_ACTION_TRIGGERED -> onPrimaryActionClicked()
         Event.MORE_ACTION_TRIGGERED -> onMoreActionClicked()
 
         // card stack events
-        Event.ADD_TOP_CARD -> handleAddTopCardEvent(payload as CardFragment)
+        Event.ADD_TOP_CARD -> handleAddTopCardEvent(payload as CardBackdropFragment)
         Event.REMOVE_TOP_CARD -> handleRemoveTopCardEvent()
 
         // fullscreen
-        Event.SHOW_FULLSCREEN_FRAGMENT -> handleShowFullscreenFragmentEvent(payload as FullscreenFragment)
-        Event.REVEAL_FULLSCREEN_FRAGMENT -> handleRevealFullscreenFragmentEvent(payload as FullscreenRevealFragment)
+        Event.SHOW_FULLSCREEN_FRAGMENT -> handleShowFullscreenFragmentEvent(payload as FullscreenBackdropFragment)
+        Event.REVEAL_FULLSCREEN_FRAGMENT -> handleRevealFullscreenFragmentEvent(payload as FullscreenRevealBackdropFragment)
         Event.HIDE_FULLSCREEN_FRAGMENT -> handleHideFullscreenFragmentEvent()
     }
 }
 
 /* region backdrop content event handling */
-private fun Activity.handlePrefetchBackdropContentEvent(layoutResId: Int): Boolean {
-    content.preCacheContentView(layoutResId)
+private fun BackdropActivity.handlePrefetchBackdropContentEvent(layoutResId: Int): Boolean {
+    backdropContent.preCacheContentView(layoutResId)
     return true
 }
 
-private fun Activity.handleShowBackdropContentEvent(layoutResId: Int): Boolean {
-    content.setContentView(layoutResId) { contentView ->
-        toolbar.disableActions()
-        toolbar.showBackdropCloseButton()
-        cardStack.disable()
+private fun BackdropActivity.handleShowBackdropContentEvent(layoutResId: Int): Boolean {
+    backdropContent.setContentView(layoutResId) { contentView ->
+        backdropToolbar.disableActions()
+        backdropToolbar.showBackdropCloseButton()
+        backdropCardStack.disable()
         animateBackdropOpening(contentView.height.toFloat())
     }
     return true
 }
 
-private fun Activity.handleHideBackdropContentEvent(): Boolean {
+private fun BackdropActivity.handleHideBackdropContentEvent(): Boolean {
     animateBackdropClosing()
-    content.hide()
-    cardStack.enable()
-    toolbar.enableActions()
-    toolbar.showMenuButton()
+    backdropContent.hide()
+    backdropCardStack.enable()
+    backdropToolbar.enableActions()
+    backdropToolbar.showMenuButton()
     viewModel.emit(Event.BACKDROP_CONTENT_INVISIBLE)
     return true
 }
 /* endregion */
 
 /* region toolbar event handling */
-private fun Activity.handleToolbarItemChangedEvent(toolbarItem: ToolbarItem): Boolean {
-    toolbar.configure(toolbarItem, cardStack.hasMoreThanOneEntry)
+private fun BackdropActivity.handleToolbarItemChangedEvent(toolbarItem: BackdropToolbarItem): Boolean {
+    backdropToolbar.configure(toolbarItem, backdropCardStack.hasMoreThanOneEntry)
     return true
 }
 /* endregion */
 
 /* region card stack event handling */
-private fun Activity.handleAddTopCardEvent(cardFragment: CardFragment): Boolean {
+private fun BackdropActivity.handleAddTopCardEvent(cardFragment: CardBackdropFragment): Boolean {
     val toolbarItem = cardFragment.toolbarItem
-    cardStack.push(cardFragment)
-    toolbar.configure(toolbarItem, cardStack.hasMoreThanOneEntry)
+    backdropCardStack.push(cardFragment)
+    backdropToolbar.configure(toolbarItem, backdropCardStack.hasMoreThanOneEntry)
     return true
 }
 
-private fun Activity.handleRemoveTopCardEvent(): Boolean {
-    cardStack.pop()
-    toolbar.configure(cardStack.topFragment.toolbarItem, cardStack.hasMoreThanOneEntry)
+private fun BackdropActivity.handleRemoveTopCardEvent(): Boolean {
+    backdropCardStack.pop()
+    backdropToolbar.configure(
+        backdropCardStack.topFragment.toolbarItem,
+        backdropCardStack.hasMoreThanOneEntry
+    )
     return true
 }
 /* endregion card stack event handling functions */
 
 /* region fullscreen fragment event handling */
-private fun Activity.handleShowFullscreenFragmentEvent(fragment: FullscreenFragment): Boolean {
+private fun BackdropActivity.handleShowFullscreenFragmentEvent(fragment: FullscreenBackdropFragment): Boolean {
     fullscreenDialogs.showFullscreenFragment(fragment)
     return true
 }
 
-private fun Activity.handleHideFullscreenFragmentEvent(): Boolean {
+private fun BackdropActivity.handleHideFullscreenFragmentEvent(): Boolean {
     fullscreenDialogs.hideFullscreenFragment()
     return true
 }
 
-private fun Activity.handleRevealFullscreenFragmentEvent(fragment: FullscreenRevealFragment): Boolean {
+private fun BackdropActivity.handleRevealFullscreenFragmentEvent(fragment: FullscreenRevealBackdropFragment): Boolean {
     fullscreenDialogs.revealFullscreen(fragment)
     return true
 }
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/activity/Activity.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/activity/BackdropActivity.kt
similarity index 73%
rename from backdroplibrary/src/main/java/de/si/backdroplibrary/activity/Activity.kt
rename to backdroplibrary/src/main/java/de/si/backdroplibrary/activity/BackdropActivity.kt
index 308baaa..984a725 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/activity/Activity.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/activity/BackdropActivity.kt
@@ -7,37 +7,37 @@ import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import de.si.backdroplibrary.Backdrop.Companion.BACKDROP_ANIMATION_DURATION
 import de.si.backdroplibrary.Backdrop.Companion.BACKDROP_CLOSED_TRANSLATION_Y
+import de.si.backdroplibrary.BackdropComponent
 import de.si.backdroplibrary.BackdropViewModel
-import de.si.backdroplibrary.Component
 import de.si.backdroplibrary.Event
 import de.si.backdroplibrary.R
-import de.si.backdroplibrary.children.CardFragment
-import de.si.backdroplibrary.components.CardStack
-import de.si.backdroplibrary.components.Content
+import de.si.backdroplibrary.children.CardBackdropFragment
+import de.si.backdroplibrary.components.BackdropCardStack
+import de.si.backdroplibrary.components.BackdropContent
+import de.si.backdroplibrary.components.BackdropToolbar
 import de.si.backdroplibrary.components.FullscreenDialogs
-import de.si.backdroplibrary.components.Toolbar
 import kotlinx.android.synthetic.main.layout_main.*
 
-abstract class Activity : AppCompatActivity(), Component {
+abstract class BackdropActivity : AppCompatActivity(), BackdropComponent {
 
     // viewModel
     override val viewModel by lazy {
         BackdropViewModel.registeredInstance(this)
     }
 
-    override val activity: Activity
+    override val backdropActivity: BackdropActivity
         get() = this
 
     /* backdrop components */
-    internal lateinit var toolbar: Toolbar
-    internal lateinit var content: Content
-    internal lateinit var cardStack: CardStack
+    internal lateinit var backdropToolbar: BackdropToolbar
+    internal lateinit var backdropContent: BackdropContent
+    internal lateinit var backdropCardStack: BackdropCardStack
     internal lateinit var fullscreenDialogs: FullscreenDialogs
 
-    abstract val baseCardFragment: CardFragment
+    abstract val baseCardFragment: CardBackdropFragment
 
     private val open: Boolean
-        get() = cardStack.isTranslatedByY
+        get() = backdropCardStack.isTranslatedByY
 
     /* animation properties */
     private val backdropOpenCloseAnimator by lazy {
@@ -74,7 +74,7 @@ abstract class Activity : AppCompatActivity(), Component {
             open -> {
                 hideBackdropContent()
             }
-            cardStack.hasMoreThanOneEntry -> {
+            backdropCardStack.hasMoreThanOneEntry -> {
                 removeTopCardFragment()
             }
             else -> {
@@ -95,26 +95,26 @@ abstract class Activity : AppCompatActivity(), Component {
     }
 
     private fun initializeToolbar() {
-        toolbar = Toolbar(this)
-        toolbar.closeBackdropClickCallback = {
+        backdropToolbar = BackdropToolbar(this)
+        backdropToolbar.closeBackdropClickCallback = {
             hideBackdropContent()
         }
     }
 
     private fun initializeContent() {
-        content = Content(this)
+        backdropContent = BackdropContent(this)
     }
 
     private fun initializeCardStack() {
-        cardStack = CardStack(this)
+        backdropCardStack = BackdropCardStack(this)
     }
 
     private fun initializeBaseCardFragment() {
-        cardStack.baseFragment = baseCardFragment
+        backdropCardStack.baseFragment = baseCardFragment
     }
 
     private fun initializeBaseToolbarItem() {
-        toolbar.configure(cardStack.baseFragment.toolbarItem, false)
+        backdropToolbar.configure(backdropCardStack.baseFragment.toolbarItem, false)
     }
 
     private fun initializeFullscreenDialogs() {
@@ -137,17 +137,17 @@ abstract class Activity : AppCompatActivity(), Component {
     /* region main menu */
     @Suppress("unused")
     fun setMenuButtonClickCallback(clickCallback: () -> Unit) {
-        toolbar.openMenuClickCallback = clickCallback
+        backdropToolbar.openMenuClickCallback = clickCallback
     }
 
     @Suppress("unused")
     fun setMenuButtonLongClickCallback(longClickCallback: () -> Boolean) {
-        toolbar.openMenuLongClickCallback = longClickCallback
+        backdropToolbar.openMenuLongClickCallback = longClickCallback
     }
 
     fun setMenuLayout(@LayoutRes layoutResId: Int) {
         viewModel.emit(Event.PREFETCH_BACKDROP_CONTENT_VIEW, layoutResId)
-        toolbar.openMenuClickCallback = {
+        backdropToolbar.openMenuClickCallback = {
             showBackdropContent(layoutResId)
         }
     }
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/children/Fragment.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/children/BackdropFragment.kt
similarity index 75%
rename from backdroplibrary/src/main/java/de/si/backdroplibrary/children/Fragment.kt
rename to backdroplibrary/src/main/java/de/si/backdroplibrary/children/BackdropFragment.kt
index c8384a2..c202a47 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/children/Fragment.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/children/BackdropFragment.kt
@@ -2,14 +2,17 @@ package de.si.backdroplibrary.children
 
 import android.view.View
 import androidx.fragment.app.Fragment
+import de.si.backdroplibrary.BackdropComponent
 import de.si.backdroplibrary.BackdropViewModel
-import de.si.backdroplibrary.Component
 import de.si.backdroplibrary.Event
-import de.si.backdroplibrary.activity.Activity
+import de.si.backdroplibrary.activity.BackdropActivity
+
+abstract class BackdropFragment : Fragment(), BackdropComponent {
+    override val backdropActivity: BackdropActivity
+        get() = requireActivity() as BackdropActivity
 
-abstract class Fragment : Fragment(), Component {
     override val viewModel: BackdropViewModel by lazy {
-        val backdropActivity = activity as? Activity
+        val backdropActivity = backdropActivity as? BackdropActivity
         backdropActivity?.let {
             BackdropViewModel.registeredInstance(it)
         } ?: throw ExceptionInInitializerError()
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/children/CardFragment.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/children/CardBackdropFragment.kt
similarity index 91%
rename from backdroplibrary/src/main/java/de/si/backdroplibrary/children/CardFragment.kt
rename to backdroplibrary/src/main/java/de/si/backdroplibrary/children/CardBackdropFragment.kt
index bb3a545..edb4bc3 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/children/CardFragment.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/children/CardBackdropFragment.kt
@@ -10,17 +10,17 @@ import androidx.core.view.get
 import androidx.core.view.isVisible
 import de.si.backdroplibrary.Backdrop
 import de.si.backdroplibrary.R
-import de.si.backdroplibrary.activity.Activity
-import de.si.backdroplibrary.components.ToolbarItem
+import de.si.backdroplibrary.activity.BackdropActivity
+import de.si.backdroplibrary.components.BackdropToolbarItem
 import de.si.kotlinx.fadeInAnimator
 import de.si.kotlinx.fadeOut
 import de.si.kotlinx.setTopMargin
 import kotlinx.android.synthetic.main.layout_card_fragment.view.*
 
-abstract class CardFragment : Fragment() {
+abstract class CardBackdropFragment : BackdropFragment() {
 
-    override val activity: Activity
-        get() = getActivity() as Activity
+    override val backdropActivity: BackdropActivity
+        get() = activity as BackdropActivity
 
     var cardTopMargin: Int
         get() = arguments?.getInt("top_margin", 0) ?: 0
@@ -96,6 +96,6 @@ abstract class CardFragment : Fragment() {
     /* region abstract implementation */
     abstract fun onContentViewCreated(view: View?, savedInstanceState: Bundle?)
 
-    abstract val toolbarItem: ToolbarItem
+    abstract val toolbarItem: BackdropToolbarItem
     /* endregion */
 }
\ No newline at end of file
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenFragment.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenBackdropFragment.kt
similarity index 61%
rename from backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenFragment.kt
rename to backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenBackdropFragment.kt
index 652817a..9e04114 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenFragment.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenBackdropFragment.kt
@@ -3,11 +3,11 @@ package de.si.backdroplibrary.children
 import android.transition.Slide
 import android.view.Gravity
 import de.si.backdroplibrary.Backdrop
-import de.si.backdroplibrary.activity.Activity
+import de.si.backdroplibrary.activity.BackdropActivity
 
-abstract class FullscreenFragment : Fragment() {
-    override val activity: Activity
-        get() = getActivity() as Activity
+abstract class FullscreenBackdropFragment : BackdropFragment() {
+    override val backdropActivity: BackdropActivity
+        get() = activity as BackdropActivity
 
     init {
         enterTransition = Slide(Gravity.BOTTOM).setDuration(Backdrop.BACKDROP_ANIMATION_DURATION)
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenRevealFragment.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenRevealBackdropFragment.kt
similarity index 50%
rename from backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenRevealFragment.kt
rename to backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenRevealBackdropFragment.kt
index e1d9080..c22e1d8 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenRevealFragment.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/children/FullscreenRevealBackdropFragment.kt
@@ -2,11 +2,11 @@ package de.si.backdroplibrary.children
 
 import android.graphics.Point
 import android.transition.Fade
-import de.si.backdroplibrary.activity.Activity
+import de.si.backdroplibrary.activity.BackdropActivity
 
-abstract class FullscreenRevealFragment : Fragment() {
-    override val activity: Activity
-        get() = getActivity() as Activity
+abstract class FullscreenRevealBackdropFragment : BackdropFragment() {
+    override val backdropActivity: BackdropActivity
+        get() = activity as BackdropActivity
 
     var revealEpiCenter: Point = Point()
 
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/components/CardStack.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropCardStack.kt
similarity index 72%
rename from backdroplibrary/src/main/java/de/si/backdroplibrary/components/CardStack.kt
rename to backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropCardStack.kt
index 7b0a1b2..1733014 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/components/CardStack.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropCardStack.kt
@@ -2,25 +2,26 @@ package de.si.backdroplibrary.components
 
 import android.util.Log
 import androidx.fragment.app.FragmentManager
-import de.si.backdroplibrary.Component
-import de.si.backdroplibrary.activity.Activity
-import de.si.backdroplibrary.children.CardFragment
+import de.si.backdroplibrary.BackdropComponent
+import de.si.backdroplibrary.activity.BackdropActivity
+import de.si.backdroplibrary.children.CardBackdropFragment
 import de.si.kotlinx.add
 import de.si.kotlinx.realPixelsFromDensityPixels
 import de.si.kotlinx.remove
 import kotlinx.android.synthetic.main.layout_main.*
 import java.util.*
 
-internal class CardStack(override val activity: Activity) : Component {
+internal class BackdropCardStack(override val backdropActivity: BackdropActivity) :
+    BackdropComponent {
 
     // view elements
-    private val layoutContainer = activity.layout_backdrop_cardstack
+    private val layoutContainer = backdropActivity.layout_backdrop_cardstack
 
     // properties
-    private val fragmentManager: FragmentManager = activity.supportFragmentManager
+    private val fragmentManager: FragmentManager = backdropActivity.supportFragmentManager
 
     // stack
-    private val fragmentStack: Stack<CardFragment> = Stack()
+    private val fragmentStack: Stack<CardBackdropFragment> = Stack()
 
     internal val isTranslatedByY: Boolean
         get() = layoutContainer.translationY > 0
@@ -39,9 +40,9 @@ internal class CardStack(override val activity: Activity) : Component {
         get() = fragmentStack.peek()
 
     private val newTopCardMargin
-        get() = fragmentStack.size * 8.realPixelsFromDensityPixels(activity.applicationContext)
+        get() = fragmentStack.size * 8.realPixelsFromDensityPixels(backdropActivity.applicationContext)
 
-    internal fun push(fragment: CardFragment) {
+    internal fun push(fragment: CardBackdropFragment) {
         printCountWarningIfNecessary()
         fragment.cardTopMargin = newTopCardMargin
         topFragment.hideContent()
@@ -49,7 +50,7 @@ internal class CardStack(override val activity: Activity) : Component {
         addNewFragment(fragment)
     }
 
-    private fun addNewFragment(fragment: CardFragment) {
+    private fun addNewFragment(fragment: CardBackdropFragment) {
         fragmentManager.add(fragment, layoutContainer.id)
     }
 
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/components/Content.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropContent.kt
similarity index 88%
rename from backdroplibrary/src/main/java/de/si/backdroplibrary/components/Content.kt
rename to backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropContent.kt
index 2233c88..50b705e 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/components/Content.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropContent.kt
@@ -6,18 +6,19 @@ import android.view.ViewGroup
 import androidx.annotation.LayoutRes
 import androidx.core.view.doOnNextLayout
 import androidx.core.view.isVisible
-import de.si.backdroplibrary.Component
+import de.si.backdroplibrary.BackdropComponent
 import de.si.backdroplibrary.Event
-import de.si.backdroplibrary.activity.Activity
+import de.si.backdroplibrary.activity.BackdropActivity
 import de.si.kotlinx.fade
 import de.si.kotlinx.fadeOut
 import de.si.kotlinx.inflateView
 import kotlinx.android.synthetic.main.layout_main.*
 
-internal class Content(override val activity: Activity) : Component {
+internal class BackdropContent(override val backdropActivity: BackdropActivity) :
+    BackdropComponent {
 
     // view container
-    private val layoutContentContainer: ViewGroup = activity.layout_backdrop_content
+    private val layoutContentContainer: ViewGroup = backdropActivity.layout_backdrop_content
 
     // view cache
     private val backdropViewCache: MutableMap<Int, View> = mutableMapOf()
@@ -51,7 +52,7 @@ internal class Content(override val activity: Activity) : Component {
 
     /* internal functions */
     private fun inflateViewAndCheckForId(@LayoutRes layoutResId: Int): View? {
-        val inflatedView = activity.inflateView(layoutResId, layoutContentContainer)
+        val inflatedView = backdropActivity.inflateView(layoutResId, layoutContentContainer)
 
         return inflatedView?.takeIf { view ->
             view.id > 0
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/components/Toolbar.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropToolbar.kt
similarity index 80%
rename from backdroplibrary/src/main/java/de/si/backdroplibrary/components/Toolbar.kt
rename to backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropToolbar.kt
index 023563e..e4895c1 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/components/Toolbar.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropToolbar.kt
@@ -8,24 +8,25 @@ import android.widget.TextView
 import androidx.core.animation.doOnEnd
 import androidx.core.view.isVisible
 import de.si.backdroplibrary.Backdrop
-import de.si.backdroplibrary.Component
+import de.si.backdroplibrary.BackdropComponent
 import de.si.backdroplibrary.Event
-import de.si.backdroplibrary.activity.Activity
+import de.si.backdroplibrary.activity.BackdropActivity
 import de.si.kotlinx.*
 import kotlinx.android.synthetic.main.layout_toolbar.*
 
-internal class Toolbar(override val activity: Activity) : Component {
+internal class BackdropToolbar(override val backdropActivity: BackdropActivity) :
+    BackdropComponent {
 
     /* view elements */
-    private val toolbarLayout: ViewGroup = activity.layout_backdrop_toolbar
-    private val buttonBack: ImageButton = activity.button_backdrop_toolbar_back
-    private val buttonCloseBackdrop: ImageButton = activity.button_backdrop_toolbar_hide
-    private val buttonOpenMenu: ImageButton = activity.button_backdrop_toolbar_menu_show
-    private val buttonPrimaryAction: ImageButton = activity.button_backdrop_toolbar_action
-    private val buttonMoreAction: ImageButton = activity.button_backdrop_toolbar_more
+    private val toolbarLayout: ViewGroup = backdropActivity.layout_backdrop_toolbar
+    private val buttonBack: ImageButton = backdropActivity.button_backdrop_toolbar_back
+    private val buttonCloseBackdrop: ImageButton = backdropActivity.button_backdrop_toolbar_hide
+    private val buttonOpenMenu: ImageButton = backdropActivity.button_backdrop_toolbar_menu_show
+    private val buttonPrimaryAction: ImageButton = backdropActivity.button_backdrop_toolbar_action
+    private val buttonMoreAction: ImageButton = backdropActivity.button_backdrop_toolbar_more
 
-    private val textTitle: TextView = activity.text_backdrop_toolbar_title
-    private val textSubTitle: TextView = activity.text_backdrop_toolbar_subtitle
+    private val textTitle: TextView = backdropActivity.text_backdrop_toolbar_title
+    private val textSubTitle: TextView = backdropActivity.text_backdrop_toolbar_subtitle
 
     /* animations */
     private val buttonMenuShowAnimator = buttonOpenMenu.fadeInAnimator
@@ -65,7 +66,7 @@ internal class Toolbar(override val activity: Activity) : Component {
         }
 
         buttonBack.setOnClickListener {
-            activity.onBackPressed()
+            backdropActivity.onBackPressed()
         }
     }
 
@@ -90,7 +91,7 @@ internal class Toolbar(override val activity: Activity) : Component {
         }
 
     /* API */
-    internal fun configure(item: ToolbarItem, back: Boolean) {
+    internal fun configure(item: BackdropToolbarItem, back: Boolean) {
         toolbarLayout.fade {
             title = item.title
             subTitle = item.subtitle
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/components/ToolbarItem.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropToolbarItem.kt
similarity index 84%
rename from backdroplibrary/src/main/java/de/si/backdroplibrary/components/ToolbarItem.kt
rename to backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropToolbarItem.kt
index ccd6070..6c7298e 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/components/ToolbarItem.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/components/BackdropToolbarItem.kt
@@ -1,6 +1,6 @@
 package de.si.backdroplibrary.components
 
-data class ToolbarItem(
+data class BackdropToolbarItem(
     val title: String,
     val subtitle: String? = null,
     val primaryAction: Int? = null,
diff --git a/backdroplibrary/src/main/java/de/si/backdroplibrary/components/FullscreenDialogs.kt b/backdroplibrary/src/main/java/de/si/backdroplibrary/components/FullscreenDialogs.kt
index d6cab3f..d68558b 100644
--- a/backdroplibrary/src/main/java/de/si/backdroplibrary/components/FullscreenDialogs.kt
+++ b/backdroplibrary/src/main/java/de/si/backdroplibrary/components/FullscreenDialogs.kt
@@ -8,24 +8,25 @@ import androidx.core.content.ContextCompat
 import androidx.core.transition.doOnEnd
 import androidx.core.view.isVisible
 import de.si.backdroplibrary.Backdrop
-import de.si.backdroplibrary.Component
+import de.si.backdroplibrary.BackdropComponent
 import de.si.backdroplibrary.R
-import de.si.backdroplibrary.activity.Activity
-import de.si.backdroplibrary.children.FullscreenFragment
-import de.si.backdroplibrary.children.FullscreenRevealFragment
+import de.si.backdroplibrary.activity.BackdropActivity
+import de.si.backdroplibrary.children.FullscreenBackdropFragment
+import de.si.backdroplibrary.children.FullscreenRevealBackdropFragment
 import de.si.kotlinx.add
 import de.si.kotlinx.remove
 import de.si.kotlinx.revealRadius
 import kotlinx.android.synthetic.main.layout_main.*
 
-internal class FullscreenDialogs(override val activity: Activity) : Component {
-    private val fragmentManager = activity.supportFragmentManager
-    private val layoutContainer = activity.layout_backdrop_overlay
+internal class FullscreenDialogs(override val backdropActivity: BackdropActivity) :
+    BackdropComponent {
+    private val fragmentManager = backdropActivity.supportFragmentManager
+    private val layoutContainer = backdropActivity.layout_backdrop_overlay
 
     val isVisible
         get() = layoutContainer.isVisible
 
-    override fun showFullscreenFragment(fragment: FullscreenFragment) {
+    override fun showFullscreenFragment(fragment: FullscreenBackdropFragment) {
         layoutContainer.setBackgroundColor(Color.TRANSPARENT)
         layoutContainer.isVisible = true
         fragmentManager.add(fragment, layoutContainer.id)
@@ -33,17 +34,17 @@ internal class FullscreenDialogs(override val activity: Activity) : Component {
 
     override fun hideFullscreenFragment() {
         when (val fragment = fragmentManager.findFragmentById(layoutContainer.id)) {
-            is FullscreenFragment -> hideFullScreen(fragment)
-            is FullscreenRevealFragment -> concealFullscreen(fragment)
+            is FullscreenBackdropFragment -> hideFullScreen(fragment)
+            is FullscreenRevealBackdropFragment -> concealFullscreen(fragment)
         }
     }
 
-    internal fun revealFullscreen(fragment: FullscreenRevealFragment) {
+    internal fun revealFullscreen(fragment: FullscreenRevealBackdropFragment) {
         val epiCenter = fragment.revealEpiCenter
 
         layoutContainer.setBackgroundColor(
             ContextCompat.getColor(
-                activity.applicationContext,
+                backdropActivity.applicationContext,
                 R.color.colorPrimaryLightLowAlpha
             )
         )
@@ -59,7 +60,7 @@ internal class FullscreenDialogs(override val activity: Activity) : Component {
         ).setDuration(Backdrop.BACKDROP_ANIMATION_DURATION).start()
     }
 
-    private fun hideFullScreen(fragment: FullscreenFragment) {
+    private fun hideFullScreen(fragment: FullscreenBackdropFragment) {
         val transition = fragment.exitTransition as? Transition
         transition?.doOnEnd {
             layoutContainer.isVisible = false
@@ -67,7 +68,7 @@ internal class FullscreenDialogs(override val activity: Activity) : Component {
         fragmentManager.remove(fragment)
     }
 
-    private fun concealFullscreen(fragment: FullscreenRevealFragment) {
+    private fun concealFullscreen(fragment: FullscreenRevealBackdropFragment) {
         val epiCenter = fragment.revealEpiCenter
 
         val concealAnimator = ViewAnimationUtils.createCircularReveal(
diff --git a/build.gradle b/build.gradle
index 79d9919..1cc63e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
 
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.50'
 
     repositories {
         google()
@@ -10,8 +10,9 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'digital.wup:android-maven-publish:3.6.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d3cb2e6..ebc4890 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue May 07 10:57:21 CEST 2019
+#Sat Aug 31 15:00:41 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip