lovis_ix/Pilldroid
1
1
Fork 0
mirror of https://github.com/jfoucry/Pilldroid.git synced 2024-11-17 18:41:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use new icons files

Browse source
This commit is contained in:
Jacques Foucry 2016-11-09 16:07:12 +01:00
parent b8eea080e0
commit d3ecc6cc0b
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/net/foucry/pilldroid/MedicamentListActivity.java
View file

@ -366,14 +366,14 @@ public class MedicamentListActivity extends AppCompatActivity {
} }
private void scheduleNotification(Notification notification, long delay) { private void scheduleNotification(Notification notification, long delay) {
Log.i(TAG, "scheduleNotification delay == " + delay); Log.i(TAG, "scheduleNotification delay == " + 30000);
Intent notificationIntent = new Intent(this, NotificationPublisher.class); Intent notificationIntent = new Intent(this, NotificationPublisher.class);
notificationIntent.putExtra(NOTIFICATION_ID, 1); notificationIntent.putExtra(NOTIFICATION_ID, 1);
notificationIntent.putExtra(NotificationPublisher.NOTIFICATION, notification); notificationIntent.putExtra(NotificationPublisher.NOTIFICATION, notification);
PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT); PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
long futureInMillis = SystemClock.elapsedRealtime() + delay; long futureInMillis = SystemClock.elapsedRealtime() + 30000;
AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE); AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, futureInMillis, pendingIntent); alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, futureInMillis, pendingIntent);
} }
@ -384,7 +384,7 @@ public class MedicamentListActivity extends AppCompatActivity {
Notification.Builder builder = new Notification.Builder(this); Notification.Builder builder = new Notification.Builder(this);
builder.setContentTitle(getAppName()); builder.setContentTitle(getAppName());
builder.setContentText(content); builder.setContentText(content);
builder.setSmallIcon(R.mipmap.ic_launcher); builder.setSmallIcon(R.drawable.ic_stat_small_capsule);
builder.setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), builder.setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(),
R.mipmap.ic_launcher)); R.mipmap.ic_launcher));
return builder.build(); return builder.build();
@ -447,14 +447,14 @@ public class MedicamentListActivity extends AppCompatActivity {
int remainingStock = (int) Math.floor(mValues.get(position).getStock() / mValues.get(position).getPrise()); int remainingStock = (int) Math.floor(mValues.get(position).getStock() / mValues.get(position).getPrise());
if (remainingStock <= mValues.get(position).getAlertThreshold()) { if (remainingStock <= mValues.get(position).getAlertThreshold()) {
holder.mView.setBackgroundResource(R.drawable.gradient_bg_alert); holder.mView.setBackgroundResource(R.drawable.gradient_bg_alert);
holder.mIconView.setImageResource(R.drawable.stock_alert); holder.mIconView.setImageResource(R.drawable.ic_stock_nok);
} else if ((remainingStock > mValues.get(position).getAlertThreshold()) && } else if ((remainingStock > mValues.get(position).getAlertThreshold()) &&
(remainingStock <= (mValues.get(position).getWarnThreshold()))) { (remainingStock <= (mValues.get(position).getWarnThreshold()))) {
holder.mView.setBackgroundResource(R.drawable.gradient_bg_warning); holder.mView.setBackgroundResource(R.drawable.gradient_bg_warning);
holder.mIconView.setImageResource(R.drawable.stock_warn); holder.mIconView.setImageResource(R.drawable.ic_stock_waring);
} else { } else {
holder.mView.setBackgroundResource(R.drawable.gradient_bg_ok); holder.mView.setBackgroundResource(R.drawable.gradient_bg_ok);
holder.mIconView.setImageResource(R.drawable.stock_ok); holder.mIconView.setImageResource(R.drawable.ic_stock_ok);
} }
} }

2
app/src/main/res/layout/medicament_list_content.xml
View file

@ -14,7 +14,7 @@
android:layout_width="50sp" android:layout_width="50sp"
android:layout_height="50sp" android:layout_height="50sp"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:src="@drawable/stock_ok" android:src="@drawable/ic_stock_ok"
android:contentDescription="Icone de stock" android:contentDescription="Icone de stock"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_alignParentStart="true" /> android:layout_alignParentStart="true" />