diff --git a/.idea/misc.xml b/.idea/misc.xml index 5489fee..283b1e5 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,7 +24,7 @@ - + diff --git a/app/src/main/kotlin/jackall/moncalc/db/FruitRealmHelper.kt b/app/src/main/kotlin/jackall/moncalc/db/FruitRealmHelper.kt index 542a05e..caf9e89 100644 --- a/app/src/main/kotlin/jackall/moncalc/db/FruitRealmHelper.kt +++ b/app/src/main/kotlin/jackall/moncalc/db/FruitRealmHelper.kt @@ -34,4 +34,12 @@ override fun findAll(): RealmResults { return realm.where(Fruit::class.java).findAll() } + + fun findNames(): List { + val results = ArrayList() + realm.where(Fruit::class.java).findAll().forEach { + results.add(it.name) + } + return results + } } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/db/TempleRealmHelper.kt b/app/src/main/kotlin/jackall/moncalc/db/TempleRealmHelper.kt index f1e54fc..16fd247 100644 --- a/app/src/main/kotlin/jackall/moncalc/db/TempleRealmHelper.kt +++ b/app/src/main/kotlin/jackall/moncalc/db/TempleRealmHelper.kt @@ -34,4 +34,12 @@ override fun findAll(): RealmResults { return realm.where(Temple::class.java).findAll() } + + fun findNames(): List { + val results = ArrayList() + realm.where(Temple::class.java).findAll().forEach { + results.add(it.name) + } + return results + } } \ No newline at end of file diff --git a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt index ab1807b..760157d 100644 --- a/app/src/main/kotlin/jackall/moncalc/service/MainService.kt +++ b/app/src/main/kotlin/jackall/moncalc/service/MainService.kt @@ -10,15 +10,20 @@ import android.os.IBinder import android.support.v4.app.NotificationCompat import android.view.* +import android.widget.ArrayAdapter import jackall.moncalc.Const import jackall.moncalc.Contract.MainServiceContract import jackall.moncalc.R import jackall.moncalc.common.PreferenceKeys import jackall.moncalc.common.PreferenceNames import jackall.moncalc.databinding.RegistOverlayBinding +import jackall.moncalc.db.FruitRealmHelper +import jackall.moncalc.db.GradeRealmHelper +import jackall.moncalc.db.TempleRealmHelper import jackall.moncalc.utils.MySharedPref import jackall.moncalc.viewmodel.OverlayRegistViewModel + /** * Created by matsumoto_k on 2017/11/01. */ @@ -40,6 +45,10 @@ } var isLongClick: Boolean = false + val templeRealmHelper by lazy { TempleRealmHelper() } + val fruitRealmHelper by lazy { FruitRealmHelper() } + val gradeRealmHelper by lazy { GradeRealmHelper() } + override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { val notificationBuilder = NotificationCompat.Builder(this, Const.serviceChannelId) .setContentTitle("mainService") // TODO:タイトルをセット @@ -84,7 +93,7 @@ if (Build.VERSION.SDK_INT >= 26) { registViewParams = WindowManager.LayoutParams( WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.WRAP_CONTENT, + WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or @@ -94,7 +103,7 @@ } else { registViewParams = WindowManager.LayoutParams( WindowManager.LayoutParams.MATCH_PARENT, - WindowManager.LayoutParams.WRAP_CONTENT, + WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.TYPE_SYSTEM_ALERT, WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE or WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN or @@ -105,6 +114,13 @@ registBinding.registViewModel = OverlayRegistViewModel(this as MainServiceContract) + val templeSpinnerAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, templeRealmHelper.findNames()) + val fruitSpinnerAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, fruitRealmHelper.findNames()) + val gradeSpinnerAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, gradeRealmHelper.findNames()) + registBinding.templeSpinner.adapter = templeSpinnerAdapter + registBinding.fruitSpinner.adapter = fruitSpinnerAdapter + registBinding.gradeSpinner.adapter = gradeSpinnerAdapter + registViewParams?.gravity = Gravity.TOP } diff --git a/app/src/main/res/layout/regist_overlay.xml b/app/src/main/res/layout/regist_overlay.xml index f3d1a1d..64461f9 100644 --- a/app/src/main/res/layout/regist_overlay.xml +++ b/app/src/main/res/layout/regist_overlay.xml @@ -11,7 +11,8 @@ + android:layout_height="match_parent" + android:background="#ff0000">