Bump version 0.0.3 Optimize imports

README.md

@@ -13,12 +13,7 @@ Badreads is very unstable. I recommend backing up with an export before installi
 GPLv3
 Copyright 2021 Fenimore Love
 
-## Bug:
-
-1. Deleting data directly after exporting, and then importing that same csv will break the CSV.
-There seems to be an issue with the first line of the "rows" that are written (after the headers).
-
-## TODO:
+## Todo:
 
 1. Move export and import to settings
 2. Fix settings action bar color
@@ -28,10 +23,11 @@ There seems to be an issue with the first line of the "rows" that are written (a
 9. OpenLibrary book details button?
 8. Add tag/star to books
 11. Fetch description **
-
-
-## TODO: sort
 1. Sort a - z
 2. Sort z - a
 3. Sort page numbers
-4. Sort rating
+
+## Known Bug:
+
+1. Deleting data directly after exporting, and then importing that same csv will break the CSV.
+There seems to be an issue with the first line of the "rows" that are written (after the headers).

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.timenotclocks.bookcase"
         minSdkVersion 29
         targetSdkVersion 30
-        versionCode 2
-        versionName "0.0.2"
+        versionCode 3
+        versionName "0.0.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.timenotclocks.bookcase">
-    <!-- for barcode -->
-    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
     <application
         android:name=".database.BooksApplication"
@@ -14,11 +12,6 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true">
-
-        <!--
-               Set to true if your app is Standalone, that is, it does not require the handheld
-               app to run.
-        -->
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name">
@@ -31,10 +24,6 @@
         <activity
             android:name=".OpenLibrarySearchActivity"
             android:label="@string/title_search_book_activity" />
-        <!--
-               Set to true if your app is Standalone, that is, it does not require the handheld
-               app to run.
-        -->
         <activity
             android:name=".BookViewActivity"
             android:label="@string/title_activity_book_view" />
@@ -55,21 +44,11 @@
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="fullSensor"
             tools:replace="screenOrientation" />
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/provider_paths" />
-        </provider>
 
     </application>
+    <!-- for barcode -->
+    <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
-    <uses-feature android:name="android.hardware.camera" />
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <uses-permission android:name="android.permission.CAMERA" />
-
 </manifest>

app/src/main/java/com/timenotclocks/bookcase/BookViewActivity.kt

@@ -12,10 +12,8 @@ import android.widget.*
 import androidx.activity.viewModels
 import androidx.annotation.MenuRes
 import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.button.MaterialButton
 import com.google.android.material.snackbar.Snackbar
 import com.squareup.picasso.Picasso
-import com.timenotclocks.bookcase.api.OpenLibraryViewModel
 import com.timenotclocks.bookcase.database.*
 import java.time.LocalDate
 

app/src/main/java/com/timenotclocks/bookcase/MainActivity.kt

@@ -16,7 +16,6 @@
 
 package com.timenotclocks.bookcase
 
-import android.R.attr
 import android.content.DialogInterface
 import android.content.Intent
 import android.net.Uri
@@ -27,17 +26,13 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.widget.EditText
-import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.marginEnd
-import androidx.core.view.marginTop
 import androidx.preference.PreferenceManager
 import androidx.viewpager.widget.ViewPager
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayout
-import com.google.zxing.integration.android.IntentIntegrator
 import com.timenotclocks.bookcase.api.Exporter
 import com.timenotclocks.bookcase.api.GoodReadImport
 import com.timenotclocks.bookcase.database.BookViewModel

app/src/main/java/com/timenotclocks/bookcase/NewBookActivity.kt

@@ -11,7 +11,6 @@ import androidx.activity.viewModels
 import androidx.annotation.MenuRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.cardview.widget.CardView
-import com.beust.klaxon.JsonReader
 import com.beust.klaxon.Klaxon
 import com.google.android.material.button.MaterialButton
 import com.squareup.picasso.Picasso

app/src/main/java/com/timenotclocks/bookcase/OpenLibrarySearchActivity.kt

@@ -24,7 +24,10 @@ import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
-import android.widget.*
+import android.widget.ProgressBar
+import android.widget.SearchView
+import android.widget.TextView
+import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer

app/src/main/java/com/timenotclocks/bookcase/SettingsActivity.kt

@@ -2,8 +2,6 @@ package com.timenotclocks.bookcase
 
 import android.content.SharedPreferences
 import android.os.Bundle
-import android.util.Log
-import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate

app/src/main/java/com/timenotclocks/bookcase/api/GoodReadImport.kt

@@ -1,14 +1,11 @@
 package com.timenotclocks.bookcase.api
 
-import android.util.Log
 import com.github.doyaaaaaken.kotlincsv.dsl.csvReader
 import com.timenotclocks.bookcase.database.Book
 import com.timenotclocks.bookcase.database.csvDateFormatter
 import java.io.InputStream
 import java.time.LocalDate
-import java.time.format.DateTimeFormatter
 import java.util.*
-import kotlin.reflect.typeOf
 
 
 const val LOG_GOOD_READ = "BookGoodRead"

app/src/main/java/com/timenotclocks/bookcase/api/OpenLibraryViewModel.kt

@@ -12,7 +12,6 @@ import com.beust.klaxon.JsonArray
 import com.beust.klaxon.JsonObject
 import com.beust.klaxon.Klaxon
 import com.timenotclocks.bookcase.LOG_SEARCH
-import com.timenotclocks.bookcase.api.RequestQueueSingleton
 import com.timenotclocks.bookcase.database.Book
 import kotlinx.coroutines.launch
 import java.io.StringReader

app/src/main/java/com/timenotclocks/bookcase/database/Book.kt

@@ -128,6 +128,7 @@ data class Book(  // TODO: can I remove overloads? i'ts for the converter
                 ShelfType.CurrentShelf -> {
                     dateStarted = LocalDate.now().toEpochDay()
                 }
+                else -> {}
             }
             if (dateAdded == null) {
                 dateAdded = LocalDate.now().toEpochDay()

app/src/main/java/com/timenotclocks/bookcase/database/BookDatabase.kt

@@ -19,33 +19,13 @@
 package com.timenotclocks.bookcase.database
 
 import android.content.Context
-import androidx.room.*
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
-
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import java.time.LocalDate
-import java.time.format.DateTimeFormatter
-
-
-class Converters {
-    var formatter: DateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
-
-    @TypeConverter
-    fun fromDateString(value: String?): LocalDate? {
-        if (value != "null" && value != null) {
-            return LocalDate.parse(value, formatter)
-        }
-        return null  // this is dumb
-    }
-
-
-    @TypeConverter
-    fun toDateString(date: LocalDate?): String? {
-        return date.toString()
-    }
-}
 
 
 /**
@@ -55,7 +35,6 @@ class Converters {
 @Database(entities = [
     Book::class, BooksFts::class
 ], version = 5)
-@TypeConverters(Converters::class)
 abstract class BookDatabase : RoomDatabase() {
 
     abstract fun bookDao(): BookDao
@@ -100,17 +79,10 @@ abstract class BookDatabase : RoomDatabase() {
                 // comment out the following line.
                 INSTANCE?.let { database ->
                     scope.launch(Dispatchers.IO) {
-                        populateDatabase(database.bookDao())
+                        // populateDatabase(database.bookDao())
                     }
                 }
             }
         }
-
-        /**
-         * Populate the database in a new coroutine.
-         * If you want to start with more words, just add them.
-         */
-        suspend fun populateDatabase(bookDao: BookDao) {
-        }
     }
 }

app/src/main/java/com/timenotclocks/bookcase/database/BookRepository.kt

@@ -19,10 +19,6 @@ package com.timenotclocks.bookcase.database
 
 import androidx.annotation.WorkerThread
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.asLiveData
-import com.timenotclocks.bookcase.database.Book
-import com.timenotclocks.bookcase.database.BookDao
 import kotlinx.coroutines.flow.Flow
 
 /**

app/src/main/java/com/timenotclocks/bookcase/database/BookViewModel.kt

@@ -18,10 +18,7 @@
 
 package com.timenotclocks.bookcase.database
 
-import android.util.Log
 import androidx.lifecycle.*
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.launch
 
 /**

app/src/main/java/com/timenotclocks/bookcase/database/BooksApplication.kt

@@ -19,8 +19,6 @@
 package com.timenotclocks.bookcase.database
 
 import android.app.Application
-import com.timenotclocks.bookcase.database.BookDatabase
-import com.timenotclocks.bookcase.database.BookRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
 

app/src/main/java/com/timenotclocks/bookcase/ui/main/BookListAdapter.kt

@@ -4,29 +4,22 @@
 
 package com.timenotclocks.bookcase.ui.main
 
-import android.content.Context
 import android.content.Intent
-import android.content.res.ColorStateList
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.RatingBar
 import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.beust.klaxon.Klaxon
-import com.google.android.material.chip.Chip
 import com.squareup.picasso.Picasso
 import com.timenotclocks.bookcase.BookViewActivity
 import com.timenotclocks.bookcase.EXTRA_ID
-import com.timenotclocks.bookcase.LOG_TAG
 import com.timenotclocks.bookcase.R
-import com.timenotclocks.bookcase.database.*
-import java.time.LocalDate
+import com.timenotclocks.bookcase.database.Book
+import com.timenotclocks.bookcase.database.ShelfType
 
 
 const val LOG_BOOK_ADAPTER = "BookAdapter"

app/src/main/java/com/timenotclocks/bookcase/ui/main/OpenLibrarySearchAdapter.kt

@@ -2,26 +2,21 @@
 
 package com.timenotclocks.bookcase.ui.main
 
-import android.content.DialogInterface
 import android.content.Intent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.beust.klaxon.Klaxon
 import com.squareup.picasso.Picasso
-import androidx.activity.viewModels
-import com.timenotclocks.bookcase.*
-import com.timenotclocks.bookcase.ui.main.OpenLibrarySearchAdapter.SearchViewHolder
+import com.timenotclocks.bookcase.NewBookActivity
+import com.timenotclocks.bookcase.R
 import com.timenotclocks.bookcase.database.Book
-import com.timenotclocks.bookcase.database.BookViewModel
-import com.timenotclocks.bookcase.database.BookViewModelFactory
-import com.timenotclocks.bookcase.database.BooksApplication
+import com.timenotclocks.bookcase.ui.main.OpenLibrarySearchAdapter.SearchViewHolder
 
 
 const val EXTRA_OPEN_LIBRARY_SEARCH = "open_library_search_extra"

app/src/main/java/com/timenotclocks/bookcase/ui/main/PageViewModel.kt

@@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
 
 class PageViewModel : ViewModel() {