From 2420c046dcf8579e0fb17f1ea5a8ec04d67ce94f Mon Sep 17 00:00:00 2001 From: Rok Biderman Date: Thu, 7 Feb 2019 02:54:33 -0800 Subject: [PATCH] Migrated off Androidx --- app/build.gradle | 8 +++----- .../org/secfirst/advancedsearch/AdvancedSearchApp.kt | 7 ++++--- .../org/secfirst/advancedsearch/DetailActivity.kt | 7 +------ .../java/org/secfirst/advancedsearch/MainActivity.kt | 9 ++++----- .../org/secfirst/advancedsearch/SearchActivity.kt | 2 +- .../secfirst/advancedsearch/mvp/data/AppDatabase.kt | 4 ++-- .../secfirst/advancedsearch/mvp/data/CategoryDao.kt | 12 ++++++------ .../advancedsearch/mvp/data/DifficultyDao.kt | 11 +++-------- .../secfirst/advancedsearch/mvp/data/SegmentDao.kt | 10 +++------- .../secfirst/advancedsearch/mvp/models/Category.kt | 9 +++++---- .../secfirst/advancedsearch/mvp/models/Difficulty.kt | 9 +++++---- .../secfirst/advancedsearch/mvp/models/Segment.kt | 11 ++++++----- app/src/main/res/layout/activity_detail.xml | 8 ++++---- app/src/main/res/layout/activity_main.xml | 4 ++-- app/src/main/res/menu/options_menu.xml | 2 +- build.gradle | 2 +- gradle.properties | 4 ++-- .../advancedsearch/adapters/SearchResultAdapter.kt | 2 +- .../advancedsearch/util/HeaderViewDecoration.kt | 2 +- .../advancedsearch/views/SearchResultView.kt | 6 +++--- library/src/main/res/layout/search_result_item.xml | 4 ++-- library/src/main/res/layout/search_view.xml | 2 +- 22 files changed, 61 insertions(+), 74 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0017ebd..5a51d85 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,11 +36,9 @@ dependencies { implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'io.reactivex.rxjava2:rxjava:2.2.0' - implementation "androidx.room:room-runtime:$room_version" - implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - kapt "androidx.room:room-compiler:$room_version" - implementation "androidx.room:room-rxjava2:$room_version" + implementation "android.arch.persistence.room:runtime:$room_version" + kapt "android.arch.persistence.room:compiler:$room_version" + implementation "android.arch.persistence.room:rxjava2:$room_version" androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/app/src/main/java/org/secfirst/advancedsearch/AdvancedSearchApp.kt b/app/src/main/java/org/secfirst/advancedsearch/AdvancedSearchApp.kt index 5fe49f5..c6c48f8 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/AdvancedSearchApp.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/AdvancedSearchApp.kt @@ -1,8 +1,8 @@ package org.secfirst.advancedsearch import android.app.Application -import androidx.room.Room -import androidx.room.RoomDatabase +import android.arch.persistence.room.Room +import android.arch.persistence.room.RoomDatabase import org.secfirst.advancedsearch.util.mvp.BgUiThreadSpec import org.secfirst.advancedsearch.util.mvp.ThreadSpec import org.secfirst.advancedsearch.mvp.data.AppDatabase @@ -17,7 +17,8 @@ class AdvancedSearchApp: Application() { instance = this db = Room.databaseBuilder( applicationContext, - AppDatabase::class.java, "umbrella.db" + AppDatabase::class.java, + "umbrella.db" ).setJournalMode(RoomDatabase.JournalMode.TRUNCATE) .build() } diff --git a/app/src/main/java/org/secfirst/advancedsearch/DetailActivity.kt b/app/src/main/java/org/secfirst/advancedsearch/DetailActivity.kt index ae440b8..d156748 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/DetailActivity.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/DetailActivity.kt @@ -1,15 +1,10 @@ package org.secfirst.advancedsearch -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle -import android.os.Handler +import android.support.v7.app.AppCompatActivity import android.widget.Toast import kotlinx.android.synthetic.main.activity_detail.* - - - - class DetailActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/org/secfirst/advancedsearch/MainActivity.kt b/app/src/main/java/org/secfirst/advancedsearch/MainActivity.kt index ed6df35..a6cd0f9 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/MainActivity.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/MainActivity.kt @@ -4,10 +4,9 @@ import android.app.SearchManager import android.content.Context import android.content.Intent import android.os.Bundle +import android.support.v7.app.AppCompatActivity +import android.support.v7.widget.SearchView import android.view.Menu -import androidx.appcompat.app.AppCompatActivity -import androidx.appcompat.widget.SearchView -import kotlinx.android.synthetic.main.activity_main.* import org.secfirst.advancedsearch.mvp.models.Category import org.secfirst.advancedsearch.mvp.models.Difficulty import org.secfirst.advancedsearch.mvp.models.Segment @@ -185,9 +184,9 @@ class MainActivity : AppCompatActivity() { category = Category("information", "Information", "") ) ) - AdvancedSearchApp.instance.db?.segmentDao()?.insertAll(*segmentsToInsert)?.subscribe { + AdvancedSearchApp.instance.db?.segmentDao()?.insertAll(*segmentsToInsert)?.let { Logger.getLogger("createRecords").info("Done") - }?.dispose() ?: kotlin.run { + } ?: kotlin.run { Logger.getLogger("createRecords").info("There was an error inserting the records") } } diff --git a/app/src/main/java/org/secfirst/advancedsearch/SearchActivity.kt b/app/src/main/java/org/secfirst/advancedsearch/SearchActivity.kt index c5be497..20008bf 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/SearchActivity.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/SearchActivity.kt @@ -3,8 +3,8 @@ package org.secfirst.advancedsearch import android.app.SearchManager import android.content.Intent import android.os.Bundle +import android.support.v7.app.AppCompatActivity import android.view.MenuItem -import androidx.appcompat.app.AppCompatActivity import kotlinx.android.synthetic.main.activity_search.* import org.secfirst.advancedsearch.interfaces.AdvancedSearchPresenter import org.secfirst.advancedsearch.interfaces.DataProvider diff --git a/app/src/main/java/org/secfirst/advancedsearch/mvp/data/AppDatabase.kt b/app/src/main/java/org/secfirst/advancedsearch/mvp/data/AppDatabase.kt index 93bc10c..f2df569 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/mvp/data/AppDatabase.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/mvp/data/AppDatabase.kt @@ -1,7 +1,7 @@ package org.secfirst.advancedsearch.mvp.data -import androidx.room.Database -import androidx.room.RoomDatabase +import android.arch.persistence.room.Database +import android.arch.persistence.room.RoomDatabase import org.secfirst.advancedsearch.mvp.models.Category import org.secfirst.advancedsearch.mvp.models.Difficulty import org.secfirst.advancedsearch.mvp.models.Segment diff --git a/app/src/main/java/org/secfirst/advancedsearch/mvp/data/CategoryDao.kt b/app/src/main/java/org/secfirst/advancedsearch/mvp/data/CategoryDao.kt index fc26439..8393040 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/mvp/data/CategoryDao.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/mvp/data/CategoryDao.kt @@ -1,9 +1,9 @@ package org.secfirst.advancedsearch.mvp.data -import androidx.room.Dao -import androidx.room.Delete -import androidx.room.Insert -import androidx.room.Query +import android.arch.persistence.room.Dao +import android.arch.persistence.room.Delete +import android.arch.persistence.room.Insert +import android.arch.persistence.room.Query import io.reactivex.Completable import io.reactivex.Flowable import io.reactivex.Maybe @@ -22,8 +22,8 @@ interface CategoryDao { fun findByName(name: String): Maybe @Insert - fun insertAll(vararg category: Category) : Completable + fun insertAll(vararg category: Category) : List @Delete - fun delete(category: Category) : Single + fun delete(category: Category) : Int } \ No newline at end of file diff --git a/app/src/main/java/org/secfirst/advancedsearch/mvp/data/DifficultyDao.kt b/app/src/main/java/org/secfirst/advancedsearch/mvp/data/DifficultyDao.kt index b508b48..501e147 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/mvp/data/DifficultyDao.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/mvp/data/DifficultyDao.kt @@ -1,13 +1,8 @@ package org.secfirst.advancedsearch.mvp.data -import androidx.room.Dao -import androidx.room.Delete -import androidx.room.Insert -import androidx.room.Query -import io.reactivex.Completable +import android.arch.persistence.room.* import io.reactivex.Flowable import io.reactivex.Maybe -import io.reactivex.Single import org.secfirst.advancedsearch.mvp.models.Difficulty @Dao @@ -22,8 +17,8 @@ interface DifficultyDao { fun findByName(name: String): Maybe @Insert - fun insertAll(vararg difficulty: Difficulty) : Completable + fun insertAll(vararg difficulty: Difficulty) : List @Delete - fun delete(difficulty: Difficulty) : Single + fun delete(difficulty: Difficulty) : Int } \ No newline at end of file diff --git a/app/src/main/java/org/secfirst/advancedsearch/mvp/data/SegmentDao.kt b/app/src/main/java/org/secfirst/advancedsearch/mvp/data/SegmentDao.kt index 4116123..a28ce5f 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/mvp/data/SegmentDao.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/mvp/data/SegmentDao.kt @@ -1,12 +1,8 @@ package org.secfirst.advancedsearch.mvp.data -import androidx.room.Dao -import androidx.room.Delete -import androidx.room.Insert -import androidx.room.Query +import android.arch.persistence.room.* import io.reactivex.Completable import io.reactivex.Flowable -import io.reactivex.Maybe import io.reactivex.Single import org.secfirst.advancedsearch.mvp.models.Segment @@ -30,8 +26,8 @@ interface SegmentDao { fun findByCriteria(title: String, category: String, difficulty: String): Flowable> @Insert - fun insertAll(vararg segment: Segment) : Completable + fun insertAll(vararg segment: Segment) : Array @Delete - fun delete(segment: Segment) : Single + fun delete(segment: Segment) : Int } \ No newline at end of file diff --git a/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Category.kt b/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Category.kt index 9ccaf42..6e54d44 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Category.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Category.kt @@ -1,9 +1,10 @@ package org.secfirst.advancedsearch.mvp.models -import androidx.annotation.NonNull -import androidx.room.ColumnInfo -import androidx.room.Entity -import androidx.room.PrimaryKey +import android.arch.persistence.room.ColumnInfo +import android.arch.persistence.room.Entity +import android.arch.persistence.room.PrimaryKey +import android.support.annotation.NonNull + @Entity(tableName = "category") data class Category( diff --git a/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Difficulty.kt b/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Difficulty.kt index 2524520..cc86d1c 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Difficulty.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Difficulty.kt @@ -1,9 +1,10 @@ package org.secfirst.advancedsearch.mvp.models -import androidx.annotation.NonNull -import androidx.room.ColumnInfo -import androidx.room.Entity -import androidx.room.PrimaryKey +import android.arch.persistence.room.ColumnInfo +import android.arch.persistence.room.Entity +import android.arch.persistence.room.PrimaryKey +import android.support.annotation.NonNull + @Entity(tableName = "difficulty") data class Difficulty ( diff --git a/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Segment.kt b/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Segment.kt index 082656c..f9e3020 100644 --- a/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Segment.kt +++ b/app/src/main/java/org/secfirst/advancedsearch/mvp/models/Segment.kt @@ -1,10 +1,11 @@ package org.secfirst.advancedsearch.mvp.models -import androidx.annotation.NonNull -import androidx.room.ColumnInfo -import androidx.room.Embedded -import androidx.room.Entity -import androidx.room.PrimaryKey +import android.arch.persistence.room.ColumnInfo +import android.arch.persistence.room.Embedded +import android.arch.persistence.room.Entity +import android.arch.persistence.room.PrimaryKey +import android.support.annotation.NonNull + @Entity(tableName = "segment") data class Segment ( diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml index 2a4a731..c936d64 100644 --- a/app/src/main/res/layout/activity_detail.xml +++ b/app/src/main/res/layout/activity_detail.xml @@ -1,5 +1,5 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index fad34e5..4e44d10 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/menu/options_menu.xml b/app/src/main/res/menu/options_menu.xml index 3bcca2c..f6097d7 100644 --- a/app/src/main/res/menu/options_menu.xml +++ b/app/src/main/res/menu/options_menu.xml @@ -6,6 +6,6 @@ android:id="@+id/menu_search" android:icon="@android:drawable/ic_menu_search" app:showAsAction="ifRoom|collapseActionView" - app:actionViewClass="androidx.appcompat.widget.SearchView" /> + app:actionViewClass="android.support.v7.widget.SearchView" /> \ No newline at end of file diff --git a/build.gradle b/build.gradle index e3a94a8..1078a1b 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext.kotlin_version = '1.3.21' ext.android_support_version = '28.0.0' - ext.room_version = "2.1.0-alpha04" + ext.room_version = "1.1.1" repositories { google() jcenter() diff --git a/gradle.properties b/gradle.properties index e4ce29f..a0e5e91 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,6 @@ org.gradle.jvmargs=-Xmx1536m # org.gradle.parallel=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -android.useAndroidX=true -android.enableJetifier=true +#android.useAndroidX=true +#android.enableJetifier=true android.enableBuildCache=true \ No newline at end of file diff --git a/library/src/main/java/org/secfirst/advancedsearch/adapters/SearchResultAdapter.kt b/library/src/main/java/org/secfirst/advancedsearch/adapters/SearchResultAdapter.kt index b3d6030..feed062 100644 --- a/library/src/main/java/org/secfirst/advancedsearch/adapters/SearchResultAdapter.kt +++ b/library/src/main/java/org/secfirst/advancedsearch/adapters/SearchResultAdapter.kt @@ -1,12 +1,12 @@ package org.secfirst.advancedsearch.adapters import android.content.Context +import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.LinearLayout import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.search_result_item.view.* import org.secfirst.advancedsearch.library.R import org.secfirst.advancedsearch.models.SearchResult diff --git a/library/src/main/java/org/secfirst/advancedsearch/util/HeaderViewDecoration.kt b/library/src/main/java/org/secfirst/advancedsearch/util/HeaderViewDecoration.kt index 9889649..0218902 100644 --- a/library/src/main/java/org/secfirst/advancedsearch/util/HeaderViewDecoration.kt +++ b/library/src/main/java/org/secfirst/advancedsearch/util/HeaderViewDecoration.kt @@ -2,8 +2,8 @@ package org.secfirst.advancedsearch.util import android.graphics.Canvas import android.graphics.Rect +import android.support.v7.widget.RecyclerView import android.view.View -import androidx.recyclerview.widget.RecyclerView class HeaderViewDecoration(private val customView: View) : RecyclerView.ItemDecoration() { diff --git a/library/src/main/java/org/secfirst/advancedsearch/views/SearchResultView.kt b/library/src/main/java/org/secfirst/advancedsearch/views/SearchResultView.kt index d3ecd52..8d32634 100644 --- a/library/src/main/java/org/secfirst/advancedsearch/views/SearchResultView.kt +++ b/library/src/main/java/org/secfirst/advancedsearch/views/SearchResultView.kt @@ -2,14 +2,14 @@ package org.secfirst.advancedsearch.views import android.content.Context import android.content.Intent +import android.support.v7.app.AppCompatActivity +import android.support.v7.widget.LinearLayoutManager +import android.support.v7.widget.RecyclerView import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.* -import androidx.appcompat.app.AppCompatActivity -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import com.jakewharton.rxbinding.view.clicks import com.jakewharton.rxrelay.BehaviorRelay import kotlinx.android.synthetic.main.search_view.view.* diff --git a/library/src/main/res/layout/search_result_item.xml b/library/src/main/res/layout/search_result_item.xml index d42cb79..0dfb1ab 100644 --- a/library/src/main/res/layout/search_result_item.xml +++ b/library/src/main/res/layout/search_result_item.xml @@ -7,7 +7,7 @@ android:paddingBottom="10dp" android:layout_height="wrap_content"> - - + \ No newline at end of file diff --git a/library/src/main/res/layout/search_view.xml b/library/src/main/res/layout/search_view.xml index 1f1aa6a..0d2eb58 100644 --- a/library/src/main/res/layout/search_view.xml +++ b/library/src/main/res/layout/search_view.xml @@ -99,7 +99,7 @@ android:textSize="@dimen/medSmallTextSize" android:layout_height="wrap_content"/> -