Merge pull request #31 from MarcDonald/version/1.2.2

Version 1.2.2
MarcDonald · Jul 8, 2019 · 714136f · 714136f
2 parents a84297a + ae94e5b
commit 714136f
Show file tree

Hide file tree

Showing 264 changed files with 4,305 additions and 96 deletions.
diff --git a/.idea/copyright/Apache_2.xml b/.idea/copyright/Apache_2.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 apply plugin: 'com.android.application'
 
 apply plugin: 'kotlin-android'
@@ -14,8 +30,8 @@ android {
         applicationId "com.marcdonald.hibi"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 30
-        versionName "1.2.1"
+        versionCode 31
+        versionName "1.2.2"
         setProperty("archivesBaseName", "Hibi-v$versionName")
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -40,7 +56,7 @@ dependencies {
 
     // AndroidX
     implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'
     implementation 'androidx.preference:preference:1.0.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation "androidx.lifecycle:lifecycle-extensions:2.2.0-alpha02"

diff --git a/app/src/main/java/com/marcdonald/hibi/Hibi.kt b/app/src/main/java/com/marcdonald/hibi/Hibi.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi
 
 import android.app.Application
@@ -10,6 +25,8 @@ 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.github.GithubStatusCodeInterceptor
+import com.marcdonald.hibi.data.network.github.GithubStatusCodeInterceptorImpl
 import com.marcdonald.hibi.data.network.jisho.JishoAPIService
 import com.marcdonald.hibi.data.repository.*
 import com.marcdonald.hibi.internal.NOTIFICATION_CHANNEL_REMINDER_ID
@@ -72,8 +89,9 @@ class Hibi : Application(), KodeinAware {
 		// </editor-fold>
 		// <editor-fold desc="Connectivity and Jisho API">
 		bind<ConnectivityInterceptor>() with singleton { ConnectivityInterceptorImpl(instance()) }
+		bind<GithubStatusCodeInterceptor>() with singleton { GithubStatusCodeInterceptorImpl() }
 		bind<JishoAPIService>() with singleton { JishoAPIService(instance()) }
-		bind<GithubAPIService>() with singleton { GithubAPIService(instance()) }
+		bind<GithubAPIService>() with singleton { GithubAPIService(instance(), instance()) }
 		// </editor-fold>
 		// <editor-fold desc="View models">
 		bind() from provider { MainEntriesViewModelFactory(instance(), instance(), instance()) }

diff --git a/app/src/main/java/com/marcdonald/hibi/MainActivity.kt b/app/src/main/java/com/marcdonald/hibi/MainActivity.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi
 
 import android.os.Bundle

diff --git a/app/src/main/java/com/marcdonald/hibi/data/database/AppDatabase.kt b/app/src/main/java/com/marcdonald/hibi/data/database/AppDatabase.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.database
 
 interface AppDatabase {

diff --git a/app/src/main/java/com/marcdonald/hibi/data/database/DAO.kt b/app/src/main/java/com/marcdonald/hibi/data/database/DAO.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.database
 
 import androidx.lifecycle.LiveData

diff --git a/app/src/main/java/com/marcdonald/hibi/data/database/ProductionAppDatabase.kt b/app/src/main/java/com/marcdonald/hibi/data/database/ProductionAppDatabase.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.database
 
 import android.content.Context

diff --git a/app/src/main/java/com/marcdonald/hibi/data/entity/Book.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/Book.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.entity
 
 import androidx.room.Entity

diff --git a/app/src/main/java/com/marcdonald/hibi/data/entity/BookEntryRelation.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/BookEntryRelation.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.entity
 
 import androidx.room.Entity

diff --git a/app/src/main/java/com/marcdonald/hibi/data/entity/Entry.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/Entry.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.entity
 
 import androidx.room.Entity

diff --git a/app/src/main/java/com/marcdonald/hibi/data/entity/EntryImage.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/EntryImage.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.entity
 
 import androidx.room.Entity

diff --git a/app/src/main/java/com/marcdonald/hibi/data/entity/NewWord.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/NewWord.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.entity
 
 import androidx.room.Entity

diff --git a/app/src/main/java/com/marcdonald/hibi/data/entity/Tag.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/Tag.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.entity
 
 import androidx.room.Entity

diff --git a/app/src/main/java/com/marcdonald/hibi/data/entity/TagEntryRelation.kt b/app/src/main/java/com/marcdonald/hibi/data/entity/TagEntryRelation.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.entity
 
 import androidx.room.Entity

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
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.network
 
 import okhttp3.Interceptor

diff --git a/app/src/main/java/com/marcdonald/hibi/data/network/ConnectivityInterceptorImpl.kt b/app/src/main/java/com/marcdonald/hibi/data/network/ConnectivityInterceptorImpl.kt
@@ -1,10 +1,25 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.network
 
 import android.content.Context
 import android.net.ConnectivityManager
-import com.marcdonald.hibi.internal.NoConnectivityException
 import okhttp3.Interceptor
 import okhttp3.Response
+import java.io.IOException
 
 class ConnectivityInterceptorImpl(context: Context) : ConnectivityInterceptor {
 
@@ -23,4 +38,6 @@ class ConnectivityInterceptorImpl(context: Context) : ConnectivityInterceptor {
 		val networkInfo = connectivityManager.activeNetworkInfo
 		return networkInfo != null && networkInfo.isConnected
 	}
-}
+}
+
+class NoConnectivityException : IOException()
diff --git a/app/src/main/java/com/marcdonald/hibi/data/network/github/GithubAPIService.kt b/app/src/main/java/com/marcdonald/hibi/data/network/github/GithubAPIService.kt
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2019 Marc Donald
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.marcdonald.hibi.data.network.github
 
 import com.marcdonald.hibi.data.network.ConnectivityInterceptor
@@ -13,9 +28,10 @@ interface GithubAPIService {
 	suspend fun getNewestVersion(): GithubVersionResponse
 
 	companion object {
-		operator fun invoke(connectivityInterceptor: ConnectivityInterceptor): GithubAPIService {
+		operator fun invoke(connectivityInterceptor: ConnectivityInterceptor, githubStatusCodeInterceptor: GithubStatusCodeInterceptor): GithubAPIService {
 			val okHttpClient = OkHttpClient.Builder()
 				.addInterceptor(connectivityInterceptor)
+				.addInterceptor(githubStatusCodeInterceptor)
 				.build()
 
 			return Retrofit.Builder()