Compare commits

..

No commits in common. "8c9baa6b8fb53ca098a260849eb791a41c8dc25b" and "b29be4fc8a1620af67a5fafb4ec6ef5810f54b8a" have entirely different histories.

3 changed files with 23 additions and 36 deletions

View file

@ -13,7 +13,11 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent">
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/btn_addFruit"
@ -34,14 +38,31 @@
app:layout_anchor="@+id/constraintLayout"
app:layout_anchorGravity="center">
<RadioGroup
android:id="@+id/radio_select"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="horizontal">
<RadioButton
android:id="@+id/backup_btn"
android:layout_width="194dp"
android:layout_height="wrap_content"
android:text="@string/export_prescriptions"/>
<include layout="@layout/custom_switch_btn"/>
<RadioButton
android:id="@+id/restore_btn"
android:layout_width="194dp"
android:layout_height="wrap_content"
android:text="@string/import_prescriptions" />
</RadioGroup>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<Button
android:id="@+id/btn_backup_location"
style="@style/Widget.MaterialComponents.Button"

View file

@ -1,32 +0,0 @@
<com.google.android.material.button.MaterialButtonToggleGroup android:id="@+id/toggleGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
app:checkedButton="@id/switch_btn_export"
app:singleSelection="true"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<Button
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:id="@+id/switch_btn_export"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/export_prescriptions"
android:backgroundTint="@color/selected_backgroundf"
android:textColor="@color/white"
/>
<Button
style="@style/Widget.MaterialComponents.Button.OutlinedButton"
android:id="@+id/switch_btn_import"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:text="@string/import_prescriptions"
android:backgroundTint="@color/unselected_backgroud"
android:textColor="@color/white"
/>
</com.google.android.material.button.MaterialButtonToggleGroup>

View file

@ -18,6 +18,4 @@
<color name="led">#31f623</color>
<color name="grey">#777</color>
<color name="unselected_backgroud">#777777</color>
<color name="selected_backgroundf">#4f91ff</color>
</resources>