diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 87b54ad..5c7643b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -32,7 +32,6 @@ android:theme="@style/AppTheme"> @@ -42,7 +41,6 @@ diff --git a/app/src/main/java/com/willowtreeapps/spurceexampleapp/RecyclerActivity.java b/app/src/main/java/com/willowtreeapps/spurceexampleapp/RecyclerActivity.java index 7184e40..ba3f920 100644 --- a/app/src/main/java/com/willowtreeapps/spurceexampleapp/RecyclerActivity.java +++ b/app/src/main/java/com/willowtreeapps/spurceexampleapp/RecyclerActivity.java @@ -57,7 +57,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { if (getSupportActionBar() != null) { - getSupportActionBar().setDisplayShowTitleEnabled(false); + getSupportActionBar().setTitle(R.string.recycler_name); getSupportActionBar().setDisplayHomeAsUpEnabled(true); } } @@ -72,7 +72,8 @@ public boolean onCreateOptionsMenu(Menu menu) { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.sort_option: - startActivity(new Intent(this, SpruceActivity.class)); + startActivity(new Intent(this, SpruceActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)); break; case R.id.recycler_option: break; diff --git a/app/src/main/java/com/willowtreeapps/spurceexampleapp/SpruceActivity.java b/app/src/main/java/com/willowtreeapps/spurceexampleapp/SpruceActivity.java index e66789d..d41e41f 100644 --- a/app/src/main/java/com/willowtreeapps/spurceexampleapp/SpruceActivity.java +++ b/app/src/main/java/com/willowtreeapps/spurceexampleapp/SpruceActivity.java @@ -71,7 +71,8 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.sort_option: break; case R.id.recycler_option: - startActivity(new Intent(this, RecyclerActivity.class)); + startActivity(new Intent(this, RecyclerActivity.class) + .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)); break; } return super.onOptionsItemSelected(item); diff --git a/app/src/main/res/layout/recycler_placeholder.xml b/app/src/main/res/layout/recycler_placeholder.xml index f32f166..8053481 100644 --- a/app/src/main/res/layout/recycler_placeholder.xml +++ b/app/src/main/res/layout/recycler_placeholder.xml @@ -26,24 +26,24 @@ android:layout_width="match_parent" android:layout_height="100dp" android:layout_marginBottom="2dp" - android:layout_marginTop="2dp"> + android:layout_marginTop="2dp" + android:background="@color/recycler_background"> + android:background="@color/white"/> + android:background="@color/square_background"/> + android:layout_toRightOf="@id/square" + android:alpha="1" + android:background="@color/fake_paragraphs"/> + android:background="@color/fake_paragraphs"/> + android:background="@color/fake_paragraphs"/> \ No newline at end of file diff --git a/app/src/main/res/layout/spinner_item.xml b/app/src/main/res/layout/spinner_item.xml index 23f31a5..4b7296d 100644 --- a/app/src/main/res/layout/spinner_item.xml +++ b/app/src/main/res/layout/spinner_item.xml @@ -26,5 +26,6 @@ style="?attr/spinnerDropDownItemStyle" android:layout_width="match_parent" android:layout_height="match_parent" + android:textStyle="bold" android:drawableRight="@drawable/ic_arrow_drop_down_white_24dp" android:textColor="@color/white"/> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9e712cc..e46b12c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -30,4 +30,7 @@ #000000 #DDDDDD #939393 + #F8F8F9 + #D9E1E2 + #DBE9F9 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ae4b9b8..ce5b944 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -22,6 +22,7 @@ Spruce + Recycler Example Sort Example