caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

stats layout

Browse source
This commit is contained in:
Milos Kozak 2019-12-31 15:04:20 +01:00
parent f8b2b596c6
commit cc125986ac
4 changed files with 97 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/activities/StatsActivity.kt
View file

@ -7,7 +7,7 @@ import info.nightscout.androidaps.utils.OKDialog
import info.nightscout.androidaps.utils.stats.TddCalculator import info.nightscout.androidaps.utils.stats.TddCalculator
import info.nightscout.androidaps.utils.stats.TirCalculator import info.nightscout.androidaps.utils.stats.TirCalculator
import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.resources.ResourceHelper
import kotlinx.android.synthetic.main.stats_activity.* import kotlinx.android.synthetic.main.activity_stats.*
import javax.inject.Inject import javax.inject.Inject
class StatsActivity : NoSplashAppCompatActivity() { class StatsActivity : NoSplashAppCompatActivity() {
@ -18,7 +18,7 @@ class StatsActivity : NoSplashAppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.stats_activity) setContentView(R.layout.activity_stats)
stats_tdds.text = tddCalculator.stats() stats_tdds.text = tddCalculator.stats()
stats_tir.text = tirCalculator.stats() stats_tir.text = tirCalculator.stats()

4
app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/activities/LogSettingActivity.kt
View file

@ -22,6 +22,7 @@ class LogSettingActivity : NoSplashAppCompatActivity() {
L.resetToDefaults() L.resetToDefaults()
createViewsForSettings() createViewsForSettings()
} }
ok.setOnClickListener { finish() }
} }
private fun createViewsForSettings() { private fun createViewsForSettings() {
@ -34,7 +35,8 @@ class LogSettingActivity : NoSplashAppCompatActivity() {
} }
internal inner class LogViewHolder(element: L.LogElement) { internal inner class LogViewHolder(element: L.LogElement) {
var baseView: LinearLayout = layoutInflater.inflate(R.layout.logsettings_item, null) as LinearLayout @Suppress("InflateParams")
var baseView = layoutInflater.inflate(R.layout.logsettings_item, null) as LinearLayout
init { init {
(baseView.findViewById<View>(R.id.logsettings_description) as TextView).text = element.name (baseView.findViewById<View>(R.id.logsettings_description) as TextView).text = element.name

75
app/src/main/res/layout/activity_logsetting.xml
View file

@ -1,21 +1,50 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
tools:context=".plugins.general.maintenance.activities.LogSettingActivity"> tools:context=".plugins.general.maintenance.activities.LogSettingActivity">
<Button <LinearLayout
android:id="@+id/logsettings_reset"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="15dp" android:orientation="vertical">
android:text="@string/resettodefaults" />
<ScrollView <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/activity_title_background"
android:orientation="horizontal"
android:padding="5dp">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/carbs"
app:srcCompat="@mipmap/ic_launcher" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:text="@string/nav_logsettings"
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:orientation="horizontal"
android:padding="5dp" />
<LinearLayout <LinearLayout
android:id="@+id/logsettings_placeholder" android:id="@+id/logsettings_placeholder"
@ -23,6 +52,34 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" /> android:orientation="vertical" />
</ScrollView> <LinearLayout
android:id="@+id/done_background"
android:layout_width="match_parent"
android:layout_height="56dp"
android:orientation="horizontal"
android:background="@android:color/transparent"
android:gravity="end"
android:layout_gravity="center_vertical"
android:paddingBottom="8dp">
</LinearLayout> <Button
android:id="@+id/logsettings_reset"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_marginEnd="8dp"
style="@style/mdtp_ActionButton.Text"
android:text="@string/resettodefaults" />
<Button
android:id="@+id/ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
style="@style/mdtp_ActionButton.Text"
android:text="@string/mdtp_ok" />
</LinearLayout>
</LinearLayout>
</ScrollView>

41
app/src/main/res/layout/stats_activity.xml → app/src/main/res/layout/activity_stats.xml
View file

@ -12,27 +12,39 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_gravity="center"
android:orientation="horizontal"> android:background="@color/activity_title_background"
android:orientation="horizontal"
android:padding="5dp">
<ImageView <ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="20dp" android:contentDescription="@string/carbs"
android:paddingStart="10dp"
app:srcCompat="@mipmap/ic_launcher" /> app:srcCompat="@mipmap/ic_launcher" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_centerInParent="true"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:text="@string/statistics" android:text="@string/statistics"
android:textAppearance="@style/TextAppearance.AppCompat.Display1" /> android:textAlignment="center"
</LinearLayout> android:textAppearance="?android:attr/textAppearanceLarge" />
</RelativeLayout>
<LinearLayout
android:id="@+id/spacer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="5dp" />
<TextView <TextView
android:id="@+id/stats_tdds" android:id="@+id/stats_tdds"
@ -55,13 +67,13 @@
android:layout_marginStart="10dp" android:layout_marginStart="10dp"
android:textAppearance="@style/TextAppearance.AppCompat.Medium" /> android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:id="@+id/done_background" android:id="@+id/done_background"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="56dp" android:layout_height="56dp"
android:orientation="horizontal" android:orientation="horizontal"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:gravity="end|right" android:gravity="end"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:paddingBottom="8dp"> android:paddingBottom="8dp">
@ -69,7 +81,6 @@
android:id="@+id/stats_reset" android:id="@+id/stats_reset"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_marginRight="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
style="@style/mdtp_ActionButton.Text" style="@style/mdtp_ActionButton.Text"
android:text="@string/reset" /> android:text="@string/reset" />
@ -78,10 +89,10 @@
android:id="@+id/ok" android:id="@+id/ok"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
style="@style/mdtp_ActionButton.Text" style="@style/mdtp_ActionButton.Text"
android:text="@string/mdtp_ok" /> android:text="@string/mdtp_ok" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>