diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..f2f0d88
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Device (please complete the following information):**
+ - Device: [e.g. Samsung S10+]
+ - App Version (e.g. 1.4.0)
+ - Android Version [e.g. Pie]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..ca23311
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[REQUEST] "
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.github/assets/add-entry-dark.png b/.github/assets/add-entry-dark.png
deleted file mode 100644
index 616f77f..0000000
Binary files a/.github/assets/add-entry-dark.png and /dev/null differ
diff --git a/.github/assets/add-entry.png b/.github/assets/add-entry.png
new file mode 100644
index 0000000..e4b635c
Binary files /dev/null and b/.github/assets/add-entry.png differ
diff --git a/.github/assets/add-tags-dark.png b/.github/assets/add-tags-dark.png
deleted file mode 100644
index b4db97b..0000000
Binary files a/.github/assets/add-tags-dark.png and /dev/null differ
diff --git a/.github/assets/add-tags.png b/.github/assets/add-tags.png
new file mode 100644
index 0000000..cb40685
Binary files /dev/null and b/.github/assets/add-tags.png differ
diff --git a/.github/assets/add-words.png b/.github/assets/add-words.png
new file mode 100644
index 0000000..7a940d1
Binary files /dev/null and b/.github/assets/add-words.png differ
diff --git a/.github/assets/header.png b/.github/assets/header.png
index 7007105..2d133c8 100644
Binary files a/.github/assets/header.png and b/.github/assets/header.png differ
diff --git a/.github/assets/main-display-dark.png b/.github/assets/main-display-dark.png
index 701b99b..400be25 100644
Binary files a/.github/assets/main-display-dark.png and b/.github/assets/main-display-dark.png differ
diff --git a/.github/assets/main-display-light.png b/.github/assets/main-display-light.png
index 4019388..62e9845 100644
Binary files a/.github/assets/main-display-light.png and b/.github/assets/main-display-light.png differ
diff --git a/.github/assets/new-word-dark.png b/.github/assets/new-word-dark.png
deleted file mode 100644
index 30b407a..0000000
Binary files a/.github/assets/new-word-dark.png and /dev/null differ
diff --git a/.github/assets/search-entries-dark.png b/.github/assets/search-entries-dark.png
deleted file mode 100644
index edb757c..0000000
Binary files a/.github/assets/search-entries-dark.png and /dev/null differ
diff --git a/.github/assets/search-entries.png b/.github/assets/search-entries.png
new file mode 100644
index 0000000..4a831d0
Binary files /dev/null and b/.github/assets/search-entries.png differ
diff --git a/.github/assets/search-jisho-dark.png b/.github/assets/search-jisho-dark.png
deleted file mode 100644
index 417d79f..0000000
Binary files a/.github/assets/search-jisho-dark.png and /dev/null differ
diff --git a/.github/assets/search-jisho-more.png b/.github/assets/search-jisho-more.png
new file mode 100644
index 0000000..b51672d
Binary files /dev/null and b/.github/assets/search-jisho-more.png differ
diff --git a/.github/assets/search-jisho.png b/.github/assets/search-jisho.png
new file mode 100644
index 0000000..d811e6a
Binary files /dev/null and b/.github/assets/search-jisho.png differ
diff --git a/.github/assets/view-entry-dark.png b/.github/assets/view-entry-dark.png
deleted file mode 100644
index f221412..0000000
Binary files a/.github/assets/view-entry-dark.png and /dev/null differ
diff --git a/README.md b/README.md
index c91b789..1e13b1e 100644
--- a/README.md
+++ b/README.md
@@ -27,23 +27,23 @@ An app for Android designed to aid your Japanese learning through keeping a jour
- Search your entries based on date, content, location, tags or books
- Daily reminder to add an entry
- Ability to backup and restore your data
-- Dark theme
+- Dark theme and Light theme
## Screenshots
| Main Screen | Main Screen Dark | Add Entry |
|:-:|:-:|:-:|
-| ![Main Screen](/.github/assets/main-display-light.png?raw=true) | ![Dark Theme](/.github/assets/main-display-dark.png?raw=true) |![Add entry](/.github/assets/add-entry-dark.png?raw=true)
+| ![Main Screen](/.github/assets/main-display-light.png?raw=true) | ![Dark Theme](/.github/assets/main-display-dark.png?raw=true) |![Add entry](/.github/assets/add-entry.png?raw=true)
-| Search Jisho | Add Tags | Add New Words |
+| Search Jisho | More Info | Add New Words |
|:-:|:-:|:-:|
-| ![Search Jisho](/.github/assets/search-jisho-dark.png?raw=true) | ![Add Tags](/.github/assets/add-tags-dark.png?raw=true) | ![Add New Words](/.github/assets/new-word-dark.png?raw=true)
+| ![Search Jisho](/.github/assets/search-jisho.png?raw=true) | ![More Info](/.github/assets/search-jisho-more.png?raw=true) | ![Add New Words](/.github/assets/add-words.png?raw=true)
-| Search Entries | View Entry |
+| Add Tags | Search Entries |
|:-:|:-:|
-| ![Search Entries](/.github/assets/search-entries-dark.png?raw=true) | ![View Entry](/.github/assets/view-entry-dark.png?raw=true) |
+| ![Add Tags](/.github/assets/add-tags.png?raw=true) | ![Search Entries](/.github/assets/search-entries.png?raw=true) |
## Tech and Architecture
-Written in Kotlin and employing an MVVM architecture pattern using [AndroidX View Model](https://developer.android.com/topic/libraries/architecture/viewmodel) components. Navigation is handled by the [AndroidX Navigation Components](https://developer.android.com/guide/navigation/). Data is stored using a [Room](https://developer.android.com/jetpack/androidx/releases/room) database and then retrieved asynchronously using Kotlin coroutines and [LiveData](https://developer.android.com/topic/libraries/architecture/livedata). [Kodein](https://github.com/Kodein-Framework/Kodein-DI) is used for dependency injection due to it's native support for Kotlin and it's ease of writing. API calls are made using [Retrofit](https://github.com/square/retrofit) and then converted into Kotlin objects using [Gson](https://github.com/google/gson). Design inspired by [Material Design](https://material.io/) and implemented using [Material Components for Android](https://github.com/material-components/material-components-android).
+Hibi is written entirely in Kotlin and employs an MVVM architecture pattern using [AndroidX View Model](https://developer.android.com/topic/libraries/architecture/viewmodel) components. Navigation is handled by the [AndroidX Navigation Components](https://developer.android.com/guide/navigation/). Data is stored using a [Room](https://developer.android.com/jetpack/androidx/releases/room) database and then retrieved asynchronously using Kotlin coroutines and [LiveData](https://developer.android.com/topic/libraries/architecture/livedata). [Kodein](https://github.com/Kodein-Framework/Kodein-DI) is used for dependency injection due to it's native support for Kotlin and it's ease of writing. API calls are made using [Retrofit](https://github.com/square/retrofit) and then converted into Kotlin objects using [Gson](https://github.com/google/gson). Design inspired by [Material Design](https://material.io/) and implemented using [Material Components for Android](https://github.com/material-components/material-components-android).
## Open Source Libraries Used
### [Timber](https://github.com/JakeWharton/timber)
diff --git a/app/build.gradle b/app/build.gradle
index 79b552f..435b041 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,11 +11,11 @@ apply plugin: 'androidx.navigation.safeargs'
android {
compileSdkVersion 28
defaultConfig {
- applicationId "app.marcdev.hibi"
+ applicationId "com.marcdonald.hibi"
minSdkVersion 23
targetSdkVersion 28
- versionCode 28
- versionName "1.1.0"
+ versionCode 29
+ versionName "1.2.0"
setProperty("archivesBaseName", "Hibi-v$versionName")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index faf36d0..9db25d6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
+ package="com.marcdonald.hibi">
@@ -9,17 +9,17 @@
@@ -29,13 +29,12 @@
android:name="android.app.shortcuts"
android:resource="@xml/shortcuts" />
-
-
-
+
+
-
\ No newline at end of file
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
index 9610755..b0962b4 100644
Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/ConnectivityInterceptor.kt b/app/src/main/java/app/marcdev/hibi/data/network/ConnectivityInterceptor.kt
deleted file mode 100644
index 3f784e0..0000000
--- a/app/src/main/java/app/marcdev/hibi/data/network/ConnectivityInterceptor.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package app.marcdev.hibi.data.network
-
-import okhttp3.Interceptor
-
-interface ConnectivityInterceptor : Interceptor
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/SearchResponse.kt b/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/SearchResponse.kt
deleted file mode 100644
index 654fcf3..0000000
--- a/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/SearchResponse.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package app.marcdev.hibi.data.network.jisho.apiresponse
-
-data class SearchResponse(
- val `data`: List
-)
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/internal/Exceptions.kt b/app/src/main/java/app/marcdev/hibi/internal/Exceptions.kt
deleted file mode 100644
index 8d3f4d8..0000000
--- a/app/src/main/java/app/marcdev/hibi/internal/Exceptions.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package app.marcdev.hibi.internal
-
-import java.io.IOException
-
-class NoConnectivityException : IOException()
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/internal/utils/ThemeUtils.kt b/app/src/main/java/app/marcdev/hibi/internal/utils/ThemeUtils.kt
deleted file mode 100644
index ce730f4..0000000
--- a/app/src/main/java/app/marcdev/hibi/internal/utils/ThemeUtils.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package app.marcdev.hibi.internal.utils
-
-interface ThemeUtils {
- fun isDarkMode(): Boolean
-
- fun getAccentColor(): Int
-}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/MainScreenMenuDialog.kt b/app/src/main/java/app/marcdev/hibi/maintabs/MainScreenMenuDialog.kt
deleted file mode 100644
index 186fd09..0000000
--- a/app/src/main/java/app/marcdev/hibi/maintabs/MainScreenMenuDialog.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package app.marcdev.hibi.maintabs
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiBottomSheetDialogFragment
-import app.marcdev.hibi.maintabs.settings.AboutActivity
-import app.marcdev.hibi.maintabs.settings.SettingsActivity
-import com.google.android.material.button.MaterialButton
-import timber.log.Timber
-
-class MainScreenMenuDialog : HibiBottomSheetDialogFragment() {
-
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
- Timber.v("Log: onCreateView: Started")
- val view = inflater.inflate(R.layout.dialog_main_menu, container, false)
- bindViews(view)
- return view
- }
-
- private fun bindViews(view: View) {
- val settingsButton: MaterialButton = view.findViewById(R.id.btn_main_menu_settings)
- settingsButton.setOnClickListener(settingsClickListener)
-
- val aboutButton: MaterialButton = view.findViewById(R.id.btn_main_menu_about)
- aboutButton.setOnClickListener(aboutClickListener)
- }
-
- private val settingsClickListener = View.OnClickListener {
- val intent = Intent(requireContext(), SettingsActivity::class.java)
- startActivity(intent)
- dismiss()
- }
-
- private val aboutClickListener = View.OnClickListener {
- val intent = Intent(requireContext(), AboutActivity::class.java)
- startActivity(intent)
- dismiss()
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/BookEntryDisplayItem.kt b/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/BookEntryDisplayItem.kt
deleted file mode 100644
index d8b1c3b..0000000
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/BookEntryDisplayItem.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package app.marcdev.hibi.maintabs.mainentriesrecycler
-
-data class BookEntryDisplayItem(var entryId: Int, var bookName: String)
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/AboutActivity.kt b/app/src/main/java/app/marcdev/hibi/maintabs/settings/AboutActivity.kt
deleted file mode 100644
index bf1a6d7..0000000
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/AboutActivity.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package app.marcdev.hibi.maintabs.settings
-
-import android.os.Bundle
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiActivity
-
-class AboutActivity : HibiActivity() {
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_empty_scroll_with_toolbar)
- bindViews()
-
- val fragmentTransaction = supportFragmentManager.beginTransaction()
- fragmentTransaction.replace(R.id.scroll_empty, AboutFragment())
- fragmentTransaction.commit()
- }
-
- private fun bindViews() {
- val toolbarTitle: TextView = findViewById(R.id.txt_back_toolbar_title)
- toolbarTitle.text = resources.getString(R.string.about)
-
- val toolbarBackButton: ImageView = findViewById(R.id.img_back_toolbar_back)
- toolbarBackButton.setOnClickListener(backClickListener)
- }
-
- private val backClickListener = View.OnClickListener {
- onBackPressed()
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/OpenSourceLicencesActivity.kt b/app/src/main/java/app/marcdev/hibi/maintabs/settings/OpenSourceLicencesActivity.kt
deleted file mode 100644
index b95ff07..0000000
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/OpenSourceLicencesActivity.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package app.marcdev.hibi.maintabs.settings
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiActivity
-import app.marcdev.hibi.uicomponents.views.LicenseDisplay
-
-class OpenSourceLicencesActivity : HibiActivity() {
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_oss)
- bindViews()
- }
-
- private fun bindViews() {
- val toolbarTitle: TextView = findViewById(R.id.txt_back_toolbar_title)
- toolbarTitle.text = resources.getString(R.string.open_source_licenses)
-
- val toolbarBackButton: ImageView = findViewById(R.id.img_back_toolbar_back)
- toolbarBackButton.setOnClickListener(backClickListener)
-
- val timber: LicenseDisplay = findViewById(R.id.license_timber)
- timber.setOnClickListener(openURLClickListener("https://github.com/JakeWharton/timber"))
-
- val kodein: LicenseDisplay = findViewById(R.id.license_kodein)
- kodein.setOnClickListener(openURLClickListener("https://github.com/Kodein-Framework/Kodein-DI"))
-
- val retrofit: LicenseDisplay = findViewById(R.id.license_retrofit)
- retrofit.setOnClickListener(openURLClickListener("https://github.com/square/retrofit"))
-
- val gson: LicenseDisplay = findViewById(R.id.license_gson)
- gson.setOnClickListener(openURLClickListener("https://github.com/google/gson"))
-
- val androidFilePicker: LicenseDisplay = findViewById(R.id.license_android_file_picker)
- androidFilePicker.setOnClickListener(openURLClickListener("https://github.com/DroidNinja/Android-FilePicker"))
-
- val mplus: LicenseDisplay = findViewById(R.id.license_mplus)
- mplus.setOnClickListener(openURLClickListener("https://fonts.google.com/specimen/M+PLUS+Rounded+1c"))
-
- val openSans: LicenseDisplay = findViewById(R.id.license_open_sans)
- openSans.setOnClickListener(openURLClickListener("https://fonts.google.com/specimen/Open+Sans"))
-
- val googleMaterialIcons: LicenseDisplay = findViewById(R.id.license_google_material_icons)
- googleMaterialIcons.setOnClickListener(openURLClickListener("https://material.io/tools/icons/"))
-
- val materialIcons: LicenseDisplay = findViewById(R.id.license_material_icons)
- materialIcons.setOnClickListener(openURLClickListener("https://materialdesignicons.com/"))
-
- val glide: LicenseDisplay = findViewById(R.id.license_glide)
- glide.setOnClickListener(openURLClickListener("https://github.com/bumptech/glide"))
- }
-
- private val backClickListener = View.OnClickListener {
- onBackPressed()
- }
-
- private fun openURLClickListener(url: String): View.OnClickListener {
- return View.OnClickListener {
- val uriUrl = Uri.parse(url)
- val launchBrowser = Intent(Intent.ACTION_VIEW)
- launchBrowser.data = uriUrl
- startActivity(launchBrowser)
- }
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/PrivacyDialog.kt b/app/src/main/java/app/marcdev/hibi/maintabs/settings/PrivacyDialog.kt
deleted file mode 100644
index c7e0b7f..0000000
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/PrivacyDialog.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-package app.marcdev.hibi.maintabs.settings
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiDialogFragment
-import com.google.android.material.button.MaterialButton
-
-class PrivacyDialog : HibiDialogFragment() {
- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
- val view = inflater.inflate(R.layout.dialog_privacy, container, false)
- bindViews(view)
- return view
- }
-
- private fun bindViews(view: View) {
- val dismissButton: MaterialButton = view.findViewById(R.id.btn_privacy_dismiss)
- dismissButton.setOnClickListener { dismiss() }
-
- val jishoButton: MaterialButton = view.findViewById(R.id.btn_privacy_jisho)
- jishoButton.setOnClickListener { openJisho() }
- }
-
- private fun openJisho() {
- val uriUrl = Uri.parse("https://jisho.org/about")
- val launchBrowser = Intent(Intent.ACTION_VIEW)
- launchBrowser.data = uriUrl
- startActivity(launchBrowser)
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/SettingsActivity.kt b/app/src/main/java/app/marcdev/hibi/maintabs/settings/SettingsActivity.kt
deleted file mode 100644
index 50bb362..0000000
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/SettingsActivity.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package app.marcdev.hibi.maintabs.settings
-
-import android.os.Bundle
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiActivity
-
-class SettingsActivity : HibiActivity() {
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_empty_scroll_with_toolbar)
- bindViews()
-
- val fragmentTransaction = supportFragmentManager.beginTransaction()
- fragmentTransaction.replace(R.id.scroll_empty, SettingsFragment())
- fragmentTransaction.commit()
- }
-
- private fun bindViews() {
- val toolbarTitle: TextView = findViewById(R.id.txt_back_toolbar_title)
- toolbarTitle.text = resources.getString(R.string.settings)
-
- val toolbarBackButton: ImageView = findViewById(R.id.img_back_toolbar_back)
- toolbarBackButton.setOnClickListener(backClickListener)
- }
-
- private val backClickListener = View.OnClickListener {
- onBackPressed()
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/Hibi.kt b/app/src/main/java/com/marcdonald/hibi/Hibi.kt
similarity index 59%
rename from app/src/main/java/app/marcdev/hibi/Hibi.kt
rename to app/src/main/java/com/marcdonald/hibi/Hibi.kt
index a6f2e2a..5c4374b 100644
--- a/app/src/main/java/app/marcdev/hibi/Hibi.kt
+++ b/app/src/main/java/com/marcdonald/hibi/Hibi.kt
@@ -1,45 +1,47 @@
-package app.marcdev.hibi
+package com.marcdonald.hibi
import android.app.Application
import android.app.NotificationChannel
import android.app.NotificationManager
import android.os.Build
-import app.marcdev.hibi.data.database.AppDatabase
-import app.marcdev.hibi.data.database.DAO
-import app.marcdev.hibi.data.database.ProductionAppDatabase
-import app.marcdev.hibi.data.network.ConnectivityInterceptor
-import app.marcdev.hibi.data.network.ConnectivityInterceptorImpl
-import app.marcdev.hibi.data.network.github.GithubAPIService
-import app.marcdev.hibi.data.network.jisho.JishoAPIService
-import app.marcdev.hibi.data.repository.*
-import app.marcdev.hibi.entryscreens.addentryscreen.AddEntryViewModelFactory
-import app.marcdev.hibi.entryscreens.viewentryscreen.ViewEntryViewModelFactory
-import app.marcdev.hibi.internal.NOTIFICATION_CHANNEL_REMINDER_ID
-import app.marcdev.hibi.internal.utils.FileUtils
-import app.marcdev.hibi.internal.utils.FileUtilsImpl
-import app.marcdev.hibi.internal.utils.ThemeUtils
-import app.marcdev.hibi.internal.utils.ThemeUtilsImpl
-import app.marcdev.hibi.maintabs.booksfragment.bookentriesfragment.BookEntriesViewModelFactory
-import app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment.BooksFragmentViewModelFactory
-import app.marcdev.hibi.maintabs.calendarfragment.CalendarTabViewModelFactory
-import app.marcdev.hibi.maintabs.mainentries.MainEntriesViewModelFactory
-import app.marcdev.hibi.maintabs.searchentries.searchentriesscreen.SearchEntriesViewModelFactory
-import app.marcdev.hibi.maintabs.settings.backupdialog.BackupDialogViewModelFactory
-import app.marcdev.hibi.maintabs.settings.restoredialog.RestoreDialogViewModelFactory
-import app.marcdev.hibi.maintabs.settings.updatedialog.UpdateDialogViewModelFactory
-import app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment.TagsFragmentViewModelFactory
-import app.marcdev.hibi.maintabs.tagsfragment.taggedentriesfragment.TaggedEntriesViewModelFactory
-import app.marcdev.hibi.search.searchmoreinfoscreen.SearchMoreInfoViewModelFactory
-import app.marcdev.hibi.search.searchresults.SearchViewModelFactory
-import app.marcdev.hibi.uicomponents.addbookdialog.AddBookViewModelFactory
-import app.marcdev.hibi.uicomponents.addentrytobookdialog.AddEntryToBookViewModelFactory
-import app.marcdev.hibi.uicomponents.addnewworddialog.AddNewWordViewModelFactory
-import app.marcdev.hibi.uicomponents.addtagdialog.AddTagViewModelFactory
-import app.marcdev.hibi.uicomponents.addtagtoentrydialog.AddTagToEntryViewModelFactory
-import app.marcdev.hibi.uicomponents.locationdialog.AddLocationToEntryViewModelFactory
-import app.marcdev.hibi.uicomponents.multiselectdialog.addmultientrytobookdialog.AddMultiEntryToBookViewModelFactory
-import app.marcdev.hibi.uicomponents.multiselectdialog.addtagtomultientrydialog.AddTagToMultiEntryViewModelFactory
-import app.marcdev.hibi.uicomponents.newwordsdialog.NewWordViewModelFactory
+import com.marcdonald.hibi.data.database.AppDatabase
+import com.marcdonald.hibi.data.database.DAO
+import com.marcdonald.hibi.data.database.ProductionAppDatabase
+import com.marcdonald.hibi.data.network.ConnectivityInterceptor
+import com.marcdonald.hibi.data.network.ConnectivityInterceptorImpl
+import com.marcdonald.hibi.data.network.github.GithubAPIService
+import com.marcdonald.hibi.data.network.jisho.JishoAPIService
+import com.marcdonald.hibi.data.repository.*
+import com.marcdonald.hibi.internal.NOTIFICATION_CHANNEL_REMINDER_ID
+import com.marcdonald.hibi.internal.utils.FileUtils
+import com.marcdonald.hibi.internal.utils.FileUtilsImpl
+import com.marcdonald.hibi.internal.utils.ThemeUtils
+import com.marcdonald.hibi.internal.utils.ThemeUtilsImpl
+import com.marcdonald.hibi.mainscreens.booksscreen.bookentriesfragment.BookEntriesViewModelFactory
+import com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment.BooksFragmentViewModelFactory
+import com.marcdonald.hibi.mainscreens.calendarscreen.CalendarTabViewModelFactory
+import com.marcdonald.hibi.mainscreens.entryscreens.addentryscreen.AddEntryViewModelFactory
+import com.marcdonald.hibi.mainscreens.entryscreens.viewentryscreen.ViewEntryViewModelFactory
+import com.marcdonald.hibi.mainscreens.mainentries.MainEntriesViewModelFactory
+import com.marcdonald.hibi.mainscreens.searchentries.searchentriesscreen.SearchEntriesViewModelFactory
+import com.marcdonald.hibi.mainscreens.settings.backupdialog.BackupDialogViewModelFactory
+import com.marcdonald.hibi.mainscreens.settings.restoredialog.RestoreDialogViewModelFactory
+import com.marcdonald.hibi.mainscreens.settings.updatedialog.UpdateDialogViewModelFactory
+import com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment.TagsFragmentViewModelFactory
+import com.marcdonald.hibi.mainscreens.tagsscreen.taggedentriesfragment.TaggedEntriesViewModelFactory
+import com.marcdonald.hibi.mainscreens.throwbackscreen.mainthrowbackscreen.ThrowbackFragmentViewModelFactory
+import com.marcdonald.hibi.mainscreens.throwbackscreen.throwbackentriesscreen.ThrowbackEntriesViewModelFactory
+import com.marcdonald.hibi.search.searchmoreinfoscreen.SearchMoreInfoViewModelFactory
+import com.marcdonald.hibi.search.searchresults.SearchViewModelFactory
+import com.marcdonald.hibi.uicomponents.addbookdialog.AddBookViewModelFactory
+import com.marcdonald.hibi.uicomponents.addentrytobookdialog.AddEntryToBookViewModelFactory
+import com.marcdonald.hibi.uicomponents.addnewworddialog.AddNewWordViewModelFactory
+import com.marcdonald.hibi.uicomponents.addtagdialog.AddTagViewModelFactory
+import com.marcdonald.hibi.uicomponents.addtagtoentrydialog.AddTagToEntryViewModelFactory
+import com.marcdonald.hibi.uicomponents.locationdialog.AddLocationToEntryViewModelFactory
+import com.marcdonald.hibi.uicomponents.multiselectdialog.addmultientrytobookdialog.AddMultiEntryToBookViewModelFactory
+import com.marcdonald.hibi.uicomponents.multiselectdialog.addtagtomultientrydialog.AddTagToMultiEntryViewModelFactory
+import com.marcdonald.hibi.uicomponents.newwordsdialog.NewWordViewModelFactory
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.androidXModule
@@ -98,6 +100,8 @@ class Hibi : Application(), KodeinAware {
bind() from provider { BackupDialogViewModelFactory(instance()) }
bind() from provider { RestoreDialogViewModelFactory(instance(), instance()) }
bind() from provider { UpdateDialogViewModelFactory(instance()) }
+ bind() from provider { ThrowbackFragmentViewModelFactory(instance(), instance(), instance()) }
+ bind() from provider { ThrowbackEntriesViewModelFactory(instance(), instance(), instance()) }
//
}
diff --git a/app/src/main/java/app/marcdev/hibi/MainActivity.kt b/app/src/main/java/com/marcdonald/hibi/MainActivity.kt
similarity index 70%
rename from app/src/main/java/app/marcdev/hibi/MainActivity.kt
rename to app/src/main/java/com/marcdonald/hibi/MainActivity.kt
index fae8b6a..5587da6 100644
--- a/app/src/main/java/app/marcdev/hibi/MainActivity.kt
+++ b/app/src/main/java/com/marcdonald/hibi/MainActivity.kt
@@ -1,13 +1,13 @@
-package app.marcdev.hibi
+package com.marcdonald.hibi
import android.os.Bundle
import androidx.core.app.NotificationManagerCompat
import androidx.navigation.Navigation
-import app.marcdev.hibi.internal.ADD_ENTRY_NOTIFICATION_INTENT_ACTION
-import app.marcdev.hibi.internal.ADD_ENTRY_SHORTCUT_INTENT_ACTION
-import app.marcdev.hibi.internal.REMINDER_NOTIFICATION_ID
-import app.marcdev.hibi.internal.base.HibiActivity
-import app.marcdev.hibi.maintabs.MainScreenFragmentDirections
+import com.marcdonald.hibi.internal.ADD_ENTRY_NOTIFICATION_INTENT_ACTION
+import com.marcdonald.hibi.internal.ADD_ENTRY_SHORTCUT_INTENT_ACTION
+import com.marcdonald.hibi.internal.REMINDER_NOTIFICATION_ID
+import com.marcdonald.hibi.internal.base.HibiActivity
+import com.marcdonald.hibi.mainscreens.MainScreenFragmentDirections
import timber.log.Timber
class MainActivity : HibiActivity() {
diff --git a/app/src/main/java/app/marcdev/hibi/data/database/AppDatabase.kt b/app/src/main/java/com/marcdonald/hibi/data/database/AppDatabase.kt
similarity index 57%
rename from app/src/main/java/app/marcdev/hibi/data/database/AppDatabase.kt
rename to app/src/main/java/com/marcdonald/hibi/data/database/AppDatabase.kt
index 103210a..f55fc5c 100644
--- a/app/src/main/java/app/marcdev/hibi/data/database/AppDatabase.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/database/AppDatabase.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.database
+package com.marcdonald.hibi.data.database
interface AppDatabase {
fun dao(): DAO
diff --git a/app/src/main/java/app/marcdev/hibi/data/database/DAO.kt b/app/src/main/java/com/marcdonald/hibi/data/database/DAO.kt
similarity index 77%
rename from app/src/main/java/app/marcdev/hibi/data/database/DAO.kt
rename to app/src/main/java/com/marcdonald/hibi/data/database/DAO.kt
index dc48905..a026ea3 100644
--- a/app/src/main/java/app/marcdev/hibi/data/database/DAO.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/database/DAO.kt
@@ -1,12 +1,12 @@
-package app.marcdev.hibi.data.database
+package com.marcdonald.hibi.data.database
import androidx.lifecycle.LiveData
import androidx.room.*
-import app.marcdev.hibi.data.entity.*
-import app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment.BookDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.BookEntryDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.TagEntryDisplayItem
-import app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment.TagDisplayItem
+import com.marcdonald.hibi.data.entity.*
+import com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment.BookDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.BookEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.TagEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment.TagDisplayItem
@Dao
interface DAO {
@@ -37,9 +37,12 @@ interface DAO {
@Query("SELECT id FROM Entry ORDER BY id DESC LIMIT 1")
fun getLastEntryId(): Int
- @Query("SELECT * FROM Entry WHERE year = :year AND month = :month AND day = :day")
+ @Query("SELECT * FROM Entry WHERE year = :year AND month = :month AND day = :day ORDER BY year DESC, month DESC, day DESC, hour DESC, minute DESC, id DESC")
fun getEntriesOnDate(year: Int, month: Int, day: Int): List
+ @Query("SELECT * FROM Entry WHERE year = :year AND month = :month AND day = :day ORDER BY year ASC, month ASC, day ASC, hour ASC, minute ASC, id ASC")
+ fun getEntriesOnDateAscending(year: Int, month: Int, day: Int): List
+
@Query("UPDATE Entry SET location = :location WHERE id = :entryId")
fun setLocation(entryId: Int, location: String)
@@ -48,6 +51,15 @@ interface DAO {
@Query("SELECT location FROM Entry WHERE id = :entryId")
fun getLocationLD(entryId: Int): LiveData
+
+ @Query("SELECT DISTINCT year FROM Entry ORDER BY year DESC")
+ fun getAllYears(): List
+
+ @Query("SELECT * FROM Entry WHERE year = :year AND month = :month AND day = :day ORDER BY year ASC, month ASC, day ASC, hour ASC, minute ASC, id LIMIT 1")
+ fun getFirstEntryOnDate(year: Int, month: Int, day: Int): Entry
+
+ @Query("SELECT COUNT(*) FROM Entry WHERE year = :year AND month = :month AND day = :day")
+ fun getAmountOfEntriesOnDate(year: Int, month: Int, day: Int): Int
//
//
@@ -83,10 +95,10 @@ interface DAO {
@Query("SELECT * FROM TagEntryRelation WHERE tagId IN (:ids)")
fun getAllTagEntryRelationsWithIds(ids: List): List
- @Query("SELECT * FROM Entry as e INNER JOIN TagEntryRelation as ter ON e.id = ter.entryId WHERE ter.tagId = :tagId ORDER BY year DESC, month DESC, day DESC, hour DESC, minute DESC, id DESC")
+ @Query("SELECT e.id, e.location, e.day, e.month, e.year, e.hour, e.minute, e.content FROM Entry as e INNER JOIN TagEntryRelation as ter ON e.id = ter.entryId WHERE ter.tagId = :tagId ORDER BY year DESC, month DESC, day DESC, hour DESC, minute DESC, id DESC")
fun getEntriesWithTag(tagId: Int): List
- @Query("SELECT * FROM Tag INNER JOIN TagEntryRelation ON Tag.id = TagEntryRelation.tagId WHERE entryId = :entryId")
+ @Query("SELECT Tag.id, Tag.name FROM Tag INNER JOIN TagEntryRelation ON Tag.id = TagEntryRelation.tagId WHERE entryId = :entryId")
fun getTagsWithEntry(entryId: Int): List
@Query("SELECT id FROM Tag INNER JOIN TagEntryRelation ON Tag.id = TagEntryRelation.tagId WHERE entryId = :entryId")
@@ -161,7 +173,7 @@ interface DAO {
@Delete
fun deleteBookEntryRelation(bookEntryRelation: BookEntryRelation)
- @Query("SELECT * FROM Entry as e INNER JOIN BookEntryRelation as ber ON e.id = ber.entryId WHERE ber.bookId = :bookId ORDER BY year DESC, month DESC, day DESC, hour DESC, minute DESC, id DESC")
+ @Query("SELECT e.id, e.location, e.day, e.month, e.year, e.hour, e.minute, e.content FROM Entry as e INNER JOIN BookEntryRelation as ber ON e.id = ber.entryId WHERE ber.bookId = :bookId ORDER BY year DESC, month DESC, day DESC, hour DESC, minute DESC, id DESC")
fun getEntriesWithBook(bookId: Int): List
@Query("SELECT b.id as bookId, b.name as bookName, COUNT(ber.entryId) as useCount FROM Book as b LEFT OUTER JOIN BookEntryRelation as ber ON b.id = ber.bookId GROUP BY b.name")
@@ -170,7 +182,7 @@ interface DAO {
@Query("SELECT id FROM Book INNER JOIN BookEntryRelation ON Book.id = BookEntryRelation.bookId WHERE entryId = :entryId")
fun getBookIdsWithEntry(entryId: Int): List
- @Query("SELECT * FROM Book INNER JOIN BookEntryRelation ON Book.id = BookEntryRelation.bookId WHERE entryId = :entryId")
+ @Query("SELECT Book.id, Book.name FROM Book INNER JOIN BookEntryRelation ON Book.id = BookEntryRelation.bookId WHERE entryId = :entryId")
fun getBooksWithEntry(entryId: Int): List
@Query("SELECT * FROM BookEntryRelation WHERE bookId IN (:ids)")
diff --git a/app/src/main/java/app/marcdev/hibi/data/database/ProductionAppDatabase.kt b/app/src/main/java/com/marcdonald/hibi/data/database/ProductionAppDatabase.kt
similarity index 90%
rename from app/src/main/java/app/marcdev/hibi/data/database/ProductionAppDatabase.kt
rename to app/src/main/java/com/marcdonald/hibi/data/database/ProductionAppDatabase.kt
index 0ec873b..6dffa4c 100644
--- a/app/src/main/java/app/marcdev/hibi/data/database/ProductionAppDatabase.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/database/ProductionAppDatabase.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.database
+package com.marcdonald.hibi.data.database
import android.content.Context
import androidx.room.Database
@@ -6,12 +6,14 @@ import androidx.room.Room
import androidx.room.RoomDatabase
import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase
-import app.marcdev.hibi.data.entity.*
-import app.marcdev.hibi.internal.PRODUCTION_DATABASE_NAME
-import app.marcdev.hibi.internal.PRODUCTION_DATABASE_VERSION
+import com.marcdonald.hibi.data.entity.*
+import com.marcdonald.hibi.internal.PRODUCTION_DATABASE_NAME
+import com.marcdonald.hibi.internal.PRODUCTION_DATABASE_VERSION
import timber.log.Timber
-@Database(entities = [Entry::class, Tag::class, TagEntryRelation::class, NewWord::class, Book::class, BookEntryRelation::class, EntryImage::class], version = PRODUCTION_DATABASE_VERSION)
+@Database(entities = [Entry::class, Tag::class, TagEntryRelation::class, NewWord::class, Book::class, BookEntryRelation::class, EntryImage::class],
+ version = PRODUCTION_DATABASE_VERSION,
+ exportSchema = false)
abstract class ProductionAppDatabase : RoomDatabase(), AppDatabase {
abstract override fun dao(): DAO
@@ -47,6 +49,7 @@ abstract class ProductionAppDatabase : RoomDatabase(), AppDatabase {
.addMigrations(MIGRATION_9_TO_10())
.addMigrations(MIGRATION_10_TO_11())
.addMigrations(MIGRATION_11_TO_12())
+ .addMigrations(MIGRATION_12_TO_13())
.build()
class MIGRATION_3_TO_5 : Migration(3, 5) {
@@ -164,5 +167,14 @@ abstract class ProductionAppDatabase : RoomDatabase(), AppDatabase {
// This is here because I forgot to add the EntryImage entity to the database in the last version
override fun migrate(database: SupportSQLiteDatabase) {}
}
+
+ class MIGRATION_12_TO_13 : Migration(12, 13) {
+ override fun migrate(database: SupportSQLiteDatabase) {
+ database.execSQL("CREATE INDEX EntryImage_EntryId_Index ON EntryImage (entryId)")
+ database.execSQL("CREATE INDEX BookEntryRelation_EntryId_Index ON BookEntryRelation (entryId)")
+ database.execSQL("CREATE INDEX NewWord_EntryId_Index ON NewWord (entryId)")
+ database.execSQL("CREATE INDEX TagEntryRelation_EntryId_Index ON TagEntryRelation (entryId)")
+ }
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/data/entity/Book.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/Book.kt
similarity index 81%
rename from app/src/main/java/app/marcdev/hibi/data/entity/Book.kt
rename to app/src/main/java/com/marcdonald/hibi/data/entity/Book.kt
index ff61da5..1a67a84 100644
--- a/app/src/main/java/app/marcdev/hibi/data/entity/Book.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/entity/Book.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.entity
+package com.marcdonald.hibi.data.entity
import androidx.room.Entity
import androidx.room.PrimaryKey
diff --git a/app/src/main/java/app/marcdev/hibi/data/entity/BookEntryRelation.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/BookEntryRelation.kt
similarity index 79%
rename from app/src/main/java/app/marcdev/hibi/data/entity/BookEntryRelation.kt
rename to app/src/main/java/com/marcdonald/hibi/data/entity/BookEntryRelation.kt
index 8bace92..4abe547 100644
--- a/app/src/main/java/app/marcdev/hibi/data/entity/BookEntryRelation.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/entity/BookEntryRelation.kt
@@ -1,7 +1,8 @@
-package app.marcdev.hibi.data.entity
+package com.marcdonald.hibi.data.entity
import androidx.room.Entity
import androidx.room.ForeignKey
+import androidx.room.Index
@Entity(tableName = "BookEntryRelation",
primaryKeys = ["bookId", "entryId"],
@@ -20,7 +21,9 @@ import androidx.room.ForeignKey
onDelete = ForeignKey.CASCADE,
onUpdate = ForeignKey.CASCADE
)
- ])
+ ],
+ indices = [Index(name = "BookEntryRelation_EntryId_Index", value = ["entryId"])]
+)
data class BookEntryRelation(
var bookId: Int,
var entryId: Int
diff --git a/app/src/main/java/app/marcdev/hibi/data/entity/Entry.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/Entry.kt
similarity index 88%
rename from app/src/main/java/app/marcdev/hibi/data/entity/Entry.kt
rename to app/src/main/java/com/marcdonald/hibi/data/entity/Entry.kt
index 8e3ac76..f728466 100644
--- a/app/src/main/java/app/marcdev/hibi/data/entity/Entry.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/entity/Entry.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.entity
+package com.marcdonald.hibi.data.entity
import androidx.room.Entity
import androidx.room.PrimaryKey
diff --git a/app/src/main/java/app/marcdev/hibi/data/entity/EntryImage.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/EntryImage.kt
similarity index 73%
rename from app/src/main/java/app/marcdev/hibi/data/entity/EntryImage.kt
rename to app/src/main/java/com/marcdonald/hibi/data/entity/EntryImage.kt
index 18c34f9..b77503d 100644
--- a/app/src/main/java/app/marcdev/hibi/data/entity/EntryImage.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/entity/EntryImage.kt
@@ -1,7 +1,8 @@
-package app.marcdev.hibi.data.entity
+package com.marcdonald.hibi.data.entity
import androidx.room.Entity
import androidx.room.ForeignKey
+import androidx.room.Index
@Entity(tableName = "EntryImage",
primaryKeys = ["imageName", "entryId"],
@@ -13,7 +14,9 @@ import androidx.room.ForeignKey
onDelete = ForeignKey.CASCADE,
onUpdate = ForeignKey.CASCADE
)
- ])
+ ],
+ indices = [Index(name = "EntryImage_EntryId_Index", value = ["entryId"])]
+)
data class EntryImage(
var imageName: String,
var entryId: Int
diff --git a/app/src/main/java/app/marcdev/hibi/data/entity/NewWord.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/NewWord.kt
similarity index 78%
rename from app/src/main/java/app/marcdev/hibi/data/entity/NewWord.kt
rename to app/src/main/java/com/marcdonald/hibi/data/entity/NewWord.kt
index 8d48a89..16bc0a3 100644
--- a/app/src/main/java/app/marcdev/hibi/data/entity/NewWord.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/entity/NewWord.kt
@@ -1,7 +1,8 @@
-package app.marcdev.hibi.data.entity
+package com.marcdonald.hibi.data.entity
import androidx.room.Entity
import androidx.room.ForeignKey
+import androidx.room.Index
import androidx.room.PrimaryKey
@Entity(tableName = "NewWord",
@@ -12,7 +13,9 @@ import androidx.room.PrimaryKey
childColumns = ["entryId"],
onDelete = ForeignKey.CASCADE,
onUpdate = ForeignKey.CASCADE)
- ])
+ ],
+ indices = [Index(name = "NewWord_EntryId_Index", value = ["entryId"])]
+)
data class NewWord(
var word: String,
var reading: String,
diff --git a/app/src/main/java/app/marcdev/hibi/data/entity/Tag.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/Tag.kt
similarity index 81%
rename from app/src/main/java/app/marcdev/hibi/data/entity/Tag.kt
rename to app/src/main/java/com/marcdonald/hibi/data/entity/Tag.kt
index 9263194..e98abf1 100644
--- a/app/src/main/java/app/marcdev/hibi/data/entity/Tag.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/entity/Tag.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.entity
+package com.marcdonald.hibi.data.entity
import androidx.room.Entity
import androidx.room.PrimaryKey
diff --git a/app/src/main/java/app/marcdev/hibi/data/entity/TagEntryRelation.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/TagEntryRelation.kt
similarity index 79%
rename from app/src/main/java/app/marcdev/hibi/data/entity/TagEntryRelation.kt
rename to app/src/main/java/com/marcdonald/hibi/data/entity/TagEntryRelation.kt
index 1767d97..a8da63f 100644
--- a/app/src/main/java/app/marcdev/hibi/data/entity/TagEntryRelation.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/entity/TagEntryRelation.kt
@@ -1,7 +1,8 @@
-package app.marcdev.hibi.data.entity
+package com.marcdonald.hibi.data.entity
import androidx.room.Entity
import androidx.room.ForeignKey
+import androidx.room.Index
@Entity(tableName = "TagEntryRelation",
primaryKeys = ["tagId", "entryId"],
@@ -20,7 +21,9 @@ import androidx.room.ForeignKey
onDelete = ForeignKey.CASCADE,
onUpdate = ForeignKey.CASCADE
)
- ])
+ ],
+ indices = [Index(name = "TagEntryRelation_EntryId_Index", value = ["entryId"])]
+)
data class TagEntryRelation(
var tagId: Int,
var entryId: Int
diff --git a/app/src/main/java/com/marcdonald/hibi/data/network/ConnectivityInterceptor.kt b/app/src/main/java/com/marcdonald/hibi/data/network/ConnectivityInterceptor.kt
new file mode 100644
index 0000000..1e9a4e9
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/ConnectivityInterceptor.kt
@@ -0,0 +1,5 @@
+package com.marcdonald.hibi.data.network
+
+import okhttp3.Interceptor
+
+interface ConnectivityInterceptor : Interceptor
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/ConnectivityInterceptorImpl.kt b/app/src/main/java/com/marcdonald/hibi/data/network/ConnectivityInterceptorImpl.kt
similarity index 87%
rename from app/src/main/java/app/marcdev/hibi/data/network/ConnectivityInterceptorImpl.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/ConnectivityInterceptorImpl.kt
index d1a97ea..ce7866e 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/ConnectivityInterceptorImpl.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/ConnectivityInterceptorImpl.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.data.network
+package com.marcdonald.hibi.data.network
import android.content.Context
import android.net.ConnectivityManager
-import app.marcdev.hibi.internal.NoConnectivityException
+import com.marcdonald.hibi.internal.NoConnectivityException
import okhttp3.Interceptor
import okhttp3.Response
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/github/GithubAPIService.kt b/app/src/main/java/com/marcdonald/hibi/data/network/github/GithubAPIService.kt
similarity index 79%
rename from app/src/main/java/app/marcdev/hibi/data/network/github/GithubAPIService.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/github/GithubAPIService.kt
index 0cb7f01..658b13e 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/github/GithubAPIService.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/github/GithubAPIService.kt
@@ -1,7 +1,7 @@
-package app.marcdev.hibi.data.network.github
+package com.marcdonald.hibi.data.network.github
-import app.marcdev.hibi.data.network.ConnectivityInterceptor
-import app.marcdev.hibi.data.network.github.apiresponse.GithubVersionResponse
+import com.marcdonald.hibi.data.network.ConnectivityInterceptor
+import com.marcdonald.hibi.data.network.github.apiresponse.GithubVersionResponse
import okhttp3.OkHttpClient
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Asset.kt b/app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/Asset.kt
similarity index 83%
rename from app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Asset.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/Asset.kt
index 6fc296d..daf78bb 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Asset.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/Asset.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.github.apiresponse
+package com.marcdonald.hibi.data.network.github.apiresponse
data class Asset(
val browser_download_url: String,
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Author.kt b/app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/Author.kt
similarity index 88%
rename from app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Author.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/Author.kt
index ccb9190..f1c8a46 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Author.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/Author.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.github.apiresponse
+package com.marcdonald.hibi.data.network.github.apiresponse
data class Author(
val avatar_url: String,
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/GithubVersionResponse.kt b/app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/GithubVersionResponse.kt
similarity index 88%
rename from app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/GithubVersionResponse.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/GithubVersionResponse.kt
index 4603cfe..6669d78 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/GithubVersionResponse.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/GithubVersionResponse.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.github.apiresponse
+package com.marcdonald.hibi.data.network.github.apiresponse
data class GithubVersionResponse(
val assets: List,
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Uploader.kt b/app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/Uploader.kt
similarity index 88%
rename from app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Uploader.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/Uploader.kt
index 09c89a9..23f2cfe 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Uploader.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/github/apiresponse/Uploader.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.github.apiresponse
+package com.marcdonald.hibi.data.network.github.apiresponse
data class Uploader(
val avatar_url: String,
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/jisho/JishoAPIService.kt b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/JishoAPIService.kt
similarity index 80%
rename from app/src/main/java/app/marcdev/hibi/data/network/jisho/JishoAPIService.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/jisho/JishoAPIService.kt
index 2fce68d..74c5a67 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/jisho/JishoAPIService.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/JishoAPIService.kt
@@ -1,7 +1,7 @@
-package app.marcdev.hibi.data.network.jisho
+package com.marcdonald.hibi.data.network.jisho
-import app.marcdev.hibi.data.network.ConnectivityInterceptor
-import app.marcdev.hibi.data.network.jisho.apiresponse.SearchResponse
+import com.marcdonald.hibi.data.network.ConnectivityInterceptor
+import com.marcdonald.hibi.data.network.jisho.apiresponse.SearchResponse
import okhttp3.OkHttpClient
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Attribution.kt b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Attribution.kt
similarity index 61%
rename from app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Attribution.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Attribution.kt
index aa06688..73c9c78 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Attribution.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Attribution.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.jisho.apiresponse
+package com.marcdonald.hibi.data.network.jisho.apiresponse
data class Attribution(
val dbpedia: Boolean,
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Data.kt b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Data.kt
similarity index 80%
rename from app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Data.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Data.kt
index 5265b50..4198926 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Data.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Data.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.jisho.apiresponse
+package com.marcdonald.hibi.data.network.jisho.apiresponse
import com.google.gson.annotations.SerializedName
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Japanese.kt b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Japanese.kt
similarity index 51%
rename from app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Japanese.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Japanese.kt
index 5796925..1775c01 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Japanese.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Japanese.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.jisho.apiresponse
+package com.marcdonald.hibi.data.network.jisho.apiresponse
data class Japanese(
val reading: String,
diff --git a/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/SearchResponse.kt b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/SearchResponse.kt
new file mode 100644
index 0000000..cdaa1d3
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/SearchResponse.kt
@@ -0,0 +1,5 @@
+package com.marcdonald.hibi.data.network.jisho.apiresponse
+
+data class SearchResponse(
+ val `data`: List
+)
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Sense.kt b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Sense.kt
similarity index 87%
rename from app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Sense.kt
rename to app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Sense.kt
index b68763f..0e24650 100644
--- a/app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Sense.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/network/jisho/apiresponse/Sense.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.jisho.apiresponse
+package com.marcdonald.hibi.data.network.jisho.apiresponse
import com.google.gson.annotations.SerializedName
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/BookEntryRelationRepository.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/BookEntryRelationRepository.kt
similarity index 65%
rename from app/src/main/java/app/marcdev/hibi/data/repository/BookEntryRelationRepository.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/BookEntryRelationRepository.kt
index 9c98781..a8efd14 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/BookEntryRelationRepository.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/BookEntryRelationRepository.kt
@@ -1,11 +1,11 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.entity.Book
-import app.marcdev.hibi.data.entity.BookEntryRelation
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment.BookDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.BookEntryDisplayItem
+import com.marcdonald.hibi.data.entity.Book
+import com.marcdonald.hibi.data.entity.BookEntryRelation
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment.BookDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.BookEntryDisplayItem
interface BookEntryRelationRepository {
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/BookEntryRelationRepositoryImpl.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/BookEntryRelationRepositoryImpl.kt
similarity index 85%
rename from app/src/main/java/app/marcdev/hibi/data/repository/BookEntryRelationRepositoryImpl.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/BookEntryRelationRepositoryImpl.kt
index ea959dd..cb77c12 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/BookEntryRelationRepositoryImpl.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/BookEntryRelationRepositoryImpl.kt
@@ -1,13 +1,13 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import android.database.sqlite.SQLiteConstraintException
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.database.DAO
-import app.marcdev.hibi.data.entity.Book
-import app.marcdev.hibi.data.entity.BookEntryRelation
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment.BookDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.BookEntryDisplayItem
+import com.marcdonald.hibi.data.database.DAO
+import com.marcdonald.hibi.data.entity.Book
+import com.marcdonald.hibi.data.entity.BookEntryRelation
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment.BookDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.BookEntryDisplayItem
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/BookRepository.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/BookRepository.kt
similarity index 78%
rename from app/src/main/java/app/marcdev/hibi/data/repository/BookRepository.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/BookRepository.kt
index ee17dc4..7e40184 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/BookRepository.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/BookRepository.kt
@@ -1,7 +1,7 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.entity.Book
+import com.marcdonald.hibi.data.entity.Book
interface BookRepository {
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/BookRepositoryImpl.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/BookRepositoryImpl.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/data/repository/BookRepositoryImpl.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/BookRepositoryImpl.kt
index 7fc8493..cec036c 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/BookRepositoryImpl.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/BookRepositoryImpl.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import android.database.sqlite.SQLiteConstraintException
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.database.DAO
-import app.marcdev.hibi.data.entity.Book
+import com.marcdonald.hibi.data.database.DAO
+import com.marcdonald.hibi.data.entity.Book
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/EntryImageRepository.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/EntryImageRepository.kt
similarity index 79%
rename from app/src/main/java/app/marcdev/hibi/data/repository/EntryImageRepository.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/EntryImageRepository.kt
index c0fb863..c823b7b 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/EntryImageRepository.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/EntryImageRepository.kt
@@ -1,7 +1,7 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.entity.EntryImage
+import com.marcdonald.hibi.data.entity.EntryImage
interface EntryImageRepository {
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/EntryImageRepositoryImpl.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/EntryImageRepositoryImpl.kt
similarity index 91%
rename from app/src/main/java/app/marcdev/hibi/data/repository/EntryImageRepositoryImpl.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/EntryImageRepositoryImpl.kt
index dde495d..cbde3e2 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/EntryImageRepositoryImpl.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/EntryImageRepositoryImpl.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import android.database.sqlite.SQLiteConstraintException
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.database.DAO
-import app.marcdev.hibi.data.entity.EntryImage
+import com.marcdonald.hibi.data.database.DAO
+import com.marcdonald.hibi.data.entity.EntryImage
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/EntryRepository.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/EntryRepository.kt
similarity index 58%
rename from app/src/main/java/app/marcdev/hibi/data/repository/EntryRepository.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/EntryRepository.kt
index 2d5aa35..a361acf 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/EntryRepository.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/EntryRepository.kt
@@ -1,7 +1,8 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.entity.Entry
+import java.util.*
interface EntryRepository {
@@ -19,9 +20,19 @@ interface EntryRepository {
suspend fun getEntriesOnDate(year: Int, month: Int, day: Int): List
+ suspend fun getEntriesOnDate(calendar: Calendar): List
+
+ suspend fun getEntriesOnDate(calendar: Calendar, ascending: Boolean): List
+
suspend fun saveLocation(entryId: Int, location: String)
suspend fun getLocation(entryId: Int): String
fun getLocationLD(entryId: Int): LiveData
+
+ suspend fun getAllYears(): List
+
+ suspend fun getFirstEntryOnDate(calendar: Calendar): Entry?
+
+ suspend fun getAmountOfEntriesOnDate(calendar: Calendar): Int
}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/EntryRepositoryImpl.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/EntryRepositoryImpl.kt
similarity index 61%
rename from app/src/main/java/app/marcdev/hibi/data/repository/EntryRepositoryImpl.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/EntryRepositoryImpl.kt
index c84efa3..878d134 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/EntryRepositoryImpl.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/EntryRepositoryImpl.kt
@@ -1,13 +1,14 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import android.database.sqlite.SQLiteConstraintException
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.database.DAO
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.internal.utils.FileUtils
+import com.marcdonald.hibi.data.database.DAO
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.internal.utils.FileUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import timber.log.Timber
+import java.util.*
class EntryRepositoryImpl private constructor(private val dao: DAO, private val fileUtils: FileUtils) : EntryRepository {
@@ -67,6 +68,16 @@ class EntryRepositoryImpl private constructor(private val dao: DAO, private val
}
}
+ override suspend fun getEntriesOnDate(calendar: Calendar): List {
+ return withContext(Dispatchers.IO) {
+ return@withContext getEntriesOnDate(
+ calendar.get(Calendar.YEAR),
+ calendar.get(Calendar.MONTH),
+ calendar.get(Calendar.DAY_OF_MONTH)
+ )
+ }
+ }
+
override suspend fun saveLocation(entryId: Int, location: String) {
withContext(Dispatchers.IO) {
dao.setLocation(entryId, location)
@@ -83,6 +94,46 @@ class EntryRepositoryImpl private constructor(private val dao: DAO, private val
return dao.getLocationLD(entryId)
}
+ override suspend fun getAllYears(): List {
+ return withContext(Dispatchers.IO) {
+ return@withContext dao.getAllYears()
+ }
+ }
+
+ override suspend fun getFirstEntryOnDate(calendar: Calendar): Entry {
+ return withContext(Dispatchers.IO) {
+ return@withContext dao.getFirstEntryOnDate(
+ calendar.get(Calendar.YEAR),
+ calendar.get(Calendar.MONTH),
+ calendar.get(Calendar.DAY_OF_MONTH)
+ )
+ }
+ }
+
+ override suspend fun getAmountOfEntriesOnDate(calendar: Calendar): Int {
+ return withContext(Dispatchers.IO) {
+ return@withContext dao.getAmountOfEntriesOnDate(
+ calendar.get(Calendar.YEAR),
+ calendar.get(Calendar.MONTH),
+ calendar.get(Calendar.DAY_OF_MONTH)
+ )
+ }
+ }
+
+ override suspend fun getEntriesOnDate(calendar: Calendar, ascending: Boolean): List {
+ if(ascending) {
+ return withContext(Dispatchers.IO) {
+ return@withContext dao.getEntriesOnDateAscending(
+ calendar.get(Calendar.YEAR),
+ calendar.get(Calendar.MONTH),
+ calendar.get(Calendar.DAY_OF_MONTH)
+ )
+ }
+ } else {
+ return getEntriesOnDate(calendar)
+ }
+ }
+
companion object {
@Volatile private var instance: EntryRepositoryImpl? = null
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/NewWordRepository.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/NewWordRepository.kt
similarity index 80%
rename from app/src/main/java/app/marcdev/hibi/data/repository/NewWordRepository.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/NewWordRepository.kt
index de7ea41..f74797f 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/NewWordRepository.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/NewWordRepository.kt
@@ -1,7 +1,7 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.entity.NewWord
+import com.marcdonald.hibi.data.entity.NewWord
interface NewWordRepository {
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/NewWordRepositoryImpl.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/NewWordRepositoryImpl.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/data/repository/NewWordRepositoryImpl.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/NewWordRepositoryImpl.kt
index eddb7c5..b4d4192 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/NewWordRepositoryImpl.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/NewWordRepositoryImpl.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import android.database.sqlite.SQLiteConstraintException
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.database.DAO
-import app.marcdev.hibi.data.entity.NewWord
+import com.marcdonald.hibi.data.database.DAO
+import com.marcdonald.hibi.data.entity.NewWord
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/TagEntryRelationRepository.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/TagEntryRelationRepository.kt
similarity index 65%
rename from app/src/main/java/app/marcdev/hibi/data/repository/TagEntryRelationRepository.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/TagEntryRelationRepository.kt
index f97f913..61399f2 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/TagEntryRelationRepository.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/TagEntryRelationRepository.kt
@@ -1,11 +1,11 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.data.entity.Tag
-import app.marcdev.hibi.data.entity.TagEntryRelation
-import app.marcdev.hibi.maintabs.mainentriesrecycler.TagEntryDisplayItem
-import app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment.TagDisplayItem
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.entity.Tag
+import com.marcdonald.hibi.data.entity.TagEntryRelation
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.TagEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment.TagDisplayItem
interface TagEntryRelationRepository {
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/TagEntryRelationRepositoryImpl.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/TagEntryRelationRepositoryImpl.kt
similarity index 85%
rename from app/src/main/java/app/marcdev/hibi/data/repository/TagEntryRelationRepositoryImpl.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/TagEntryRelationRepositoryImpl.kt
index 9caad26..9c79aa2 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/TagEntryRelationRepositoryImpl.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/TagEntryRelationRepositoryImpl.kt
@@ -1,13 +1,13 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import android.database.sqlite.SQLiteConstraintException
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.database.DAO
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.data.entity.Tag
-import app.marcdev.hibi.data.entity.TagEntryRelation
-import app.marcdev.hibi.maintabs.mainentriesrecycler.TagEntryDisplayItem
-import app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment.TagDisplayItem
+import com.marcdonald.hibi.data.database.DAO
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.entity.Tag
+import com.marcdonald.hibi.data.entity.TagEntryRelation
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.TagEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment.TagDisplayItem
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/TagRepository.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/TagRepository.kt
similarity index 77%
rename from app/src/main/java/app/marcdev/hibi/data/repository/TagRepository.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/TagRepository.kt
index 11aa691..65c2d11 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/TagRepository.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/TagRepository.kt
@@ -1,7 +1,7 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.entity.Tag
+import com.marcdonald.hibi.data.entity.Tag
interface TagRepository {
diff --git a/app/src/main/java/app/marcdev/hibi/data/repository/TagRepositoryImpl.kt b/app/src/main/java/com/marcdonald/hibi/data/repository/TagRepositoryImpl.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/data/repository/TagRepositoryImpl.kt
rename to app/src/main/java/com/marcdonald/hibi/data/repository/TagRepositoryImpl.kt
index fa1b5d2..60b94d6 100644
--- a/app/src/main/java/app/marcdev/hibi/data/repository/TagRepositoryImpl.kt
+++ b/app/src/main/java/com/marcdonald/hibi/data/repository/TagRepositoryImpl.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.data.repository
+package com.marcdonald.hibi.data.repository
import android.database.sqlite.SQLiteConstraintException
import androidx.lifecycle.LiveData
-import app.marcdev.hibi.data.database.DAO
-import app.marcdev.hibi.data.entity.Tag
+import com.marcdonald.hibi.data.database.DAO
+import com.marcdonald.hibi.data.entity.Tag
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/internal/Constants.kt b/app/src/main/java/com/marcdonald/hibi/internal/Constants.kt
similarity index 84%
rename from app/src/main/java/app/marcdev/hibi/internal/Constants.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/Constants.kt
index 203e116..46df4b6 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/Constants.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/Constants.kt
@@ -1,7 +1,7 @@
-package app.marcdev.hibi.internal
+package com.marcdonald.hibi.internal
//
-const val PRODUCTION_DATABASE_VERSION = 12
+const val PRODUCTION_DATABASE_VERSION = 13
const val PRODUCTION_DATABASE_NAME = "Database.db"
//
@@ -43,9 +43,9 @@ const val NOTIFICATION_CHANNEL_REMINDER_ID = "reminder"
//
//
-const val ADD_ENTRY_SHORTCUT_INTENT_ACTION = "app.marcdev.hibi.intent.ADD_ENTRY_SHORTCUT"
-const val ADD_ENTRY_NOTIFICATION_INTENT_ACTION = "app.marcdev.hibi.intent.ADD_ENTRY_NOTIFICATION"
-const val PACKAGE = "app.marcdev.hibi"
+const val ADD_ENTRY_SHORTCUT_INTENT_ACTION = "com.marcdonald.hibi.intent.ADD_ENTRY_SHORTCUT"
+const val ADD_ENTRY_NOTIFICATION_INTENT_ACTION = "com.marcdonald.hibi.intent.ADD_ENTRY_NOTIFICATION"
+const val PACKAGE = "com.marcdonald.hibi"
//
//
diff --git a/app/src/main/java/com/marcdonald/hibi/internal/Exceptions.kt b/app/src/main/java/com/marcdonald/hibi/internal/Exceptions.kt
new file mode 100644
index 0000000..0641588
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/internal/Exceptions.kt
@@ -0,0 +1,5 @@
+package com.marcdonald.hibi.internal
+
+import java.io.IOException
+
+class NoConnectivityException : IOException()
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/internal/base/HibiActivity.kt b/app/src/main/java/com/marcdonald/hibi/internal/base/HibiActivity.kt
similarity index 73%
rename from app/src/main/java/app/marcdev/hibi/internal/base/HibiActivity.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/base/HibiActivity.kt
index 661a677..0bfc5a2 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/base/HibiActivity.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/base/HibiActivity.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.internal.base
+package com.marcdonald.hibi.internal.base
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.utils.ThemeUtils
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.utils.ThemeUtils
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.closestKodein
@@ -13,7 +13,7 @@ abstract class HibiActivity : AppCompatActivity(), KodeinAware {
override val kodein: Kodein by closestKodein()
private val themeUtils: ThemeUtils by instance()
- private var isDarkTheme: Boolean = false
+ private var isLightTheme: Boolean = false
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -21,11 +21,11 @@ abstract class HibiActivity : AppCompatActivity(), KodeinAware {
}
private fun updateTheme() {
- isDarkTheme = if(themeUtils.isDarkMode()) {
- setTheme(R.style.AppTheme_Dark)
+ isLightTheme = if(themeUtils.isLightMode()) {
+ setTheme(R.style.AppTheme_Light)
true
} else {
- setTheme(R.style.AppTheme_Light)
+ setTheme(R.style.AppTheme_Dark)
false
}
}
@@ -33,8 +33,8 @@ abstract class HibiActivity : AppCompatActivity(), KodeinAware {
override fun onResume() {
super.onResume()
// Checks if the theme was changed while it was paused and then sees if the current theme of the activity matches
- val isDarkThemeNow = themeUtils.isDarkMode()
- if(isDarkTheme != isDarkThemeNow) {
+ val isLightThemeNow = themeUtils.isLightMode()
+ if(isLightTheme != isLightThemeNow) {
updateTheme()
recreate()
}
diff --git a/app/src/main/java/app/marcdev/hibi/internal/base/HibiBottomSheetDialogFragment.kt b/app/src/main/java/com/marcdonald/hibi/internal/base/HibiBottomSheetDialogFragment.kt
similarity index 82%
rename from app/src/main/java/app/marcdev/hibi/internal/base/HibiBottomSheetDialogFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/base/HibiBottomSheetDialogFragment.kt
index 1aa81fb..8f034f0 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/base/HibiBottomSheetDialogFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/base/HibiBottomSheetDialogFragment.kt
@@ -1,11 +1,11 @@
-package app.marcdev.hibi.internal.base
+package com.marcdonald.hibi.internal.base
import android.app.Dialog
import android.os.Bundle
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.utils.ThemeUtils
import com.google.android.material.bottomsheet.BottomSheetDialog
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.utils.ThemeUtils
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
@@ -16,10 +16,10 @@ abstract class HibiBottomSheetDialogFragment : BottomSheetDialogFragment(), Kode
private val themeUtils: ThemeUtils by instance()
override fun getTheme(): Int {
- return if(themeUtils.isDarkMode())
- R.style.Theme_Hibi_BottomSheetDialog_Dark
- else
+ return if(themeUtils.isLightMode())
R.style.Theme_Hibi_BottomSheetDialog_Light
+ else
+ R.style.Theme_Hibi_BottomSheetDialog_Dark
}
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
diff --git a/app/src/main/java/app/marcdev/hibi/internal/base/HibiDialogFragment.kt b/app/src/main/java/com/marcdonald/hibi/internal/base/HibiDialogFragment.kt
similarity index 77%
rename from app/src/main/java/app/marcdev/hibi/internal/base/HibiDialogFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/base/HibiDialogFragment.kt
index 5974d20..ea0e947 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/base/HibiDialogFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/base/HibiDialogFragment.kt
@@ -1,7 +1,7 @@
-package app.marcdev.hibi.internal.base
+package com.marcdonald.hibi.internal.base
import androidx.fragment.app.DialogFragment
-import app.marcdev.hibi.R
+import com.marcdonald.hibi.R
abstract class HibiDialogFragment : DialogFragment() {
override fun onStart() {
diff --git a/app/src/main/java/app/marcdev/hibi/internal/extension/ViewExtension.kt b/app/src/main/java/com/marcdonald/hibi/internal/extension/ViewExtension.kt
similarity index 71%
rename from app/src/main/java/app/marcdev/hibi/internal/extension/ViewExtension.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/extension/ViewExtension.kt
index 4f83649..bd3d83a 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/extension/ViewExtension.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/extension/ViewExtension.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.internal.extension
+package com.marcdonald.hibi.internal.extension
import android.view.View
diff --git a/app/src/main/java/app/marcdev/hibi/internal/notification/AlertReceiver.kt b/app/src/main/java/com/marcdonald/hibi/internal/notification/AlertReceiver.kt
similarity index 89%
rename from app/src/main/java/app/marcdev/hibi/internal/notification/AlertReceiver.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/notification/AlertReceiver.kt
index 4c2a32b..69ad794 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/notification/AlertReceiver.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/notification/AlertReceiver.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.internal.notification
+package com.marcdonald.hibi.internal.notification
import android.content.BroadcastReceiver
import android.content.Context
diff --git a/app/src/main/java/app/marcdev/hibi/internal/notification/NotificationHelper.kt b/app/src/main/java/com/marcdonald/hibi/internal/notification/NotificationHelper.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/internal/notification/NotificationHelper.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/notification/NotificationHelper.kt
index 0e47e54..9a87197 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/notification/NotificationHelper.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/notification/NotificationHelper.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.internal.notification
+package com.marcdonald.hibi.internal.notification
import android.app.AlarmManager
import android.app.PendingIntent
@@ -7,9 +7,9 @@ import android.content.Intent
import android.preference.PreferenceManager
import androidx.core.app.NotificationCompat
import androidx.core.app.NotificationManagerCompat
-import app.marcdev.hibi.MainActivity
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.*
+import com.marcdonald.hibi.MainActivity
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.*
class NotificationHelper {
diff --git a/app/src/main/java/app/marcdev/hibi/internal/utils/DateTimeUtils.kt b/app/src/main/java/com/marcdonald/hibi/internal/utils/DateTimeUtils.kt
similarity index 98%
rename from app/src/main/java/app/marcdev/hibi/internal/utils/DateTimeUtils.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/utils/DateTimeUtils.kt
index d412142..4f35a2f 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/utils/DateTimeUtils.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/utils/DateTimeUtils.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.internal.utils
+package com.marcdonald.hibi.internal.utils
import android.text.format.DateFormat
import java.util.*
diff --git a/app/src/main/java/app/marcdev/hibi/internal/utils/FileUtils.kt b/app/src/main/java/com/marcdonald/hibi/internal/utils/FileUtils.kt
similarity index 86%
rename from app/src/main/java/app/marcdev/hibi/internal/utils/FileUtils.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/utils/FileUtils.kt
index 5a3a4b8..0d6eb8c 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/utils/FileUtils.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/utils/FileUtils.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.internal.utils
+package com.marcdonald.hibi.internal.utils
import android.net.Uri
import java.io.File
diff --git a/app/src/main/java/app/marcdev/hibi/internal/utils/FileUtilsImpl.kt b/app/src/main/java/com/marcdonald/hibi/internal/utils/FileUtilsImpl.kt
similarity index 89%
rename from app/src/main/java/app/marcdev/hibi/internal/utils/FileUtilsImpl.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/utils/FileUtilsImpl.kt
index 58ea20c..a87781e 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/utils/FileUtilsImpl.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/utils/FileUtilsImpl.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.internal.utils
+package com.marcdonald.hibi.internal.utils
import android.content.Context
import android.net.Uri
import androidx.core.content.FileProvider
-import app.marcdev.hibi.internal.PACKAGE
-import app.marcdev.hibi.internal.PRODUCTION_DATABASE_NAME
+import com.marcdonald.hibi.internal.PACKAGE
+import com.marcdonald.hibi.internal.PRODUCTION_DATABASE_NAME
import timber.log.Timber
import java.io.File
diff --git a/app/src/main/java/com/marcdonald/hibi/internal/utils/ThemeUtils.kt b/app/src/main/java/com/marcdonald/hibi/internal/utils/ThemeUtils.kt
new file mode 100644
index 0000000..98deb93
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/internal/utils/ThemeUtils.kt
@@ -0,0 +1,7 @@
+package com.marcdonald.hibi.internal.utils
+
+interface ThemeUtils {
+ fun isLightMode(): Boolean
+
+ fun getAccentColor(): Int
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/internal/utils/ThemeUtilsImpl.kt b/app/src/main/java/com/marcdonald/hibi/internal/utils/ThemeUtilsImpl.kt
similarity index 51%
rename from app/src/main/java/app/marcdev/hibi/internal/utils/ThemeUtilsImpl.kt
rename to app/src/main/java/com/marcdonald/hibi/internal/utils/ThemeUtilsImpl.kt
index 20999e2..a587ed3 100644
--- a/app/src/main/java/app/marcdev/hibi/internal/utils/ThemeUtilsImpl.kt
+++ b/app/src/main/java/com/marcdonald/hibi/internal/utils/ThemeUtilsImpl.kt
@@ -1,19 +1,19 @@
-package app.marcdev.hibi.internal.utils
+package com.marcdonald.hibi.internal.utils
import android.content.Context
import android.preference.PreferenceManager
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_DARK_THEME
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_DARK_THEME
class ThemeUtilsImpl(private val context: Context) : ThemeUtils {
- override fun isDarkMode(): Boolean {
- return PreferenceManager.getDefaultSharedPreferences(context.applicationContext).getBoolean(PREF_DARK_THEME, false)
+ override fun isLightMode(): Boolean {
+ return !(PreferenceManager.getDefaultSharedPreferences(context.applicationContext).getBoolean(PREF_DARK_THEME, true))
}
override fun getAccentColor(): Int {
- return if(isDarkMode())
- context.resources.getColor(R.color.darkThemeColorAccent, null)
- else
+ return if(isLightMode())
context.resources.getColor(R.color.lightThemeColorAccent, null)
+ else
+ context.resources.getColor(R.color.darkThemeColorAccent, null)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/MainScreenFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/MainScreenFragment.kt
similarity index 84%
rename from app/src/main/java/app/marcdev/hibi/maintabs/MainScreenFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/MainScreenFragment.kt
index 8964456..4ecce53 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/MainScreenFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/MainScreenFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs
+package com.marcdonald.hibi.mainscreens
import android.os.Bundle
import android.view.LayoutInflater
@@ -8,19 +8,19 @@ import android.widget.ImageView
import androidx.fragment.app.Fragment
import androidx.navigation.Navigation
import androidx.viewpager.widget.ViewPager
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.BOOKS_TAB
-import app.marcdev.hibi.internal.CALENDAR_TAB
-import app.marcdev.hibi.internal.ENTRIES_TAB
-import app.marcdev.hibi.internal.TAGS_TAB
-import app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment.BooksFragment
-import app.marcdev.hibi.maintabs.calendarfragment.CalendarFragment
-import app.marcdev.hibi.maintabs.mainentries.MainEntriesFragment
-import app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment.TagsFragment
-import app.marcdev.hibi.uicomponents.addbookdialog.AddBookDialog
-import app.marcdev.hibi.uicomponents.addtagdialog.AddTagDialog
import com.google.android.material.button.MaterialButton
import com.google.android.material.tabs.TabLayout
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.BOOKS_TAB
+import com.marcdonald.hibi.internal.CALENDAR_TAB
+import com.marcdonald.hibi.internal.ENTRIES_TAB
+import com.marcdonald.hibi.internal.TAGS_TAB
+import com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment.BooksFragment
+import com.marcdonald.hibi.mainscreens.calendarscreen.CalendarFragment
+import com.marcdonald.hibi.mainscreens.mainentries.MainEntriesFragment
+import com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment.TagsFragment
+import com.marcdonald.hibi.uicomponents.addbookdialog.AddBookDialog
+import com.marcdonald.hibi.uicomponents.addtagdialog.AddTagDialog
import timber.log.Timber
class MainScreenFragment : Fragment() {
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/MainScreenMenuDialog.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/MainScreenMenuDialog.kt
new file mode 100644
index 0000000..8797bc5
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/MainScreenMenuDialog.kt
@@ -0,0 +1,42 @@
+package com.marcdonald.hibi.mainscreens
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.navigation.Navigation
+import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiBottomSheetDialogFragment
+
+class MainScreenMenuDialog : HibiBottomSheetDialogFragment() {
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ val view = inflater.inflate(R.layout.dialog_main_menu, container, false)
+ bindViews(view)
+ return view
+ }
+
+ private fun bindViews(view: View) {
+ view.findViewById(R.id.btn_main_menu_throwback)
+ .setOnClickListener {
+ val throwbackAction = MainScreenFragmentDirections.throwbackAction()
+ Navigation.findNavController(requireParentFragment().requireView()).navigate(throwbackAction)
+ dismiss()
+ }
+
+ view.findViewById(R.id.btn_main_menu_settings)
+ .setOnClickListener {
+ val settingsAction = MainScreenFragmentDirections.settingsAction()
+ Navigation.findNavController(requireParentFragment().requireView()).navigate(settingsAction)
+ dismiss()
+ }
+
+ view.findViewById(R.id.btn_main_menu_about)
+ .setOnClickListener {
+ val aboutAction = MainScreenFragmentDirections.aboutAction()
+ Navigation.findNavController(requireParentFragment().requireView()).navigate(aboutAction)
+ dismiss()
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/MainScreenPageAdapter.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/MainScreenPageAdapter.kt
similarity index 94%
rename from app/src/main/java/app/marcdev/hibi/maintabs/MainScreenPageAdapter.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/MainScreenPageAdapter.kt
index 6d2a6d4..79aef3f 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/MainScreenPageAdapter.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/MainScreenPageAdapter.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs
+package com.marcdonald.hibi.mainscreens
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/about/AboutFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/about/AboutFragment.kt
new file mode 100644
index 0000000..8bf720b
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/about/AboutFragment.kt
@@ -0,0 +1,23 @@
+package com.marcdonald.hibi.mainscreens.about
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import com.marcdonald.hibi.R
+
+class AboutFragment : Fragment() {
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ val view = inflater.inflate(R.layout.fragment_about, container, false)
+ view.findViewById(R.id.txt_back_toolbar_title).text = resources.getString(R.string.about)
+
+ view.findViewById(R.id.img_back_toolbar_back).setOnClickListener {
+ requireActivity().onBackPressed()
+ }
+ return view
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/AboutFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/about/AboutPreferenceFragment.kt
similarity index 76%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/AboutFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/about/AboutPreferenceFragment.kt
index d2c3c7f..d5e9ca5 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/AboutFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/about/AboutPreferenceFragment.kt
@@ -1,15 +1,16 @@
-package app.marcdev.hibi.maintabs.settings
+package com.marcdonald.hibi.mainscreens.about
import android.content.Intent
import android.net.Uri
import android.os.Bundle
import android.widget.Toast
+import androidx.navigation.Navigation
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
-import app.marcdev.hibi.BuildConfig
-import app.marcdev.hibi.R
+import com.marcdonald.hibi.BuildConfig
+import com.marcdonald.hibi.R
-class AboutFragment : PreferenceFragmentCompat() {
+class AboutPreferenceFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.about, rootKey)
bindViews()
@@ -19,8 +20,9 @@ class AboutFragment : PreferenceFragmentCompat() {
initVersion()
findPreference("about_oss").onPreferenceClickListener = Preference.OnPreferenceClickListener {
- val intent = Intent(requireContext(), OpenSourceLicencesActivity::class.java)
- startActivity(intent)
+ val ossAction = AboutFragmentDirections.ossAction()
+ Navigation.findNavController(requireView()).navigate(ossAction)
+
true
}
@@ -30,8 +32,8 @@ class AboutFragment : PreferenceFragmentCompat() {
}
findPreference("about_privacy").onPreferenceClickListener = Preference.OnPreferenceClickListener {
- val dialog = PrivacyDialog()
- dialog.show(requireFragmentManager(), "Privacy Dialog")
+ val privacyAction = AboutFragmentDirections.privacyAction()
+ Navigation.findNavController(requireView()).navigate(privacyAction)
true
}
@@ -41,7 +43,7 @@ class AboutFragment : PreferenceFragmentCompat() {
}
findPreference("about_author").onPreferenceClickListener = Preference.OnPreferenceClickListener {
- launchURL("https://github.com/MarcDonald/")
+ launchURL("https://marcdonald.com")
true
}
}
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/about/OpenSourceLicencesFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/about/OpenSourceLicencesFragment.kt
new file mode 100644
index 0000000..cab088d
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/about/OpenSourceLicencesFragment.kt
@@ -0,0 +1,71 @@
+package com.marcdonald.hibi.mainscreens.about
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.navigation.Navigation
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.uicomponents.views.LicenseDisplay
+
+class OpenSourceLicencesFragment : Fragment() {
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ val view = inflater.inflate(R.layout.fragment_oss, container, false)
+ bindViews(view)
+ return view
+ }
+
+ private fun bindViews(view: View) {
+ view.findViewById(R.id.txt_back_toolbar_title).text = resources.getString(R.string.open_source_licenses)
+ view.findViewById(R.id.img_back_toolbar_back).setOnClickListener(backClickListener)
+
+ view.findViewById(R.id.license_timber)
+ .setOnClickListener(openURLClickListener("https://github.com/JakeWharton/timber"))
+
+ view.findViewById(R.id.license_kodein)
+ .setOnClickListener(openURLClickListener("https://github.com/Kodein-Framework/Kodein-DI"))
+
+ view.findViewById(R.id.license_retrofit)
+ .setOnClickListener(openURLClickListener("https://github.com/square/retrofit"))
+
+ view.findViewById(R.id.license_gson)
+ .setOnClickListener(openURLClickListener("https://github.com/google/gson"))
+
+ view.findViewById(R.id.license_android_file_picker)
+ .setOnClickListener(openURLClickListener("https://github.com/DroidNinja/Android-FilePicker"))
+
+ view.findViewById(R.id.license_mplus)
+ .setOnClickListener(openURLClickListener("https://fonts.google.com/specimen/M+PLUS+Rounded+1c"))
+
+ view.findViewById(R.id.license_open_sans)
+ .setOnClickListener(openURLClickListener("https://fonts.google.com/specimen/Open+Sans"))
+
+ view.findViewById(R.id.license_google_material_icons)
+ .setOnClickListener(openURLClickListener("https://material.io/tools/icons/"))
+
+ view.findViewById(R.id.license_material_icons)
+ .setOnClickListener(openURLClickListener("https://materialdesignicons.com/"))
+
+ view.findViewById(R.id.license_glide)
+ .setOnClickListener(openURLClickListener("https://github.com/bumptech/glide"))
+ }
+
+ private val backClickListener = View.OnClickListener {
+ Navigation.findNavController(requireView()).popBackStack()
+ }
+
+ private fun openURLClickListener(url: String): View.OnClickListener {
+ return View.OnClickListener {
+ val uriUrl = Uri.parse(url)
+ val launchBrowser = Intent(Intent.ACTION_VIEW)
+ launchBrowser.data = uriUrl
+ startActivity(launchBrowser)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/about/PrivacyPolicyFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/about/PrivacyPolicyFragment.kt
new file mode 100644
index 0000000..8f1f220
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/about/PrivacyPolicyFragment.kt
@@ -0,0 +1,22 @@
+package com.marcdonald.hibi.mainscreens.about
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.navigation.Navigation
+import com.marcdonald.hibi.R
+
+class PrivacyPolicyFragment : Fragment() {
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ val view = inflater.inflate(R.layout.fragment_privacy, container, false)
+ view.findViewById(R.id.txt_back_toolbar_title).text = resources.getString(R.string.privacy_policy)
+ view.findViewById(R.id.img_back_toolbar_back).setOnClickListener {
+ Navigation.findNavController(requireView()).popBackStack()
+ }
+ return view
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/bookentriesfragment/BookEntriesFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/bookentriesfragment/BookEntriesFragment.kt
similarity index 91%
rename from app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/bookentriesfragment/BookEntriesFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/bookentriesfragment/BookEntriesFragment.kt
index a75e12d..559b5f4 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/bookentriesfragment/BookEntriesFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/bookentriesfragment/BookEntriesFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.booksfragment.bookentriesfragment
+package com.marcdonald.hibi.mainscreens.booksscreen.bookentriesfragment
import android.os.Bundle
import android.preference.PreferenceManager
@@ -15,11 +15,11 @@ import androidx.navigation.Navigation
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_ENTRY_DIVIDERS
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.maintabs.mainentriesrecycler.EntriesRecyclerAdapter
-import app.marcdev.hibi.maintabs.mainentriesrecycler.MainEntriesHeaderItemDecoration
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_ENTRY_DIVIDERS
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.EntriesRecyclerAdapter
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesHeaderItemDecoration
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
import org.kodein.di.generic.instance
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/bookentriesfragment/BookEntriesViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/bookentriesfragment/BookEntriesViewModel.kt
similarity index 88%
rename from app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/bookentriesfragment/BookEntriesViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/bookentriesfragment/BookEntriesViewModel.kt
index ad1d282..a067588 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/bookentriesfragment/BookEntriesViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/bookentriesfragment/BookEntriesViewModel.kt
@@ -1,16 +1,16 @@
-package app.marcdev.hibi.maintabs.booksfragment.bookentriesfragment
+package com.marcdonald.hibi.mainscreens.booksscreen.bookentriesfragment
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
-import app.marcdev.hibi.data.repository.BookRepository
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
-import app.marcdev.hibi.maintabs.mainentriesrecycler.BookEntryDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.MainEntriesDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.TagEntryDisplayItem
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.BookRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.BookEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.TagEntryDisplayItem
import kotlinx.coroutines.launch
class BookEntriesViewModel(private val bookRepository: BookRepository,
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/bookentriesfragment/BookEntriesViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/bookentriesfragment/BookEntriesViewModelFactory.kt
similarity index 69%
rename from app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/bookentriesfragment/BookEntriesViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/bookentriesfragment/BookEntriesViewModelFactory.kt
index 735db92..a275ee8 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/bookentriesfragment/BookEntriesViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/bookentriesfragment/BookEntriesViewModelFactory.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.maintabs.booksfragment.bookentriesfragment
+package com.marcdonald.hibi.mainscreens.booksscreen.bookentriesfragment
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
-import app.marcdev.hibi.data.repository.BookRepository
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.BookRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
class BookEntriesViewModelFactory(private val bookRepository: BookRepository,
private val bookEntryRelationRepository: BookEntryRelationRepository,
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BookDisplayItem.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BookDisplayItem.kt
similarity index 66%
rename from app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BookDisplayItem.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BookDisplayItem.kt
index ea150cf..39aea43 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BookDisplayItem.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BookDisplayItem.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment
+package com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment
data class BookDisplayItem(val bookId: Int,
val bookName: String,
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragment.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragment.kt
index 2c6e151..1693ec1 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment
+package com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment
import android.os.Bundle
import android.preference.PreferenceManager
@@ -12,9 +12,9 @@ import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_ENTRY_DIVIDERS
-import app.marcdev.hibi.internal.extension.show
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_ENTRY_DIVIDERS
+import com.marcdonald.hibi.internal.extension.show
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
import org.kodein.di.generic.instance
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragmentRecyclerViewHolder.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragmentRecyclerViewHolder.kt
similarity index 85%
rename from app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragmentRecyclerViewHolder.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragmentRecyclerViewHolder.kt
index 7e902d9..74b4a3a 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragmentRecyclerViewHolder.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragmentRecyclerViewHolder.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment
+package com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment
import android.os.Bundle
import android.view.View
@@ -6,10 +6,10 @@ import android.widget.TextView
import androidx.fragment.app.FragmentManager
import androidx.navigation.Navigation
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.BOOK_ID_KEY
-import app.marcdev.hibi.maintabs.MainScreenFragmentDirections
-import app.marcdev.hibi.uicomponents.addbookdialog.AddBookDialog
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.BOOK_ID_KEY
+import com.marcdonald.hibi.mainscreens.MainScreenFragmentDirections
+import com.marcdonald.hibi.uicomponents.addbookdialog.AddBookDialog
class BooksFragmentRecyclerViewHolder(itemView: View, private val fragmentManager: FragmentManager) : RecyclerView.ViewHolder(itemView) {
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragmentViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragmentViewModel.kt
similarity index 83%
rename from app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragmentViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragmentViewModel.kt
index 3678859..56a8830 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragmentViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragmentViewModel.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment
+package com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
class BooksFragmentViewModel(bookEntryRelationRepository: BookEntryRelationRepository) : ViewModel() {
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragmentViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragmentViewModelFactory.kt
similarity index 73%
rename from app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragmentViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragmentViewModelFactory.kt
index 20f636c..4ea8c2a 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksFragmentViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksFragmentViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment
+package com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
class BooksFragmentViewModelFactory(private val bookEntryRelationRepository: BookEntryRelationRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksRecyclerAdapter.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksRecyclerAdapter.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksRecyclerAdapter.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksRecyclerAdapter.kt
index 73421db..a19d7ee 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/booksfragment/mainbooksfragment/BooksRecyclerAdapter.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/booksscreen/mainbooksfragment/BooksRecyclerAdapter.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.booksfragment.mainbooksfragment
+package com.marcdonald.hibi.mainscreens.booksscreen.mainbooksfragment
import android.content.Context
import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.view.ViewGroup
import android.view.animation.AnimationUtils
import androidx.fragment.app.FragmentManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
+import com.marcdonald.hibi.R
class BooksRecyclerAdapter(private val context: Context, private val fragmentManager: FragmentManager)
: RecyclerView.Adapter() {
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/calendarfragment/CalendarFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/calendarscreen/CalendarFragment.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/maintabs/calendarfragment/CalendarFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/calendarscreen/CalendarFragment.kt
index e1c0e9e..7c5c969 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/calendarfragment/CalendarFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/calendarscreen/CalendarFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.calendarfragment
+package com.marcdonald.hibi.mainscreens.calendarscreen
import android.os.Bundle
import android.preference.PreferenceManager
@@ -13,10 +13,10 @@ import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_ENTRY_DIVIDERS
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.maintabs.mainentriesrecycler.EntriesRecyclerAdapter
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_ENTRY_DIVIDERS
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.EntriesRecyclerAdapter
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
import org.kodein.di.generic.instance
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/calendarfragment/CalendarTabViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/calendarscreen/CalendarTabViewModel.kt
similarity index 83%
rename from app/src/main/java/app/marcdev/hibi/maintabs/calendarfragment/CalendarTabViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/calendarscreen/CalendarTabViewModel.kt
index 8b5fe69..502f981 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/calendarfragment/CalendarTabViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/calendarscreen/CalendarTabViewModel.kt
@@ -1,16 +1,16 @@
-package app.marcdev.hibi.maintabs.calendarfragment
+package com.marcdonald.hibi.mainscreens.calendarscreen
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
-import app.marcdev.hibi.data.repository.EntryRepository
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
-import app.marcdev.hibi.maintabs.mainentriesrecycler.BookEntryDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.MainEntriesDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.TagEntryDisplayItem
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.EntryRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.BookEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.TagEntryDisplayItem
import kotlinx.coroutines.launch
import java.util.*
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/calendarfragment/CalendarTabViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/calendarscreen/CalendarTabViewModelFactory.kt
similarity index 70%
rename from app/src/main/java/app/marcdev/hibi/maintabs/calendarfragment/CalendarTabViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/calendarscreen/CalendarTabViewModelFactory.kt
index db21ddf..ef010be 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/calendarfragment/CalendarTabViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/calendarscreen/CalendarTabViewModelFactory.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.maintabs.calendarfragment
+package com.marcdonald.hibi.mainscreens.calendarscreen
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
-import app.marcdev.hibi.data.repository.EntryRepository
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.EntryRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
class CalendarTabViewModelFactory(private val entryRepository: EntryRepository,
private val tagEntryRelationRepository: TagEntryRelationRepository,
diff --git a/app/src/main/java/app/marcdev/hibi/entryscreens/ImageRecyclerAdapter.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/ImageRecyclerAdapter.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/entryscreens/ImageRecyclerAdapter.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/ImageRecyclerAdapter.kt
index 86ef9eb..847fc4c 100644
--- a/app/src/main/java/app/marcdev/hibi/entryscreens/ImageRecyclerAdapter.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/ImageRecyclerAdapter.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.entryscreens
+package com.marcdonald.hibi.mainscreens.entryscreens
import android.content.Context
import android.content.res.Resources
@@ -7,10 +7,10 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.maintabs.mainentriesrecycler.BaseEntriesRecyclerViewHolder
import com.bumptech.glide.Glide
import com.bumptech.glide.request.RequestOptions
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.BaseEntriesRecyclerViewHolder
class ImageRecyclerAdapter(private val onItemClick: (String) -> Unit,
private val onItemLongClick: (String) -> Unit,
diff --git a/app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/AddEntryFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/AddEntryFragment.kt
similarity index 94%
rename from app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/AddEntryFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/AddEntryFragment.kt
index 7aa67d0..9d36999 100644
--- a/app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/AddEntryFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/AddEntryFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.entryscreens.addentryscreen
+package com.marcdonald.hibi.mainscreens.entryscreens.addentryscreen
import android.Manifest
import android.app.Activity
@@ -23,20 +23,20 @@ import androidx.lifecycle.ViewModelProviders
import androidx.navigation.Navigation
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.entryscreens.ImageRecyclerAdapter
-import app.marcdev.hibi.internal.*
-import app.marcdev.hibi.internal.utils.ThemeUtils
-import app.marcdev.hibi.search.searchresults.SearchResultsDialog
-import app.marcdev.hibi.uicomponents.BinaryOptionDialog
-import app.marcdev.hibi.uicomponents.DatePickerDialog
-import app.marcdev.hibi.uicomponents.TimePickerDialog
-import app.marcdev.hibi.uicomponents.addentrytobookdialog.AddEntryToBookDialog
-import app.marcdev.hibi.uicomponents.addtagtoentrydialog.AddTagToEntryDialog
-import app.marcdev.hibi.uicomponents.locationdialog.AddLocationToEntryDialog
-import app.marcdev.hibi.uicomponents.newwordsdialog.NewWordDialog
-import app.marcdev.hibi.uicomponents.views.SearchBar
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.*
+import com.marcdonald.hibi.internal.utils.ThemeUtils
+import com.marcdonald.hibi.mainscreens.entryscreens.ImageRecyclerAdapter
+import com.marcdonald.hibi.search.searchresults.SearchResultsDialog
+import com.marcdonald.hibi.uicomponents.BinaryOptionDialog
+import com.marcdonald.hibi.uicomponents.DatePickerDialog
+import com.marcdonald.hibi.uicomponents.TimePickerDialog
+import com.marcdonald.hibi.uicomponents.addentrytobookdialog.AddEntryToBookDialog
+import com.marcdonald.hibi.uicomponents.addtagtoentrydialog.AddTagToEntryDialog
+import com.marcdonald.hibi.uicomponents.locationdialog.AddLocationToEntryDialog
+import com.marcdonald.hibi.uicomponents.newwordsdialog.NewWordDialog
+import com.marcdonald.hibi.uicomponents.views.SearchBar
import droidninja.filepicker.FilePickerBuilder
import droidninja.filepicker.FilePickerConst
import org.kodein.di.KodeinAware
diff --git a/app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/AddEntryViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/AddEntryViewModel.kt
similarity index 95%
rename from app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/AddEntryViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/AddEntryViewModel.kt
index f0c9e41..cdc18d8 100644
--- a/app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/AddEntryViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/AddEntryViewModel.kt
@@ -1,13 +1,13 @@
-package app.marcdev.hibi.entryscreens.addentryscreen
+package com.marcdonald.hibi.mainscreens.entryscreens.addentryscreen
import android.app.Application
import android.preference.PreferenceManager
import androidx.lifecycle.*
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.data.entity.EntryImage
-import app.marcdev.hibi.data.repository.*
-import app.marcdev.hibi.internal.PREF_SAVE_ON_PAUSE
-import app.marcdev.hibi.internal.utils.FileUtils
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.entity.EntryImage
+import com.marcdonald.hibi.data.repository.*
+import com.marcdonald.hibi.internal.PREF_SAVE_ON_PAUSE
+import com.marcdonald.hibi.internal.utils.FileUtils
import kotlinx.coroutines.launch
import timber.log.Timber
import java.io.File
diff --git a/app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/AddEntryViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/AddEntryViewModelFactory.kt
similarity index 86%
rename from app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/AddEntryViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/AddEntryViewModelFactory.kt
index f25a46f..d2755fc 100644
--- a/app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/AddEntryViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/AddEntryViewModelFactory.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.entryscreens.addentryscreen
+package com.marcdonald.hibi.mainscreens.entryscreens.addentryscreen
import android.app.Application
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.*
-import app.marcdev.hibi.internal.utils.FileUtils
+import com.marcdonald.hibi.data.repository.*
+import com.marcdonald.hibi.internal.utils.FileUtils
class AddEntryViewModelFactory(private val application: Application,
private val entryRepository: EntryRepository,
diff --git a/app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/DateTimeStore.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/DateTimeStore.kt
similarity index 86%
rename from app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/DateTimeStore.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/DateTimeStore.kt
index 58861ab..ed36e9a 100644
--- a/app/src/main/java/app/marcdev/hibi/entryscreens/addentryscreen/DateTimeStore.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/addentryscreen/DateTimeStore.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.entryscreens.addentryscreen
+package com.marcdonald.hibi.mainscreens.entryscreens.addentryscreen
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
-import app.marcdev.hibi.internal.utils.formatDateForDisplay
-import app.marcdev.hibi.internal.utils.formatTimeForDisplay
+import com.marcdonald.hibi.internal.utils.formatDateForDisplay
+import com.marcdonald.hibi.internal.utils.formatTimeForDisplay
import java.util.*
class DateTimeStore {
diff --git a/app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/FullscreenImageFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/FullscreenImageFragment.kt
similarity index 91%
rename from app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/FullscreenImageFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/FullscreenImageFragment.kt
index 101c67a..94ade08 100644
--- a/app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/FullscreenImageFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/FullscreenImageFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.entryscreens.viewentryscreen
+package com.marcdonald.hibi.mainscreens.entryscreens.viewentryscreen
import android.os.Bundle
import android.view.LayoutInflater
@@ -6,9 +6,9 @@ import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.fragment.app.Fragment
-import app.marcdev.hibi.R
import com.bumptech.glide.Glide
import com.bumptech.glide.request.RequestOptions
+import com.marcdonald.hibi.R
class FullscreenImageFragment : Fragment() {
diff --git a/app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/ViewEntryFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/ViewEntryFragment.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/ViewEntryFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/ViewEntryFragment.kt
index 8751a89..384a182 100644
--- a/app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/ViewEntryFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/ViewEntryFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.entryscreens.viewentryscreen
+package com.marcdonald.hibi.mainscreens.entryscreens.viewentryscreen
import android.content.ClipData
import android.content.ClipboardManager
@@ -18,20 +18,20 @@ import androidx.lifecycle.ViewModelProviders
import androidx.navigation.Navigation
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.entryscreens.ImageRecyclerAdapter
-import app.marcdev.hibi.internal.ENTRY_ID_KEY
-import app.marcdev.hibi.internal.IS_EDIT_MODE_KEY
-import app.marcdev.hibi.internal.SEARCH_TERM_KEY
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.search.searchresults.SearchResultsDialog
-import app.marcdev.hibi.uicomponents.BinaryOptionDialog
-import app.marcdev.hibi.uicomponents.newwordsdialog.NewWordDialog
-import app.marcdev.hibi.uicomponents.views.SearchBar
import com.google.android.material.button.MaterialButton
import com.google.android.material.chip.Chip
import com.google.android.material.chip.ChipGroup
import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.ENTRY_ID_KEY
+import com.marcdonald.hibi.internal.IS_EDIT_MODE_KEY
+import com.marcdonald.hibi.internal.SEARCH_TERM_KEY
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.mainscreens.entryscreens.ImageRecyclerAdapter
+import com.marcdonald.hibi.search.searchresults.SearchResultsDialog
+import com.marcdonald.hibi.uicomponents.BinaryOptionDialog
+import com.marcdonald.hibi.uicomponents.newwordsdialog.NewWordDialog
+import com.marcdonald.hibi.uicomponents.views.SearchBar
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
import org.kodein.di.generic.instance
diff --git a/app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/ViewEntryViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/ViewEntryViewModel.kt
similarity index 89%
rename from app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/ViewEntryViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/ViewEntryViewModel.kt
index cca30a3..33e94a3 100644
--- a/app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/ViewEntryViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/ViewEntryViewModel.kt
@@ -1,12 +1,12 @@
-package app.marcdev.hibi.entryscreens.viewentryscreen
+package com.marcdonald.hibi.mainscreens.entryscreens.viewentryscreen
import androidx.lifecycle.*
-import app.marcdev.hibi.data.entity.Book
-import app.marcdev.hibi.data.entity.Tag
-import app.marcdev.hibi.data.repository.*
-import app.marcdev.hibi.internal.utils.FileUtils
-import app.marcdev.hibi.internal.utils.formatDateForDisplay
-import app.marcdev.hibi.internal.utils.formatTimeForDisplay
+import com.marcdonald.hibi.data.entity.Book
+import com.marcdonald.hibi.data.entity.Tag
+import com.marcdonald.hibi.data.repository.*
+import com.marcdonald.hibi.internal.utils.FileUtils
+import com.marcdonald.hibi.internal.utils.formatDateForDisplay
+import com.marcdonald.hibi.internal.utils.formatTimeForDisplay
import kotlinx.coroutines.launch
import timber.log.Timber
@@ -63,7 +63,7 @@ class ViewEntryViewModel(private val entryRepository: EntryRepository,
list.forEach { entryImage ->
returnList.add(fileUtils.imagesDirectory + entryImage.imageName)
}
- return@switchMap MutableLiveData>(returnList) as LiveData>
+ return@switchMap MutableLiveData>(returnList)
}
fun passArguments(entryIdArg: Int) {
diff --git a/app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/ViewEntryViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/ViewEntryViewModelFactory.kt
similarity index 84%
rename from app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/ViewEntryViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/ViewEntryViewModelFactory.kt
index f3127d4..77bf0b6 100644
--- a/app/src/main/java/app/marcdev/hibi/entryscreens/viewentryscreen/ViewEntryViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/entryscreens/viewentryscreen/ViewEntryViewModelFactory.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.entryscreens.viewentryscreen
+package com.marcdonald.hibi.mainscreens.entryscreens.viewentryscreen
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.*
-import app.marcdev.hibi.internal.utils.FileUtils
+import com.marcdonald.hibi.data.repository.*
+import com.marcdonald.hibi.internal.utils.FileUtils
class ViewEntryViewModelFactory(private val entryRepository: EntryRepository,
private val tagEntryRelationRepository: TagEntryRelationRepository,
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentries/MainEntriesFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentries/MainEntriesFragment.kt
similarity index 89%
rename from app/src/main/java/app/marcdev/hibi/maintabs/mainentries/MainEntriesFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/mainentries/MainEntriesFragment.kt
index 4324da8..e6462d2 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentries/MainEntriesFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentries/MainEntriesFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.mainentries
+package com.marcdonald.hibi.mainscreens.mainentries
import android.os.Bundle
import android.view.LayoutInflater
@@ -13,16 +13,16 @@ import androidx.preference.PreferenceManager
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_ENTRY_DIVIDERS
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.maintabs.mainentriesrecycler.EntriesRecyclerAdapter
-import app.marcdev.hibi.maintabs.mainentriesrecycler.MainEntriesHeaderItemDecoration
-import app.marcdev.hibi.uicomponents.BinaryOptionDialog
-import app.marcdev.hibi.uicomponents.TextInputDialog
-import app.marcdev.hibi.uicomponents.multiselectdialog.MultiSelectMenu
-import app.marcdev.hibi.uicomponents.multiselectdialog.addmultientrytobookdialog.AddMultiEntryToBookDialog
-import app.marcdev.hibi.uicomponents.multiselectdialog.addtagtomultientrydialog.AddTagToMultiEntryDialog
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_ENTRY_DIVIDERS
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.EntriesRecyclerAdapter
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesHeaderItemDecoration
+import com.marcdonald.hibi.uicomponents.BinaryOptionDialog
+import com.marcdonald.hibi.uicomponents.TextInputDialog
+import com.marcdonald.hibi.uicomponents.multiselectdialog.MultiSelectMenu
+import com.marcdonald.hibi.uicomponents.multiselectdialog.addmultientrytobookdialog.AddMultiEntryToBookDialog
+import com.marcdonald.hibi.uicomponents.multiselectdialog.addtagtomultientrydialog.AddTagToMultiEntryDialog
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
import org.kodein.di.generic.instance
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentries/MainEntriesViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentries/MainEntriesViewModel.kt
similarity index 88%
rename from app/src/main/java/app/marcdev/hibi/maintabs/mainentries/MainEntriesViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/mainentries/MainEntriesViewModel.kt
index 21253e4..44b8d4c 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentries/MainEntriesViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentries/MainEntriesViewModel.kt
@@ -1,18 +1,18 @@
-package app.marcdev.hibi.maintabs.mainentries
+package com.marcdonald.hibi.mainscreens.mainentries
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.entity.BookEntryRelation
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.data.entity.TagEntryRelation
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
-import app.marcdev.hibi.data.repository.EntryRepository
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
-import app.marcdev.hibi.maintabs.mainentriesrecycler.BookEntryDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.MainEntriesDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.TagEntryDisplayItem
+import com.marcdonald.hibi.data.entity.BookEntryRelation
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.entity.TagEntryRelation
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.EntryRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.BookEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.TagEntryDisplayItem
import kotlinx.coroutines.launch
class MainEntriesViewModel(private val entryRepository: EntryRepository,
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentries/MainEntriesViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentries/MainEntriesViewModelFactory.kt
similarity index 71%
rename from app/src/main/java/app/marcdev/hibi/maintabs/mainentries/MainEntriesViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/mainentries/MainEntriesViewModelFactory.kt
index e125c9d..810bda1 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentries/MainEntriesViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentries/MainEntriesViewModelFactory.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.maintabs.mainentries
+package com.marcdonald.hibi.mainscreens.mainentries
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
-import app.marcdev.hibi.data.repository.EntryRepository
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.EntryRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
class MainEntriesViewModelFactory(private val entryRepository: EntryRepository,
private val tagEntryRelationRepository: TagEntryRelationRepository,
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/BaseEntriesRecyclerViewHolder.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/BaseEntriesRecyclerViewHolder.kt
similarity index 80%
rename from app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/BaseEntriesRecyclerViewHolder.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/BaseEntriesRecyclerViewHolder.kt
index dd4e05b..00b0646 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/BaseEntriesRecyclerViewHolder.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/BaseEntriesRecyclerViewHolder.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.mainentriesrecycler
+package com.marcdonald.hibi.mainscreens.mainentriesrecycler
import android.view.View
import androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/BookEntryDisplayItem.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/BookEntryDisplayItem.kt
new file mode 100644
index 0000000..3f69bd0
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/BookEntryDisplayItem.kt
@@ -0,0 +1,3 @@
+package com.marcdonald.hibi.mainscreens.mainentriesrecycler
+
+data class BookEntryDisplayItem(var entryId: Int, var bookName: String)
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/EntriesRecyclerAdapter.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/EntriesRecyclerAdapter.kt
similarity index 97%
rename from app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/EntriesRecyclerAdapter.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/EntriesRecyclerAdapter.kt
index f9194e3..be982cf 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/EntriesRecyclerAdapter.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/EntriesRecyclerAdapter.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.mainentriesrecycler
+package com.marcdonald.hibi.mainscreens.mainentriesrecycler
import android.content.Context
import android.content.res.Resources
@@ -10,7 +10,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
+import com.marcdonald.hibi.R
class EntriesRecyclerAdapter(private val context: Context, private val theme: Resources.Theme) : RecyclerView.Adapter() {
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/EntriesRecyclerViewHolder.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/EntriesRecyclerViewHolder.kt
similarity index 87%
rename from app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/EntriesRecyclerViewHolder.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/EntriesRecyclerViewHolder.kt
index fadacdf..c6b7977 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/EntriesRecyclerViewHolder.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/EntriesRecyclerViewHolder.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.mainentriesrecycler
+package com.marcdonald.hibi.mainscreens.mainentriesrecycler
import android.content.res.Resources
import android.preference.PreferenceManager
@@ -9,16 +9,16 @@ import android.widget.LinearLayout
import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.navigation.Navigation
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_BOOKS
-import app.marcdev.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_LOCATION
-import app.marcdev.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_TAGS
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.internal.utils.formatDateForDisplay
-import app.marcdev.hibi.internal.utils.formatTimeForDisplay
-import app.marcdev.hibi.maintabs.MainScreenFragmentDirections
import com.google.android.material.chip.Chip
import com.google.android.material.chip.ChipGroup
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_BOOKS
+import com.marcdonald.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_LOCATION
+import com.marcdonald.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_TAGS
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.internal.utils.formatDateForDisplay
+import com.marcdonald.hibi.internal.utils.formatTimeForDisplay
+import com.marcdonald.hibi.mainscreens.MainScreenFragmentDirections
class EntriesRecyclerViewHolder(private val onSelectClick: View.OnClickListener?,
itemView: View,
@@ -99,8 +99,6 @@ class EntriesRecyclerViewHolder(private val onSelectClick: View.OnClickListener?
item.tags.forEach { tagName ->
val chip = Chip(itemView.context)
chip.text = tagName
- chip.scaleX = 0.9f
- chip.scaleY = 0.9f
tagChipGroup.addView(chip)
}
}
@@ -121,8 +119,6 @@ class EntriesRecyclerViewHolder(private val onSelectClick: View.OnClickListener?
item.books.forEach { bookName ->
val chip = Chip(itemView.context)
chip.text = bookName
- chip.scaleX = 0.9f
- chip.scaleY = 0.9f
bookChipGroup.addView(chip)
}
}
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/EntriesRecyclerViewHolderHeader.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/EntriesRecyclerViewHolderHeader.kt
similarity index 76%
rename from app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/EntriesRecyclerViewHolderHeader.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/EntriesRecyclerViewHolderHeader.kt
index 3c03124..96044b8 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/EntriesRecyclerViewHolderHeader.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/EntriesRecyclerViewHolderHeader.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.maintabs.mainentriesrecycler
+package com.marcdonald.hibi.mainscreens.mainentriesrecycler
import android.view.View
import android.widget.TextView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.utils.formatDateForHeader
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.utils.formatDateForHeader
class EntriesRecyclerViewHolderHeader(itemView: View) : BaseEntriesRecyclerViewHolder(itemView) {
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/MainEntriesDisplayItem.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/MainEntriesDisplayItem.kt
similarity index 56%
rename from app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/MainEntriesDisplayItem.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/MainEntriesDisplayItem.kt
index d3a3f20..a98f095 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/MainEntriesDisplayItem.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/MainEntriesDisplayItem.kt
@@ -1,6 +1,6 @@
-package app.marcdev.hibi.maintabs.mainentriesrecycler
+package com.marcdonald.hibi.mainscreens.mainentriesrecycler
-import app.marcdev.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.entity.Entry
data class MainEntriesDisplayItem(var entry: Entry, var tags: List, var books: List) {
var isSelected: Boolean = false
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/MainEntriesHeaderItemDecoration.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/MainEntriesHeaderItemDecoration.kt
similarity index 98%
rename from app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/MainEntriesHeaderItemDecoration.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/MainEntriesHeaderItemDecoration.kt
index e9403a6..73cca95 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/MainEntriesHeaderItemDecoration.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/MainEntriesHeaderItemDecoration.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.mainentriesrecycler
+package com.marcdonald.hibi.mainscreens.mainentriesrecycler
import android.graphics.Canvas
import android.graphics.Rect
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/TagEntryDisplayItem.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/TagEntryDisplayItem.kt
similarity index 50%
rename from app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/TagEntryDisplayItem.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/TagEntryDisplayItem.kt
index b39b315..221cea5 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/mainentriesrecycler/TagEntryDisplayItem.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/mainentriesrecycler/TagEntryDisplayItem.kt
@@ -1,3 +1,3 @@
-package app.marcdev.hibi.maintabs.mainentriesrecycler
+package com.marcdonald.hibi.mainscreens.mainentriesrecycler
data class TagEntryDisplayItem(var entryId: Int, var tagName: String)
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/searchentries/EntrySearchCriteria.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/EntrySearchCriteria.kt
similarity index 96%
rename from app/src/main/java/app/marcdev/hibi/maintabs/searchentries/EntrySearchCriteria.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/EntrySearchCriteria.kt
index 003cfc6..2b9a8b5 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/searchentries/EntrySearchCriteria.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/EntrySearchCriteria.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.searchentries
+package com.marcdonald.hibi.mainscreens.searchentries
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/searchentries/searchentriesscreen/SearchEntriesFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/searchentriesscreen/SearchEntriesFragment.kt
similarity index 95%
rename from app/src/main/java/app/marcdev/hibi/maintabs/searchentries/searchentriesscreen/SearchEntriesFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/searchentriesscreen/SearchEntriesFragment.kt
index 8011403..a3eb813 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/searchentries/searchentriesscreen/SearchEntriesFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/searchentriesscreen/SearchEntriesFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.searchentries.searchentriesscreen
+package com.marcdonald.hibi.mainscreens.searchentries.searchentriesscreen
import android.os.Bundle
import android.preference.PreferenceManager
@@ -17,18 +17,18 @@ import androidx.navigation.Navigation
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_ENTRY_DIVIDERS
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.internal.utils.ThemeUtils
-import app.marcdev.hibi.maintabs.mainentriesrecycler.EntriesRecyclerAdapter
-import app.marcdev.hibi.maintabs.mainentriesrecycler.MainEntriesHeaderItemDecoration
-import app.marcdev.hibi.uicomponents.DatePickerDialog
-import app.marcdev.hibi.uicomponents.TextInputDialog
-import app.marcdev.hibi.uicomponents.views.ChipWithId
import com.google.android.material.bottomsheet.BottomSheetBehavior
import com.google.android.material.button.MaterialButton
import com.google.android.material.chip.ChipGroup
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_ENTRY_DIVIDERS
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.internal.utils.ThemeUtils
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.EntriesRecyclerAdapter
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesHeaderItemDecoration
+import com.marcdonald.hibi.uicomponents.DatePickerDialog
+import com.marcdonald.hibi.uicomponents.TextInputDialog
+import com.marcdonald.hibi.uicomponents.views.ChipWithId
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
import org.kodein.di.generic.instance
@@ -356,7 +356,7 @@ class SearchEntriesFragment : Fragment(), KodeinAware {
displayTag.text = tag.name
displayTag.itemId = tag.id
displayTag.isCheckable = true
- if(themeUtils.isDarkMode()) {
+ if(!themeUtils.isLightMode()) {
displayTag.setChipBackgroundColorResource(R.color.darkThemeDarkChipBackground)
}
tagChipGroup.addView(displayTag)
@@ -385,7 +385,7 @@ class SearchEntriesFragment : Fragment(), KodeinAware {
displayBook.text = book.name
displayBook.itemId = book.id
displayBook.isCheckable = true
- if(themeUtils.isDarkMode()) {
+ if(!themeUtils.isLightMode()) {
displayBook.setChipBackgroundColorResource(R.color.darkThemeDarkChipBackground)
}
bookChipGroup.addView(displayBook)
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/searchentries/searchentriesscreen/SearchEntriesViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/searchentriesscreen/SearchEntriesViewModel.kt
similarity index 95%
rename from app/src/main/java/app/marcdev/hibi/maintabs/searchentries/searchentriesscreen/SearchEntriesViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/searchentriesscreen/SearchEntriesViewModel.kt
index 7cc4c41..45c4ac5 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/searchentries/searchentriesscreen/SearchEntriesViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/searchentriesscreen/SearchEntriesViewModel.kt
@@ -1,18 +1,18 @@
-package app.marcdev.hibi.maintabs.searchentries.searchentriesscreen
+package com.marcdonald.hibi.mainscreens.searchentries.searchentriesscreen
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.entity.Book
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.data.entity.Tag
-import app.marcdev.hibi.data.repository.*
-import app.marcdev.hibi.internal.utils.formatDateForDisplay
-import app.marcdev.hibi.maintabs.mainentriesrecycler.BookEntryDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.MainEntriesDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.TagEntryDisplayItem
-import app.marcdev.hibi.maintabs.searchentries.EntrySearchCriteria
+import com.marcdonald.hibi.data.entity.Book
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.entity.Tag
+import com.marcdonald.hibi.data.repository.*
+import com.marcdonald.hibi.internal.utils.formatDateForDisplay
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.BookEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.TagEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.searchentries.EntrySearchCriteria
import kotlinx.coroutines.launch
class SearchEntriesViewModel(private val entryRepository: EntryRepository,
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/searchentries/searchentriesscreen/SearchEntriesViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/searchentriesscreen/SearchEntriesViewModelFactory.kt
similarity index 87%
rename from app/src/main/java/app/marcdev/hibi/maintabs/searchentries/searchentriesscreen/SearchEntriesViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/searchentriesscreen/SearchEntriesViewModelFactory.kt
index 6a394cd..9a9984e 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/searchentries/searchentriesscreen/SearchEntriesViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/searchentries/searchentriesscreen/SearchEntriesViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.maintabs.searchentries.searchentriesscreen
+package com.marcdonald.hibi.mainscreens.searchentries.searchentriesscreen
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.*
+import com.marcdonald.hibi.data.repository.*
class SearchEntriesViewModelFactory(private val entryRepository: EntryRepository,
private val tagRepository: TagRepository,
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/MainEntriesDisplayPreferenceDialog.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/MainEntriesDisplayPreferenceDialog.kt
similarity index 80%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/MainEntriesDisplayPreferenceDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/MainEntriesDisplayPreferenceDialog.kt
index 9375e2d..44dd134 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/MainEntriesDisplayPreferenceDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/MainEntriesDisplayPreferenceDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.settings
+package com.marcdonald.hibi.mainscreens.settings
import android.os.Bundle
import android.preference.PreferenceManager
@@ -6,14 +6,14 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.CheckBox
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_BOOKS
-import app.marcdev.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_LOCATION
-import app.marcdev.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_TAGS
-import app.marcdev.hibi.internal.base.HibiDialogFragment
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_BOOKS
+import com.marcdonald.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_LOCATION
+import com.marcdonald.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_TAGS
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
-class MainEntriesDisplayPreferenceDialog(private val okClick: (Boolean) -> Unit) : HibiDialogFragment() {
+class MainEntriesDisplayPreferenceDialog : HibiDialogFragment() {
//
private lateinit var locationCheckBox: CheckBox
private lateinit var tagsCheckBox: CheckBox
@@ -47,6 +47,5 @@ class MainEntriesDisplayPreferenceDialog(private val okClick: (Boolean) -> Unit)
prefs.edit().putBoolean(PREF_MAIN_ENTRY_DISPLAY_TAGS, tagsCheckBox.isChecked).apply()
prefs.edit().putBoolean(PREF_MAIN_ENTRY_DISPLAY_BOOKS, booksCheckBox.isChecked).apply()
dismiss()
- okClick(true)
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/SettingsFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/SettingsFragment.kt
new file mode 100644
index 0000000..5c7cfea
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/SettingsFragment.kt
@@ -0,0 +1,23 @@
+package com.marcdonald.hibi.mainscreens.settings
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import androidx.navigation.Navigation
+import com.marcdonald.hibi.R
+
+class SettingsFragment : Fragment() {
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ val view = inflater.inflate(R.layout.fragment_settings, container, false)
+ view.findViewById(R.id.txt_back_toolbar_title).text = resources.getString(R.string.settings)
+ view.findViewById(R.id.img_back_toolbar_back).setOnClickListener {
+ Navigation.findNavController(view).popBackStack()
+ }
+ return view
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/SettingsFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/SettingsPreferenceFragment.kt
similarity index 88%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/SettingsFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/SettingsPreferenceFragment.kt
index b07b962..8a4175e 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/SettingsPreferenceFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.settings
+package com.marcdonald.hibi.mainscreens.settings
import android.Manifest
import android.app.Activity
@@ -14,14 +14,13 @@ import androidx.core.content.ContextCompat
import androidx.preference.ListPreference
import androidx.preference.Preference
import androidx.preference.PreferenceFragmentCompat
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.*
-import app.marcdev.hibi.internal.notification.NotificationHelper
-import app.marcdev.hibi.maintabs.settings.backupdialog.BackupDialog
-import app.marcdev.hibi.maintabs.settings.restoredialog.RestoreDialog
-import app.marcdev.hibi.maintabs.settings.updatedialog.UpdateDialog
-import app.marcdev.hibi.uicomponents.TimePickerDialog
-import com.google.android.material.snackbar.Snackbar
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.*
+import com.marcdonald.hibi.internal.notification.NotificationHelper
+import com.marcdonald.hibi.mainscreens.settings.backupdialog.BackupDialog
+import com.marcdonald.hibi.mainscreens.settings.restoredialog.RestoreDialog
+import com.marcdonald.hibi.mainscreens.settings.updatedialog.UpdateDialog
+import com.marcdonald.hibi.uicomponents.TimePickerDialog
import droidninja.filepicker.FilePickerBuilder
import droidninja.filepicker.FilePickerConst
import org.kodein.di.KodeinAware
@@ -31,7 +30,7 @@ import java.util.*
import java.util.Calendar.*
-class SettingsFragment : PreferenceFragmentCompat(), KodeinAware {
+class SettingsPreferenceFragment : PreferenceFragmentCompat(), KodeinAware {
// Kodein initialisation
override val kodein by closestKodein()
@@ -47,7 +46,6 @@ class SettingsFragment : PreferenceFragmentCompat(), KodeinAware {
private fun bindViews() {
val sharedPreferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
- findPreference(PREF_ENTRY_DIVIDERS).onPreferenceChangeListener = mayRequireRestartChangeListener
findPreference(PREF_DARK_THEME).onPreferenceChangeListener = onThemeChangeListener
findPreference(PREF_REMINDER_NOTIFICATION).onPreferenceChangeListener = reminderChangeListener
if(sharedPreferences.getBoolean(PREF_REMINDER_NOTIFICATION, false)) {
@@ -205,22 +203,12 @@ class SettingsFragment : PreferenceFragmentCompat(), KodeinAware {
dialog.show(requireFragmentManager(), "Restore Dialog")
}
- private val mayRequireRestartChangeListener = Preference.OnPreferenceChangeListener { _, _ ->
- displayMayRequireRestart()
- true
- }
-
private val mainEntryDisplayItemsClickListener = Preference.OnPreferenceClickListener {
- val dialog = MainEntriesDisplayPreferenceDialog(::onMainEntryDisplayItemOnClick)
+ val dialog = MainEntriesDisplayPreferenceDialog()
dialog.show(requireFragmentManager(), "Main Entries Display Preference Dialog")
true
}
- private fun onMainEntryDisplayItemOnClick(show: Boolean) {
- if(show)
- displayMayRequireRestart()
- }
-
private fun matchSummaryToSelection(preference: Preference, value: String) {
if(preference is ListPreference) {
val index = preference.findIndexOfValue(value)
@@ -238,10 +226,6 @@ class SettingsFragment : PreferenceFragmentCompat(), KodeinAware {
}
}
- private fun displayMayRequireRestart() {
- Snackbar.make(requireView(), resources.getString(R.string.may_need_restart), Snackbar.LENGTH_SHORT).show()
- }
-
override fun onDestroy() {
super.onDestroy()
PreferenceManager.getDefaultSharedPreferences(requireContext()).unregisterOnSharedPreferenceChangeListener(reminderTimeChangeListener)
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/backupdialog/BackupDialog.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/backupdialog/BackupDialog.kt
similarity index 94%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/backupdialog/BackupDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/backupdialog/BackupDialog.kt
index 5a716f2..2faa8ca 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/backupdialog/BackupDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/backupdialog/BackupDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.settings.backupdialog
+package com.marcdonald.hibi.mainscreens.settings.backupdialog
import android.content.Intent
import android.os.Bundle
@@ -10,10 +10,10 @@ import android.widget.ProgressBar
import android.widget.TextView
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiDialogFragment
-import app.marcdev.hibi.internal.extension.show
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
+import com.marcdonald.hibi.internal.extension.show
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/backupdialog/BackupDialogViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/backupdialog/BackupDialogViewModel.kt
similarity index 94%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/backupdialog/BackupDialogViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/backupdialog/BackupDialogViewModel.kt
index a099062..c4d28cb 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/backupdialog/BackupDialogViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/backupdialog/BackupDialogViewModel.kt
@@ -1,12 +1,12 @@
-package app.marcdev.hibi.maintabs.settings.backupdialog
+package com.marcdonald.hibi.mainscreens.settings.backupdialog
import android.net.Uri
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.internal.PRODUCTION_DATABASE_NAME
-import app.marcdev.hibi.internal.utils.FileUtils
+import com.marcdonald.hibi.internal.PRODUCTION_DATABASE_NAME
+import com.marcdonald.hibi.internal.utils.FileUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import java.io.*
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/backupdialog/BackupDialogViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/backupdialog/BackupDialogViewModelFactory.kt
similarity index 75%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/backupdialog/BackupDialogViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/backupdialog/BackupDialogViewModelFactory.kt
index c11e48e..39874c3 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/backupdialog/BackupDialogViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/backupdialog/BackupDialogViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.maintabs.settings.backupdialog
+package com.marcdonald.hibi.mainscreens.settings.backupdialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.internal.utils.FileUtils
+import com.marcdonald.hibi.internal.utils.FileUtils
class BackupDialogViewModelFactory(private val fileUtils: FileUtils)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/restoredialog/RestoreDialog.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/restoredialog/RestoreDialog.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/restoredialog/RestoreDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/restoredialog/RestoreDialog.kt
index e066a98..2505605 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/restoredialog/RestoreDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/restoredialog/RestoreDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.settings.restoredialog
+package com.marcdonald.hibi.mainscreens.settings.restoredialog
import android.os.Bundle
import android.view.LayoutInflater
@@ -9,11 +9,11 @@ import android.widget.ProgressBar
import android.widget.TextView
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.RESTORE_FILE_PATH_KEY
-import app.marcdev.hibi.internal.base.HibiDialogFragment
-import app.marcdev.hibi.internal.extension.show
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.RESTORE_FILE_PATH_KEY
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
+import com.marcdonald.hibi.internal.extension.show
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/restoredialog/RestoreDialogViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/restoredialog/RestoreDialogViewModel.kt
similarity index 94%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/restoredialog/RestoreDialogViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/restoredialog/RestoreDialogViewModel.kt
index 8763beb..7ed45d3 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/restoredialog/RestoreDialogViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/restoredialog/RestoreDialogViewModel.kt
@@ -1,12 +1,12 @@
-package app.marcdev.hibi.maintabs.settings.restoredialog
+package com.marcdonald.hibi.mainscreens.settings.restoredialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.database.AppDatabase
-import app.marcdev.hibi.internal.PRODUCTION_DATABASE_NAME
-import app.marcdev.hibi.internal.utils.FileUtils
+import com.marcdonald.hibi.data.database.AppDatabase
+import com.marcdonald.hibi.internal.PRODUCTION_DATABASE_NAME
+import com.marcdonald.hibi.internal.utils.FileUtils
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/restoredialog/RestoreDialogViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/restoredialog/RestoreDialogViewModelFactory.kt
similarity index 71%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/restoredialog/RestoreDialogViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/restoredialog/RestoreDialogViewModelFactory.kt
index a70d9fd..dc4e8e4 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/restoredialog/RestoreDialogViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/restoredialog/RestoreDialogViewModelFactory.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.maintabs.settings.restoredialog
+package com.marcdonald.hibi.mainscreens.settings.restoredialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.database.AppDatabase
-import app.marcdev.hibi.internal.utils.FileUtils
+import com.marcdonald.hibi.data.database.AppDatabase
+import com.marcdonald.hibi.internal.utils.FileUtils
class RestoreDialogViewModelFactory(private val fileUtils: FileUtils,
private val database: AppDatabase)
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/updatedialog/UpdateDialog.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/updatedialog/UpdateDialog.kt
similarity index 95%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/updatedialog/UpdateDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/updatedialog/UpdateDialog.kt
index 0ee744d..45103db 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/updatedialog/UpdateDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/updatedialog/UpdateDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.settings.updatedialog
+package com.marcdonald.hibi.mainscreens.settings.updatedialog
import android.content.Intent
import android.net.Uri
@@ -12,10 +12,10 @@ import android.widget.ProgressBar
import android.widget.TextView
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiDialogFragment
-import app.marcdev.hibi.internal.extension.show
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
+import com.marcdonald.hibi.internal.extension.show
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/updatedialog/UpdateDialogViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/updatedialog/UpdateDialogViewModel.kt
similarity index 89%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/updatedialog/UpdateDialogViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/updatedialog/UpdateDialogViewModel.kt
index 0354699..a19b3b7 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/updatedialog/UpdateDialogViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/updatedialog/UpdateDialogViewModel.kt
@@ -1,13 +1,13 @@
-package app.marcdev.hibi.maintabs.settings.updatedialog
+package com.marcdonald.hibi.mainscreens.settings.updatedialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.BuildConfig
-import app.marcdev.hibi.data.network.github.GithubAPIService
-import app.marcdev.hibi.data.network.github.apiresponse.GithubVersionResponse
-import app.marcdev.hibi.internal.NoConnectivityException
+import com.marcdonald.hibi.BuildConfig
+import com.marcdonald.hibi.data.network.github.GithubAPIService
+import com.marcdonald.hibi.data.network.github.apiresponse.GithubVersionResponse
+import com.marcdonald.hibi.internal.NoConnectivityException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/settings/updatedialog/UpdateDialogViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/updatedialog/UpdateDialogViewModelFactory.kt
similarity index 74%
rename from app/src/main/java/app/marcdev/hibi/maintabs/settings/updatedialog/UpdateDialogViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/settings/updatedialog/UpdateDialogViewModelFactory.kt
index bf08bc2..07b8f01 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/settings/updatedialog/UpdateDialogViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/settings/updatedialog/UpdateDialogViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.maintabs.settings.updatedialog
+package com.marcdonald.hibi.mainscreens.settings.updatedialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.network.github.GithubAPIService
+import com.marcdonald.hibi.data.network.github.GithubAPIService
class UpdateDialogViewModelFactory(private val githubAPIService: GithubAPIService)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagDisplayItem.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagDisplayItem.kt
similarity index 66%
rename from app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagDisplayItem.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagDisplayItem.kt
index b8c9315..a5cef67 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagDisplayItem.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagDisplayItem.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment
+package com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment
data class TagDisplayItem(val tagID: Int,
val tagName: String,
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragment.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragment.kt
index d54b590..8a5027a 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment
+package com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment
import android.os.Bundle
import android.preference.PreferenceManager
@@ -12,9 +12,9 @@ import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_ENTRY_DIVIDERS
-import app.marcdev.hibi.internal.extension.show
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_ENTRY_DIVIDERS
+import com.marcdonald.hibi.internal.extension.show
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
import org.kodein.di.generic.instance
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragmentRecyclerViewHolder.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragmentRecyclerViewHolder.kt
similarity index 85%
rename from app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragmentRecyclerViewHolder.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragmentRecyclerViewHolder.kt
index d0f7b43..2e6c8ae 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragmentRecyclerViewHolder.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragmentRecyclerViewHolder.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment
+package com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment
import android.os.Bundle
import android.view.View
@@ -6,10 +6,10 @@ import android.widget.TextView
import androidx.fragment.app.FragmentManager
import androidx.navigation.Navigation
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.TAG_ID_KEY
-import app.marcdev.hibi.maintabs.MainScreenFragmentDirections
-import app.marcdev.hibi.uicomponents.addtagdialog.AddTagDialog
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.TAG_ID_KEY
+import com.marcdonald.hibi.mainscreens.MainScreenFragmentDirections
+import com.marcdonald.hibi.uicomponents.addtagdialog.AddTagDialog
class TagsFragmentRecyclerViewHolder(itemView: View,
private val fragmentManager: FragmentManager)
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragmentViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragmentViewModel.kt
similarity index 83%
rename from app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragmentViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragmentViewModel.kt
index e1e290b..5e3b8fd 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragmentViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragmentViewModel.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment
+package com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
class TagsFragmentViewModel(tagEntryRelationRepository: TagEntryRelationRepository) : ViewModel() {
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragmentViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragmentViewModelFactory.kt
similarity index 74%
rename from app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragmentViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragmentViewModelFactory.kt
index bcb3800..22a8ffc 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsFragmentViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsFragmentViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment
+package com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
class TagsFragmentViewModelFactory(private val tagEntryRelationRepository: TagEntryRelationRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsRecyclerAdapter.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsRecyclerAdapter.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsRecyclerAdapter.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsRecyclerAdapter.kt
index ed51b19..41ff8f7 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/maintagsfragment/TagsRecyclerAdapter.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/maintagsfragment/TagsRecyclerAdapter.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.tagsfragment.maintagsfragment
+package com.marcdonald.hibi.mainscreens.tagsscreen.maintagsfragment
import android.content.Context
import android.view.LayoutInflater
@@ -7,7 +7,7 @@ import android.view.ViewGroup
import android.view.animation.AnimationUtils
import androidx.fragment.app.FragmentManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
+import com.marcdonald.hibi.R
class TagsRecyclerAdapter(private val context: Context,
private val fragmentManager: FragmentManager)
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/taggedentriesfragment/TaggedEntriesFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/taggedentriesfragment/TaggedEntriesFragment.kt
similarity index 91%
rename from app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/taggedentriesfragment/TaggedEntriesFragment.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/taggedentriesfragment/TaggedEntriesFragment.kt
index 3321557..643aa29 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/taggedentriesfragment/TaggedEntriesFragment.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/taggedentriesfragment/TaggedEntriesFragment.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.maintabs.tagsfragment.taggedentriesfragment
+package com.marcdonald.hibi.mainscreens.tagsscreen.taggedentriesfragment
import android.os.Bundle
import android.preference.PreferenceManager
@@ -15,11 +15,11 @@ import androidx.navigation.Navigation
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_ENTRY_DIVIDERS
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.maintabs.mainentriesrecycler.EntriesRecyclerAdapter
-import app.marcdev.hibi.maintabs.mainentriesrecycler.MainEntriesHeaderItemDecoration
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_ENTRY_DIVIDERS
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.EntriesRecyclerAdapter
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesHeaderItemDecoration
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
import org.kodein.di.generic.instance
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/taggedentriesfragment/TaggedEntriesViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/taggedentriesfragment/TaggedEntriesViewModel.kt
similarity index 88%
rename from app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/taggedentriesfragment/TaggedEntriesViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/taggedentriesfragment/TaggedEntriesViewModel.kt
index 4038ef6..0c000b5 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/taggedentriesfragment/TaggedEntriesViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/taggedentriesfragment/TaggedEntriesViewModel.kt
@@ -1,16 +1,16 @@
-package app.marcdev.hibi.maintabs.tagsfragment.taggedentriesfragment
+package com.marcdonald.hibi.mainscreens.tagsscreen.taggedentriesfragment
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.entity.Entry
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
-import app.marcdev.hibi.data.repository.TagRepository
-import app.marcdev.hibi.maintabs.mainentriesrecycler.BookEntryDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.MainEntriesDisplayItem
-import app.marcdev.hibi.maintabs.mainentriesrecycler.TagEntryDisplayItem
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.data.repository.TagRepository
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.BookEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.TagEntryDisplayItem
import kotlinx.coroutines.launch
class TaggedEntriesViewModel(private val tagRepository: TagRepository,
diff --git a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/taggedentriesfragment/TaggedEntriesViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/taggedentriesfragment/TaggedEntriesViewModelFactory.kt
similarity index 69%
rename from app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/taggedentriesfragment/TaggedEntriesViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/taggedentriesfragment/TaggedEntriesViewModelFactory.kt
index 023e958..bf6cc9d 100644
--- a/app/src/main/java/app/marcdev/hibi/maintabs/tagsfragment/taggedentriesfragment/TaggedEntriesViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/tagsscreen/taggedentriesfragment/TaggedEntriesViewModelFactory.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.maintabs.tagsfragment.taggedentriesfragment
+package com.marcdonald.hibi.mainscreens.tagsscreen.taggedentriesfragment
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
-import app.marcdev.hibi.data.repository.TagRepository
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.data.repository.TagRepository
class TaggedEntriesViewModelFactory(private val tagRepository: TagRepository,
private val tagEntryRelationRepository: TagEntryRelationRepository,
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackDisplayItem.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackDisplayItem.kt
new file mode 100644
index 0000000..bc967c9
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackDisplayItem.kt
@@ -0,0 +1,6 @@
+package com.marcdonald.hibi.mainscreens.throwbackscreen.mainthrowbackscreen
+
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesDisplayItem
+
+data class ThrowbackDisplayItem(val entryDisplayItem: MainEntriesDisplayItem,
+ val amountOfOtherEntries: Int)
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragment.kt
new file mode 100644
index 0000000..e14ff67
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragment.kt
@@ -0,0 +1,94 @@
+package com.marcdonald.hibi.mainscreens.throwbackscreen.mainthrowbackscreen
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
+import androidx.navigation.Navigation
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.extension.show
+import org.kodein.di.Kodein
+import org.kodein.di.KodeinAware
+import org.kodein.di.android.x.closestKodein
+import org.kodein.di.generic.instance
+
+class ThrowbackFragment : Fragment(), KodeinAware {
+ override val kodein: Kodein by closestKodein()
+
+ //
+ private val viewModelFactory: ThrowbackFragmentViewModelFactory by instance()
+ private lateinit var viewModel: ThrowbackFragmentViewModel
+ //
+
+ //
+ private lateinit var loadingDisplay: ConstraintLayout
+ private lateinit var noEntriesDisplay: ConstraintLayout
+ private lateinit var recyclerAdapter: ThrowbackRecyclerAdapter
+ //
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ viewModel = ViewModelProviders.of(this, viewModelFactory).get(ThrowbackFragmentViewModel::class.java)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ val view = inflater.inflate(R.layout.fragment_throwback, container, false)
+ bindViews(view)
+ initRecycler(view)
+ setupObservers()
+ viewModel.loadEntries()
+ return view
+ }
+
+ private fun bindViews(view: View) {
+ view.findViewById(R.id.txt_back_toolbar_title).text = resources.getString(R.string.throwback)
+ view.findViewById(R.id.img_back_toolbar_back).setOnClickListener {
+ Navigation.findNavController(view).popBackStack()
+ }
+ loadingDisplay = view.findViewById(R.id.const_throwback_loading)
+ loadingDisplay.show(false)
+ noEntriesDisplay = view.findViewById(R.id.const_no_throwback)
+ noEntriesDisplay.show(false)
+ }
+
+ private fun initRecycler(view: View) {
+ val recycler: RecyclerView = view.findViewById(R.id.recycler_throwback)
+ this.recyclerAdapter = ThrowbackRecyclerAdapter(requireContext(), ::onItemClick)
+ val layoutManager = LinearLayoutManager(context)
+ recycler.adapter = recyclerAdapter
+ recycler.layoutManager = layoutManager
+ }
+
+ private fun setupObservers() {
+ viewModel.displayLoading.observe(this, Observer { value ->
+ value?.let { shouldShow ->
+ loadingDisplay.show(shouldShow)
+ }
+ })
+
+ viewModel.displayNoResults.observe(this, Observer { value ->
+ value?.let { shouldShow ->
+ noEntriesDisplay.show(shouldShow)
+ }
+ })
+
+ viewModel.displayItems.observe(this, Observer { items ->
+ items?.let {
+ recyclerAdapter.updateList(items)
+ }
+ })
+ }
+
+ private fun onItemClick(day: Int, month: Int, year: Int) {
+ val action = ThrowbackFragmentDirections.throwbackEntriesAction(day, month, year)
+ Navigation.findNavController(requireParentFragment().requireView()).navigate(action)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragmentViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragmentViewModel.kt
new file mode 100644
index 0000000..f856726
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragmentViewModel.kt
@@ -0,0 +1,149 @@
+package com.marcdonald.hibi.mainscreens.throwbackscreen.mainthrowbackscreen
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.EntryRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesDisplayItem
+import kotlinx.coroutines.launch
+import java.util.*
+
+class ThrowbackFragmentViewModel(private val entryRepository: EntryRepository,
+ private val tagEntryRelationRepository: TagEntryRelationRepository,
+ private val bookEntryRelationRepository: BookEntryRelationRepository)
+ : ViewModel() {
+
+ private val today = Calendar.getInstance()
+
+ private val _displayLoading = MutableLiveData()
+ val displayLoading: LiveData
+ get() = _displayLoading
+
+ private val _displayNoResults = MutableLiveData()
+ val displayNoResults: LiveData
+ get() = _displayNoResults
+
+ private val _displayItems = MutableLiveData>()
+ val displayItems: LiveData>
+ get() = _displayItems
+
+ fun loadEntries() {
+ viewModelScope.launch {
+ _displayLoading.value = true
+ _displayNoResults.value = false
+ getDisplayItems()
+ _displayLoading.value = false
+ _displayNoResults.value = displayItems.value == null || displayItems.value!!.isEmpty()
+ }
+ }
+
+ private suspend fun getDisplayItems() {
+ val lastMonthThrowback = getMonthThrowback()
+ val lastYearThrowbacks = getYearThrowbacks()
+
+ val allItems = if(lastMonthThrowback != null)
+ listOf(lastMonthThrowback) + lastYearThrowbacks
+ else
+ lastYearThrowbacks
+
+ _displayItems.value = allItems
+ }
+
+ private suspend fun getMonthThrowback(): ThrowbackDisplayItem? {
+ val returnItem: ThrowbackDisplayItem?
+ val februaryMaxDay = if(today.getActualMaximum(Calendar.DAY_OF_YEAR) > 365) 29 else 28
+
+ returnItem = if(today.get(Calendar.MONTH) == 0) {
+ getLastDecemberThrowbackItem()
+ } else if(today.get(Calendar.MONTH) == 2 && today.get(Calendar.DAY_OF_MONTH) > februaryMaxDay) {
+ null
+ } else if(today.get(Calendar.DAY_OF_MONTH) == 31) {
+ if(doesLastMonthHave30Days()) {
+ null
+ } else {
+ getThrowbackItemOnThisDateLastMonth()
+ }
+ } else {
+ getThrowbackItemOnThisDateLastMonth()
+ }
+
+ return returnItem
+ }
+
+ private suspend fun getYearThrowbacks(): List {
+ val returnList = mutableListOf()
+
+ val dateToRetrieve = today.clone() as Calendar
+ entryRepository.getAllYears().forEach { year ->
+ if(year != today.get(Calendar.YEAR)) {
+ if(isDateOnPreviousYearValid(year)) {
+ dateToRetrieve.set(Calendar.YEAR, year)
+ val throwbackItem = getThrowbackDisplayItem(dateToRetrieve)
+ if(throwbackItem != null)
+ returnList.add(throwbackItem)
+ }
+ }
+ }
+ return returnList
+ }
+
+ private fun isDateOnPreviousYearValid(year: Int): Boolean {
+ val calendarToCheck = today.clone() as Calendar
+ // Need to set day to 1 as if it's 31 and the last month has 30 days it doesn't behave as expected
+ if(calendarToCheck.get(Calendar.MONTH) == 1 && calendarToCheck.get(Calendar.DAY_OF_MONTH) == 29) {
+ calendarToCheck.set(Calendar.DAY_OF_MONTH, 1)
+ calendarToCheck.set(Calendar.YEAR, year)
+ if(calendarToCheck.getActualMaximum(Calendar.DAY_OF_YEAR) == 365) {
+ return false
+ }
+ }
+ return true
+ }
+
+ private suspend fun getLastDecemberThrowbackItem(): ThrowbackDisplayItem? {
+ val dateToRetrieve = today.clone() as Calendar
+ dateToRetrieve.set(Calendar.MONTH, 11)
+ dateToRetrieve.set(Calendar.YEAR, today.get(Calendar.YEAR) - 1)
+ return getThrowbackDisplayItem(dateToRetrieve)
+ }
+
+ private suspend fun getThrowbackItemOnThisDateLastMonth(): ThrowbackDisplayItem? {
+ val dateToRetrieve = today.clone() as Calendar
+ dateToRetrieve.set(Calendar.MONTH, today.get(Calendar.MONTH) - 1)
+ return getThrowbackDisplayItem(dateToRetrieve)
+ }
+
+ private fun doesLastMonthHave30Days(): Boolean {
+ val lastMonth = today.clone() as Calendar
+ // Need to set day to 1 as if it's 31 and the last month has 30 days it doesn't behave as expected
+ lastMonth.set(Calendar.DAY_OF_MONTH, 1)
+ lastMonth.set(Calendar.MONTH, lastMonth.get(Calendar.MONTH - 1))
+ return lastMonth.getActualMaximum(Calendar.DAY_OF_MONTH) == 30
+ }
+
+ private suspend fun getThrowbackDisplayItem(dateToRetrieve: Calendar): ThrowbackDisplayItem? {
+ val entry = entryRepository.getFirstEntryOnDate(dateToRetrieve)
+ return if(entry != null) {
+ val tagsToAdd = mutableListOf()
+ val allTags = tagEntryRelationRepository.getTagsWithEntry(entry.id)
+ allTags.forEach { tag ->
+ tagsToAdd.add(tag.name)
+ }
+
+ val booksToAdd = mutableListOf()
+ val allBooks = bookEntryRelationRepository.getBooksWithEntry(entry.id)
+ allBooks.forEach { book ->
+ booksToAdd.add(book.name)
+ }
+
+ val mainEntryDisplayItem = MainEntriesDisplayItem(entry, tagsToAdd, booksToAdd)
+ val amountOfOtherEntries = entryRepository.getAmountOfEntriesOnDate(dateToRetrieve) - 1
+ ThrowbackDisplayItem(mainEntryDisplayItem, amountOfOtherEntries)
+ } else {
+ null
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragmentViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragmentViewModelFactory.kt
new file mode 100644
index 0000000..8963e31
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackFragmentViewModelFactory.kt
@@ -0,0 +1,18 @@
+package com.marcdonald.hibi.mainscreens.throwbackscreen.mainthrowbackscreen
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.EntryRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+
+class ThrowbackFragmentViewModelFactory(private val entryRepository: EntryRepository,
+ private val tagEntryRelationRepository: TagEntryRelationRepository,
+ private val bookEntryRelationRepository: BookEntryRelationRepository)
+ : ViewModelProvider.NewInstanceFactory() {
+
+ @Suppress("UNCHECKED_CAST")
+ override fun create(modelClass: Class): T {
+ return ThrowbackFragmentViewModel(entryRepository, tagEntryRelationRepository, bookEntryRelationRepository) as T
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackRecyclerAdapter.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackRecyclerAdapter.kt
new file mode 100644
index 0000000..e5c9afd
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackRecyclerAdapter.kt
@@ -0,0 +1,45 @@
+package com.marcdonald.hibi.mainscreens.throwbackscreen.mainthrowbackscreen
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.AnimationUtils
+import androidx.recyclerview.widget.RecyclerView
+import com.marcdonald.hibi.R
+
+class ThrowbackRecyclerAdapter(private val context: Context,
+ private val onClick: (day: Int, month: Int, year: Int) -> Unit)
+ : RecyclerView.Adapter() {
+
+ private val inflater: LayoutInflater = LayoutInflater.from(context)
+ private var items: List = listOf()
+ private var lastPosition = -1
+
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ThrowbackRecyclerViewHolder {
+ val view = inflater.inflate(R.layout.item_throwback, parent, false)
+ return ThrowbackRecyclerViewHolder(view, onClick)
+ }
+
+ override fun getItemCount(): Int {
+ return items.size
+ }
+
+ override fun onBindViewHolder(holder: ThrowbackRecyclerViewHolder, position: Int) {
+ holder.display(items[position])
+ setAnimation(holder.itemView, position)
+ }
+
+ fun updateList(list: List) {
+ items = list
+ notifyDataSetChanged()
+ }
+
+ private fun setAnimation(viewToAnimate: View, position: Int) {
+ if(position > lastPosition) {
+ val animation = AnimationUtils.loadAnimation(context, android.R.anim.fade_in)
+ viewToAnimate.startAnimation(animation)
+ lastPosition = position
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackRecyclerViewHolder.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackRecyclerViewHolder.kt
new file mode 100644
index 0000000..0a719ea
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/mainthrowbackscreen/ThrowbackRecyclerViewHolder.kt
@@ -0,0 +1,133 @@
+package com.marcdonald.hibi.mainscreens.throwbackscreen.mainthrowbackscreen
+
+import android.preference.PreferenceManager
+import android.view.View
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.chip.Chip
+import com.google.android.material.chip.ChipGroup
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_BOOKS
+import com.marcdonald.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_LOCATION
+import com.marcdonald.hibi.internal.PREF_MAIN_ENTRY_DISPLAY_TAGS
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.internal.utils.formatDateForDisplay
+import com.marcdonald.hibi.internal.utils.formatTimeForDisplay
+import java.util.*
+
+class ThrowbackRecyclerViewHolder(itemView: View,
+ onClick: (day: Int, month: Int, year: Int) -> Unit)
+ : RecyclerView.ViewHolder(itemView) {
+
+ //
+ private var titleDisplay: TextView = itemView.findViewById(R.id.txt_throwback_title)
+ private var dateDisplay: TextView = itemView.findViewById(R.id.item_date)
+ private var timeDisplay: TextView = itemView.findViewById(R.id.item_time)
+ private var contentDisplay: TextView = itemView.findViewById(R.id.item_content)
+ private var tagDisplay: LinearLayout = itemView.findViewById(R.id.lin_main_tags)
+ private var bookDisplay: LinearLayout = itemView.findViewById(R.id.lin_main_books)
+ private var locationDisplay: TextView = itemView.findViewById(R.id.txt_item_location)
+ private var moreEntriesDisplay: TextView = itemView.findViewById(R.id.txt_throwback_more_entries)
+ //
+
+ //
+ private var displayedItem: ThrowbackDisplayItem? = null
+ private val prefs = PreferenceManager.getDefaultSharedPreferences(itemView.context)
+ //
+
+ init {
+ itemView.findViewById(R.id.lin_throwback).setOnClickListener {
+ displayedItem?.let { item ->
+ onClick(item.entryDisplayItem.entry.day, item.entryDisplayItem.entry.month, item.entryDisplayItem.entry.year)
+ }
+ }
+ }
+
+ fun display(item: ThrowbackDisplayItem) {
+ this.displayedItem = item
+ val dateDisplayText = formatDateForDisplay(item.entryDisplayItem.entry.day, item.entryDisplayItem.entry.month, item.entryDisplayItem.entry.year)
+ dateDisplay.text = dateDisplayText
+ val timeDisplayText = formatTimeForDisplay(item.entryDisplayItem.entry.hour, item.entryDisplayItem.entry.minute)
+ timeDisplay.text = timeDisplayText
+ contentDisplay.text = item.entryDisplayItem.entry.content
+ displayTitle()
+ displayLocation()
+ displayTags()
+ displayBooks()
+ if(item.amountOfOtherEntries > 0) {
+ moreEntriesDisplay.text = itemView.resources.getQuantityString(R.plurals.throwback_more_entries, item.amountOfOtherEntries, item.amountOfOtherEntries)
+ moreEntriesDisplay.show(true)
+ } else {
+ moreEntriesDisplay.show(false)
+ }
+ }
+
+ private fun displayTitle() {
+ displayedItem?.let { item ->
+ val calendar = Calendar.getInstance()
+ calendar.set(Calendar.DAY_OF_MONTH, 1)
+ calendar.set(Calendar.MONTH, calendar.get(Calendar.MONTH) - 1)
+ if(item.entryDisplayItem.entry.month == calendar.get(Calendar.MONTH)) {
+ titleDisplay.text = itemView.resources.getString(R.string.last_month)
+ } else {
+ titleDisplay.text = item.entryDisplayItem.entry.year.toString()
+ }
+ }
+ }
+
+ private fun displayLocation() {
+ if(prefs.getBoolean(PREF_MAIN_ENTRY_DISPLAY_LOCATION, true)) {
+ displayedItem?.let { item ->
+ if(item.entryDisplayItem.entry.location.isNotBlank()) {
+ locationDisplay.text = item.entryDisplayItem.entry.location
+ locationDisplay.show(true)
+ } else {
+ locationDisplay.show(false)
+ }
+ }
+ } else {
+ locationDisplay.show(false)
+ }
+ }
+
+ private fun displayTags() {
+ if(prefs.getBoolean(PREF_MAIN_ENTRY_DISPLAY_TAGS, true)) {
+ displayedItem?.let { item ->
+ tagDisplay.show(item.entryDisplayItem.tags.isNotEmpty())
+ val tagChipGroup = itemView.findViewById(R.id.cg_main_tags)
+
+ tagChipGroup.removeAllViews()
+ if(item.entryDisplayItem.tags.isNotEmpty()) {
+ item.entryDisplayItem.tags.forEach { tagName ->
+ val chip = Chip(itemView.context)
+ chip.text = tagName
+ tagChipGroup.addView(chip)
+ }
+ }
+ }
+ } else {
+ tagDisplay.show(false)
+ }
+ }
+
+ private fun displayBooks() {
+ if(prefs.getBoolean(PREF_MAIN_ENTRY_DISPLAY_BOOKS, true)) {
+ displayedItem?.let { item ->
+ bookDisplay.show(item.entryDisplayItem.books.isNotEmpty())
+ val bookChipGroup = itemView.findViewById(R.id.cg_main_books)
+
+ bookChipGroup.removeAllViews()
+ if(item.entryDisplayItem.books.isNotEmpty()) {
+ item.entryDisplayItem.books.forEach { bookName ->
+ val chip = Chip(itemView.context)
+ chip.text = bookName
+ bookChipGroup.addView(chip)
+ }
+ }
+ }
+ } else {
+ bookDisplay.show(false)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/throwbackentriesscreen/ThrowbackEntriesFragment.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/throwbackentriesscreen/ThrowbackEntriesFragment.kt
new file mode 100644
index 0000000..0a5bf4d
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/throwbackentriesscreen/ThrowbackEntriesFragment.kt
@@ -0,0 +1,107 @@
+package com.marcdonald.hibi.mainscreens.throwbackscreen.throwbackentriesscreen
+
+import android.os.Bundle
+import android.preference.PreferenceManager
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
+import androidx.navigation.Navigation
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_ENTRY_DIVIDERS
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.EntriesRecyclerAdapter
+import org.kodein.di.KodeinAware
+import org.kodein.di.android.x.closestKodein
+import org.kodein.di.generic.instance
+
+class ThrowbackEntriesFragment : Fragment(), KodeinAware {
+ override val kodein by closestKodein()
+
+ //
+ private val viewModelFactory: ThrowbackEntriesViewModelFactory by instance()
+ private lateinit var viewModel: ThrowbackEntriesViewModel
+ //
+
+ //
+ private lateinit var loadingDisplay: ConstraintLayout
+ private lateinit var toolbarTitle: TextView
+ private lateinit var recyclerAdapter: EntriesRecyclerAdapter
+ //
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ viewModel = ViewModelProviders.of(this, viewModelFactory).get(ThrowbackEntriesViewModel::class.java)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+ val view = inflater.inflate(R.layout.fragment_throwback_entries, container, false)
+
+ bindViews(view)
+ initRecycler(view)
+ setupObservers()
+ viewModel.loadEntries()
+
+ return view
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ arguments?.let { arguments ->
+ viewModel.passArguments(ThrowbackEntriesFragmentArgs.fromBundle(arguments).day,
+ ThrowbackEntriesFragmentArgs.fromBundle(arguments).month,
+ ThrowbackEntriesFragmentArgs.fromBundle(arguments).year)
+ }
+ }
+
+ private fun bindViews(view: View) {
+ loadingDisplay = view.findViewById(R.id.const_throwback_entries_loading)
+ toolbarTitle = view.findViewById(R.id.txt_back_toolbar_title)
+ val toolbarBack: ImageView = view.findViewById(R.id.img_back_toolbar_back)
+ toolbarBack.setOnClickListener {
+ Navigation.findNavController(requireView()).popBackStack()
+ }
+ }
+
+ private fun setupObservers() {
+ viewModel.toolbarTitle.observe(this, Observer { value ->
+ value?.let { title ->
+ toolbarTitle.text = title
+ }
+ })
+
+ viewModel.entries.observe(this, Observer { value ->
+ value?.let { list ->
+ recyclerAdapter.updateList(list)
+ }
+ })
+
+ viewModel.displayLoading.observe(this, Observer { value ->
+ value?.let { shouldShow ->
+ loadingDisplay.show(shouldShow)
+ }
+ })
+ }
+
+ private fun initRecycler(view: View) {
+ val recycler: RecyclerView = view.findViewById(R.id.recycler_throwback_entries)
+ this.recyclerAdapter = EntriesRecyclerAdapter(requireContext(), requireActivity().theme)
+ val layoutManager = LinearLayoutManager(context)
+ recycler.adapter = recyclerAdapter
+ recycler.layoutManager = layoutManager
+
+ val includeEntryDividers = PreferenceManager.getDefaultSharedPreferences(requireContext()).getBoolean(PREF_ENTRY_DIVIDERS, true)
+ if(includeEntryDividers) {
+ val dividerItemDecoration = DividerItemDecoration(recycler.context, layoutManager.orientation)
+ recycler.addItemDecoration(dividerItemDecoration)
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/throwbackentriesscreen/ThrowbackEntriesViewModel.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/throwbackentriesscreen/ThrowbackEntriesViewModel.kt
new file mode 100644
index 0000000..7ee14e6
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/throwbackentriesscreen/ThrowbackEntriesViewModel.kt
@@ -0,0 +1,94 @@
+package com.marcdonald.hibi.mainscreens.throwbackscreen.throwbackentriesscreen
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.marcdonald.hibi.data.entity.Entry
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.EntryRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.internal.utils.formatDateForDisplay
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.BookEntryDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.MainEntriesDisplayItem
+import com.marcdonald.hibi.mainscreens.mainentriesrecycler.TagEntryDisplayItem
+import kotlinx.coroutines.launch
+import java.util.*
+import kotlin.collections.ArrayList
+
+class ThrowbackEntriesViewModel(private val entryRepository: EntryRepository,
+ private val tagEntryRelationRepository: TagEntryRelationRepository,
+ private val bookEntryRelationRepository: BookEntryRelationRepository)
+ : ViewModel() {
+
+ private val dateToRetrieve = Calendar.getInstance()
+
+ private val _toolbarTitle = MutableLiveData()
+ val toolbarTitle: LiveData
+ get() = _toolbarTitle
+
+ private val _entries = MutableLiveData>()
+ val entries: LiveData>
+ get() = _entries
+
+ private val _displayLoading = MutableLiveData()
+ val displayLoading: LiveData
+ get() = _displayLoading
+
+ private val _displayNoResults = MutableLiveData()
+ val displayNoResults: LiveData
+ get() = _displayNoResults
+
+ fun passArguments(day: Int, month: Int, year: Int) {
+ dateToRetrieve.set(Calendar.YEAR, year)
+ dateToRetrieve.set(Calendar.MONTH, month)
+ dateToRetrieve.set(Calendar.DAY_OF_MONTH, day)
+
+ viewModelScope.launch {
+ _toolbarTitle.value = formatDateForDisplay(dateToRetrieve)
+ }
+ }
+
+ fun loadEntries() {
+ viewModelScope.launch {
+ _displayLoading.value = true
+ getMainEntryDisplayItems()
+ _displayLoading.value = false
+ }
+ }
+
+ private suspend fun getMainEntryDisplayItems() {
+ val entries = entryRepository.getEntriesOnDate(dateToRetrieve, true)
+ val tagEntryDisplayItems = tagEntryRelationRepository.getTagEntryDisplayItems()
+ val bookEntryDisplayItem = bookEntryRelationRepository.getBookEntryDisplayItems()
+ _entries.value = combineData(entries, tagEntryDisplayItems, bookEntryDisplayItem)
+ }
+
+ private fun combineData(entries: List, tagEntryDisplayItems: List, bookEntryDisplayItems: List): List {
+ val itemList = ArrayList()
+
+ entries.forEach { entry ->
+ val item = MainEntriesDisplayItem(entry, listOf(), listOf())
+ val listOfTags = ArrayList()
+ val listOfBooks = ArrayList()
+
+ tagEntryDisplayItems.forEach { tagEntryDisplayItem ->
+ if(tagEntryDisplayItem.entryId == entry.id) {
+ listOfTags.add(tagEntryDisplayItem.tagName)
+ }
+ }
+
+ bookEntryDisplayItems.forEach { bookEntryDisplayItem ->
+ if(bookEntryDisplayItem.entryId == entry.id) {
+ listOfBooks.add(bookEntryDisplayItem.bookName)
+ }
+ }
+
+ item.tags = listOfTags
+ item.books = listOfBooks
+ itemList.add(item)
+ }
+
+ return itemList
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/throwbackentriesscreen/ThrowbackEntriesViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/throwbackentriesscreen/ThrowbackEntriesViewModelFactory.kt
new file mode 100644
index 0000000..d9892c0
--- /dev/null
+++ b/app/src/main/java/com/marcdonald/hibi/mainscreens/throwbackscreen/throwbackentriesscreen/ThrowbackEntriesViewModelFactory.kt
@@ -0,0 +1,18 @@
+package com.marcdonald.hibi.mainscreens.throwbackscreen.throwbackentriesscreen
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.EntryRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+
+class ThrowbackEntriesViewModelFactory(private val entryRepository: EntryRepository,
+ private val tagEntryRelationRepository: TagEntryRelationRepository,
+ private val bookEntryRelationRepository: BookEntryRelationRepository)
+ : ViewModelProvider.NewInstanceFactory() {
+
+ @Suppress("UNCHECKED_CAST")
+ override fun create(modelClass: Class): T {
+ return ThrowbackEntriesViewModel(entryRepository, tagEntryRelationRepository, bookEntryRelationRepository) as T
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/SearchMoreInfoDialog.kt b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/SearchMoreInfoDialog.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/SearchMoreInfoDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/SearchMoreInfoDialog.kt
index cfd1559..6e504ff 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/SearchMoreInfoDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/SearchMoreInfoDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.search.searchmoreinfoscreen
+package com.marcdonald.hibi.search.searchmoreinfoscreen
import android.content.ClipData
import android.content.ClipboardManager
@@ -14,11 +14,11 @@ import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiDialogFragment
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.search.searchmoreinfoscreen.alternativesrecycler.SearchMoreInfoAlternativesRecyclerAdapter
-import app.marcdev.hibi.search.searchmoreinfoscreen.senserecycler.SearchMoreInfoSenseRecyclerAdapter
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.search.searchmoreinfoscreen.alternativesrecycler.SearchMoreInfoAlternativesRecyclerAdapter
+import com.marcdonald.hibi.search.searchmoreinfoscreen.senserecycler.SearchMoreInfoSenseRecyclerAdapter
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModel.kt b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModel.kt
similarity index 94%
rename from app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModel.kt
index a6deca1..7920480 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModel.kt
@@ -1,11 +1,11 @@
-package app.marcdev.hibi.search.searchmoreinfoscreen
+package com.marcdonald.hibi.search.searchmoreinfoscreen
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import app.marcdev.hibi.data.network.jisho.apiresponse.Japanese
-import app.marcdev.hibi.data.network.jisho.apiresponse.Sense
import com.google.gson.Gson
+import com.marcdonald.hibi.data.network.jisho.apiresponse.Japanese
+import com.marcdonald.hibi.data.network.jisho.apiresponse.Sense
class SearchMoreInfoViewModel : ViewModel() {
private var _senseList = MutableLiveData>()
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModelFactory.kt
similarity index 84%
rename from app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModelFactory.kt
index dbb3840..7a4832b 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/SearchMoreInfoViewModelFactory.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.search.searchmoreinfoscreen
+package com.marcdonald.hibi.search.searchmoreinfoscreen
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerAdapter.kt b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerAdapter.kt
similarity index 85%
rename from app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerAdapter.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerAdapter.kt
index 702758c..181f8c5 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerAdapter.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerAdapter.kt
@@ -1,11 +1,11 @@
-package app.marcdev.hibi.search.searchmoreinfoscreen.alternativesrecycler
+package com.marcdonald.hibi.search.searchmoreinfoscreen.alternativesrecycler
import android.content.Context
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.data.network.jisho.apiresponse.Japanese
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.data.network.jisho.apiresponse.Japanese
class SearchMoreInfoAlternativesRecyclerAdapter(context: Context)
: RecyclerView.Adapter() {
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerViewHolder.kt b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerViewHolder.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerViewHolder.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerViewHolder.kt
index a1b7a39..7974690 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerViewHolder.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/alternativesrecycler/SearchMoreInfoAlternativesRecyclerViewHolder.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.search.searchmoreinfoscreen.alternativesrecycler
+package com.marcdonald.hibi.search.searchmoreinfoscreen.alternativesrecycler
import android.content.ClipData
import android.content.ClipboardManager
@@ -7,8 +7,8 @@ import android.view.View
import android.widget.TextView
import android.widget.Toast
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.data.network.jisho.apiresponse.Japanese
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.data.network.jisho.apiresponse.Japanese
class SearchMoreInfoAlternativesRecyclerViewHolder(itemView: View)
: RecyclerView.ViewHolder(itemView) {
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerAdapter.kt b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerAdapter.kt
similarity index 85%
rename from app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerAdapter.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerAdapter.kt
index 5b0979e..44d4390 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerAdapter.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerAdapter.kt
@@ -1,11 +1,11 @@
-package app.marcdev.hibi.search.searchmoreinfoscreen.senserecycler
+package com.marcdonald.hibi.search.searchmoreinfoscreen.senserecycler
import android.content.Context
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.data.network.jisho.apiresponse.Sense
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.data.network.jisho.apiresponse.Sense
class SearchMoreInfoSenseRecyclerAdapter(context: Context)
: RecyclerView.Adapter() {
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerViewHolder.kt b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerViewHolder.kt
similarity index 97%
rename from app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerViewHolder.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerViewHolder.kt
index 9481c2b..04a3f67 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerViewHolder.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchmoreinfoscreen/senserecycler/SearchMoreInfoSenseRecyclerViewHolder.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.search.searchmoreinfoscreen.senserecycler
+package com.marcdonald.hibi.search.searchmoreinfoscreen.senserecycler
import android.content.ClipData
import android.content.ClipboardManager
@@ -7,8 +7,8 @@ import android.view.View
import android.widget.TextView
import android.widget.Toast
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.data.network.jisho.apiresponse.Sense
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.data.network.jisho.apiresponse.Sense
class SearchMoreInfoSenseRecyclerViewHolder(itemView: View)
: RecyclerView.ViewHolder(itemView) {
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchresults/SearchResultsDialog.kt b/app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchResultsDialog.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/search/searchresults/SearchResultsDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchResultsDialog.kt
index 643801b..a385503 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchresults/SearchResultsDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchResultsDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.search.searchresults
+package com.marcdonald.hibi.search.searchresults
import android.content.Context
import android.os.Bundle
@@ -13,10 +13,10 @@ import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.SEARCH_TERM_KEY
-import app.marcdev.hibi.internal.base.HibiBottomSheetDialogFragment
-import app.marcdev.hibi.internal.extension.show
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.SEARCH_TERM_KEY
+import com.marcdonald.hibi.internal.base.HibiBottomSheetDialogFragment
+import com.marcdonald.hibi.internal.extension.show
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
import org.kodein.di.generic.instance
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchresults/SearchResultsRecyclerAdapter.kt b/app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchResultsRecyclerAdapter.kt
similarity index 87%
rename from app/src/main/java/app/marcdev/hibi/search/searchresults/SearchResultsRecyclerAdapter.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchResultsRecyclerAdapter.kt
index b4348a6..1b304ca 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchresults/SearchResultsRecyclerAdapter.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchResultsRecyclerAdapter.kt
@@ -1,12 +1,12 @@
-package app.marcdev.hibi.search.searchresults
+package com.marcdonald.hibi.search.searchresults
import android.content.Context
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.fragment.app.FragmentManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.data.network.jisho.apiresponse.Data
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.data.network.jisho.apiresponse.Data
class SearchResultsRecyclerAdapter(context: Context, private val fragmentManager: FragmentManager) : RecyclerView.Adapter() {
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchresults/SearchResultsRecyclerViewHolder.kt b/app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchResultsRecyclerViewHolder.kt
similarity index 95%
rename from app/src/main/java/app/marcdev/hibi/search/searchresults/SearchResultsRecyclerViewHolder.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchResultsRecyclerViewHolder.kt
index ca28b23..b5507b5 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchresults/SearchResultsRecyclerViewHolder.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchResultsRecyclerViewHolder.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.search.searchresults
+package com.marcdonald.hibi.search.searchresults
import android.os.Bundle
import android.view.View
@@ -6,10 +6,10 @@ import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.fragment.app.FragmentManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.data.network.jisho.apiresponse.Data
-import app.marcdev.hibi.search.searchmoreinfoscreen.SearchMoreInfoDialog
import com.google.gson.Gson
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.data.network.jisho.apiresponse.Data
+import com.marcdonald.hibi.search.searchmoreinfoscreen.SearchMoreInfoDialog
class SearchResultsRecyclerViewHolder(itemView: View, fragmentManager: FragmentManager) : RecyclerView.ViewHolder(itemView) {
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchresults/SearchViewModel.kt b/app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchViewModel.kt
similarity index 85%
rename from app/src/main/java/app/marcdev/hibi/search/searchresults/SearchViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchViewModel.kt
index cb25acf..a17a703 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchresults/SearchViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchViewModel.kt
@@ -1,12 +1,12 @@
-package app.marcdev.hibi.search.searchresults
+package com.marcdonald.hibi.search.searchresults
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.network.jisho.JishoAPIService
-import app.marcdev.hibi.data.network.jisho.apiresponse.Data
-import app.marcdev.hibi.internal.NoConnectivityException
+import com.marcdonald.hibi.data.network.jisho.JishoAPIService
+import com.marcdonald.hibi.data.network.jisho.apiresponse.Data
+import com.marcdonald.hibi.internal.NoConnectivityException
import kotlinx.coroutines.launch
class SearchViewModel(private val apiService: JishoAPIService) : ViewModel() {
diff --git a/app/src/main/java/app/marcdev/hibi/search/searchresults/SearchViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchViewModelFactory.kt
similarity index 75%
rename from app/src/main/java/app/marcdev/hibi/search/searchresults/SearchViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchViewModelFactory.kt
index e75e9ba..05e99a7 100644
--- a/app/src/main/java/app/marcdev/hibi/search/searchresults/SearchViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/search/searchresults/SearchViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.search.searchresults
+package com.marcdonald.hibi.search.searchresults
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.network.jisho.JishoAPIService
+import com.marcdonald.hibi.data.network.jisho.JishoAPIService
class SearchViewModelFactory(private val apiService: JishoAPIService)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/BinaryOptionDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/BinaryOptionDialog.kt
similarity index 94%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/BinaryOptionDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/BinaryOptionDialog.kt
index d162e8c..40d8506 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/BinaryOptionDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/BinaryOptionDialog.kt
@@ -1,14 +1,14 @@
-package app.marcdev.hibi.uicomponents
+package com.marcdonald.hibi.uicomponents
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TextView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiDialogFragment
-import app.marcdev.hibi.internal.extension.show
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
+import com.marcdonald.hibi.internal.extension.show
class BinaryOptionDialog : HibiDialogFragment() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/DatePickerDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/DatePickerDialog.kt
similarity index 96%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/DatePickerDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/DatePickerDialog.kt
index 1c29734..5f15971 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/DatePickerDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/DatePickerDialog.kt
@@ -1,14 +1,14 @@
-package app.marcdev.hibi.uicomponents
+package com.marcdonald.hibi.uicomponents
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.DatePicker
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiDialogFragment
-import app.marcdev.hibi.internal.extension.show
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
+import com.marcdonald.hibi.internal.extension.show
import timber.log.Timber
class DatePickerDialog : HibiDialogFragment() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/TextInputDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/TextInputDialog.kt
similarity index 96%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/TextInputDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/TextInputDialog.kt
index db35166..0722cfe 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/TextInputDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/TextInputDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents
+package com.marcdonald.hibi.uicomponents
import android.os.Bundle
import android.view.LayoutInflater
@@ -6,9 +6,9 @@ import android.view.View
import android.view.ViewGroup
import android.widget.EditText
import android.widget.TextView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiDialogFragment
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/TimePickerDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/TimePickerDialog.kt
similarity index 96%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/TimePickerDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/TimePickerDialog.kt
index 53f5fee..2cc98e6 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/TimePickerDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/TimePickerDialog.kt
@@ -1,14 +1,14 @@
-package app.marcdev.hibi.uicomponents
+package com.marcdonald.hibi.uicomponents
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.TimePicker
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiDialogFragment
-import app.marcdev.hibi.internal.extension.show
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
+import com.marcdonald.hibi.internal.extension.show
import timber.log.Timber
class TimePickerDialog : HibiDialogFragment() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addbookdialog/AddBookDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addbookdialog/AddBookDialog.kt
similarity index 94%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addbookdialog/AddBookDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addbookdialog/AddBookDialog.kt
index 452749c..5e909ba 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addbookdialog/AddBookDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addbookdialog/AddBookDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.addbookdialog
+package com.marcdonald.hibi.uicomponents.addbookdialog
import android.os.Bundle
import android.view.KeyEvent
@@ -9,10 +9,10 @@ import android.widget.EditText
import android.widget.TextView
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.BOOK_ID_KEY
-import app.marcdev.hibi.internal.base.HibiDialogFragment
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.BOOK_ID_KEY
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addbookdialog/AddBookViewModel.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addbookdialog/AddBookViewModel.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addbookdialog/AddBookViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addbookdialog/AddBookViewModel.kt
index a6feb65..9edb912 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addbookdialog/AddBookViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addbookdialog/AddBookViewModel.kt
@@ -1,11 +1,11 @@
-package app.marcdev.hibi.uicomponents.addbookdialog
+package com.marcdonald.hibi.uicomponents.addbookdialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.entity.Book
-import app.marcdev.hibi.data.repository.BookRepository
+import com.marcdonald.hibi.data.entity.Book
+import com.marcdonald.hibi.data.repository.BookRepository
import kotlinx.coroutines.launch
class AddBookViewModel(private val bookRepository: BookRepository) : ViewModel() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addbookdialog/AddBookViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addbookdialog/AddBookViewModelFactory.kt
similarity index 75%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addbookdialog/AddBookViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addbookdialog/AddBookViewModelFactory.kt
index b960ca5..c0260e1 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addbookdialog/AddBookViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addbookdialog/AddBookViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.uicomponents.addbookdialog
+package com.marcdonald.hibi.uicomponents.addbookdialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.BookRepository
+import com.marcdonald.hibi.data.repository.BookRepository
class AddBookViewModelFactory(private val bookRepository: BookRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addentrytobookdialog/AddEntryToBookDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addentrytobookdialog/AddEntryToBookDialog.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addentrytobookdialog/AddEntryToBookDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addentrytobookdialog/AddEntryToBookDialog.kt
index dc44336..86722cb 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addentrytobookdialog/AddEntryToBookDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addentrytobookdialog/AddEntryToBookDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.addentrytobookdialog
+package com.marcdonald.hibi.uicomponents.addentrytobookdialog
import android.os.Bundle
import android.view.LayoutInflater
@@ -8,13 +8,13 @@ import android.widget.LinearLayout
import android.widget.TextView
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.ENTRY_ID_KEY
-import app.marcdev.hibi.internal.base.HibiBottomSheetDialogFragment
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.uicomponents.addbookdialog.AddBookDialog
-import app.marcdev.hibi.uicomponents.views.CheckBoxWithId
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.ENTRY_ID_KEY
+import com.marcdonald.hibi.internal.base.HibiBottomSheetDialogFragment
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.uicomponents.addbookdialog.AddBookDialog
+import com.marcdonald.hibi.uicomponents.views.CheckBoxWithId
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModel.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModel.kt
similarity index 87%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModel.kt
index f386ae0..de0f491 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModel.kt
@@ -1,13 +1,13 @@
-package app.marcdev.hibi.uicomponents.addentrytobookdialog
+package com.marcdonald.hibi.uicomponents.addentrytobookdialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.entity.Book
-import app.marcdev.hibi.data.entity.BookEntryRelation
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
-import app.marcdev.hibi.data.repository.BookRepository
+import com.marcdonald.hibi.data.entity.Book
+import com.marcdonald.hibi.data.entity.BookEntryRelation
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.BookRepository
import kotlinx.coroutines.launch
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModelFactory.kt
similarity index 70%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModelFactory.kt
index 289668a..b697870 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addentrytobookdialog/AddEntryToBookViewModelFactory.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.uicomponents.addentrytobookdialog
+package com.marcdonald.hibi.uicomponents.addentrytobookdialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.BookEntryRelationRepository
-import app.marcdev.hibi.data.repository.BookRepository
+import com.marcdonald.hibi.data.repository.BookEntryRelationRepository
+import com.marcdonald.hibi.data.repository.BookRepository
class AddEntryToBookViewModelFactory(private val bookRepository: BookRepository, private val bookEntryRelationRepository: BookEntryRelationRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addnewworddialog/AddNewWordDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addnewworddialog/AddNewWordDialog.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addnewworddialog/AddNewWordDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addnewworddialog/AddNewWordDialog.kt
index 2e79524..533b679 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addnewworddialog/AddNewWordDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addnewworddialog/AddNewWordDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.addnewworddialog
+package com.marcdonald.hibi.uicomponents.addnewworddialog
import android.os.Bundle
import android.view.LayoutInflater
@@ -8,11 +8,11 @@ import android.widget.EditText
import android.widget.TextView
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.ENTRY_ID_KEY
-import app.marcdev.hibi.internal.NEW_WORD_ID_KEY
-import app.marcdev.hibi.internal.base.HibiDialogFragment
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.ENTRY_ID_KEY
+import com.marcdonald.hibi.internal.NEW_WORD_ID_KEY
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addnewworddialog/AddNewWordViewModel.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addnewworddialog/AddNewWordViewModel.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addnewworddialog/AddNewWordViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addnewworddialog/AddNewWordViewModel.kt
index d7ef681..84cd69b 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addnewworddialog/AddNewWordViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addnewworddialog/AddNewWordViewModel.kt
@@ -1,11 +1,11 @@
-package app.marcdev.hibi.uicomponents.addnewworddialog
+package com.marcdonald.hibi.uicomponents.addnewworddialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.entity.NewWord
-import app.marcdev.hibi.data.repository.NewWordRepository
+import com.marcdonald.hibi.data.entity.NewWord
+import com.marcdonald.hibi.data.repository.NewWordRepository
import kotlinx.coroutines.launch
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addnewworddialog/AddNewWordViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addnewworddialog/AddNewWordViewModelFactory.kt
similarity index 75%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addnewworddialog/AddNewWordViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addnewworddialog/AddNewWordViewModelFactory.kt
index 03bc7fe..2909cf1 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addnewworddialog/AddNewWordViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addnewworddialog/AddNewWordViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.uicomponents.addnewworddialog
+package com.marcdonald.hibi.uicomponents.addnewworddialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.NewWordRepository
+import com.marcdonald.hibi.data.repository.NewWordRepository
class AddNewWordViewModelFactory(private val newWordRepository: NewWordRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagdialog/AddTagDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagdialog/AddTagDialog.kt
similarity index 94%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addtagdialog/AddTagDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addtagdialog/AddTagDialog.kt
index cac67c9..c147ec7 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagdialog/AddTagDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagdialog/AddTagDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.addtagdialog
+package com.marcdonald.hibi.uicomponents.addtagdialog
import android.os.Bundle
import android.view.KeyEvent
@@ -9,10 +9,10 @@ import android.widget.EditText
import android.widget.TextView
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.TAG_ID_KEY
-import app.marcdev.hibi.internal.base.HibiDialogFragment
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.TAG_ID_KEY
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagdialog/AddTagViewModel.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagdialog/AddTagViewModel.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addtagdialog/AddTagViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addtagdialog/AddTagViewModel.kt
index ac83e68..8d9ee0e 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagdialog/AddTagViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagdialog/AddTagViewModel.kt
@@ -1,11 +1,11 @@
-package app.marcdev.hibi.uicomponents.addtagdialog
+package com.marcdonald.hibi.uicomponents.addtagdialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.entity.Tag
-import app.marcdev.hibi.data.repository.TagRepository
+import com.marcdonald.hibi.data.entity.Tag
+import com.marcdonald.hibi.data.repository.TagRepository
import kotlinx.coroutines.launch
class AddTagViewModel(private val tagRepository: TagRepository) : ViewModel() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagdialog/AddTagViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagdialog/AddTagViewModelFactory.kt
similarity index 75%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addtagdialog/AddTagViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addtagdialog/AddTagViewModelFactory.kt
index 116ed74..a22c9ee 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagdialog/AddTagViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagdialog/AddTagViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.uicomponents.addtagdialog
+package com.marcdonald.hibi.uicomponents.addtagdialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.TagRepository
+import com.marcdonald.hibi.data.repository.TagRepository
class AddTagViewModelFactory(private val tagRepository: TagRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryDialog.kt
similarity index 91%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryDialog.kt
index 7a0d8b8..6685259 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.addtagtoentrydialog
+package com.marcdonald.hibi.uicomponents.addtagtoentrydialog
import android.os.Bundle
import android.view.LayoutInflater
@@ -8,13 +8,13 @@ import android.widget.LinearLayout
import android.widget.TextView
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.ENTRY_ID_KEY
-import app.marcdev.hibi.internal.base.HibiBottomSheetDialogFragment
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.uicomponents.addtagdialog.AddTagDialog
-import app.marcdev.hibi.uicomponents.views.CheckBoxWithId
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.ENTRY_ID_KEY
+import com.marcdonald.hibi.internal.base.HibiBottomSheetDialogFragment
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.uicomponents.addtagdialog.AddTagDialog
+import com.marcdonald.hibi.uicomponents.views.CheckBoxWithId
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModel.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModel.kt
similarity index 87%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModel.kt
index a8adbcd..18a6b0f 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModel.kt
@@ -1,13 +1,13 @@
-package app.marcdev.hibi.uicomponents.addtagtoentrydialog
+package com.marcdonald.hibi.uicomponents.addtagtoentrydialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.entity.Tag
-import app.marcdev.hibi.data.entity.TagEntryRelation
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
-import app.marcdev.hibi.data.repository.TagRepository
+import com.marcdonald.hibi.data.entity.Tag
+import com.marcdonald.hibi.data.entity.TagEntryRelation
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.data.repository.TagRepository
import kotlinx.coroutines.launch
import timber.log.Timber
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModelFactory.kt
similarity index 70%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModelFactory.kt
index bfa4647..8ff625a 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/addtagtoentrydialog/AddTagToEntryViewModelFactory.kt
@@ -1,9 +1,9 @@
-package app.marcdev.hibi.uicomponents.addtagtoentrydialog
+package com.marcdonald.hibi.uicomponents.addtagtoentrydialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.TagEntryRelationRepository
-import app.marcdev.hibi.data.repository.TagRepository
+import com.marcdonald.hibi.data.repository.TagEntryRelationRepository
+import com.marcdonald.hibi.data.repository.TagRepository
class AddTagToEntryViewModelFactory(private val tagRepository: TagRepository, private val tagEntryRelationRepository: TagEntryRelationRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/locationdialog/AddLocationToEntryDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/locationdialog/AddLocationToEntryDialog.kt
similarity index 93%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/locationdialog/AddLocationToEntryDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/locationdialog/AddLocationToEntryDialog.kt
index 15e976f..d332f8c 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/locationdialog/AddLocationToEntryDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/locationdialog/AddLocationToEntryDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.locationdialog
+package com.marcdonald.hibi.uicomponents.locationdialog
import android.os.Bundle
import android.view.KeyEvent
@@ -8,10 +8,10 @@ import android.view.ViewGroup
import android.widget.EditText
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.ENTRY_ID_KEY
-import app.marcdev.hibi.internal.base.HibiDialogFragment
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.ENTRY_ID_KEY
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/locationdialog/AddLocationToEntryViewModel.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/locationdialog/AddLocationToEntryViewModel.kt
similarity index 91%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/locationdialog/AddLocationToEntryViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/locationdialog/AddLocationToEntryViewModel.kt
index ba26347..27c61c9 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/locationdialog/AddLocationToEntryViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/locationdialog/AddLocationToEntryViewModel.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.uicomponents.locationdialog
+package com.marcdonald.hibi.uicomponents.locationdialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
-import app.marcdev.hibi.data.repository.EntryRepository
+import com.marcdonald.hibi.data.repository.EntryRepository
import kotlinx.coroutines.launch
class AddLocationToEntryViewModel(private val entryRepository: EntryRepository) : ViewModel() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/locationdialog/AddLocationToEntryViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/locationdialog/AddLocationToEntryViewModelFactory.kt
similarity index 76%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/locationdialog/AddLocationToEntryViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/locationdialog/AddLocationToEntryViewModelFactory.kt
index acaf3dd..401945e 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/locationdialog/AddLocationToEntryViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/locationdialog/AddLocationToEntryViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.uicomponents.locationdialog
+package com.marcdonald.hibi.uicomponents.locationdialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.EntryRepository
+import com.marcdonald.hibi.data.repository.EntryRepository
class AddLocationToEntryViewModelFactory(private val entryRepository: EntryRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/MultiSelectMenu.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/MultiSelectMenu.kt
similarity index 90%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/MultiSelectMenu.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/MultiSelectMenu.kt
index 6ee30b0..3fa926e 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/MultiSelectMenu.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/MultiSelectMenu.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.uicomponents.multiselectdialog
+package com.marcdonald.hibi.uicomponents.multiselectdialog
import android.os.Bundle
import android.view.*
import android.widget.ImageView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiDialogFragment
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiDialogFragment
class MultiSelectMenu(private val listener: ItemSelectedListener?) : HibiDialogFragment() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookDialog.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookDialog.kt
index 5a007dd..f893b3a 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.multiselectdialog.addmultientrytobookdialog
+package com.marcdonald.hibi.uicomponents.multiselectdialog.addmultientrytobookdialog
import android.os.Bundle
import android.view.LayoutInflater
@@ -8,12 +8,12 @@ import android.widget.LinearLayout
import android.widget.TextView
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiBottomSheetDialogFragment
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.uicomponents.addbookdialog.AddBookDialog
-import app.marcdev.hibi.uicomponents.views.CheckBoxWithId
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiBottomSheetDialogFragment
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.uicomponents.addbookdialog.AddBookDialog
+import com.marcdonald.hibi.uicomponents.views.CheckBoxWithId
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModel.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModel.kt
similarity index 72%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModel.kt
index eb64b9c..68d839a 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModel.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.uicomponents.multiselectdialog.addmultientrytobookdialog
+package com.marcdonald.hibi.uicomponents.multiselectdialog.addmultientrytobookdialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import app.marcdev.hibi.data.entity.Book
-import app.marcdev.hibi.data.repository.BookRepository
+import com.marcdonald.hibi.data.entity.Book
+import com.marcdonald.hibi.data.repository.BookRepository
class AddMultiEntryToBookViewModel(bookRepository: BookRepository) : ViewModel() {
val allBooks: LiveData> = bookRepository.getAllBooksLD()
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModelFactory.kt
similarity index 72%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModelFactory.kt
index 81c18ad..2332cc4 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addmultientrytobookdialog/AddMultiEntryToBookViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.uicomponents.multiselectdialog.addmultientrytobookdialog
+package com.marcdonald.hibi.uicomponents.multiselectdialog.addmultientrytobookdialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.BookRepository
+import com.marcdonald.hibi.data.repository.BookRepository
class AddMultiEntryToBookViewModelFactory(private val bookRepository: BookRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryDialog.kt
similarity index 92%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryDialog.kt
index eccbfef..1b83b86 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.multiselectdialog.addtagtomultientrydialog
+package com.marcdonald.hibi.uicomponents.multiselectdialog.addtagtomultientrydialog
import android.os.Bundle
import android.view.LayoutInflater
@@ -8,12 +8,12 @@ import android.widget.LinearLayout
import android.widget.TextView
import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.base.HibiBottomSheetDialogFragment
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.uicomponents.addtagdialog.AddTagDialog
-import app.marcdev.hibi.uicomponents.views.CheckBoxWithId
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.base.HibiBottomSheetDialogFragment
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.uicomponents.addtagdialog.AddTagDialog
+import com.marcdonald.hibi.uicomponents.views.CheckBoxWithId
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModel.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModel.kt
similarity index 72%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModel.kt
index 3a8e59a..93e4531 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModel.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.uicomponents.multiselectdialog.addtagtomultientrydialog
+package com.marcdonald.hibi.uicomponents.multiselectdialog.addtagtomultientrydialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import app.marcdev.hibi.data.entity.Tag
-import app.marcdev.hibi.data.repository.TagRepository
+import com.marcdonald.hibi.data.entity.Tag
+import com.marcdonald.hibi.data.repository.TagRepository
class AddTagToMultiEntryViewModel(tagRepository: TagRepository) : ViewModel() {
val allTags: LiveData> = tagRepository.getAllTagsLD()
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModelFactory.kt
similarity index 72%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModelFactory.kt
index b56ba13..58367e4 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/multiselectdialog/addtagtomultientrydialog/AddTagToMultiEntryViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.uicomponents.multiselectdialog.addtagtomultientrydialog
+package com.marcdonald.hibi.uicomponents.multiselectdialog.addtagtomultientrydialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.TagRepository
+import com.marcdonald.hibi.data.repository.TagRepository
class AddTagToMultiEntryViewModelFactory(private val tagRepository: TagRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordDialog.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordDialog.kt
similarity index 90%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordDialog.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordDialog.kt
index b3d6d4b..b431db8 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordDialog.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordDialog.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.newwordsdialog
+package com.marcdonald.hibi.uicomponents.newwordsdialog
import android.os.Bundle
import android.view.LayoutInflater
@@ -10,13 +10,13 @@ import androidx.lifecycle.ViewModelProviders
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.ENTRY_ID_KEY
-import app.marcdev.hibi.internal.IS_EDIT_MODE_KEY
-import app.marcdev.hibi.internal.base.HibiBottomSheetDialogFragment
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.uicomponents.addnewworddialog.AddNewWordDialog
import com.google.android.material.button.MaterialButton
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.ENTRY_ID_KEY
+import com.marcdonald.hibi.internal.IS_EDIT_MODE_KEY
+import com.marcdonald.hibi.internal.base.HibiBottomSheetDialogFragment
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.uicomponents.addnewworddialog.AddNewWordDialog
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.closestKodein
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordViewModel.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordViewModel.kt
similarity index 88%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordViewModel.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordViewModel.kt
index 15f7e51..879b687 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordViewModel.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordViewModel.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.uicomponents.newwordsdialog
+package com.marcdonald.hibi.uicomponents.newwordsdialog
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
-import app.marcdev.hibi.data.entity.NewWord
-import app.marcdev.hibi.data.repository.NewWordRepository
+import com.marcdonald.hibi.data.entity.NewWord
+import com.marcdonald.hibi.data.repository.NewWordRepository
import timber.log.Timber
class NewWordViewModel(private val newWordRepository: NewWordRepository) : ViewModel() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordViewModelFactory.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordViewModelFactory.kt
similarity index 75%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordViewModelFactory.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordViewModelFactory.kt
index b02c335..9729250 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordViewModelFactory.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordViewModelFactory.kt
@@ -1,8 +1,8 @@
-package app.marcdev.hibi.uicomponents.newwordsdialog
+package com.marcdonald.hibi.uicomponents.newwordsdialog
import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
-import app.marcdev.hibi.data.repository.NewWordRepository
+import com.marcdonald.hibi.data.repository.NewWordRepository
class NewWordViewModelFactory(private val newWordRepository: NewWordRepository)
: ViewModelProvider.NewInstanceFactory() {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordsRecyclerAdapter.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordsRecyclerAdapter.kt
similarity index 91%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordsRecyclerAdapter.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordsRecyclerAdapter.kt
index 36e936a..c6dc51d 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordsRecyclerAdapter.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordsRecyclerAdapter.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.newwordsdialog
+package com.marcdonald.hibi.uicomponents.newwordsdialog
import android.content.Context
import android.view.LayoutInflater
@@ -7,8 +7,8 @@ import android.view.ViewGroup
import android.view.animation.AnimationUtils
import androidx.fragment.app.FragmentManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.data.entity.NewWord
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.data.entity.NewWord
class NewWordsRecyclerAdapter(private val context: Context,
private val fragmentManager: FragmentManager)
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordsRecyclerViewHolder.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordsRecyclerViewHolder.kt
similarity index 86%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordsRecyclerViewHolder.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordsRecyclerViewHolder.kt
index b4f4c14..2384758 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/newwordsdialog/NewWordsRecyclerViewHolder.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/newwordsdialog/NewWordsRecyclerViewHolder.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.newwordsdialog
+package com.marcdonald.hibi.uicomponents.newwordsdialog
import android.os.Bundle
import android.view.View
@@ -6,12 +6,12 @@ import android.widget.TextView
import androidx.constraintlayout.widget.ConstraintLayout
import androidx.fragment.app.FragmentManager
import androidx.recyclerview.widget.RecyclerView
-import app.marcdev.hibi.R
-import app.marcdev.hibi.data.entity.NewWord
-import app.marcdev.hibi.internal.ENTRY_ID_KEY
-import app.marcdev.hibi.internal.NEW_WORD_ID_KEY
-import app.marcdev.hibi.internal.extension.show
-import app.marcdev.hibi.uicomponents.addnewworddialog.AddNewWordDialog
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.data.entity.NewWord
+import com.marcdonald.hibi.internal.ENTRY_ID_KEY
+import com.marcdonald.hibi.internal.NEW_WORD_ID_KEY
+import com.marcdonald.hibi.internal.extension.show
+import com.marcdonald.hibi.uicomponents.addnewworddialog.AddNewWordDialog
class NewWordsRecyclerViewHolder(itemView: View,
fragmentManager: FragmentManager,
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/views/CheckBoxWithId.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/views/CheckBoxWithId.kt
similarity index 75%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/views/CheckBoxWithId.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/views/CheckBoxWithId.kt
index 73a3faa..2b8c306 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/views/CheckBoxWithId.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/views/CheckBoxWithId.kt
@@ -1,10 +1,10 @@
-package app.marcdev.hibi.uicomponents.views
+package com.marcdonald.hibi.uicomponents.views
import android.content.Context
import android.widget.CheckBox
import androidx.preference.PreferenceManager
-import app.marcdev.hibi.R
-import app.marcdev.hibi.internal.PREF_DARK_THEME
+import com.marcdonald.hibi.R
+import com.marcdonald.hibi.internal.PREF_DARK_THEME
class CheckBoxWithId(context: Context) : CheckBox(context) {
var itemId: Int = 0
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/views/ChipWithId.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/views/ChipWithId.kt
similarity index 76%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/views/ChipWithId.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/views/ChipWithId.kt
index 9411315..ff06e5c 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/views/ChipWithId.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/views/ChipWithId.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.views
+package com.marcdonald.hibi.uicomponents.views
import android.content.Context
import com.google.android.material.chip.Chip
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/views/LicenseDisplay.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/views/LicenseDisplay.kt
similarity index 94%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/views/LicenseDisplay.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/views/LicenseDisplay.kt
index 8e13cff..396fc37 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/views/LicenseDisplay.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/views/LicenseDisplay.kt
@@ -1,11 +1,11 @@
-package app.marcdev.hibi.uicomponents.views
+package com.marcdonald.hibi.uicomponents.views
import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.TextView
-import app.marcdev.hibi.R
import com.google.android.material.card.MaterialCardView
+import com.marcdonald.hibi.R
class LicenseDisplay(context: Context, attributeSet: AttributeSet?, defStyle: Int) : MaterialCardView(context, attributeSet, defStyle) {
diff --git a/app/src/main/java/app/marcdev/hibi/uicomponents/views/SearchBar.kt b/app/src/main/java/com/marcdonald/hibi/uicomponents/views/SearchBar.kt
similarity index 96%
rename from app/src/main/java/app/marcdev/hibi/uicomponents/views/SearchBar.kt
rename to app/src/main/java/com/marcdonald/hibi/uicomponents/views/SearchBar.kt
index 811f8cd..f8d1579 100644
--- a/app/src/main/java/app/marcdev/hibi/uicomponents/views/SearchBar.kt
+++ b/app/src/main/java/com/marcdonald/hibi/uicomponents/views/SearchBar.kt
@@ -1,4 +1,4 @@
-package app.marcdev.hibi.uicomponents.views
+package com.marcdonald.hibi.uicomponents.views
import android.content.Context
import android.util.AttributeSet
@@ -10,7 +10,7 @@ import android.view.View.OnKeyListener
import android.widget.EditText
import android.widget.ImageView
import androidx.constraintlayout.widget.ConstraintLayout
-import app.marcdev.hibi.R
+import com.marcdonald.hibi.R
class SearchBar(context: Context, attributeSet: AttributeSet?, defStyle: Int) : ConstraintLayout(context, attributeSet, defStyle) {
diff --git a/app/src/main/res/drawable/divider_standard.xml b/app/src/main/res/drawable/divider_standard.xml
index a4a1838..8cd65e8 100644
--- a/app/src/main/res/drawable/divider_standard.xml
+++ b/app/src/main/res/drawable/divider_standard.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/app/src/main/res/drawable/ic_event_24dp.xml b/app/src/main/res/drawable/ic_event_24dp.xml
new file mode 100644
index 0000000..27c3478
--- /dev/null
+++ b/app/src/main/res/drawable/ic_event_24dp.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index de205fa..c90453a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,6 @@
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_main_menu.xml b/app/src/main/res/layout/dialog_main_menu.xml
index 1956c3a..7f09ade 100644
--- a/app/src/main/res/layout/dialog_main_menu.xml
+++ b/app/src/main/res/layout/dialog_main_menu.xml
@@ -17,6 +17,24 @@
android:layout_margin="@dimen/margin_standard"
android:orientation="vertical">
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
new file mode 100644
index 0000000..e81cb7b
--- /dev/null
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_oss.xml b/app/src/main/res/layout/fragment_oss.xml
similarity index 89%
rename from app/src/main/res/layout/activity_oss.xml
rename to app/src/main/res/layout/fragment_oss.xml
index 1eb96d4..0ce0a91 100644
--- a/app/src/main/res/layout/activity_oss.xml
+++ b/app/src/main/res/layout/fragment_oss.xml
@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
new file mode 100644
index 0000000..9858cc1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_throwback.xml b/app/src/main/res/layout/fragment_throwback.xml
new file mode 100644
index 0000000..6383084
--- /dev/null
+++ b/app/src/main/res/layout/fragment_throwback.xml
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_throwback_entries.xml b/app/src/main/res/layout/fragment_throwback_entries.xml
new file mode 100644
index 0000000..9860003
--- /dev/null
+++ b/app/src/main/res/layout/fragment_throwback_entries.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_view_entry.xml b/app/src/main/res/layout/fragment_view_entry.xml
index 45b4e82..c1ac853 100644
--- a/app/src/main/res/layout/fragment_view_entry.xml
+++ b/app/src/main/res/layout/fragment_view_entry.xml
@@ -195,7 +195,7 @@
android:backgroundTint="?colorPrimaryDark"
app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior">
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+ android:text="@string/content"
+ android:textAppearance="@style/TextAppearance.Hibi.MainEntryContent"
+ android:maxLines="3"
+ android:ellipsize="end"
+ android:padding="@dimen/margin_standard"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@id/item_date" />
+
+
+
+
+
-
-
-
-
-
-
-
-
+ android:layout_gravity="center"
+ android:layout_marginEnd="@dimen/margin_standard"
+ android:src="@drawable/ic_tag_24dp"
+ android:contentDescription="@string/entry_tags" />
-
-
+ android:layout_gravity="center">
-
-
-
+ android:text="@string/tag_name" />
+
+
+
+
+
+
-
-
-
-
+
-
-
+ android:layout_gravity="center">
-
-
-
-
-
-
-
-
+ android:text="@string/book_name" />
+
+
+
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
index 020b89f..2d0bea4 100644
--- a/app/src/main/res/layout/item_search_result.xml
+++ b/app/src/main/res/layout/item_search_result.xml
@@ -1,6 +1,7 @@
+
+
@@ -42,6 +58,8 @@
android:layout_height="24dp"
android:text="@string/reading_wc"
android:textAppearance="@style/TextAppearance.Hibi.ResultItemPrimary"
+ android:maxLines="1"
+ android:ellipsize="end"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/txt_search_result_word" />
diff --git a/app/src/main/res/layout/item_throwback.xml b/app/src/main/res/layout/item_throwback.xml
new file mode 100644
index 0000000..bc80975
--- /dev/null
+++ b/app/src/main/res/layout/item_throwback.xml
@@ -0,0 +1,182 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 305a821..588eab9 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
index 671c9f9..86ea725 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 3ccedfa..68550fa 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 5e37e98..c6faacf 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
index d2bc8ff..fe82f7a 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 20721d5..525a296 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 6644f9a..9b237c9 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
index 815db39..012df0c 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 976c808..6e1dccc 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index b6b1dfe..b00101b 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
index 6d136b5..ea5b9bc 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index e35fd44..96929f2 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index f4ff48a..0745b44 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
index 1e046f0..e4a42f2 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index 9075111..4dd99eb 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/main_navigation.xml
similarity index 52%
rename from app/src/main/res/navigation/mobile_navigation.xml
rename to app/src/main/res/navigation/main_navigation.xml
index 0a423ae..5bb80b7 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/main_navigation.xml
@@ -7,7 +7,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index 16cdd5a..1129ca2 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
- #FFFFFF
+ #212121
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a9563c6..1bd5b8e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -168,6 +168,11 @@
Add Entry
+
+ Throwback
+ Last Month
+
+
Settings
Behaviour
@@ -219,15 +224,18 @@
Credits
Author
Marc Donald
- Privacy Policy
- This app stores all user data on device and does not send analytics, user data etc. off-device
- except when searching for a word using the Jisho.org API.
- \nThis app also uses some Open Source Libraries which may
- collect information. Please see the Open Source Licenses section for more information about which libraries are used.
- \nFor more information about Jisho.org, click the button below.
- \nIf you have any more questions or concerns about this app, you can look at the code on Github or contact marcsdeveloperemail@gmail.com.
- Visit Jisho.org
+
+
+ Privacy Policy
+ What analytics does Hibi collect?
+ Hibi does not collect any analytics.
+ Where is my data sent?
+ Your data is stored completely on-device. The only time data is sent off-device is when searching for a word on the Jisho.org API. When you search for a word, only the search term you entered is sent.
+ What libraries are used?
+ See the Open Source Libraries section for more information on what libraries are used in this app.
+ Where can I find more information?
+ For more information you can look at the source code on Github or contact marcsdeveloperemail@gmail.com.
@@ -302,6 +310,11 @@
- Add %d Entry To Books
- Add %d Entries To Books
+
+
+ - and %d more entry
+ - and %d more entries
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5f2aba9..18193cd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -311,6 +311,34 @@
- false
- 0.0125
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 7ac7819..b60b9c2 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -2,7 +2,7 @@
diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml
index 9d596fa..56c3873 100644
--- a/app/src/main/res/xml/shortcuts.xml
+++ b/app/src/main/res/xml/shortcuts.xml
@@ -11,8 +11,8 @@
tools:targetApi="n_mr1">
+ android:action="com.marcdonald.hibi.intent.ADD_ENTRY_SHORTCUT"
+ android:targetPackage="com.marcdonald.hibi"
+ android:targetClass="com.marcdonald.hibi.MainActivity" />
\ No newline at end of file