Merge pull request #28 from MarcDonald/feature/githubVersionChecking

GitHub Version Checking

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "app.marcdev.hibi"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 27
-        versionName "1.0.0"
+        versionCode 28
+        versionName "1.1.0"
         setProperty("archivesBaseName", "Hibi-v$versionName")
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/app/marcdev/hibi/Hibi.kt

@@ -9,7 +9,8 @@ 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.JishoAPIService
+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
@@ -25,6 +26,7 @@ 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
@@ -70,6 +72,7 @@ class Hibi : Application(), KodeinAware {
     // <editor-fold desc="Connectivity and Jisho API">
     bind<ConnectivityInterceptor>() with singleton { ConnectivityInterceptorImpl(instance()) }
     bind<JishoAPIService>() with singleton { JishoAPIService(instance()) }
+    bind<GithubAPIService>() with singleton { GithubAPIService(instance()) }
     // </editor-fold>
     // <editor-fold desc="View models">
     bind() from provider { MainEntriesViewModelFactory(instance(), instance(), instance()) }
@@ -94,6 +97,7 @@ class Hibi : Application(), KodeinAware {
     bind() from provider { AddMultiEntryToBookViewModelFactory(instance()) }
     bind() from provider { BackupDialogViewModelFactory(instance()) }
     bind() from provider { RestoreDialogViewModelFactory(instance(), instance()) }
+    bind() from provider { UpdateDialogViewModelFactory(instance()) }
     // </editor-fold>
   }
 

app/src/main/java/app/marcdev/hibi/data/network/github/GithubAPIService.kt

@@ -0,0 +1,29 @@
+package app.marcdev.hibi.data.network.github
+
+import app.marcdev.hibi.data.network.ConnectivityInterceptor
+import app.marcdev.hibi.data.network.github.apiresponse.GithubVersionResponse
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.http.GET
+
+interface GithubAPIService {
+
+  @GET("repos/MarcDonald/Hibi/releases/latest")
+  suspend fun getNewestVersion(): GithubVersionResponse
+
+  companion object {
+    operator fun invoke(connectivityInterceptor: ConnectivityInterceptor): GithubAPIService {
+      val okHttpClient = OkHttpClient.Builder()
+        .addInterceptor(connectivityInterceptor)
+        .build()
+
+      return Retrofit.Builder()
+        .client(okHttpClient)
+        .baseUrl("https://api.github.com/")
+        .addConverterFactory(GsonConverterFactory.create())
+        .build()
+        .create(GithubAPIService::class.java)
+    }
+  }
+}

app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Asset.kt

@@ -0,0 +1,17 @@
+package app.marcdev.hibi.data.network.github.apiresponse
+
+data class Asset(
+  val browser_download_url: String,
+  val content_type: String,
+  val created_at: String,
+  val download_count: Int,
+  val id: Int,
+  val label: Any,
+  val name: String,
+  val node_id: String,
+  val size: Int,
+  val state: String,
+  val updated_at: String,
+  val uploader: Uploader,
+  val url: String
+)

app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Author.kt

@@ -0,0 +1,22 @@
+package app.marcdev.hibi.data.network.github.apiresponse
+
+data class Author(
+  val avatar_url: String,
+  val events_url: String,
+  val followers_url: String,
+  val following_url: String,
+  val gists_url: String,
+  val gravatar_id: String,
+  val html_url: String,
+  val id: Int,
+  val login: String,
+  val node_id: String,
+  val organizations_url: String,
+  val received_events_url: String,
+  val repos_url: String,
+  val site_admin: Boolean,
+  val starred_url: String,
+  val subscriptions_url: String,
+  val type: String,
+  val url: String
+)

app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/GithubVersionResponse.kt

@@ -0,0 +1,22 @@
+package app.marcdev.hibi.data.network.github.apiresponse
+
+data class GithubVersionResponse(
+  val assets: List<Asset>,
+  val assets_url: String,
+  val author: Author,
+  val body: String,
+  val created_at: String,
+  val draft: Boolean,
+  val html_url: String,
+  val id: Int,
+  val name: String,
+  val node_id: String,
+  val prerelease: Boolean,
+  val published_at: String,
+  val tag_name: String,
+  val tarball_url: String,
+  val target_commitish: String,
+  val upload_url: String,
+  val url: String,
+  val zipball_url: String
+)

app/src/main/java/app/marcdev/hibi/data/network/github/apiresponse/Uploader.kt

@@ -0,0 +1,22 @@
+package app.marcdev.hibi.data.network.github.apiresponse
+
+data class Uploader(
+  val avatar_url: String,
+  val events_url: String,
+  val followers_url: String,
+  val following_url: String,
+  val gists_url: String,
+  val gravatar_id: String,
+  val html_url: String,
+  val id: Int,
+  val login: String,
+  val node_id: String,
+  val organizations_url: String,
+  val received_events_url: String,
+  val repos_url: String,
+  val site_admin: Boolean,
+  val starred_url: String,
+  val subscriptions_url: String,
+  val type: String,
+  val url: String
+)

app/src/main/java/app/marcdev/hibi/data/network/JishoAPIService.kt → app/src/main/java/app/marcdev/hibi/data/network/jisho/JishoAPIService.kt

@@ -1,6 +1,7 @@
-package app.marcdev.hibi.data.network
+package app.marcdev.hibi.data.network.jisho
 
-import app.marcdev.hibi.data.network.apiresponse.SearchResponse
+import app.marcdev.hibi.data.network.ConnectivityInterceptor
+import app.marcdev.hibi.data.network.jisho.apiresponse.SearchResponse
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory

app/src/main/java/app/marcdev/hibi/data/network/apiresponse/Attribution.kt → app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Attribution.kt

@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.apiresponse
+package app.marcdev.hibi.data.network.jisho.apiresponse
 
 data class Attribution(
   val dbpedia: Boolean,

app/src/main/java/app/marcdev/hibi/data/network/apiresponse/Data.kt → app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Data.kt

@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.apiresponse
+package app.marcdev.hibi.data.network.jisho.apiresponse
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/app/marcdev/hibi/data/network/apiresponse/Japanese.kt → app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Japanese.kt

@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.apiresponse
+package app.marcdev.hibi.data.network.jisho.apiresponse
 
 data class Japanese(
   val reading: String,

app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/SearchResponse.kt

@@ -0,0 +1,5 @@
+package app.marcdev.hibi.data.network.jisho.apiresponse
+
+data class SearchResponse(
+  val `data`: List<Data>
+)

app/src/main/java/app/marcdev/hibi/data/network/apiresponse/Sense.kt → app/src/main/java/app/marcdev/hibi/data/network/jisho/apiresponse/Sense.kt

@@ -1,4 +1,4 @@
-package app.marcdev.hibi.data.network.apiresponse
+package app.marcdev.hibi.data.network.jisho.apiresponse
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/app/marcdev/hibi/maintabs/settings/AboutFragment.kt

@@ -61,6 +61,5 @@ class AboutFragment : PreferenceFragmentCompat() {
     val launchBrowser = Intent(Intent.ACTION_VIEW)
     launchBrowser.data = uriUrl
     startActivity(launchBrowser)
-
   }
 }

app/src/main/java/app/marcdev/hibi/maintabs/settings/SettingsFragment.kt

@@ -19,6 +19,7 @@ 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 droidninja.filepicker.FilePickerBuilder
@@ -64,6 +65,12 @@ class SettingsFragment : PreferenceFragmentCompat(), KodeinAware {
 
     val mainEntryDisplayItems = findPreference(PREF_MAIN_ENTRY_DISPLAY_ITEMS)
     mainEntryDisplayItems.onPreferenceClickListener = mainEntryDisplayItemsClickListener
+
+    findPreference("pref_app_update").onPreferenceClickListener = Preference.OnPreferenceClickListener {
+      val dialog = UpdateDialog()
+      dialog.show(requireFragmentManager(), "Update Dialog")
+      true
+    }
   }
 
   private val onThemeChangeListener = Preference.OnPreferenceChangeListener { _, _ ->

app/src/main/java/app/marcdev/hibi/maintabs/settings/backupdialog/BackupDialog.kt

@@ -65,14 +65,9 @@ class BackupDialog : HibiDialogFragment(), KodeinAware {
 
   private fun setupObservers() {
     viewModel.displayDismiss.observe(this, Observer { value ->
-      value?.let { display ->
-        if(display) {
-          dismissButton.show(true)
-          isCancelable = true
-        } else {
-          dismissButton.show(false)
-          isCancelable = false
-        }
+      value?.let { dismissable ->
+        dismissButton.show(dismissable)
+        isCancelable = dismissable
       }
     })