caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

cardview for actions and overview and optical improvements

Browse source
This commit is contained in:
osodebailar 2022-04-16 13:02:05 +02:00
parent 8b709e2b2a
commit 81675f1051
5 changed files with 505 additions and 356 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
app/src/main/res/layout/actions_fragment.xml
View file

@ -1,4 +1,5 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.core.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" 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"
@ -11,17 +12,32 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.card.MaterialCardView
android:id="@+id/actions"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:paddingStart="15dp" android:paddingStart="15dp"
android:paddingEnd="15dp" android:paddingEnd="15dp"
android:layout_marginBottom="10dp"
android:text="@string/actions" /> android:text="@string/actions" />
<androidx.gridlayout.widget.GridLayout <androidx.gridlayout.widget.GridLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dip" android:padding="10dip"
app:columnCount="2"> app:columnCount="2">
@ -119,12 +135,21 @@
</androidx.gridlayout.widget.GridLayout> </androidx.gridlayout.widget.GridLayout>
<TextView </com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/careportal_statuslight"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="15dp" android:layout_marginStart="4dp"
android:paddingEnd="15dp" android:layout_marginEnd="4dp"
android:text="@string/careportal" /> android:layout_marginTop="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<include <include
android:id="@+id/status" android:id="@+id/status"
@ -133,9 +158,33 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" /> android:layout_marginTop="10dp" />
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/careportal_statuslightbutton"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="15dp"
android:paddingEnd="15dp"
android:text="@string/careportal" />
<androidx.gridlayout.widget.GridLayout <androidx.gridlayout.widget.GridLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dip" android:padding="10dip"
app:columnCount="2"> app:columnCount="2">
@ -261,6 +310,23 @@
</androidx.gridlayout.widget.GridLayout> </androidx.gridlayout.widget.GridLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/careportal_tools"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -271,6 +337,7 @@
<androidx.gridlayout.widget.GridLayout <androidx.gridlayout.widget.GridLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="10dip" android:padding="10dip"
app:columnCount="2"> app:columnCount="2">
@ -306,6 +373,8 @@
</androidx.gridlayout.widget.GridLayout> </androidx.gridlayout.widget.GridLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout> </LinearLayout>
</ScrollView> </androidx.core.widget.NestedScrollView>

87
app/src/main/res/layout/overview_fragment.xml
View file

@ -3,10 +3,11 @@
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"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical" android:orientation="vertical"
tools:context=".plugins.general.overview.OverviewFragment"> tools:context=".plugins.general.overview.OverviewFragment">
<ScrollView <androidx.core.widget.NestedScrollView
android:id="@+id/top_part_scrollbar" android:id="@+id/top_part_scrollbar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
@ -23,6 +24,20 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<com.google.android.material.card.MaterialCardView
android:id="@+id/loop"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<LinearLayout <LinearLayout
android:id="@+id/loop_layout" android:id="@+id/loop_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -60,17 +75,64 @@
</LinearLayout> </LinearLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/info"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<include <include
android:id="@+id/info_layout" android:id="@+id/info_layout"
layout="@layout/overview_info_layout" /> layout="@layout/overview_info_layout" />
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/status"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<include <include
android:id="@+id/status_lights_layout" android:id="@+id/status_lights_layout"
layout="@layout/overview_statuslights_layout" /> layout="@layout/overview_statuslights_layout" />
<com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto" </com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/nsclient_layout" android:id="@+id/nsclient_layout"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<com.google.android.flexbox.FlexboxLayout
android:id="@+id/nsclient"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/colorControlHighlight" android:background="?attr/colorControlHighlight"
@ -114,13 +176,32 @@
</com.google.android.flexbox.FlexboxLayout> </com.google.android.flexbox.FlexboxLayout>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/graph"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
app:cardCornerRadius="4dp"
app:contentPadding="2dp"
app:cardElevation="4dp"
app:cardUseCompatPadding="false"
android:layout_gravity="center">
<include <include
android:id="@+id/graphs_layout" android:id="@+id/graphs_layout"
layout="@layout/overview_graphs_layout" /> layout="@layout/overview_graphs_layout" />
</com.google.android.material.card.MaterialCardView>
</LinearLayout> </LinearLayout>
</ScrollView> </androidx.core.widget.NestedScrollView>
<LinearLayout <LinearLayout
android:id="@+id/pump_status_layout" android:id="@+id/pump_status_layout"

1
app/src/main/res/layout/overview_statuslights_layout.xml
View file

@ -7,7 +7,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:background="?attr/colorControlHighlight"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="4dp"> android:paddingBottom="4dp">

2
core/src/main/res/values-night/styles.xml
View file

@ -110,7 +110,7 @@
<item name="android:dialogCornerRadius">12dp</item> <item name="android:dialogCornerRadius">12dp</item>
<!---Overview and Historybrowser --> <!---Overview and Historybrowser -->
<item name="graphgrid">@color/graphgrid</item> <item name="graphgrid">@color/graphgrid</item>
<item name="viewPortbackgroundColor">@color/white_alpha_20</item> <item name="viewPortbackgroundColor">@color/transparent</item>
<item name="tempTargetBackgroundColor">@color/tempTargetBackground</item> <item name="tempTargetBackgroundColor">@color/tempTargetBackground</item>
<!---CGM source--> <!---CGM source-->
<item name="cgmdexColor">@color/byodagray</item> <item name="cgmdexColor">@color/byodagray</item>

2
core/src/main/res/values/styles.xml
View file

@ -113,7 +113,7 @@
<item name="android:dialogCornerRadius">12dp</item> <item name="android:dialogCornerRadius">12dp</item>
<!---Overview and Historybrowser --> <!---Overview and Historybrowser -->
<item name="graphgrid">@color/graphgrid</item> <item name="graphgrid">@color/graphgrid</item>
<item name="viewPortbackgroundColor">@color/black_alpha_20</item> <item name="viewPortbackgroundColor">@color/transparent</item>
<item name="tempTargetBackgroundColor">@color/tempTargetBackground</item> <item name="tempTargetBackgroundColor">@color/tempTargetBackground</item>
<!---CGM source--> <!---CGM source-->
<item name="cgmdexColor">@color/byodagray</item> <item name="cgmdexColor">@color/byodagray</item>