From 1a56cfb4196440e80ff4564ed2f80cc026fc62be Mon Sep 17 00:00:00 2001 From: Aurelien Hubert Date: Fri, 22 Feb 2019 15:23:47 +0100 Subject: [PATCH] Clean unnecessary files & code --- .../android/model/realm/Session.kt | 71 +------------------ .../android/util/data/LiveRealmData.kt | 21 ------ .../android/util/data/Realm+Dao.kt | 11 --- 3 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 app/src/main/java/net/pokeranalytics/android/util/data/LiveRealmData.kt delete mode 100644 app/src/main/java/net/pokeranalytics/android/util/data/Realm+Dao.kt diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt index 9775dd2c..0b3a11ec 100644 --- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt +++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt @@ -2,7 +2,8 @@ package net.pokeranalytics.android.model.realm import android.content.Context import android.text.InputType -import io.realm.* +import io.realm.RealmList +import io.realm.RealmObject import io.realm.annotations.Ignore import io.realm.annotations.PrimaryKey import net.pokeranalytics.android.R @@ -16,7 +17,6 @@ import net.pokeranalytics.android.ui.fragment.components.bottomsheet.BottomSheet import net.pokeranalytics.android.ui.view.RowEditable import net.pokeranalytics.android.ui.view.RowRepresentable import net.pokeranalytics.android.ui.view.SessionRow -import net.pokeranalytics.android.util.data.sessionDao import net.pokeranalytics.android.util.getDuration import net.pokeranalytics.android.util.round import net.pokeranalytics.android.util.short @@ -420,70 +420,3 @@ enum class TournamentKind { MTT, SNG } - - -/** - * Session Dao - */ -class SessionDao(realmDb: Realm) { - - var realm: Realm = realmDb - - /** - * Create or update session - */ - fun createOrUpdateSession(session: Session): Session { - realm.beginTransaction() - val sessionToSave = realm.copyToRealmOrUpdate(session) - realm.commitTransaction() - return realm.copyFromRealm(sessionToSave) - } - - /** - * Create or update sessions - */ - fun createOrUpdateSessions(sessions: List): List { - - realm.beginTransaction() - - // Update - val sessionsToSave = realm.copyToRealmOrUpdate(sessions) - realm.commitTransaction() - - return realm.copyFromRealm(sessionsToSave) - } - - /** - * Find all sessions - */ - fun findAllSessions(): RealmResults { - return realm.where(Session::class.java).findAll().sort("creationDate", Sort.DESCENDING) - } - - /** - * Find session by id - */ - fun findSessionById(sessionId: Int): Session? { - return realm.copyFromRealm(realm.where(Session::class.java).equalTo("id", sessionId).findFirst()) - } - - /** - * Delete session - */ - fun deleteSession(sessionId: Int) { - realm.beginTransaction() - realm.sessionDao().findSessionById(sessionId)?.deleteFromRealm() - realm.commitTransaction() - } - - /** - * Delete all sessions - */ - fun deleteAllSessions() { - realm.beginTransaction() - realm.sessionDao().findAllSessions().deleteAllFromRealm() - realm.commitTransaction() - } - - -} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/util/data/LiveRealmData.kt b/app/src/main/java/net/pokeranalytics/android/util/data/LiveRealmData.kt deleted file mode 100644 index 3edd4d69..00000000 --- a/app/src/main/java/net/pokeranalytics/android/util/data/LiveRealmData.kt +++ /dev/null @@ -1,21 +0,0 @@ -package net.pokeranalytics.android.util.data - -import androidx.lifecycle.LiveData -import io.realm.RealmChangeListener -import io.realm.RealmModel -import io.realm.RealmResults - - -class LiveRealmData(private val results: RealmResults) : LiveData>() { - private val listener = RealmChangeListener> { results -> value = results } - - override fun onActive() { - results.addChangeListener(listener) - value = results - } - - override fun onInactive() { - results.removeChangeListener(listener) - } - -} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/util/data/Realm+Dao.kt b/app/src/main/java/net/pokeranalytics/android/util/data/Realm+Dao.kt deleted file mode 100644 index f09412c6..00000000 --- a/app/src/main/java/net/pokeranalytics/android/util/data/Realm+Dao.kt +++ /dev/null @@ -1,11 +0,0 @@ -@file:JvmName("RealmUtils") // pretty name for utils class if called from -package net.pokeranalytics.android.util.data - -import io.realm.Realm -import io.realm.RealmModel -import io.realm.RealmResults -import net.pokeranalytics.android.model.realm.SessionDao - -fun Realm.sessionDao(): SessionDao = SessionDao(this) - -fun RealmResults.asLiveData() = LiveRealmData(this) \ No newline at end of file