Browse Source

Add AddDietActivity, Color fixes, Other minor fixes

master
Apostolos Fanakis 6 years ago
parent
commit
42861f0b21
  1. 3
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/AndroidManifest.xml
  2. 108
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/AddDietActivity.java
  3. 6
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/AddItemActivity.java
  4. 22
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/diets/DietsActivity.java
  5. 113
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_add_diet.xml
  6. 11
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_add_item.xml
  7. 7
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_add_restaurant.xml
  8. 6
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_diets.xml
  9. 2
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_drink.xml
  10. 2
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_food.xml
  11. 6
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_main.xml
  12. 2
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_profile.xml
  13. 8
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_rate_item.xml
  14. 8
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_rate_restaurant.xml
  15. 2
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_restaurant.xml
  16. 1
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/fragment_restaurant_info.xml
  17. 4
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/reusable_recycler_list.xml
  18. 8
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/colors.xml
  19. 10
      UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/strings.xml
  20. 2
      UI/AndroidApp/flavoursWithoutBorders/app/src/release/res/values/google_maps_api.xml

3
UI/AndroidApp/flavoursWithoutBorders/app/src/main/AndroidManifest.xml

@ -10,6 +10,7 @@
-->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@ -56,6 +57,6 @@
<activity android:name=".activities.RateRestaurantActivity" />
<activity android:name=".activities.RateItemActivity" />
<activity android:name=".activities.diets.DietsActivity" />
<activity android:name=".activities.AddDietActivity" />
</application>
</manifest>

108
UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/AddDietActivity.java

@ -0,0 +1,108 @@
package gr.auth.databases.flavours.activities;
import android.os.Bundle;
import android.view.KeyEvent;
import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import java.util.ArrayList;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.widget.AppCompatButton;
import androidx.appcompat.widget.AppCompatImageButton;
import androidx.appcompat.widget.Toolbar;
import gr.auth.databases.flavours.R;
import gr.auth.databases.flavours.base.BaseActivity;
import gr.auth.databases.flavours.model.IngredientSummary;
public class AddDietActivity extends BaseActivity {
private ArrayList<IngredientSummary> ingredients = new ArrayList<>();
private EditText dietNameInput, dietDescriptionInput;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_add_diet);
Toolbar toolbar = findViewById(R.id.add_diet_toolbar);
setSupportActionBar(toolbar);
ActionBar actionbar = getSupportActionBar();
if (actionbar != null) {
actionbar.setDisplayHomeAsUpEnabled(true);
actionbar.setHomeAsUpIndicator(R.drawable.ic_menu_black_24dp);
}
dietNameInput = findViewById(R.id.add_diet_name);
AppCompatButton addItemButton = findViewById(R.id.add_diet_add_btn);
final TextView ingredientsTitle = findViewById(R.id.add_diet_add_ingredient_title);
final EditText addIngredientInput = findViewById(R.id.add_diet_add_ingredient);
final LinearLayout ingredientsList = findViewById(R.id.add_diet_ingredients_list);
addIngredientInput.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override
public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
if (actionId == EditorInfo.IME_ACTION_DONE) {
ingredients.add(new IngredientSummary(
addIngredientInput.getText().toString(), false));
View ingredientRow = getLayoutInflater().inflate(R.layout.add_item_ingredient_row, ingredientsList, false);
TextView ingredientName = ingredientRow.findViewById(R.id.add_item_ingredient_name);
ingredientName.setText(ingredients.get(ingredients.size() - 1).getName());
AppCompatImageButton removeIngredientBtn = ingredientRow.findViewById(R.id.add_item_remove_ingredient);
removeIngredientBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
int index = ingredientsList.indexOfChild((View) view.getParent());
ingredients.remove(index);
ingredientsList.removeViewAt(index);
}
});
ingredientsList.addView(ingredientRow);
ingredientsTitle.setVisibility(View.VISIBLE);
ingredientsList.setVisibility(View.VISIBLE);
addIngredientInput.setText("");
return true;
}
return false;
}
});
addItemButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
//TODO
}
});
createDrawer();
drawer.setSelection(-1);
}
@Override
public void onBackPressed() {
if (drawer.isDrawerOpen()) {
drawer.closeDrawer();
} else {
super.onBackPressed();
}
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id == android.R.id.home) {
drawer.openDrawer();
return true;
}
return super.onOptionsItemSelected(item);
}
}

6
UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/AddItemActivity.java

@ -10,6 +10,8 @@ import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.google.android.material.textfield.TextInputLayout;
import java.util.ArrayList;
import androidx.appcompat.app.ActionBar;
@ -60,10 +62,10 @@ public class AddItemActivity extends BaseActivity {
final LinearLayout ingredientsList = findViewById(R.id.add_item_ingredients_list);
if (itemType == ItemSummary.ItemType.FOOD) {
itemNameInput.setHint(R.string.add_food_hint_name);
((TextInputLayout) itemNameInput.getParent().getParent()).setHint(getString(R.string.add_food_hint_name));
addItemButton.setText(R.string.add_food_add_btn);
} else if (itemType == ItemSummary.ItemType.DRINK) {
itemNameInput.setHint(R.string.add_drink_hint_name);
((TextInputLayout) itemNameInput.getParent().getParent()).setHint(getString(R.string.add_drink_hint_name));
addItemButton.setText(R.string.add_drink_add_btn);
}

22
UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/diets/DietsActivity.java

@ -1,6 +1,8 @@
package gr.auth.databases.flavours.activities.diets;
import android.content.Intent;
import android.os.Bundle;
import android.view.MenuItem;
import android.view.View;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
@ -12,6 +14,7 @@ import androidx.appcompat.widget.Toolbar;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import gr.auth.databases.flavours.R;
import gr.auth.databases.flavours.activities.AddDietActivity;
import gr.auth.databases.flavours.base.BaseActivity;
import gr.auth.databases.flavours.model.Diet;
@ -39,8 +42,8 @@ public class DietsActivity extends BaseActivity {
FAB.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
/*Intent intent = new Intent(view.getContext(), AddRestaurantActivity.class);
startActivity(intent);*/
Intent intent = new Intent(view.getContext(), AddDietActivity.class);
startActivity(intent);
}
});
@ -65,24 +68,15 @@ public class DietsActivity extends BaseActivity {
}
}
/*@Override
@Override
public boolean onOptionsItemSelected(MenuItem item) {
int id = item.getItemId();
if (id == R.id.main_toolbar_menu_filter) {
return true;
} else if (id == R.id.main_toolbar_menu_map) {
if (viewPager.getCurrentItem() == 0) {
viewPager.setCurrentItem(1);
} else if (viewPager.getCurrentItem() == 1) {
viewPager.setCurrentItem(0);
}
return true;
} else if (id == android.R.id.home) {
if (id == android.R.id.home) {
drawer.openDrawer();
return true;
}
return super.onOptionsItemSelected(item);
}*/
}
}

113
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_add_diet.xml

@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/add_diet_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ToolbarTheme">
<androidx.appcompat.widget.Toolbar
android:id="@+id/add_diet_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/ToolbarTheme"
app:title="@string/add_diet_toolbar_title" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:focusableInTouchMode="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
app:passwordToggleEnabled="true">
<EditText
android:id="@+id/add_diet_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/add_diet_hint_name"
android:importantForAutofill="no"
android:inputType="text"
tools:targetApi="o" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
app:passwordToggleEnabled="true">
<EditText
android:id="@+id/add_diet_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/add_diet_hint_description"
android:importantForAutofill="no"
android:inputType="text"
android:maxLines="1"
tools:targetApi="o" />
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:id="@+id/add_diet_add_ingredient_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/add_diet_ingredients_title"
android:textSize="16sp"
android:textStyle="bold" />
<LinearLayout
android:id="@+id/add_diet_ingredients_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:orientation="vertical"
android:visibility="gone" />
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp">
<EditText
android:id="@+id/add_diet_add_ingredient"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/add_diet_add_ingredient"
android:imeOptions="actionDone"
android:importantForAutofill="no"
android:inputType="text"
android:maxLines="1"
tools:targetApi="o" />
</com.google.android.material.textfield.TextInputLayout>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/add_diet_add_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/add_diet_add_btn" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

11
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_add_item.xml

@ -4,27 +4,28 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/add_item_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.AppCompat.Light">
android:theme="@style/ToolbarTheme">
<androidx.appcompat.widget.Toolbar
android:id="@+id/add_item_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.AppCompat.Light"
app:popupTheme="@style/ToolbarTheme"
app:title="@string/add_item_toolbar_title" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBackground"
android:focusableInTouchMode="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
@ -32,7 +33,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:focusableInTouchMode="true"
android:orientation="vertical">
<com.google.android.material.textfield.TextInputLayout
@ -74,8 +74,7 @@
android:layout_height="wrap_content"
android:text="@string/add_item_ingredients_title"
android:textSize="16sp"
android:textStyle="bold"
android:visibility="gone" />
android:textStyle="bold" />
<LinearLayout
android:id="@+id/add_item_ingredients_list"

7
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_add_restaurant.xml

@ -4,21 +4,20 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/add_restaurant_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.AppCompat.Light">
android:theme="@style/ToolbarTheme">
<androidx.appcompat.widget.Toolbar
android:id="@+id/add_restaurant_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.AppCompat.Light" />
app:popupTheme="@style/ToolbarTheme" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
@ -26,6 +25,8 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:background="@color/colorBackground"
android:focusableInTouchMode="true"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

6
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_diets.xml

@ -10,14 +10,14 @@
android:id="@+id/diets_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.AppCompat.Light">
android:theme="@style/ToolbarTheme">
<androidx.appcompat.widget.Toolbar
android:id="@+id/diets_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.AppCompat.Light"
app:popupTheme="@style/ToolbarTheme"
app:title="@string/diets_toolbar_title" />
</com.google.android.material.appbar.AppBarLayout>
@ -25,6 +25,8 @@
android:id="@+id/diets_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="4dp"
android:paddingBottom="4dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<com.google.android.material.floatingactionbutton.FloatingActionButton

2
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_drink.xml

@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
@ -37,6 +36,7 @@
android:id="@+id/drink_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBackground"
app:layout_anchor="@id/drink_appbar"
app:layout_anchorGravity="bottom|start"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

2
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_food.xml

@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
@ -37,6 +36,7 @@
android:id="@+id/food_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBackground"
app:layout_anchor="@id/food_appbar"
app:layout_anchorGravity="bottom|start"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

6
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_main.xml

@ -3,27 +3,27 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/main_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.AppCompat.Light">
android:theme="@style/ToolbarTheme">
<androidx.appcompat.widget.Toolbar
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.AppCompat.Light" />
app:popupTheme="@style/ToolbarTheme" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/main_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBackground"
app:layout_anchor="@id/main_appbar"
app:layout_anchorGravity="bottom|start"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

2
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_profile.xml

@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
@ -36,6 +35,7 @@
android:id="@+id/profile_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBackground"
app:layout_anchor="@id/profile_appbar"
app:layout_anchorGravity="bottom|start"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

8
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_rate_item.xml

@ -4,27 +4,28 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/rate_item_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.AppCompat.Light">
android:theme="@style/ToolbarTheme">
<androidx.appcompat.widget.Toolbar
android:id="@+id/rate_item_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.AppCompat.Light"
app:popupTheme="@style/ToolbarTheme"
app:title="@string/rate_item_toolbar_title" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBackground"
android:focusableInTouchMode="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
@ -32,7 +33,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:focusableInTouchMode="true"
android:orientation="vertical">
<LinearLayout

8
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_rate_restaurant.xml

@ -4,27 +4,28 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/rate_restaurant_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.AppCompat.Light">
android:theme="@style/ToolbarTheme">
<androidx.appcompat.widget.Toolbar
android:id="@+id/rate_restaurant_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/Theme.AppCompat.Light"
app:popupTheme="@style/ToolbarTheme"
app:title="@string/rate_restaurant_toolbar_title" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBackground"
android:focusableInTouchMode="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<LinearLayout
@ -32,7 +33,6 @@
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
android:focusableInTouchMode="true"
android:orientation="vertical">
<LinearLayout

2
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/activity_restaurant.xml

@ -3,7 +3,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/background_light"
android:fitsSystemWindows="true">
<com.google.android.material.appbar.AppBarLayout
@ -37,6 +36,7 @@
android:id="@+id/restaurant_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorBackground"
app:layout_anchor="@id/restaurant_appbar"
app:layout_anchorGravity="bottom|start"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

1
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/fragment_restaurant_info.xml

@ -45,6 +45,5 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="6dp"
android:layout_marginBottom="12dp"
android:layout_weight="1" />
</LinearLayout>

4
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/layout/reusable_recycler_list.xml

@ -5,4 +5,6 @@
android:layout_height="match_parent"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:orientation="vertical" />
android:orientation="vertical"
android:paddingTop="4dp"
android:paddingBottom="4dp" />

8
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/colors.xml

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#008577</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
<color name="colorBackground">#DDDDDD</color>
<color name="colorPrimary">#4caf50</color>
<color name="colorPrimaryDark">#357a38</color>
<color name="colorAccent">#ff9100</color>
<color name="colorBackground">#EFEFEF</color>
<color name="iron">#F6F8Fa</color>
<color name="textPrimary">#303030</color>
</resources>

10
UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/strings.xml

@ -118,9 +118,16 @@
<string name="add_food_add_btn">ADD FOOD</string>
<string name="add_drink_add_btn">ADD DRINK</string>
<!-- Add Diet -->
<string name="add_diet_toolbar_title">Add Diet</string>
<string name="add_diet_hint_name">Diet\'s title</string>
<string name="add_diet_hint_description">Description</string>
<string name="add_diet_ingredients_title">Prohibited ingredients:</string>
<string name="add_diet_add_ingredient">Add prohibited ingredient</string>
<string name="add_diet_add_btn">ADD DIET</string>
<!-- Rate Restaurant -->
<string name="rate_restaurant_toolbar_title">Rate Restaurant</string>
<string name="rate_restaurant_toolbar_title_placeholder">Rate %1$s</string>
<string name="rate_restaurant_grade_title">Grade:</string>
<string name="rate_restaurant_accessibility_title">Accessibility:</string>
<string name="rate_restaurant_diet_title">Diet:</string>
@ -129,7 +136,6 @@
<!-- Rate Item -->
<string name="rate_item_toolbar_title">Rate Item</string>
<string name="rate_item_toolbar_title_placeholder">Rate %1$s</string>
<string name="rate_item_grade_title">Grade:</string>
<string name="rate_item_portion_size_title">Portion size:</string>
<string name="rate_item_text">Add some text to your rating</string>

2
UI/AndroidApp/flavoursWithoutBorders/app/src/release/res/values/google_maps_api.xml

@ -16,5 +16,5 @@
Once you have your key (it starts with "AIza"), replace the "google_maps_key"
string in this file.
-->
<string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">YOUR_KEY_HERE</string>
<string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyApwRyyhtWE1zsCrSmtU6l9HG2dp-rzPqk</string>
</resources>

Loading…
Cancel
Save