mirror of
https://github.com/jfoucry/Pilldroid.git
synced 2024-11-21 20:19:23 +01:00
Changement des images dans les Floating button et changement du message
Ajout du séparateur entre deux liges de la liste de médicaement Différents changement de look
This commit is contained in:
parent
068cf57ac7
commit
012797857f
7 changed files with 16 additions and 24 deletions
|
@ -49,19 +49,6 @@ public class Medicament implements Serializable {
|
|||
this.alertThreshold = alert;
|
||||
}
|
||||
|
||||
// private Medicament(Cursor cursor) {
|
||||
// if (cursor == null) throw new AssertionError();
|
||||
//
|
||||
// this.setCis(cursor.getString(0));
|
||||
// this.setCip13(cursor.getString(1));
|
||||
// this.setNom(cursor.getString(2));
|
||||
// this.setMode_administration(cursor.getString(3));
|
||||
// this.setPresentation(cursor.getString(4));
|
||||
// this.setStock(cursor.getFloat(5));
|
||||
// this.setPrise(cursor.getFloat(6));
|
||||
// }
|
||||
|
||||
|
||||
|
||||
public int getId() {
|
||||
return id;
|
||||
|
|
|
@ -33,7 +33,7 @@ public class MedicamentDetailActivity extends AppCompatActivity {
|
|||
fab.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
Snackbar.make(view, "Replace with your own detail action", Snackbar.LENGTH_LONG)
|
||||
Snackbar.make(view, "Will be use to save changes in a drug", Snackbar.LENGTH_LONG)
|
||||
.setAction("Action", null).show();
|
||||
}
|
||||
});
|
||||
|
|
|
@ -41,11 +41,11 @@
|
|||
|
||||
<android.support.design.widget.FloatingActionButton
|
||||
android:id="@+id/fab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="60dp"
|
||||
android:layout_gravity="center_vertical|start"
|
||||
android:layout_margin="@dimen/fab_margin"
|
||||
android:src="@android:drawable/stat_notify_chat"
|
||||
android:src="@android:drawable/ic_menu_save"
|
||||
app:layout_anchor="@+id/medicament_detail_container"
|
||||
app:layout_anchorGravity="top|end" />
|
||||
|
||||
|
|
|
@ -32,11 +32,14 @@
|
|||
|
||||
<android.support.design.widget.FloatingActionButton
|
||||
android:id="@+id/fab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="60dp"
|
||||
android:layout_height="60dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_margin="@dimen/fab_margin"
|
||||
android:src="@android:drawable/ic_dialog_email" />
|
||||
android:src="@android:drawable/ic_input_add"
|
||||
android:adjustViewBounds="true"
|
||||
android:clickable="false"
|
||||
android:baselineAlignBottom="false"/>
|
||||
|
||||
|
||||
</android.support.design.widget.CoordinatorLayout>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
android:layout_below="@+id/valeur"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:textStyle="italic"
|
||||
android:textColor="#57C1DE"
|
||||
android:textColor="#0c4758"
|
||||
android:background="@android:color/transparent"
|
||||
android:id="@+id/label"
|
||||
android:paddingLeft="10sp"
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
android:layout_width="50sp"
|
||||
android:layout_height="50sp"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:layout_marginTop="2dp"
|
||||
android:src="@drawable/stock_ok" />
|
||||
</LinearLayout>
|
||||
<!-- Drug's name-->
|
||||
|
|
|
@ -24,11 +24,13 @@
|
|||
android:inputType="numberDecimal"
|
||||
android:ems="10"
|
||||
android:id="@+id/valeur"
|
||||
android:paddingRight="10dp"
|
||||
android:paddingRight="25dp"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:textAlignment="gravity"
|
||||
android:background="@drawable/list_selector"
|
||||
android:text="0" />
|
||||
android:text="0"
|
||||
android:gravity="right|fill_vertical"
|
||||
android:numeric="decimal" />
|
||||
|
||||
</RelativeLayout>
|
Loading…
Reference in a new issue