Skip to content

Commit da3a7c6

Browse files
samcrowsamcrow
committed
Merge branch 'ui-consolidation' of github.com:Cook-E-team/Cook-E into ui-consolidation
2 parents da2b28e + d14e4f8 commit da3a7c6

File tree

2 files changed

+64
-40
lines changed

2 files changed

+64
-40
lines changed

‎app/src/main/java/org/cook_e/cook_e/EditRecipeActivity.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import android.os.Bundle;
2323
import android.support.v7.app.AppCompatActivity;
24+
import android.support.v7.widget.Toolbar;
2425
import android.view.Menu;
2526
import android.view.MenuInflater;
2627
import android.view.MenuItem;
@@ -42,6 +43,10 @@ protected void onCreate(Bundle savedInstanceState) {
4243
super.onCreate(savedInstanceState);
4344
setContentView(R.layout.activity_edit_recipe);
4445

46+
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
47+
setSupportActionBar(toolbar);
48+
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
49+
4550
final StepListAdapter stepsAdapter = new StepListAdapter(this);
4651
ListView stepsList = (ListView) findViewById(R.id.recipeSteps);
4752
stepsList.setAdapter(stepsAdapter);

‎app/src/main/res/layout/activity_edit_recipe.xml‎

Lines changed: 59 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -18,55 +18,74 @@
1818
~ along with Cook-E. If not, see <http://www.gnu.org/licenses/>.
1919
-->
2020

21-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
21+
<android.support.design.widget.CoordinatorLayout
22+
xmlns:android="http://schemas.android.com/apk/res/android"
2223
xmlns:app="http://schemas.android.com/apk/res-auto"
24+
xmlns:tools="http://schemas.android.com/tools"
2325
android:layout_width="match_parent"
24-
android:layout_height="match_parent"
25-
android:focusableInTouchMode="true">
26+
android:layout_height="match_parent">
2627

27-
<ImageButton
28-
android:layout_width="150sp"
29-
android:layout_height="150sp"
30-
android:id="@+id/recipeImage"
31-
android:layout_alignParentTop="true"
32-
android:layout_alignParentLeft="true"
33-
android:layout_alignParentStart="true"
34-
android:contentDescription="@string/recipe_image"
35-
android:scaleType="fitXY" />
28+
<RelativeLayout
29+
android:layout_width="match_parent"
30+
android:layout_height="match_parent"
31+
android:focusableInTouchMode="true">
3632

37-
<EditText
38-
android:layout_width="wrap_content"
39-
android:layout_height="wrap_content"
40-
android:inputType="textMultiLine"
41-
android:ems="10"
42-
android:id="@+id/recipeDescription"
43-
android:layout_toEndOf="@+id/recipeImage"
44-
android:layout_toRightOf="@+id/recipeImage"
45-
android:layout_alignBottom="@+id/recipeImage"
46-
android:layout_alignParentRight="true"
47-
android:layout_alignParentEnd="true"
48-
android:layout_alignParentTop="true"
49-
android:hint="@string/recipe_description"
50-
android:gravity="start|top" />
33+
<android.support.v7.widget.Toolbar
34+
android:id="@+id/toolbar"
35+
android:layout_width="match_parent"
36+
android:layout_height="?attr/actionBarSize"
37+
android:background="?attr/colorPrimary"
38+
android:elevation="4dp"
39+
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
40+
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
41+
tools:ignore="UnusedAttribute"/>
5142

52-
<ListView
53-
android:layout_width="wrap_content"
54-
android:layout_height="wrap_content"
55-
android:id="@+id/recipeSteps"
56-
android:layout_below="@+id/recipeImage"
57-
android:layout_alignParentLeft="true"
58-
android:layout_alignParentStart="true"
59-
android:layout_alignParentBottom="true"
60-
android:layout_alignParentRight="true"
61-
android:layout_alignParentEnd="true" />
43+
<ImageButton
44+
android:layout_width="150sp"
45+
android:layout_height="150sp"
46+
android:id="@+id/recipeImage"
47+
android:layout_below="@+id/toolbar"
48+
android:layout_alignParentLeft="true"
49+
android:layout_alignParentStart="true"
50+
android:contentDescription="@string/recipe_image"
51+
android:scaleType="fitXY" />
52+
53+
<EditText
54+
android:layout_width="wrap_content"
55+
android:layout_height="wrap_content"
56+
android:inputType="textMultiLine"
57+
android:ems="10"
58+
android:id="@+id/recipeDescription"
59+
android:hint="@string/recipe_description"
60+
android:gravity="start|top"
61+
android:layout_below="@+id/toolbar"
62+
android:layout_toRightOf="@+id/recipeImage"
63+
android:layout_above="@+id/recipeSteps"
64+
android:layout_alignParentRight="true"
65+
android:layout_alignParentEnd="true" />
66+
67+
<ListView
68+
android:layout_width="wrap_content"
69+
android:layout_height="wrap_content"
70+
android:id="@+id/recipeSteps"
71+
android:layout_below="@+id/recipeImage"
72+
android:layout_alignParentLeft="true"
73+
android:layout_alignParentStart="true"
74+
android:layout_alignParentBottom="true"
75+
android:layout_alignParentRight="true"
76+
android:layout_alignParentEnd="true" />
77+
</RelativeLayout>
6278

6379
<android.support.design.widget.FloatingActionButton
6480
android:id="@+id/stepAdd"
6581
android:layout_width="wrap_content"
6682
android:layout_height="wrap_content"
83+
android:layout_margin="32dp"
6784
android:clickable="true"
68-
android:layout_alignBottom="@+id/recipeSteps"
69-
android:layout_alignRight="@+id/recipeDescription"
70-
android:layout_alignEnd="@+id/recipeDescription" />
85+
android:src="@drawable/ic_add_white_36dp"
86+
app:layout_anchor="@id/recipeSteps"
87+
app:layout_anchorGravity="bottom|right|end"
88+
app:elevation="6dp"
89+
app:pressedTranslationZ="12dp"/>
7190

72-
</RelativeLayout>
91+
</android.support.design.widget.CoordinatorLayout>

0 commit comments

Comments
 (0)