Merge branch 'feature/trivial-fix' into develop

geckour · Aug 28, 2017 · 117a2d6 · 117a2d6
2 parents d3a4220 + 7dd7888
commit 117a2d6
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,12 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 
+androidExtensions {
+    experimental = true
+}
+
 android {
     compileSdkVersion 26
     buildToolsVersion "26.0.1"
@@ -96,10 +101,6 @@ dependencies {
     compile 'com.jakewharton.timber:timber:4.5.1'
 
     // Misc
-    compile 'nz.bradcampbell:paperparcel:2.0.1'
-    compile 'nz.bradcampbell:paperparcel-kotlin:2.0.1'
-    kapt 'nz.bradcampbell:paperparcel-compiler:2.0.1'
-
     compile('com.mikepenz:materialdrawer:5.9.0@aar') {
         transitive = true
     }

diff --git a/app/src/main/java/com/geckour/egret/App.kt b/app/src/main/java/com/geckour/egret/App.kt
@@ -12,11 +12,8 @@ import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import com.vanniktech.emoji.EmojiManager
 import com.vanniktech.emoji.one.EmojiOneProvider
-import paperparcel.Adapter
-import paperparcel.ProcessorConfig
 import timber.log.Timber
 
-@ProcessorConfig(adapters = arrayOf(Adapter(SpannedTypeAdapter::class)))
 class App: Application() {
 
     companion object {

diff --git a/app/src/main/java/com/geckour/egret/model/AccessToken.kt b/app/src/main/java/com/geckour/egret/model/AccessToken.kt
@@ -4,7 +4,7 @@ import com.github.gfx.android.orma.annotation.*
 import java.util.*
 
 @Table
-class AccessToken(
+data class AccessToken(
         @Setter("id") @PrimaryKey(autoincrement = true) val id: Long = -1L,
         @Setter("access_token") @Column val token: String = "",
         @Setter("instance_id") @Column val instanceId: Long = -1L,

diff --git a/app/src/main/java/com/geckour/egret/model/InstanceAuthInfo.kt b/app/src/main/java/com/geckour/egret/model/InstanceAuthInfo.kt
@@ -7,7 +7,7 @@ import com.github.gfx.android.orma.annotation.Table
 import java.util.*
 
 @Table
-class InstanceAuthInfo(
+data class InstanceAuthInfo(
         @Setter("id") @PrimaryKey(autoincrement = true) val id: Long = -1L,
         @Setter("instance") @Column val instance: String = "",
         @Setter("auth_id") @Column var authId: Long = -1L,

diff --git a/app/src/main/java/com/geckour/egret/model/MuteHashTag.kt b/app/src/main/java/com/geckour/egret/model/MuteHashTag.kt
@@ -6,7 +6,7 @@ import com.github.gfx.android.orma.annotation.Setter
 import com.github.gfx.android.orma.annotation.Table
 
 @Table
-class MuteHashTag(
+data class MuteHashTag(
     @Setter("id") @PrimaryKey(autoincrement = true) val id: Long = -1L,
     @Setter("hashTag") @Column var hashTag: String = ""
 )
diff --git a/app/src/main/java/com/geckour/egret/model/MuteInstance.kt b/app/src/main/java/com/geckour/egret/model/MuteInstance.kt
@@ -6,7 +6,7 @@ import com.github.gfx.android.orma.annotation.Setter
 import com.github.gfx.android.orma.annotation.Table
 
 @Table
-class MuteInstance(
+data class MuteInstance(
         @Setter("id") @PrimaryKey(autoincrement = true) val id: Long = -1L,
         @Setter("instance") @Column var instance: String = ""
 )
diff --git a/app/src/main/java/com/geckour/egret/model/MuteKeyword.kt b/app/src/main/java/com/geckour/egret/model/MuteKeyword.kt
@@ -6,7 +6,7 @@ import com.github.gfx.android.orma.annotation.Setter
 import com.github.gfx.android.orma.annotation.Table
 
 @Table
-class MuteKeyword(
+data class MuteKeyword(
         @Setter("id") @PrimaryKey(autoincrement = true) val id: Long = -1L,
         @Setter("is_regex") @Column var isRegex: Boolean = false,
         @Setter("hashTag") @Column var keyword: String = ""

diff --git a/app/src/main/java/com/geckour/egret/view/adapter/model/TimelineContent.kt b/app/src/main/java/com/geckour/egret/view/adapter/model/TimelineContent.kt
@@ -1,7 +1,6 @@
 package com.geckour.egret.view.adapter.model
 
 import android.text.Spanned
-import com.geckour.egret.api.model.Notification
 import java.io.Serializable
 import java.util.*
 

diff --git a/app/src/main/java/com/geckour/egret/view/fragment/HashTagMuteFragment.kt b/app/src/main/java/com/geckour/egret/view/fragment/HashTagMuteFragment.kt
@@ -15,7 +15,6 @@ import com.geckour.egret.util.Common
 import com.geckour.egret.util.OrmaProvider
 import com.geckour.egret.view.activity.MainActivity
 import com.geckour.egret.view.adapter.MuteHashTagAdapter
-import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import io.reactivex.Observable
 import io.reactivex.Single