Moved the mp4 reader to a pure java module

zayuim · Jul 24, 2017 · b8df7f7 · b8df7f7
1 parent 3914c04
commit b8df7f7
Show file tree

Hide file tree

Showing 363 changed files with 164 additions and 108 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/audiobook/.gitignore → app/.gitignore b/audiobook/.gitignore → app/.gitignore
diff --git a/audiobook/build.gradle → app/build.gradle b/audiobook/build.gradle → app/build.gradle
@@ -45,11 +45,13 @@ android {
  shrinkResources true
  proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.pro'
  signingConfig signingConfigs.release
+ multiDexEnabled false
  }
  debug {
  minifyEnabled false
  shrinkResources false
  ext.enableCrashlytics = false
+ multiDexEnabled true
 
  applicationIdSuffix ".debug"
  }
@@ -79,6 +81,8 @@ android {
 
 dependencies {
  compile project(":core")
+ compile project(":common")
+ compile project(":chapterreader")
 
  kapt libraries.dataBindingCompiler
 

diff --git a/audiobook/proguard-rules.txt → app/proguard-rules.txt b/audiobook/proguard-rules.txt → app/proguard-rules.txt
diff --git a/audiobook/proguard.pro → app/proguard.pro b/audiobook/proguard.pro → app/proguard.pro
diff --git a/...istence/internals/DataBaseMigratorTest.kt → ...istence/internals/DataBaseMigratorTest.kt b/...istence/internals/DataBaseMigratorTest.kt → ...istence/internals/DataBaseMigratorTest.kt
diff --git a/...ternals/migrations/Migration39to40Test.kt → ...ternals/migrations/Migration39to40Test.kt b/...ternals/migrations/Migration39to40Test.kt → ...ternals/migrations/Migration39to40Test.kt
diff --git a/...ternals/migrations/Migration40to41Test.kt → ...ternals/migrations/Migration40to41Test.kt b/...ternals/migrations/Migration40to41Test.kt → ...ternals/migrations/Migration40to41Test.kt
diff --git a/...k/src/debug/res/values/donottranslate.xml → app/src/debug/res/values/donottranslate.xml b/...k/src/debug/res/values/donottranslate.xml → app/src/debug/res/values/donottranslate.xml
diff --git a/audiobook/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml b/audiobook/src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml
diff --git a/...k/src/main/java/de/ph1b/audiobook/Book.kt → app/src/main/java/de/ph1b/audiobook/Book.kt b/...k/src/main/java/de/ph1b/audiobook/Book.kt → app/src/main/java/de/ph1b/audiobook/Book.kt
diff --git a/...c/main/java/de/ph1b/audiobook/Bookmark.kt → ...c/main/java/de/ph1b/audiobook/Bookmark.kt b/...c/main/java/de/ph1b/audiobook/Bookmark.kt → ...c/main/java/de/ph1b/audiobook/Bookmark.kt
diff --git a/...rc/main/java/de/ph1b/audiobook/Chapter.kt → ...rc/main/java/de/ph1b/audiobook/Chapter.kt b/...rc/main/java/de/ph1b/audiobook/Chapter.kt → ...rc/main/java/de/ph1b/audiobook/Chapter.kt
diff --git a/...e/ph1b/audiobook/features/BaseActivity.kt → ...e/ph1b/audiobook/features/BaseActivity.kt b/...e/ph1b/audiobook/features/BaseActivity.kt → ...e/ph1b/audiobook/features/BaseActivity.kt
diff --git a/...ph1b/audiobook/features/BaseController.kt → ...ph1b/audiobook/features/BaseController.kt b/...ph1b/audiobook/features/BaseController.kt → ...ph1b/audiobook/features/BaseController.kt
diff --git a/...a/de/ph1b/audiobook/features/BookAdder.kt → ...a/de/ph1b/audiobook/features/BookAdder.kt b/...a/de/ph1b/audiobook/features/BookAdder.kt → ...a/de/ph1b/audiobook/features/BookAdder.kt
@@ -8,9 +8,9 @@ import android.support.v4.content.ContextCompat
 import d
 import de.ph1b.audiobook.Book
 import de.ph1b.audiobook.Chapter
+import de.ph1b.audiobook.chapterReader.mp4.Mp4ChapterReader
 import de.ph1b.audiobook.features.chapterReader.id3.ID3ChapterReader
 import de.ph1b.audiobook.features.chapterReader.matroska.MatroskaChapterReader
-import de.ph1b.audiobook.features.chapterReader.mp4.Mp4ChapterReader
 import de.ph1b.audiobook.features.chapterReader.ogg.readChaptersFromOgg
 import de.ph1b.audiobook.misc.FileRecognition
 import de.ph1b.audiobook.misc.MediaAnalyzer
@@ -19,6 +19,7 @@ import de.ph1b.audiobook.misc.asV2Observable
 import de.ph1b.audiobook.misc.combineLatest
 import de.ph1b.audiobook.misc.emptySparseArray
 import de.ph1b.audiobook.misc.listFilesSafely
+import de.ph1b.audiobook.misc.toSparseArray
 import de.ph1b.audiobook.misc.value
 import de.ph1b.audiobook.persistence.BookRepository
 import de.ph1b.audiobook.persistence.PrefsManager
@@ -44,7 +45,8 @@ import javax.inject.Singleton
  private val prefs: PrefsManager,
  private val repo: BookRepository,
  private val coverCollector: CoverFromDiscCollector,
- private val mediaAnalyzer: MediaAnalyzer
+ private val mediaAnalyzer: MediaAnalyzer,
+ private val mp4ChapterReader: Mp4ChapterReader
 ) {
 
  private val executor = Executors.newSingleThreadExecutor()
@@ -324,7 +326,7 @@ import javax.inject.Singleton
  if (result is MediaAnalyzer.Result.Success) {
  val marks = when (f.extension) {
  "mp3" -> f.inputStream().use { ID3ChapterReader.readInputStream(it) }
- "mp4", "m4a", "m4b", "aac" -> Mp4ChapterReader.readChapters(f)
+ "mp4", "m4a", "m4b", "aac" -> mp4ChapterReader.readChapters(f).toSparseArray()
  "opus", "ogg", "oga" -> f.inputStream().use { readChaptersFromOgg(it) }
  "mka", "mkv", "webm" -> MatroskaChapterReader.read(f)
  else -> emptySparseArray<String>()

diff --git a/...e/ph1b/audiobook/features/MainActivity.kt → ...e/ph1b/audiobook/features/MainActivity.kt b/...e/ph1b/audiobook/features/MainActivity.kt → ...e/ph1b/audiobook/features/MainActivity.kt
diff --git a/...h1b/audiobook/features/audio/Equalizer.kt → ...h1b/audiobook/features/audio/Equalizer.kt b/...h1b/audiobook/features/audio/Equalizer.kt → ...h1b/audiobook/features/audio/Equalizer.kt
diff --git a/...udiobook/features/audio/LoudnessDialog.kt → ...udiobook/features/audio/LoudnessDialog.kt b/...udiobook/features/audio/LoudnessDialog.kt → ...udiobook/features/audio/LoudnessDialog.kt
diff --git a/.../audiobook/features/audio/LoudnessGain.kt → .../audiobook/features/audio/LoudnessGain.kt b/.../audiobook/features/audio/LoudnessGain.kt → .../audiobook/features/audio/LoudnessGain.kt
diff --git a/...features/bookOverview/BookShelfAdapter.kt → ...features/bookOverview/BookShelfAdapter.kt b/...features/bookOverview/BookShelfAdapter.kt → ...features/bookOverview/BookShelfAdapter.kt
diff --git a/...tures/bookOverview/BookShelfController.kt → ...tures/bookOverview/BookShelfController.kt b/...tures/bookOverview/BookShelfController.kt → ...tures/bookOverview/BookShelfController.kt
diff --git a/...atures/bookOverview/BookShelfPresenter.kt → ...atures/bookOverview/BookShelfPresenter.kt b/...atures/bookOverview/BookShelfPresenter.kt → ...atures/bookOverview/BookShelfPresenter.kt
diff --git a/...tures/bookOverview/EditBookBottomSheet.kt → ...tures/bookOverview/EditBookBottomSheet.kt b/...tures/bookOverview/EditBookBottomSheet.kt → ...tures/bookOverview/EditBookBottomSheet.kt
diff --git a/...okOverview/EditBookTitleDialogFragment.kt → ...okOverview/EditBookTitleDialogFragment.kt b/...okOverview/EditBookTitleDialogFragment.kt → ...okOverview/EditBookTitleDialogFragment.kt
diff --git a/...s/bookOverview/EditCoverDialogFragment.kt → ...s/bookOverview/EditCoverDialogFragment.kt b/...s/bookOverview/EditCoverDialogFragment.kt → ...s/bookOverview/EditCoverDialogFragment.kt
diff --git a/...Overview/NoFolderWarningDialogFragment.kt → ...Overview/NoFolderWarningDialogFragment.kt b/...Overview/NoFolderWarningDialogFragment.kt → ...Overview/NoFolderWarningDialogFragment.kt
diff --git a/...k/features/bookPlaying/BookPlayChapter.kt → ...k/features/bookPlaying/BookPlayChapter.kt b/...k/features/bookPlaying/BookPlayChapter.kt → ...k/features/bookPlaying/BookPlayChapter.kt
diff --git a/...eatures/bookPlaying/BookPlayController.kt → ...eatures/bookPlaying/BookPlayController.kt b/...eatures/bookPlaying/BookPlayController.kt → ...eatures/bookPlaying/BookPlayController.kt
diff --git a/...obook/features/bookPlaying/BookPlayMvp.kt → ...obook/features/bookPlaying/BookPlayMvp.kt b/...obook/features/bookPlaying/BookPlayMvp.kt → ...obook/features/bookPlaying/BookPlayMvp.kt
diff --git a/...features/bookPlaying/BookPlayPresenter.kt → ...features/bookPlaying/BookPlayPresenter.kt b/...features/bookPlaying/BookPlayPresenter.kt → ...features/bookPlaying/BookPlayPresenter.kt
diff --git a/...okPlaying/JumpToPositionDialogFragment.kt → ...okPlaying/JumpToPositionDialogFragment.kt b/...okPlaying/JumpToPositionDialogFragment.kt → ...okPlaying/JumpToPositionDialogFragment.kt
diff --git a/...eatures/bookPlaying/SeekDialogFragment.kt → ...eatures/bookPlaying/SeekDialogFragment.kt b/...eatures/bookPlaying/SeekDialogFragment.kt → ...eatures/bookPlaying/SeekDialogFragment.kt
diff --git a/...s/bookPlaying/SleepTimerDialogFragment.kt → ...s/bookPlaying/SleepTimerDialogFragment.kt b/...s/bookPlaying/SleepTimerDialogFragment.kt → ...s/bookPlaying/SleepTimerDialogFragment.kt
diff --git a/...diobook/features/bookSearch/BookSearch.kt → ...diobook/features/bookSearch/BookSearch.kt b/...diobook/features/bookSearch/BookSearch.kt → ...diobook/features/bookSearch/BookSearch.kt
diff --git a/.../features/bookSearch/BookSearchHandler.kt → .../features/bookSearch/BookSearchHandler.kt b/.../features/bookSearch/BookSearchHandler.kt → .../features/bookSearch/BookSearchHandler.kt
diff --git a/...k/features/bookSearch/BookSearchParser.kt → ...k/features/bookSearch/BookSearchParser.kt b/...k/features/bookSearch/BookSearchParser.kt → ...k/features/bookSearch/BookSearchParser.kt
diff --git a/.../features/bookmarks/BookmarkController.kt → .../features/bookmarks/BookmarkController.kt b/.../features/bookmarks/BookmarkController.kt → .../features/bookmarks/BookmarkController.kt
diff --git a/...k/features/bookmarks/BookmarkPresenter.kt → ...k/features/bookmarks/BookmarkPresenter.kt b/...k/features/bookmarks/BookmarkPresenter.kt → ...k/features/bookmarks/BookmarkPresenter.kt
diff --git a/...iobook/features/bookmarks/BookmarkView.kt → ...iobook/features/bookmarks/BookmarkView.kt b/...iobook/features/bookmarks/BookmarkView.kt → ...iobook/features/bookmarks/BookmarkView.kt
diff --git a/...es/bookmarks/dialogs/AddBookmarkDialog.kt → ...es/bookmarks/dialogs/AddBookmarkDialog.kt b/...es/bookmarks/dialogs/AddBookmarkDialog.kt → ...es/bookmarks/dialogs/AddBookmarkDialog.kt
diff --git a/...bookmarks/dialogs/DeleteBookmarkDialog.kt → ...bookmarks/dialogs/DeleteBookmarkDialog.kt b/...bookmarks/dialogs/DeleteBookmarkDialog.kt → ...bookmarks/dialogs/DeleteBookmarkDialog.kt
diff --git a/...s/bookmarks/dialogs/EditBookmarkDialog.kt → ...s/bookmarks/dialogs/EditBookmarkDialog.kt b/...s/bookmarks/dialogs/EditBookmarkDialog.kt → ...s/bookmarks/dialogs/EditBookmarkDialog.kt
diff --git a/...features/bookmarks/list/BookMarkHolder.kt → ...features/bookmarks/list/BookMarkHolder.kt b/...features/bookmarks/list/BookMarkHolder.kt → ...features/bookmarks/list/BookMarkHolder.kt
diff --git a/...eatures/bookmarks/list/BookmarkAdapter.kt → ...eatures/bookmarks/list/BookmarkAdapter.kt b/...eatures/bookmarks/list/BookmarkAdapter.kt → ...eatures/bookmarks/list/BookmarkAdapter.kt
diff --git a/...s/bookmarks/list/BookmarkClickListener.kt → ...s/bookmarks/list/BookmarkClickListener.kt b/...s/bookmarks/list/BookmarkClickListener.kt → ...s/bookmarks/list/BookmarkClickListener.kt
diff --git a/...ookmarks/list/BookmarkDiffUtilCallback.kt → ...ookmarks/list/BookmarkDiffUtilCallback.kt b/...ookmarks/list/BookmarkDiffUtilCallback.kt → ...ookmarks/list/BookmarkDiffUtilCallback.kt
diff --git a/...book/features/chapterReader/id3/Header.kt → ...book/features/chapterReader/id3/Header.kt b/...book/features/chapterReader/id3/Header.kt → ...book/features/chapterReader/id3/Header.kt
diff --git a/...res/chapterReader/id3/ID3ChapterReader.kt → ...res/chapterReader/id3/ID3ChapterReader.kt b/...res/chapterReader/id3/ID3ChapterReader.kt → ...res/chapterReader/id3/ID3ChapterReader.kt
@@ -1,7 +1,7 @@
 package de.ph1b.audiobook.features.chapterReader.id3
 
 import android.util.SparseArray
-import de.ph1b.audiobook.features.chapterReader.skipBytes
+import de.ph1b.audiobook.common.skipBytes
 import e
 import java.io.IOException
 import java.io.InputStream

diff --git a/...s/chapterReader/id3/ID3ReaderException.kt → ...s/chapterReader/id3/ID3ReaderException.kt b/...s/chapterReader/id3/ID3ReaderException.kt → ...s/chapterReader/id3/ID3ReaderException.kt
diff --git a/...chapterReader/matroska/MatroskaChapter.kt → ...chapterReader/matroska/MatroskaChapter.kt b/...chapterReader/matroska/MatroskaChapter.kt → ...chapterReader/matroska/MatroskaChapter.kt
diff --git a/...ader/matroska/MatroskaChapterFlattener.kt → ...ader/matroska/MatroskaChapterFlattener.kt b/...ader/matroska/MatroskaChapterFlattener.kt → ...ader/matroska/MatroskaChapterFlattener.kt
diff --git a/...terReader/matroska/MatroskaChapterName.kt → ...terReader/matroska/MatroskaChapterName.kt b/...terReader/matroska/MatroskaChapterName.kt → ...terReader/matroska/MatroskaChapterName.kt
diff --git a/...rReader/matroska/MatroskaChapterReader.kt → ...rReader/matroska/MatroskaChapterReader.kt b/...rReader/matroska/MatroskaChapterReader.kt → ...rReader/matroska/MatroskaChapterReader.kt
diff --git a/...Reader/matroska/MatroskaParseException.kt → ...Reader/matroska/MatroskaParseException.kt b/...Reader/matroska/MatroskaParseException.kt → ...Reader/matroska/MatroskaParseException.kt
diff --git a/...Reader/matroska/ReadAsMatroskaChapters.kt → ...Reader/matroska/ReadAsMatroskaChapters.kt b/...Reader/matroska/ReadAsMatroskaChapters.kt → ...Reader/matroska/ReadAsMatroskaChapters.kt
diff --git a/...es/chapterReader/ogg/oggChapterReading.kt → ...es/chapterReader/ogg/oggChapterReading.kt b/...es/chapterReader/ogg/oggChapterReading.kt → ...es/chapterReader/ogg/oggChapterReading.kt
@@ -1,15 +1,14 @@
 package de.ph1b.audiobook.features.chapterReader.ogg
 
 import android.util.SparseArray
+import de.ph1b.audiobook.common.startsWith
 import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.OggPageParseException
 import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.OggStream
 import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.demuxOggStreams
 import de.ph1b.audiobook.features.chapterReader.ogg.oggReading.readOggPages
 import de.ph1b.audiobook.features.chapterReader.ogg.vorbisComment.VorbisComment
 import de.ph1b.audiobook.features.chapterReader.ogg.vorbisComment.VorbisCommentParseException
 import de.ph1b.audiobook.features.chapterReader.ogg.vorbisComment.VorbisCommentReader
-import de.ph1b.audiobook.features.chapterReader.readBytes
-import de.ph1b.audiobook.features.chapterReader.startsWith
 import de.ph1b.audiobook.misc.emptySparseArray
 import de.ph1b.audiobook.misc.values
 import e

diff --git a/...s/chapterReader/ogg/oggReading/OggPage.kt → ...s/chapterReader/ogg/oggReading/OggPage.kt b/...s/chapterReader/ogg/oggReading/OggPage.kt → ...s/chapterReader/ogg/oggReading/OggPage.kt
diff --git a/...r/ogg/oggReading/OggPageParseException.kt → ...r/ogg/oggReading/OggPageParseException.kt b/...r/ogg/oggReading/OggPageParseException.kt → ...r/ogg/oggReading/OggPageParseException.kt
diff --git a/...chapterReader/ogg/oggReading/OggStream.kt → ...chapterReader/ogg/oggReading/OggStream.kt b/...chapterReader/ogg/oggReading/OggStream.kt → ...chapterReader/ogg/oggReading/OggStream.kt
diff --git a/...eader/ogg/oggReading/PackageSizeParser.kt → ...eader/ogg/oggReading/PackageSizeParser.kt b/...eader/ogg/oggReading/PackageSizeParser.kt → ...eader/ogg/oggReading/PackageSizeParser.kt
@@ -1,6 +1,6 @@
 package de.ph1b.audiobook.features.chapterReader.ogg.oggReading
 
-import de.ph1b.audiobook.features.chapterReader.toUInt
+import de.ph1b.audiobook.common.toUInt
 
 
 object PackageSizeParser {

diff --git a/...hapterReader/ogg/oggReading/oggReading.kt → ...hapterReader/ogg/oggReading/oggReading.kt b/...hapterReader/ogg/oggReading/oggReading.kt → ...hapterReader/ogg/oggReading/oggReading.kt
@@ -1,13 +1,12 @@
 package de.ph1b.audiobook.features.chapterReader.ogg.oggReading
 
 import android.util.SparseArray
-import de.ph1b.audiobook.features.chapterReader.readBytes
-import de.ph1b.audiobook.features.chapterReader.readLeInt32
-import de.ph1b.audiobook.features.chapterReader.readLeInt64
-import de.ph1b.audiobook.features.chapterReader.readLeUInt32
-import de.ph1b.audiobook.features.chapterReader.readUInt8
-import de.ph1b.audiobook.features.chapterReader.skipBytes
-import de.ph1b.audiobook.features.chapterReader.toUInt
+import de.ph1b.audiobook.common.readLeInt32
+import de.ph1b.audiobook.common.readLeInt64
+import de.ph1b.audiobook.common.readLeUInt32
+import de.ph1b.audiobook.common.readUInt8
+import de.ph1b.audiobook.common.skipBytes
+import de.ph1b.audiobook.common.toUInt
 import java.io.EOFException
 import java.io.InputStream
 

diff --git a/...Reader/ogg/vorbisComment/VorbisComment.kt → ...Reader/ogg/vorbisComment/VorbisComment.kt b/...Reader/ogg/vorbisComment/VorbisComment.kt → ...Reader/ogg/vorbisComment/VorbisComment.kt
diff --git a/...bisComment/VorbisCommentParseException.kt → ...bisComment/VorbisCommentParseException.kt b/...bisComment/VorbisCommentParseException.kt → ...bisComment/VorbisCommentParseException.kt
diff --git a/.../ogg/vorbisComment/VorbisCommentReader.kt → .../ogg/vorbisComment/VorbisCommentReader.kt b/.../ogg/vorbisComment/VorbisCommentReader.kt → .../ogg/vorbisComment/VorbisCommentReader.kt
@@ -1,7 +1,6 @@
 package de.ph1b.audiobook.features.chapterReader.ogg.vorbisComment
 
-import de.ph1b.audiobook.features.chapterReader.readBytes
-import de.ph1b.audiobook.features.chapterReader.readLeUInt32
+import de.ph1b.audiobook.common.readLeUInt32
 import java.io.InputStream
 
 object VorbisCommentReader {

diff --git a/...book/features/coldStart/SplashActivity.kt → ...book/features/coldStart/SplashActivity.kt b/...book/features/coldStart/SplashActivity.kt → ...book/features/coldStart/SplashActivity.kt
diff --git a/.../features/crashlytics/CrashLoggingTree.kt → .../features/crashlytics/CrashLoggingTree.kt b/.../features/crashlytics/CrashLoggingTree.kt → .../features/crashlytics/CrashLoggingTree.kt
diff --git a/...orageMissing/NoExternalStorageActivity.kt → ...orageMissing/NoExternalStorageActivity.kt b/...orageMissing/NoExternalStorageActivity.kt → ...orageMissing/NoExternalStorageActivity.kt
diff --git a/...es/folderChooser/FolderChooserActivity.kt → ...es/folderChooser/FolderChooserActivity.kt b/...es/folderChooser/FolderChooserActivity.kt → ...es/folderChooser/FolderChooserActivity.kt
diff --git a/...res/folderChooser/FolderChooserAdapter.kt → ...res/folderChooser/FolderChooserAdapter.kt b/...res/folderChooser/FolderChooserAdapter.kt → ...res/folderChooser/FolderChooserAdapter.kt
diff --git a/...s/folderChooser/FolderChooserPresenter.kt → ...s/folderChooser/FolderChooserPresenter.kt b/...s/folderChooser/FolderChooserPresenter.kt → ...s/folderChooser/FolderChooserPresenter.kt
diff --git a/...atures/folderChooser/FolderChooserView.kt → ...atures/folderChooser/FolderChooserView.kt b/...atures/folderChooser/FolderChooserView.kt → ...atures/folderChooser/FolderChooserView.kt
diff --git a/...udiobook/features/folderChooser/Holder.kt → ...udiobook/features/folderChooser/Holder.kt b/...udiobook/features/folderChooser/Holder.kt → ...udiobook/features/folderChooser/Holder.kt
diff --git a/...eatures/folderChooser/StorageDirFinder.kt → ...eatures/folderChooser/StorageDirFinder.kt b/...eatures/folderChooser/StorageDirFinder.kt → ...eatures/folderChooser/StorageDirFinder.kt
diff --git a/...ok/features/folderOverview/FolderModel.kt → ...ok/features/folderOverview/FolderModel.kt b/...ok/features/folderOverview/FolderModel.kt → ...ok/features/folderOverview/FolderModel.kt
diff --git a/...s/folderOverview/FolderOverviewAdapter.kt → ...s/folderOverview/FolderOverviewAdapter.kt b/...s/folderOverview/FolderOverviewAdapter.kt → ...s/folderOverview/FolderOverviewAdapter.kt
diff --git a/...olderOverview/FolderOverviewController.kt → ...olderOverview/FolderOverviewController.kt b/...olderOverview/FolderOverviewController.kt → ...olderOverview/FolderOverviewController.kt
diff --git a/...olderOverview/FolderOverviewDiffHelper.kt → ...olderOverview/FolderOverviewDiffHelper.kt b/...olderOverview/FolderOverviewDiffHelper.kt → ...olderOverview/FolderOverviewDiffHelper.kt
diff --git a/...es/folderOverview/FolderOverviewHolder.kt → ...es/folderOverview/FolderOverviewHolder.kt b/...es/folderOverview/FolderOverviewHolder.kt → ...es/folderOverview/FolderOverviewHolder.kt
diff --git a/...folderOverview/FolderOverviewPresenter.kt → ...folderOverview/FolderOverviewPresenter.kt b/...folderOverview/FolderOverviewPresenter.kt → ...folderOverview/FolderOverviewPresenter.kt
diff --git a/...obook/features/imagepicker/CropOverlay.kt → ...obook/features/imagepicker/CropOverlay.kt b/...obook/features/imagepicker/CropOverlay.kt → ...obook/features/imagepicker/CropOverlay.kt
diff --git a/...ures/imagepicker/ImagePickerController.kt → ...ures/imagepicker/ImagePickerController.kt b/...ures/imagepicker/ImagePickerController.kt → ...ures/imagepicker/ImagePickerController.kt
diff --git a/...k/features/settings/SettingsController.kt → ...k/features/settings/SettingsController.kt b/...k/features/settings/SettingsController.kt → ...k/features/settings/SettingsController.kt
diff --git a/...tings/dialogs/AutoRewindDialogFragment.kt → ...tings/dialogs/AutoRewindDialogFragment.kt b/...tings/dialogs/AutoRewindDialogFragment.kt → ...tings/dialogs/AutoRewindDialogFragment.kt
diff --git a/...gs/dialogs/PlaybackSpeedDialogFragment.kt → ...gs/dialogs/PlaybackSpeedDialogFragment.kt b/...gs/dialogs/PlaybackSpeedDialogFragment.kt → ...gs/dialogs/PlaybackSpeedDialogFragment.kt
diff --git a/...settings/dialogs/SupportDialogFragment.kt → ...settings/dialogs/SupportDialogFragment.kt b/...settings/dialogs/SupportDialogFragment.kt → ...settings/dialogs/SupportDialogFragment.kt
diff --git a/...ings/dialogs/ThemePickerDialogFragment.kt → ...ings/dialogs/ThemePickerDialogFragment.kt b/...ings/dialogs/ThemePickerDialogFragment.kt → ...ings/dialogs/ThemePickerDialogFragment.kt
diff --git a/...ook/features/widget/BaseWidgetProvider.kt → ...ook/features/widget/BaseWidgetProvider.kt b/...ook/features/widget/BaseWidgetProvider.kt → ...ook/features/widget/BaseWidgetProvider.kt
diff --git a/...ok/features/widget/WidgetUpdateService.kt → ...ok/features/widget/WidgetUpdateService.kt b/...ok/features/widget/WidgetUpdateService.kt → ...ok/features/widget/WidgetUpdateService.kt
diff --git a/...ph1b/audiobook/injection/AndroidModule.kt → ...ph1b/audiobook/injection/AndroidModule.kt b/...ph1b/audiobook/injection/AndroidModule.kt → ...ph1b/audiobook/injection/AndroidModule.kt
@@ -13,6 +13,8 @@ import android.view.WindowManager
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides
+import de.ph1b.audiobook.common.ErrorReporter
+import de.ph1b.audiobook.features.crashlytics.CrashlyticsProxy
 import javax.inject.Singleton
 
 
@@ -30,4 +32,5 @@ import javax.inject.Singleton
  @Provides @Singleton fun provideSensorManager(context: Context) = context.getSystemService(Context.SENSOR_SERVICE) as SensorManager?
  @Provides @Singleton fun providePowerManager(context: Context) = context.getSystemService(Context.POWER_SERVICE) as PowerManager
  @Provides @Singleton fun provideMoshi(): Moshi = Moshi.Builder().build()
+ @Provides @Singleton fun provideErrorReporter(): ErrorReporter = CrashlyticsProxy
 }
diff --git a/...n/java/de/ph1b/audiobook/injection/App.kt → ...n/java/de/ph1b/audiobook/injection/App.kt b/...n/java/de/ph1b/audiobook/injection/App.kt → ...n/java/de/ph1b/audiobook/injection/App.kt
diff --git a/.../ph1b/audiobook/injection/AppComponent.kt → .../ph1b/audiobook/injection/AppComponent.kt b/.../ph1b/audiobook/injection/AppComponent.kt → .../ph1b/audiobook/injection/AppComponent.kt
diff --git a/...ph1b/audiobook/injection/BindingModule.kt → ...ph1b/audiobook/injection/BindingModule.kt b/...ph1b/audiobook/injection/BindingModule.kt → ...ph1b/audiobook/injection/BindingModule.kt
diff --git a/...de/ph1b/audiobook/injection/PerService.kt → ...de/ph1b/audiobook/injection/PerService.kt b/...de/ph1b/audiobook/injection/PerService.kt → ...de/ph1b/audiobook/injection/PerService.kt
diff --git a/...h1b/audiobook/injection/PlaybackModule.kt → ...h1b/audiobook/injection/PlaybackModule.kt b/...h1b/audiobook/injection/PlaybackModule.kt → ...h1b/audiobook/injection/PlaybackModule.kt
diff --git a/...e/ph1b/audiobook/injection/PrefsModule.kt → ...e/ph1b/audiobook/injection/PrefsModule.kt b/...e/ph1b/audiobook/injection/PrefsModule.kt → ...e/ph1b/audiobook/injection/PrefsModule.kt
diff --git a/...h1b/audiobook/injection/prefQualifiers.kt → ...h1b/audiobook/injection/prefQualifiers.kt b/...h1b/audiobook/injection/prefQualifiers.kt → ...h1b/audiobook/injection/prefQualifiers.kt
diff --git a/...e/ph1b/audiobook/misc/DialogController.kt → ...e/ph1b/audiobook/misc/DialogController.kt b/...e/ph1b/audiobook/misc/DialogController.kt → ...e/ph1b/audiobook/misc/DialogController.kt
diff --git a/...e/ph1b/audiobook/misc/DurationAnalyzer.kt → ...e/ph1b/audiobook/misc/DurationAnalyzer.kt b/...e/ph1b/audiobook/misc/DurationAnalyzer.kt → ...e/ph1b/audiobook/misc/DurationAnalyzer.kt
diff --git a/...e/ph1b/audiobook/misc/EmptySparseArray.kt → ...e/ph1b/audiobook/misc/EmptySparseArray.kt b/...e/ph1b/audiobook/misc/EmptySparseArray.kt → ...e/ph1b/audiobook/misc/EmptySparseArray.kt
diff --git a/...de/ph1b/audiobook/misc/FileRecognition.kt → ...de/ph1b/audiobook/misc/FileRecognition.kt b/...de/ph1b/audiobook/misc/FileRecognition.kt → ...de/ph1b/audiobook/misc/FileRecognition.kt
diff --git a/...udiobook/misc/IntelliJStringComparator.kt → ...udiobook/misc/IntelliJStringComparator.kt b/...udiobook/misc/IntelliJStringComparator.kt → ...udiobook/misc/IntelliJStringComparator.kt
diff --git a/...a/de/ph1b/audiobook/misc/MediaAnalyzer.kt → ...a/de/ph1b/audiobook/misc/MediaAnalyzer.kt b/...a/de/ph1b/audiobook/misc/MediaAnalyzer.kt → ...a/de/ph1b/audiobook/misc/MediaAnalyzer.kt
diff --git a/...e/ph1b/audiobook/misc/MetaDataAnalyzer.kt → ...e/ph1b/audiobook/misc/MetaDataAnalyzer.kt b/...e/ph1b/audiobook/misc/MetaDataAnalyzer.kt → ...e/ph1b/audiobook/misc/MetaDataAnalyzer.kt
diff --git a/...audiobook/misc/MultiLineSpinnerAdapter.kt → ...audiobook/misc/MultiLineSpinnerAdapter.kt b/...audiobook/misc/MultiLineSpinnerAdapter.kt → ...audiobook/misc/MultiLineSpinnerAdapter.kt
diff --git a/.../audiobook/misc/NaturalOrderComparator.kt → .../audiobook/misc/NaturalOrderComparator.kt b/.../audiobook/misc/NaturalOrderComparator.kt → .../audiobook/misc/NaturalOrderComparator.kt
diff --git a/...e/ph1b/audiobook/misc/PermissionHelper.kt → ...e/ph1b/audiobook/misc/PermissionHelper.kt b/...e/ph1b/audiobook/misc/PermissionHelper.kt → ...e/ph1b/audiobook/misc/PermissionHelper.kt
diff --git a/...ava/de/ph1b/audiobook/misc/Permissions.kt → ...ava/de/ph1b/audiobook/misc/Permissions.kt b/...ava/de/ph1b/audiobook/misc/Permissions.kt → ...ava/de/ph1b/audiobook/misc/Permissions.kt
diff --git a/.../de/ph1b/audiobook/misc/RouterProvider.kt → .../de/ph1b/audiobook/misc/RouterProvider.kt b/.../de/ph1b/audiobook/misc/RouterProvider.kt → .../de/ph1b/audiobook/misc/RouterProvider.kt
diff --git a/...ava/de/ph1b/audiobook/misc/RxBroadcast.kt → ...ava/de/ph1b/audiobook/misc/RxBroadcast.kt b/...ava/de/ph1b/audiobook/misc/RxBroadcast.kt → ...ava/de/ph1b/audiobook/misc/RxBroadcast.kt
diff --git a/...ph1b/audiobook/misc/SparseArrayAdapter.kt → ...ph1b/audiobook/misc/SparseArrayAdapter.kt b/...ph1b/audiobook/misc/SparseArrayAdapter.kt → ...ph1b/audiobook/misc/SparseArrayAdapter.kt
diff --git a/.../ph1b/audiobook/misc/androidExtensions.kt → .../ph1b/audiobook/misc/androidExtensions.kt b/.../ph1b/audiobook/misc/androidExtensions.kt → .../ph1b/audiobook/misc/androidExtensions.kt
@@ -98,6 +98,14 @@ fun <T> SparseArray<T>.toMap(): Map<Int, T> {
  return res
 }
 
+fun <T> Map<Int, T>.toSparseArray(): SparseArray<T> {
+ val array = SparseArray<T>(size)
+ forEach { (key, value) ->
+ array.put(key, value)
+ }
+ return array
+}
+
 val <T> SparseArray<T>.values
  get() = (0..size() - 1).map { valueAt(it) }
 

diff --git a/...h1b/audiobook/misc/conductorExtensions.kt → ...h1b/audiobook/misc/conductorExtensions.kt b/...h1b/audiobook/misc/conductorExtensions.kt → ...h1b/audiobook/misc/conductorExtensions.kt
diff --git a/...va/de/ph1b/audiobook/misc/rxExtensions.kt → ...va/de/ph1b/audiobook/misc/rxExtensions.kt b/...va/de/ph1b/audiobook/misc/rxExtensions.kt → ...va/de/ph1b/audiobook/misc/rxExtensions.kt
diff --git a/...n/java/de/ph1b/audiobook/misc/rxKotlin.kt → ...n/java/de/ph1b/audiobook/misc/rxKotlin.kt b/...n/java/de/ph1b/audiobook/misc/rxKotlin.kt → ...n/java/de/ph1b/audiobook/misc/rxKotlin.kt
diff --git a/.../de/ph1b/audiobook/misc/viewExtensions.kt → .../de/ph1b/audiobook/misc/viewExtensions.kt b/.../de/ph1b/audiobook/misc/viewExtensions.kt → .../de/ph1b/audiobook/misc/viewExtensions.kt
diff --git a/...va/de/ph1b/audiobook/mvp/MvpController.kt → ...va/de/ph1b/audiobook/mvp/MvpController.kt b/...va/de/ph1b/audiobook/mvp/MvpController.kt → ...va/de/ph1b/audiobook/mvp/MvpController.kt
diff --git a/...n/java/de/ph1b/audiobook/mvp/Presenter.kt → ...n/java/de/ph1b/audiobook/mvp/Presenter.kt b/...n/java/de/ph1b/audiobook/mvp/Presenter.kt → ...n/java/de/ph1b/audiobook/mvp/Presenter.kt
diff --git a/...e/ph1b/audiobook/mvp/PresenterDelegate.kt → ...e/ph1b/audiobook/mvp/PresenterDelegate.kt b/...e/ph1b/audiobook/mvp/PresenterDelegate.kt → ...e/ph1b/audiobook/mvp/PresenterDelegate.kt
diff --git a/...a/de/ph1b/audiobook/mvp/RxBaseActivity.kt → ...a/de/ph1b/audiobook/mvp/RxBaseActivity.kt b/...a/de/ph1b/audiobook/mvp/RxBaseActivity.kt → ...a/de/ph1b/audiobook/mvp/RxBaseActivity.kt
diff --git a/...b/audiobook/persistence/BookRepository.kt → ...b/audiobook/persistence/BookRepository.kt b/...b/audiobook/persistence/BookRepository.kt → ...b/audiobook/persistence/BookRepository.kt
diff --git a/...audiobook/persistence/BookmarkProvider.kt → ...audiobook/persistence/BookmarkProvider.kt b/...audiobook/persistence/BookmarkProvider.kt → ...audiobook/persistence/BookmarkProvider.kt
diff --git a/...h1b/audiobook/persistence/PrefsManager.kt → ...h1b/audiobook/persistence/PrefsManager.kt b/...h1b/audiobook/persistence/PrefsManager.kt → ...h1b/audiobook/persistence/PrefsManager.kt
diff --git a/...book/persistence/internals/BookStorage.kt → ...book/persistence/internals/BookStorage.kt b/...book/persistence/internals/BookStorage.kt → ...book/persistence/internals/BookStorage.kt
diff --git a/...iobook/persistence/internals/BookTable.kt → ...iobook/persistence/internals/BookTable.kt b/...iobook/persistence/internals/BookTable.kt → ...iobook/persistence/internals/BookTable.kt
diff --git a/...ok/persistence/internals/BookmarkTable.kt → ...ok/persistence/internals/BookmarkTable.kt b/...ok/persistence/internals/BookmarkTable.kt → ...ok/persistence/internals/BookmarkTable.kt
diff --git a/...ook/persistence/internals/ChapterTable.kt → ...ook/persistence/internals/ChapterTable.kt b/...ook/persistence/internals/ChapterTable.kt → ...ook/persistence/internals/ChapterTable.kt
diff --git a/...rsistence/internals/DataBaseExtensions.kt → ...rsistence/internals/DataBaseExtensions.kt b/...rsistence/internals/DataBaseExtensions.kt → ...rsistence/internals/DataBaseExtensions.kt
diff --git a/...persistence/internals/DataBaseMigrator.kt → ...persistence/internals/DataBaseMigrator.kt b/...persistence/internals/DataBaseMigrator.kt → ...persistence/internals/DataBaseMigrator.kt
diff --git a/...obook/persistence/internals/InternalDb.kt → ...obook/persistence/internals/InternalDb.kt b/...obook/persistence/internals/InternalDb.kt → ...obook/persistence/internals/InternalDb.kt
diff --git a/...persistence/internals/SqlBookmarkStore.kt → ...persistence/internals/SqlBookmarkStore.kt b/...persistence/internals/SqlBookmarkStore.kt → ...persistence/internals/SqlBookmarkStore.kt
diff --git a/...istence/internals/migrations/Migration.kt → ...istence/internals/migrations/Migration.kt b/...istence/internals/migrations/Migration.kt → ...istence/internals/migrations/Migration.kt
diff --git a/...e/internals/migrations/Migration23to24.kt → ...e/internals/migrations/Migration23to24.kt b/...e/internals/migrations/Migration23to24.kt → ...e/internals/migrations/Migration23to24.kt
diff --git a/...e/internals/migrations/Migration24to25.kt → ...e/internals/migrations/Migration24to25.kt b/...e/internals/migrations/Migration24to25.kt → ...e/internals/migrations/Migration24to25.kt
diff --git a/...e/internals/migrations/Migration25to26.kt → ...e/internals/migrations/Migration25to26.kt b/...e/internals/migrations/Migration25to26.kt → ...e/internals/migrations/Migration25to26.kt
diff --git a/...e/internals/migrations/Migration26to27.kt → ...e/internals/migrations/Migration26to27.kt b/...e/internals/migrations/Migration26to27.kt → ...e/internals/migrations/Migration26to27.kt
diff --git a/...e/internals/migrations/Migration27to28.kt → ...e/internals/migrations/Migration27to28.kt b/...e/internals/migrations/Migration27to28.kt → ...e/internals/migrations/Migration27to28.kt
diff --git a/...e/internals/migrations/Migration28to29.kt → ...e/internals/migrations/Migration28to29.kt b/...e/internals/migrations/Migration28to29.kt → ...e/internals/migrations/Migration28to29.kt
diff --git a/...e/internals/migrations/Migration29to30.kt → ...e/internals/migrations/Migration29to30.kt b/...e/internals/migrations/Migration29to30.kt → ...e/internals/migrations/Migration29to30.kt
diff --git a/...e/internals/migrations/Migration30to31.kt → ...e/internals/migrations/Migration30to31.kt b/...e/internals/migrations/Migration30to31.kt → ...e/internals/migrations/Migration30to31.kt
diff --git a/...e/internals/migrations/Migration31to32.kt → ...e/internals/migrations/Migration31to32.kt b/...e/internals/migrations/Migration31to32.kt → ...e/internals/migrations/Migration31to32.kt
diff --git a/...e/internals/migrations/Migration32to34.kt → ...e/internals/migrations/Migration32to34.kt b/...e/internals/migrations/Migration32to34.kt → ...e/internals/migrations/Migration32to34.kt
diff --git a/...e/internals/migrations/Migration34to35.kt → ...e/internals/migrations/Migration34to35.kt b/...e/internals/migrations/Migration34to35.kt → ...e/internals/migrations/Migration34to35.kt
diff --git a/...e/internals/migrations/Migration35to36.kt → ...e/internals/migrations/Migration35to36.kt b/...e/internals/migrations/Migration35to36.kt → ...e/internals/migrations/Migration35to36.kt
diff --git a/...e/internals/migrations/Migration36to37.kt → ...e/internals/migrations/Migration36to37.kt b/...e/internals/migrations/Migration36to37.kt → ...e/internals/migrations/Migration36to37.kt
diff --git a/...e/internals/migrations/Migration37to38.kt → ...e/internals/migrations/Migration37to38.kt b/...e/internals/migrations/Migration37to38.kt → ...e/internals/migrations/Migration37to38.kt
diff --git a/...e/internals/migrations/Migration38to39.kt → ...e/internals/migrations/Migration38to39.kt b/...e/internals/migrations/Migration38to39.kt → ...e/internals/migrations/Migration38to39.kt
diff --git a/...e/internals/migrations/Migration39to40.kt → ...e/internals/migrations/Migration39to40.kt b/...e/internals/migrations/Migration39to40.kt → ...e/internals/migrations/Migration39to40.kt
diff --git a/...e/internals/migrations/Migration40to41.kt → ...e/internals/migrations/Migration40to41.kt b/...e/internals/migrations/Migration40to41.kt → ...e/internals/migrations/Migration40to41.kt
diff --git a/...e/internals/migrations/Migration41to42.kt → ...e/internals/migrations/Migration41to42.kt b/...e/internals/migrations/Migration41to42.kt → ...e/internals/migrations/Migration41to42.kt
diff --git a/...e/internals/migrations/Migration42to43.kt → ...e/internals/migrations/Migration42to43.kt b/...e/internals/migrations/Migration42to43.kt → ...e/internals/migrations/Migration42to43.kt
diff --git a/.../audiobook/playback/AndroidAutoActions.kt → .../audiobook/playback/AndroidAutoActions.kt b/.../audiobook/playback/AndroidAutoActions.kt → .../audiobook/playback/AndroidAutoActions.kt
diff --git a/...diobook/playback/AndroidAutoConnection.kt → ...diobook/playback/AndroidAutoConnection.kt b/...diobook/playback/AndroidAutoConnection.kt → ...diobook/playback/AndroidAutoConnection.kt
diff --git a/...de/ph1b/audiobook/playback/MediaPlayer.kt → ...de/ph1b/audiobook/playback/MediaPlayer.kt b/...de/ph1b/audiobook/playback/MediaPlayer.kt → ...de/ph1b/audiobook/playback/MediaPlayer.kt
diff --git a/...udiobook/playback/MediaSessionCallback.kt → ...udiobook/playback/MediaSessionCallback.kt b/...udiobook/playback/MediaSessionCallback.kt → ...udiobook/playback/MediaSessionCallback.kt
diff --git a/...1b/audiobook/playback/PlayStateManager.kt → ...1b/audiobook/playback/PlayStateManager.kt b/...1b/audiobook/playback/PlayStateManager.kt → ...1b/audiobook/playback/PlayStateManager.kt
diff --git a/...h1b/audiobook/playback/PlaybackService.kt → ...h1b/audiobook/playback/PlaybackService.kt b/...h1b/audiobook/playback/PlaybackService.kt → ...h1b/audiobook/playback/PlaybackService.kt
diff --git a/...1b/audiobook/playback/PlayerController.kt → ...1b/audiobook/playback/PlayerController.kt b/...1b/audiobook/playback/PlayerController.kt → ...1b/audiobook/playback/PlayerController.kt
diff --git a/...de/ph1b/audiobook/playback/PlayerState.kt → ...de/ph1b/audiobook/playback/PlayerState.kt b/...de/ph1b/audiobook/playback/PlayerState.kt → ...de/ph1b/audiobook/playback/PlayerState.kt
diff --git a/...ava/de/ph1b/audiobook/playback/Sandman.kt → ...ava/de/ph1b/audiobook/playback/Sandman.kt b/...ava/de/ph1b/audiobook/playback/Sandman.kt → ...ava/de/ph1b/audiobook/playback/Sandman.kt
diff --git a/.../ph1b/audiobook/playback/ShakeDetector.kt → .../ph1b/audiobook/playback/ShakeDetector.kt b/.../ph1b/audiobook/playback/ShakeDetector.kt → .../ph1b/audiobook/playback/ShakeDetector.kt
diff --git a/...ok/playback/events/HeadsetPlugReceiver.kt → ...ok/playback/events/HeadsetPlugReceiver.kt b/...ok/playback/events/HeadsetPlugReceiver.kt → ...ok/playback/events/HeadsetPlugReceiver.kt
diff --git a/...ook/playback/events/MediaEventReceiver.kt → ...ook/playback/events/MediaEventReceiver.kt b/...ook/playback/events/MediaEventReceiver.kt → ...ook/playback/events/MediaEventReceiver.kt
diff --git a/...iobook/playback/utils/BookUriConverter.kt → ...iobook/playback/utils/BookUriConverter.kt b/...iobook/playback/utils/BookUriConverter.kt → ...iobook/playback/utils/BookUriConverter.kt
diff --git a/...b/audiobook/playback/utils/CachedImage.kt → ...b/audiobook/playback/utils/CachedImage.kt b/...b/audiobook/playback/utils/CachedImage.kt → ...b/audiobook/playback/utils/CachedImage.kt
diff --git a/...udiobook/playback/utils/ChangeNotifier.kt → ...udiobook/playback/utils/ChangeNotifier.kt b/...udiobook/playback/utils/ChangeNotifier.kt → ...udiobook/playback/utils/ChangeNotifier.kt
diff --git a/...ook/playback/utils/DataSourceConverter.kt → ...ook/playback/utils/DataSourceConverter.kt b/...ook/playback/utils/DataSourceConverter.kt → ...ook/playback/utils/DataSourceConverter.kt
diff --git a/...book/playback/utils/MediaBrowserHelper.kt → ...book/playback/utils/MediaBrowserHelper.kt b/...book/playback/utils/MediaBrowserHelper.kt → ...book/playback/utils/MediaBrowserHelper.kt
diff --git a/...k/playback/utils/NotificationAnnouncer.kt → ...k/playback/utils/NotificationAnnouncer.kt b/...k/playback/utils/NotificationAnnouncer.kt → ...k/playback/utils/NotificationAnnouncer.kt
diff --git a/...obook/playback/utils/ServiceController.kt → ...obook/playback/utils/ServiceController.kt b/...obook/playback/utils/ServiceController.kt → ...obook/playback/utils/ServiceController.kt
diff --git a/...utils/SimpleAudioRendererEventListener.kt → ...utils/SimpleAudioRendererEventListener.kt b/...utils/SimpleAudioRendererEventListener.kt → ...utils/SimpleAudioRendererEventListener.kt
diff --git a/...ook/playback/utils/SimpleEventListener.kt → ...ook/playback/utils/SimpleEventListener.kt b/...ook/playback/utils/SimpleEventListener.kt → ...ook/playback/utils/SimpleEventListener.kt
diff --git a/...diobook/playback/utils/WakeLockManager.kt → ...diobook/playback/utils/WakeLockManager.kt b/...diobook/playback/utils/WakeLockManager.kt → ...diobook/playback/utils/WakeLockManager.kt
diff --git a/...audiobook/playback/utils/exoExtensions.kt → ...audiobook/playback/utils/exoExtensions.kt b/...audiobook/playback/utils/exoExtensions.kt → ...audiobook/playback/utils/exoExtensions.kt
diff --git a/...ph1b/audiobook/uitools/AnimationHelper.kt → ...ph1b/audiobook/uitools/AnimationHelper.kt b/...ph1b/audiobook/uitools/AnimationHelper.kt → ...ph1b/audiobook/uitools/AnimationHelper.kt
diff --git a/.../de/ph1b/audiobook/uitools/BetterSnack.kt → .../de/ph1b/audiobook/uitools/BetterSnack.kt b/.../de/ph1b/audiobook/uitools/BetterSnack.kt → .../de/ph1b/audiobook/uitools/BetterSnack.kt
diff --git a/.../ph1b/audiobook/uitools/BookTransition.kt → .../ph1b/audiobook/uitools/BookTransition.kt b/.../ph1b/audiobook/uitools/BookTransition.kt → .../ph1b/audiobook/uitools/BookTransition.kt
diff --git a/...diobook/uitools/CoverFromDiscCollector.kt → ...diobook/uitools/CoverFromDiscCollector.kt b/...diobook/uitools/CoverFromDiscCollector.kt → ...diobook/uitools/CoverFromDiscCollector.kt
diff --git a/...h1b/audiobook/uitools/CoverReplacement.kt → ...h1b/audiobook/uitools/CoverReplacement.kt b/...h1b/audiobook/uitools/CoverReplacement.kt → ...h1b/audiobook/uitools/CoverReplacement.kt
diff --git a/...b/audiobook/uitools/CropTransformation.kt → ...b/audiobook/uitools/CropTransformation.kt b/...b/audiobook/uitools/CropTransformation.kt → ...b/audiobook/uitools/CropTransformation.kt
diff --git a/.../de/ph1b/audiobook/uitools/ImageHelper.kt → .../de/ph1b/audiobook/uitools/ImageHelper.kt b/.../de/ph1b/audiobook/uitools/ImageHelper.kt → .../de/ph1b/audiobook/uitools/ImageHelper.kt
diff --git a/...e/ph1b/audiobook/uitools/Interpolators.kt → ...e/ph1b/audiobook/uitools/Interpolators.kt b/...e/ph1b/audiobook/uitools/Interpolators.kt → ...e/ph1b/audiobook/uitools/Interpolators.kt
diff --git a/...1b/audiobook/uitools/PlayPauseDrawable.kt → ...1b/audiobook/uitools/PlayPauseDrawable.kt b/...1b/audiobook/uitools/PlayPauseDrawable.kt → ...1b/audiobook/uitools/PlayPauseDrawable.kt
diff --git a/...ava/de/ph1b/audiobook/uitools/Scroller.kt → ...ava/de/ph1b/audiobook/uitools/Scroller.kt b/...ava/de/ph1b/audiobook/uitools/Scroller.kt → ...ava/de/ph1b/audiobook/uitools/Scroller.kt
diff --git a/...de/ph1b/audiobook/uitools/SimpleTarget.kt → ...de/ph1b/audiobook/uitools/SimpleTarget.kt b/...de/ph1b/audiobook/uitools/SimpleTarget.kt → ...de/ph1b/audiobook/uitools/SimpleTarget.kt
diff --git a/...ph1b/audiobook/uitools/SquareImageView.kt → ...ph1b/audiobook/uitools/SquareImageView.kt b/...ph1b/audiobook/uitools/SquareImageView.kt → ...ph1b/audiobook/uitools/SquareImageView.kt
diff --git a/...va/de/ph1b/audiobook/uitools/ThemeUtil.kt → ...va/de/ph1b/audiobook/uitools/ThemeUtil.kt b/...va/de/ph1b/audiobook/uitools/ThemeUtil.kt → ...va/de/ph1b/audiobook/uitools/ThemeUtil.kt
diff --git a/...udiobook/uitools/VerticalChangeHandler.kt → ...udiobook/uitools/VerticalChangeHandler.kt b/...udiobook/uitools/VerticalChangeHandler.kt → ...udiobook/uitools/VerticalChangeHandler.kt
diff --git a/.../uitools/VerticalDividerItemDecoration.kt → .../uitools/VerticalDividerItemDecoration.kt b/.../uitools/VerticalDividerItemDecoration.kt → .../uitools/VerticalDividerItemDecoration.kt
diff --git a/audiobook/src/main/res/anim/rotate.xml → app/src/main/res/anim/rotate.xml b/audiobook/src/main/res/anim/rotate.xml → app/src/main/res/anim/rotate.xml
diff --git a/...r/copy_abc_primary_text_material_dark.xml → ...r/copy_abc_primary_text_material_dark.xml b/...r/copy_abc_primary_text_material_dark.xml → ...r/copy_abc_primary_text_material_dark.xml
diff --git a/...copy_abc_secondary_text_material_dark.xml → ...copy_abc_secondary_text_material_dark.xml b/...copy_abc_secondary_text_material_dark.xml → ...copy_abc_secondary_text_material_dark.xml
diff --git a/...wable-hdpi/ic_fast_forward_white_36dp.png → ...wable-hdpi/ic_fast_forward_white_36dp.png b/...wable-hdpi/ic_fast_forward_white_36dp.png → ...wable-hdpi/ic_fast_forward_white_36dp.png
diff --git a/...ain/res/drawable-hdpi/ic_notification.png → ...ain/res/drawable-hdpi/ic_notification.png b/...ain/res/drawable-hdpi/ic_notification.png → ...ain/res/drawable-hdpi/ic_notification.png
diff --git a/...res/drawable-hdpi/ic_pause_white_36dp.png → ...res/drawable-hdpi/ic_pause_white_36dp.png b/...res/drawable-hdpi/ic_pause_white_36dp.png → ...res/drawable-hdpi/ic_pause_white_36dp.png
diff --git a/.../res/drawable-hdpi/ic_play_white_36dp.png → .../res/drawable-hdpi/ic_play_white_36dp.png b/.../res/drawable-hdpi/ic_play_white_36dp.png → .../res/drawable-hdpi/ic_play_white_36dp.png
diff --git a/...es/drawable-hdpi/ic_rewind_white_36dp.png → ...es/drawable-hdpi/ic_rewind_white_36dp.png b/...es/drawable-hdpi/ic_rewind_white_36dp.png → ...es/drawable-hdpi/ic_rewind_white_36dp.png
diff --git a/...e-hdpi/ic_shortcut_play_circle_filled.png → ...e-hdpi/ic_shortcut_play_circle_filled.png b/...e-hdpi/ic_shortcut_play_circle_filled.png → ...e-hdpi/ic_shortcut_play_circle_filled.png
diff --git a/...src/main/res/drawable-hdpi/icon_108dp.png → ...src/main/res/drawable-hdpi/icon_108dp.png b/...src/main/res/drawable-hdpi/icon_108dp.png → ...src/main/res/drawable-hdpi/icon_108dp.png
diff --git a/...wable-mdpi/ic_fast_forward_white_36dp.png → ...wable-mdpi/ic_fast_forward_white_36dp.png b/...wable-mdpi/ic_fast_forward_white_36dp.png → ...wable-mdpi/ic_fast_forward_white_36dp.png
diff --git a/...ain/res/drawable-mdpi/ic_notification.png → ...ain/res/drawable-mdpi/ic_notification.png b/...ain/res/drawable-mdpi/ic_notification.png → ...ain/res/drawable-mdpi/ic_notification.png
diff --git a/...res/drawable-mdpi/ic_pause_white_36dp.png → ...res/drawable-mdpi/ic_pause_white_36dp.png b/...res/drawable-mdpi/ic_pause_white_36dp.png → ...res/drawable-mdpi/ic_pause_white_36dp.png
diff --git a/.../res/drawable-mdpi/ic_play_white_36dp.png → .../res/drawable-mdpi/ic_play_white_36dp.png b/.../res/drawable-mdpi/ic_play_white_36dp.png → .../res/drawable-mdpi/ic_play_white_36dp.png
diff --git a/...es/drawable-mdpi/ic_rewind_white_36dp.png → ...es/drawable-mdpi/ic_rewind_white_36dp.png b/...es/drawable-mdpi/ic_rewind_white_36dp.png → ...es/drawable-mdpi/ic_rewind_white_36dp.png
diff --git a/...e-mdpi/ic_shortcut_play_circle_filled.png → ...e-mdpi/ic_shortcut_play_circle_filled.png b/...e-mdpi/ic_shortcut_play_circle_filled.png → ...e-mdpi/ic_shortcut_play_circle_filled.png
diff --git a/...src/main/res/drawable-mdpi/icon_108dp.png → ...src/main/res/drawable-mdpi/icon_108dp.png b/...src/main/res/drawable-mdpi/icon_108dp.png → ...src/main/res/drawable-mdpi/icon_108dp.png
diff --git a/...wable-v21/spinner_selected_background.xml → ...wable-v21/spinner_selected_background.xml b/...wable-v21/spinner_selected_background.xml → ...wable-v21/spinner_selected_background.xml
diff --git a/...able-xhdpi/ic_fast_forward_white_36dp.png → ...able-xhdpi/ic_fast_forward_white_36dp.png b/...able-xhdpi/ic_fast_forward_white_36dp.png → ...able-xhdpi/ic_fast_forward_white_36dp.png
diff --git a/...in/res/drawable-xhdpi/ic_notification.png → ...in/res/drawable-xhdpi/ic_notification.png b/...in/res/drawable-xhdpi/ic_notification.png → ...in/res/drawable-xhdpi/ic_notification.png
diff --git a/...es/drawable-xhdpi/ic_pause_white_36dp.png → ...es/drawable-xhdpi/ic_pause_white_36dp.png b/...es/drawable-xhdpi/ic_pause_white_36dp.png → ...es/drawable-xhdpi/ic_pause_white_36dp.png
diff --git a/...res/drawable-xhdpi/ic_play_white_36dp.png → ...res/drawable-xhdpi/ic_play_white_36dp.png b/...res/drawable-xhdpi/ic_play_white_36dp.png → ...res/drawable-xhdpi/ic_play_white_36dp.png
diff --git a/...s/drawable-xhdpi/ic_rewind_white_36dp.png → ...s/drawable-xhdpi/ic_rewind_white_36dp.png b/...s/drawable-xhdpi/ic_rewind_white_36dp.png → ...s/drawable-xhdpi/ic_rewind_white_36dp.png
diff --git a/...-xhdpi/ic_shortcut_play_circle_filled.png → ...-xhdpi/ic_shortcut_play_circle_filled.png b/...-xhdpi/ic_shortcut_play_circle_filled.png → ...-xhdpi/ic_shortcut_play_circle_filled.png
diff --git a/...rc/main/res/drawable-xhdpi/icon_108dp.png → ...rc/main/res/drawable-xhdpi/icon_108dp.png b/...rc/main/res/drawable-xhdpi/icon_108dp.png → ...rc/main/res/drawable-xhdpi/icon_108dp.png
diff --git a/...ble-xxhdpi/ic_fast_forward_white_36dp.png → ...ble-xxhdpi/ic_fast_forward_white_36dp.png b/...ble-xxhdpi/ic_fast_forward_white_36dp.png → ...ble-xxhdpi/ic_fast_forward_white_36dp.png
diff --git a/...n/res/drawable-xxhdpi/ic_notification.png → ...n/res/drawable-xxhdpi/ic_notification.png b/...n/res/drawable-xxhdpi/ic_notification.png → ...n/res/drawable-xxhdpi/ic_notification.png
diff --git a/...s/drawable-xxhdpi/ic_pause_white_36dp.png → ...s/drawable-xxhdpi/ic_pause_white_36dp.png b/...s/drawable-xxhdpi/ic_pause_white_36dp.png → ...s/drawable-xxhdpi/ic_pause_white_36dp.png
diff --git a/...es/drawable-xxhdpi/ic_play_white_36dp.png → ...es/drawable-xxhdpi/ic_play_white_36dp.png b/...es/drawable-xxhdpi/ic_play_white_36dp.png → ...es/drawable-xxhdpi/ic_play_white_36dp.png
diff --git a/.../drawable-xxhdpi/ic_rewind_white_36dp.png → .../drawable-xxhdpi/ic_rewind_white_36dp.png b/.../drawable-xxhdpi/ic_rewind_white_36dp.png → .../drawable-xxhdpi/ic_rewind_white_36dp.png
diff --git a/...xxhdpi/ic_shortcut_play_circle_filled.png → ...xxhdpi/ic_shortcut_play_circle_filled.png b/...xxhdpi/ic_shortcut_play_circle_filled.png → ...xxhdpi/ic_shortcut_play_circle_filled.png
diff --git a/...c/main/res/drawable-xxhdpi/icon_108dp.png → ...c/main/res/drawable-xxhdpi/icon_108dp.png b/...c/main/res/drawable-xxhdpi/icon_108dp.png → ...c/main/res/drawable-xxhdpi/icon_108dp.png
diff --git a/...le-xxxhdpi/ic_fast_forward_white_36dp.png → ...le-xxxhdpi/ic_fast_forward_white_36dp.png b/...le-xxxhdpi/ic_fast_forward_white_36dp.png → ...le-xxxhdpi/ic_fast_forward_white_36dp.png
diff --git a/.../res/drawable-xxxhdpi/ic_notification.png → .../res/drawable-xxxhdpi/ic_notification.png b/.../res/drawable-xxxhdpi/ic_notification.png → .../res/drawable-xxxhdpi/ic_notification.png
diff --git a/.../drawable-xxxhdpi/ic_pause_white_36dp.png → .../drawable-xxxhdpi/ic_pause_white_36dp.png b/.../drawable-xxxhdpi/ic_pause_white_36dp.png → .../drawable-xxxhdpi/ic_pause_white_36dp.png
diff --git a/...s/drawable-xxxhdpi/ic_play_white_36dp.png → ...s/drawable-xxxhdpi/ic_play_white_36dp.png b/...s/drawable-xxxhdpi/ic_play_white_36dp.png → ...s/drawable-xxxhdpi/ic_play_white_36dp.png
diff --git a/...drawable-xxxhdpi/ic_rewind_white_36dp.png → ...drawable-xxxhdpi/ic_rewind_white_36dp.png b/...drawable-xxxhdpi/ic_rewind_white_36dp.png → ...drawable-xxxhdpi/ic_rewind_white_36dp.png
diff --git a/...xxhdpi/ic_shortcut_play_circle_filled.png → ...xxhdpi/ic_shortcut_play_circle_filled.png b/...xxhdpi/ic_shortcut_play_circle_filled.png → ...xxhdpi/ic_shortcut_play_circle_filled.png
diff --git a/.../main/res/drawable-xxxhdpi/icon_108dp.png → .../main/res/drawable-xxxhdpi/icon_108dp.png b/.../main/res/drawable-xxxhdpi/icon_108dp.png → .../main/res/drawable-xxxhdpi/icon_108dp.png
diff --git a/audiobook/src/main/res/drawable/alarm.xml → app/src/main/res/drawable/alarm.xml b/audiobook/src/main/res/drawable/alarm.xml → app/src/main/res/drawable/alarm.xml
diff --git a/...obook/src/main/res/drawable/alarm_off.xml → app/src/main/res/drawable/alarm_off.xml b/...obook/src/main/res/drawable/alarm_off.xml → app/src/main/res/drawable/alarm_off.xml
diff --git a/...obook/src/main/res/drawable/backspace.xml → app/src/main/res/drawable/backspace.xml b/...obook/src/main/res/drawable/backspace.xml → app/src/main/res/drawable/backspace.xml
diff --git a/audiobook/src/main/res/drawable/bookmark.xml → app/src/main/res/drawable/bookmark.xml b/audiobook/src/main/res/drawable/bookmark.xml → app/src/main/res/drawable/bookmark.xml
diff --git a/...rc/main/res/drawable/bookmark_outline.xml → ...rc/main/res/drawable/bookmark_outline.xml b/...rc/main/res/drawable/bookmark_outline.xml → ...rc/main/res/drawable/bookmark_outline.xml
diff --git a/audiobook/src/main/res/drawable/check.xml → app/src/main/res/drawable/check.xml b/audiobook/src/main/res/drawable/check.xml → app/src/main/res/drawable/check.xml
diff --git a/audiobook/src/main/res/drawable/circle.xml → app/src/main/res/drawable/circle.xml b/audiobook/src/main/res/drawable/circle.xml → app/src/main/res/drawable/circle.xml
diff --git a/audiobook/src/main/res/drawable/close.xml → app/src/main/res/drawable/close.xml b/audiobook/src/main/res/drawable/close.xml → app/src/main/res/drawable/close.xml
diff --git a/audiobook/src/main/res/drawable/crop.xml → app/src/main/res/drawable/crop.xml b/audiobook/src/main/res/drawable/crop.xml → app/src/main/res/drawable/crop.xml
diff --git a/...ble/current_playing_circle_background.xml → ...ble/current_playing_circle_background.xml b/...ble/current_playing_circle_background.xml → ...ble/current_playing_circle_background.xml
diff --git a/audiobook/src/main/res/drawable/delete.xml → app/src/main/res/drawable/delete.xml b/audiobook/src/main/res/drawable/delete.xml → app/src/main/res/drawable/delete.xml
diff --git a/...ain/res/drawable/fab_label_background.xml → ...ain/res/drawable/fab_label_background.xml b/...ain/res/drawable/fab_label_background.xml → ...ain/res/drawable/fab_label_background.xml
diff --git a/...src/main/res/drawable/folder_multiple.xml → ...src/main/res/drawable/folder_multiple.xml b/...src/main/res/drawable/folder_multiple.xml → ...src/main/res/drawable/folder_multiple.xml
diff --git a/...ook/src/main/res/drawable/format_text.xml → app/src/main/res/drawable/format_text.xml b/...ook/src/main/res/drawable/format_text.xml → app/src/main/res/drawable/format_text.xml
diff --git a/audiobook/src/main/res/drawable/home.xml → app/src/main/res/drawable/home.xml b/audiobook/src/main/res/drawable/home.xml → app/src/main/res/drawable/home.xml
diff --git a/...in/res/drawable/ic_add_circle_outline.xml → ...in/res/drawable/ic_add_circle_outline.xml b/...in/res/drawable/ic_add_circle_outline.xml → ...in/res/drawable/ic_add_circle_outline.xml
diff --git a/audiobook/src/main/res/drawable/ic_album.xml → app/src/main/res/drawable/ic_album.xml b/audiobook/src/main/res/drawable/ic_album.xml → app/src/main/res/drawable/ic_album.xml
diff --git a/...k/src/main/res/drawable/ic_arrow_back.xml → app/src/main/res/drawable/ic_arrow_back.xml b/...k/src/main/res/drawable/ic_arrow_back.xml → app/src/main/res/drawable/ic_arrow_back.xml
diff --git a/...src/main/res/drawable/ic_arrow_upward.xml → ...src/main/res/drawable/ic_arrow_upward.xml b/...src/main/res/drawable/ic_arrow_upward.xml → ...src/main/res/drawable/ic_arrow_upward.xml
diff --git a/...ook/src/main/res/drawable/ic_download.xml → app/src/main/res/drawable/ic_download.xml b/...ook/src/main/res/drawable/ic_download.xml → app/src/main/res/drawable/ic_download.xml
diff --git a/...ok/src/main/res/drawable/ic_equalizer.xml → app/src/main/res/drawable/ic_equalizer.xml b/...ok/src/main/res/drawable/ic_equalizer.xml → app/src/main/res/drawable/ic_equalizer.xml
diff --git a/...src/main/res/drawable/ic_fast_forward.xml → ...src/main/res/drawable/ic_fast_forward.xml b/...src/main/res/drawable/ic_fast_forward.xml → ...src/main/res/drawable/ic_fast_forward.xml
diff --git a/.../src/main/res/drawable/ic_fast_rewind.xml → app/src/main/res/drawable/ic_fast_rewind.xml b/.../src/main/res/drawable/ic_fast_rewind.xml → app/src/main/res/drawable/ic_fast_rewind.xml
diff --git a/...ook/src/main/res/drawable/ic_favorite.xml → app/src/main/res/drawable/ic_favorite.xml b/...ook/src/main/res/drawable/ic_favorite.xml → app/src/main/res/drawable/ic_favorite.xml
diff --git a/...obook/src/main/res/drawable/ic_folder.xml → app/src/main/res/drawable/ic_folder.xml b/...obook/src/main/res/drawable/ic_folder.xml → app/src/main/res/drawable/ic_folder.xml
diff --git a/audiobook/src/main/res/drawable/ic_image.xml → app/src/main/res/drawable/ic_image.xml b/audiobook/src/main/res/drawable/ic_image.xml → app/src/main/res/drawable/ic_image.xml
diff --git a/...ok/src/main/res/drawable/ic_more_vert.xml → app/src/main/res/drawable/ic_more_vert.xml b/...ok/src/main/res/drawable/ic_more_vert.xml → app/src/main/res/drawable/ic_more_vert.xml
diff --git a/audiobook/src/main/res/drawable/ic_pause.xml → app/src/main/res/drawable/ic_pause.xml b/audiobook/src/main/res/drawable/ic_pause.xml → app/src/main/res/drawable/ic_pause.xml
diff --git a/...k/src/main/res/drawable/ic_play_arrow.xml → app/src/main/res/drawable/ic_play_arrow.xml b/...k/src/main/res/drawable/ic_play_arrow.xml → app/src/main/res/drawable/ic_play_arrow.xml
diff --git a/...n/res/drawable/ic_play_circle_outline.xml → ...n/res/drawable/ic_play_circle_outline.xml b/...n/res/drawable/ic_play_circle_outline.xml → ...n/res/drawable/ic_play_circle_outline.xml
diff --git a/...ok/src/main/res/drawable/ic_skip_next.xml → app/src/main/res/drawable/ic_skip_next.xml b/...ok/src/main/res/drawable/ic_skip_next.xml → app/src/main/res/drawable/ic_skip_next.xml
diff --git a/...rc/main/res/drawable/ic_skip_previous.xml → ...rc/main/res/drawable/ic_skip_previous.xml b/...rc/main/res/drawable/ic_skip_previous.xml → ...rc/main/res/drawable/ic_skip_previous.xml
diff --git a/...ok/src/main/res/drawable/ic_view_list.xml → app/src/main/res/drawable/ic_view_list.xml b/...ok/src/main/res/drawable/ic_view_list.xml → app/src/main/res/drawable/ic_view_list.xml
diff --git a/...ain/res/drawable/notification_divider.xml → ...ain/res/drawable/notification_divider.xml b/...ain/res/drawable/notification_divider.xml → ...ain/res/drawable/notification_divider.xml
diff --git a/audiobook/src/main/res/drawable/plus.xml → app/src/main/res/drawable/plus.xml b/audiobook/src/main/res/drawable/plus.xml → app/src/main/res/drawable/plus.xml
diff --git a/audiobook/src/main/res/drawable/refresh.xml → app/src/main/res/drawable/refresh.xml b/audiobook/src/main/res/drawable/refresh.xml → app/src/main/res/drawable/refresh.xml
diff --git a/...ook/src/main/res/drawable/speedometer.xml → app/src/main/res/drawable/speedometer.xml b/...ook/src/main/res/drawable/speedometer.xml → app/src/main/res/drawable/speedometer.xml
diff --git a/.../drawable/spinner_selected_background.xml → .../drawable/spinner_selected_background.xml b/.../drawable/spinner_selected_background.xml → .../drawable/spinner_selected_background.xml
diff --git a/audiobook/src/main/res/drawable/usb.xml → app/src/main/res/drawable/usb.xml b/audiobook/src/main/res/drawable/usb.xml → app/src/main/res/drawable/usb.xml
diff --git a/...obook/src/main/res/drawable/view_grid.xml → app/src/main/res/drawable/view_grid.xml b/...obook/src/main/res/drawable/view_grid.xml → app/src/main/res/drawable/view_grid.xml
diff --git a/...ook/src/main/res/drawable/volume_plus.xml → app/src/main/res/drawable/volume_plus.xml b/...ook/src/main/res/drawable/volume_plus.xml → app/src/main/res/drawable/volume_plus.xml
diff --git a/...c/main/res/drawable/widget_background.xml → ...c/main/res/drawable/widget_background.xml b/...c/main/res/drawable/widget_background.xml → ...c/main/res/drawable/widget_background.xml
diff --git a/audiobook/src/main/res/drawable/wifi_off.xml → app/src/main/res/drawable/wifi_off.xml b/audiobook/src/main/res/drawable/wifi_off.xml → app/src/main/res/drawable/wifi_off.xml
diff --git a/...ok/src/main/res/layout-land/book_play.xml → app/src/main/res/layout-land/book_play.xml b/...ok/src/main/res/layout-land/book_play.xml → app/src/main/res/layout-land/book_play.xml
diff --git a/...ook/src/main/res/layout/activity_book.xml → app/src/main/res/layout/activity_book.xml b/...ook/src/main/res/layout/activity_book.xml → app/src/main/res/layout/activity_book.xml
diff --git a/...in/res/layout/activity_folder_chooser.xml → ...in/res/layout/activity_folder_chooser.xml b/...in/res/layout/activity_folder_chooser.xml → ...in/res/layout/activity_folder_chooser.xml
diff --git a/...ity_folder_chooser_adapter_row_layout.xml → ...ity_folder_chooser_adapter_row_layout.xml b/...ity_folder_chooser_adapter_row_layout.xml → ...ity_folder_chooser_adapter_row_layout.xml
diff --git a/...t/activity_folder_overview_row_layout.xml → ...t/activity_folder_overview_row_layout.xml b/...t/activity_folder_overview_row_layout.xml → ...t/activity_folder_overview_row_layout.xml
diff --git a/.../main/res/layout/activity_no_external.xml → .../main/res/layout/activity_no_external.xml b/.../main/res/layout/activity_no_external.xml → .../main/res/layout/activity_no_external.xml
diff --git a/...ain/res/layout/book_more_bottom_sheet.xml → ...ain/res/layout/book_more_bottom_sheet.xml b/...ain/res/layout/book_more_bottom_sheet.xml → ...ain/res/layout/book_more_bottom_sheet.xml
diff --git a/audiobook/src/main/res/layout/book_play.xml → app/src/main/res/layout/book_play.xml b/audiobook/src/main/res/layout/book_play.xml → app/src/main/res/layout/book_play.xml
diff --git a/...src/main/res/layout/book_play_spinner.xml → ...src/main/res/layout/book_play_spinner.xml b/...src/main/res/layout/book_play_spinner.xml → ...src/main/res/layout/book_play_spinner.xml
diff --git a/audiobook/src/main/res/layout/book_shelf.xml → app/src/main/res/layout/book_shelf.xml b/audiobook/src/main/res/layout/book_shelf.xml → app/src/main/res/layout/book_shelf.xml
diff --git a/...ain/res/layout/book_shelf_grid_layout.xml → ...ain/res/layout/book_shelf_grid_layout.xml b/...ain/res/layout/book_shelf_grid_layout.xml → ...ain/res/layout/book_shelf_grid_layout.xml
diff --git a/...ain/res/layout/book_shelf_list_layout.xml → ...ain/res/layout/book_shelf_list_layout.xml b/...ain/res/layout/book_shelf_list_layout.xml → ...ain/res/layout/book_shelf_list_layout.xml
diff --git a/audiobook/src/main/res/layout/bookmark.xml → app/src/main/res/layout/bookmark.xml b/audiobook/src/main/res/layout/bookmark.xml → app/src/main/res/layout/bookmark.xml
diff --git a/...c/main/res/layout/bookmark_row_layout.xml → ...c/main/res/layout/bookmark_row_layout.xml b/...c/main/res/layout/bookmark_row_layout.xml → ...c/main/res/layout/bookmark_row_layout.xml
diff --git a/audiobook/src/main/res/layout/circle.xml → app/src/main/res/layout/circle.xml b/audiobook/src/main/res/layout/circle.xml → app/src/main/res/layout/circle.xml
diff --git a/...main/res/layout/dialog_amount_chooser.xml → ...main/res/layout/dialog_amount_chooser.xml b/...main/res/layout/dialog_amount_chooser.xml → ...main/res/layout/dialog_amount_chooser.xml
diff --git a/...src/main/res/layout/dialog_cover_edit.xml → ...src/main/res/layout/dialog_cover_edit.xml b/...src/main/res/layout/dialog_cover_edit.xml → ...src/main/res/layout/dialog_cover_edit.xml
diff --git a/...book/src/main/res/layout/dialog_sleep.xml → app/src/main/res/layout/dialog_sleep.xml b/...book/src/main/res/layout/dialog_sleep.xml → app/src/main/res/layout/dialog_sleep.xml
diff --git a/...rc/main/res/layout/dialog_time_picker.xml → ...rc/main/res/layout/dialog_time_picker.xml b/...rc/main/res/layout/dialog_time_picker.xml → ...rc/main/res/layout/dialog_time_picker.xml
diff --git a/...k/src/main/res/layout/folder_overview.xml → app/src/main/res/layout/folder_overview.xml b/...k/src/main/res/layout/folder_overview.xml → app/src/main/res/layout/folder_overview.xml
diff --git a/...book/src/main/res/layout/image_picker.xml → app/src/main/res/layout/image_picker.xml b/...book/src/main/res/layout/image_picker.xml → app/src/main/res/layout/image_picker.xml
diff --git a/audiobook/src/main/res/layout/loudness.xml → app/src/main/res/layout/loudness.xml b/audiobook/src/main/res/layout/loudness.xml → app/src/main/res/layout/loudness.xml
diff --git a/...obook/src/main/res/layout/rotate_view.xml → app/src/main/res/layout/rotate_view.xml b/...obook/src/main/res/layout/rotate_view.xml → app/src/main/res/layout/rotate_view.xml
diff --git a/...rc/main/res/layout/setting_row_double.xml → ...rc/main/res/layout/setting_row_double.xml b/...rc/main/res/layout/setting_row_double.xml → ...rc/main/res/layout/setting_row_double.xml
diff --git a/...rc/main/res/layout/setting_row_switch.xml → ...rc/main/res/layout/setting_row_switch.xml b/...rc/main/res/layout/setting_row_switch.xml → ...rc/main/res/layout/setting_row_switch.xml
diff --git a/audiobook/src/main/res/layout/settings.xml → app/src/main/res/layout/settings.xml b/audiobook/src/main/res/layout/settings.xml → app/src/main/res/layout/settings.xml
diff --git a/audiobook/src/main/res/layout/toolbar.xml → app/src/main/res/layout/toolbar.xml b/audiobook/src/main/res/layout/toolbar.xml → app/src/main/res/layout/toolbar.xml
diff --git a/audiobook/src/main/res/layout/widget.xml → app/src/main/res/layout/widget.xml b/audiobook/src/main/res/layout/widget.xml → app/src/main/res/layout/widget.xml
diff --git a/audiobook/src/main/res/menu/book_play.xml → app/src/main/res/menu/book_play.xml b/audiobook/src/main/res/menu/book_play.xml → app/src/main/res/menu/book_play.xml