caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

fragment redesign

Browse source
This commit is contained in:
Milos Kozak 2019-09-16 09:20:23 +02:00
parent cf506a5439
commit 60a113bda6
2 changed files with 107 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
app/src/main/res/layout/localprofile_fragment.xml
View file

@ -19,20 +19,99 @@
android:textColor="@android:color/holo_red_light" android:textColor="@android:color/holo_red_light"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:background="@color/linearBlockBackground" android:gravity="start"
android:layout_marginStart="10dp" android:orientation="horizontal">
android:text="@string/units"
android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:text="@string/selected_profile"
android:textAppearance="?android:attr/textAppearanceMedium" />
<Spinner
android:id="@+id/spinner"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/localprofile_profile_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp"
android:scaleX="2"
android:scaleY="2"
android:src="@drawable/add"
android:contentDescription="@string/addnew" />
<ImageView
android:id="@+id/localprofile_profile_remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp"
android:layout_marginEnd="10dp"
android:scaleX="2"
android:scaleY="2"
android:src="@drawable/remove"
android:contentDescription="@string/remove_label"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_horizontal" android:gravity="start"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginBottom="10dp"
android:text="@string/profile_name"
android:labelFor="@+id/localprofile_name"
android:textAppearance="?android:attr/textAppearanceMedium" />
<EditText
android:id="@+id/localprofile_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:ems="10"
android:inputType="text"
android:importantForAutofill="no" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="start"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginBottom="20dp"
android:text="@string/units"
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<RadioButton <RadioButton
android:id="@+id/localprofile_mgdl" android:id="@+id/localprofile_mgdl"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -43,62 +122,45 @@
android:id="@+id/localprofile_mmol" android:id="@+id/localprofile_mmol"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:text="@string/mmol" /> android:text="@string/mmol" />
</LinearLayout> </LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/linearBlockBackground"
android:layout_marginStart="10dp"
android:text="@string/dia"
android:textAppearance="?android:attr/textAppearanceMedium" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="start"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="5dp" android:paddingTop="5dp">
android:textAppearance="?android:attr/textAppearanceSmall">
<!-- dummy to align with TimeListEdits added dynamically --> <TextView
<Spinner
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp" android:layout_marginStart="10dp"
android:minWidth="80dp" android:text="@string/dia"
android:visibility="invisible"/> android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1" />
<info.nightscout.androidaps.utils.NumberPicker <info.nightscout.androidaps.utils.NumberPicker
android:id="@+id/localprofile_dia" android:id="@+id/localprofile_dia"
android:layout_width="130dp" android:layout_width="130dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"/> android:layout_marginBottom="10dp" />
<!-- dummy to align with TimeListEdits added dynamically --> <TextView
<ImageView
android:id="@+id/timelistedit_add"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="15dp" android:text="@string/hours"
android:src="@drawable/add" android:textAppearance="?android:attr/textAppearanceSmall"/>
android:visibility="invisible"/>
<!-- dummy to align with TimeListEdits added dynamically -->
<ImageView
android:id="@+id/timelistedit_remove"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="15dp"
android:src="@drawable/remove"
android:visibility="invisible"/>
</LinearLayout> </LinearLayout>
@ -136,7 +198,7 @@
android:id="@+id/localprofile_profileswitch" android:id="@+id/localprofile_profileswitch"
style="?android:attr/buttonStyle" style="?android:attr/buttonStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginBottom="3dp" android:layout_marginBottom="3dp"
android:layout_marginLeft="10dp" android:layout_marginLeft="10dp"

2
app/src/main/res/values/strings.xml
View file

@ -1604,5 +1604,7 @@
<string name="format_cob_ic">%1$.1fg IC: %2$.1f</string> <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
<string name="boluswizard">Bolus wizard</string> <string name="boluswizard">Bolus wizard</string>
<string name="unit_minute_short">min</string> <string name="unit_minute_short">min</string>
<string name="profile_name">Profile name:</string>
<string name="selected_profile">Selected:</string>
</resources> </resources>