diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/ingredients/IngredientsActivity.java b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/ingredients/IngredientsActivity.java index 45d082f..d30aa4e 100644 --- a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/ingredients/IngredientsActivity.java +++ b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/ingredients/IngredientsActivity.java @@ -46,8 +46,9 @@ public class IngredientsActivity extends BaseActivity implements IngredientsAdap actionbar.setHomeAsUpIndicator(R.drawable.ic_menu_black_24dp); } - FAB = findViewById(R.id.ingredients_fab); createDrawer(); + + FAB = findViewById(R.id.ingredients_fab); FAB.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/base/BaseActivity.java b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/base/BaseActivity.java index e55fe99..40c6aea 100644 --- a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/base/BaseActivity.java +++ b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/base/BaseActivity.java @@ -97,7 +97,7 @@ public abstract class BaseActivity extends AppCompatActivity { protected static final int HOME_ID = 0; protected static final int DIETS_ID = 1; protected static final int INGREDIENTS_ID = 2; - protected static final int LOG_ID = 4; + protected static final int LOG_ID = 3; private AccountHeader accountHeader; private ProfileDrawerItem profileDrawerItem; diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/colors.xml b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/colors.xml index f127af3..5a129dd 100644 --- a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/colors.xml +++ b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/colors.xml @@ -1,8 +1,8 @@ - #4caf50 - #357a38 - #ff9100 + #4CAF50 + #357A38 + #FFC400 #EFEFEF #F6F8Fa #303030