caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

DiaconnG8HistoryActivity: toolbar

Browse source
This commit is contained in:
Milos Kozak 2023-08-19 14:07:11 +02:00
parent f56b25da97
commit b0d6580f9a
3 changed files with 25 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pump/diaconn/src/main/AndroidManifest.xml
View file

@ -10,7 +10,7 @@
<activity
android:name=".activities.DiaconnG8HistoryActivity"
android:exported="false"
android:theme="@style/AppTheme.NoActionBar" />
android:theme="@style/AppTheme" />
<activity
android:name=".activities.DiaconnG8UserOptionsActivity"
android:exported="false"

22
pump/diaconn/src/main/java/info/nightscout/pump/diaconn/activities/DiaconnG8HistoryActivity.kt
View file

@ -2,11 +2,15 @@ package info.nightscout.pump.diaconn.activities
import android.os.Bundle
import android.view.LayoutInflater
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.widget.AdapterView
import android.widget.ArrayAdapter
import android.widget.TextView
import androidx.core.view.MenuProvider
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import info.nightscout.core.ui.activities.TranslatedDaggerAppCompatActivity
@ -74,6 +78,10 @@ class DiaconnG8HistoryActivity : TranslatedDaggerAppCompatActivity() {
binding = DiaconnG8HistoryActivityBinding.inflate(layoutInflater)
setContentView(binding.root)
title = rh.gs(info.nightscout.core.ui.R.string.pump_history)
supportActionBar?.setDisplayHomeAsUpEnabled(true)
supportActionBar?.setDisplayShowHomeEnabled(true)
binding.recyclerview.setHasFixedSize(true)
binding.recyclerview.layoutManager = LinearLayoutManager(this)
binding.recyclerview.adapter = RecyclerViewAdapter(historyList)
@ -112,6 +120,20 @@ class DiaconnG8HistoryActivity : TranslatedDaggerAppCompatActivity() {
showingType = selected.type
swapAdapter(selected.type)
}
// Add menu items without overriding methods in the Activity
addMenuProvider(object : MenuProvider {
override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {}
override fun onMenuItemSelected(menuItem: MenuItem): Boolean =
when (menuItem.itemId) {
android.R.id.home -> {
onBackPressedDispatcher.onBackPressed()
true
}
else -> false
}
})
}
inner class RecyclerViewAdapter internal constructor(private var historyList: List<DiaconnHistoryRecord>) : RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder>() {

41
pump/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
View file

@ -4,51 +4,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
tools:context="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity">
<RelativeLayout
android:id="@+id/header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_gravity="center"
android:background="?attr/activity_title_backgroundColor"
android:orientation="horizontal"
android:padding="5dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:importantForAccessibility="no"
app:srcCompat="@drawable/ic_pump_history" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:text="@string/pump_history"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceLarge" />
</RelativeLayout>
<LinearLayout
android:id="@+id/spacer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/header"
android:orientation="horizontal"
android:padding="5dp" />
tools:context="info.nightscout.pump.diaconn.activities.DiaconnG8HistoryActivity">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/typeListLayout"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/spacer"
android:layout_alignParentTop="true"
android:layout_marginStart="5dp"
android:layout_marginEnd="5dp"
android:hint="@string/event_type">