Skip to content

Commit

Permalink
Merge pull request #62 from willowtreeapps/feature/ux-feedback
Browse files Browse the repository at this point in the history
UX Feedback
  • Loading branch information
bret-fears authored Mar 24, 2017
2 parents ffe9a56 + 5f77d37 commit 0c011be
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 17 deletions.
2 changes: 0 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
android:theme="@style/AppTheme">
<activity
android:name=".SpruceActivity"
android:launchMode="singleInstance"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
Expand All @@ -42,7 +41,6 @@
</activity>
<activity
android:name=".RecyclerActivity"
android:launchMode="singleInstance"
android:screenOrientation="portrait"/>
</application>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
24 changes: 12 additions & 12 deletions app/src/main/res/layout/recycler_placeholder.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,34 @@
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">

<View
android:id="@+id/background"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:background="@color/lighter_gray"/>
android:background="@color/white"/>

<View
android:id="@+id/green_square"
android:id="@+id/square"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentLeft="true"
android:layout_marginLeft="20dp"
android:layout_marginTop="20dp"
android:alpha="0.5"
android:background="@color/colorAccent"/>
android:background="@color/square_background"/>

<View
android:id="@+id/darker_gray_strip"
android:layout_width="150dp"
android:layout_height="10dp"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:layout_toRightOf="@id/green_square"
android:alpha="0.5"
android:background="@color/darker_gray"/>
android:layout_toRightOf="@id/square"
android:alpha="1"
android:background="@color/fake_paragraphs"/>

<View
android:id="@+id/secondary_gray_strip"
Expand All @@ -62,9 +62,9 @@
android:layout_below="@id/darker_gray_strip"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:layout_toRightOf="@id/green_square"
android:layout_toRightOf="@id/square"
android:alpha="0.5"
android:background="@color/darker_gray"/>
android:background="@color/fake_paragraphs"/>

<View
android:id="@+id/tertiary_gray_strip"
Expand All @@ -73,9 +73,9 @@
android:layout_below="@id/secondary_gray_strip"
android:layout_marginLeft="10dp"
android:layout_marginTop="20dp"
android:layout_toRightOf="@id/green_square"
android:layout_toRightOf="@id/square"
android:alpha="0.5"
android:background="@color/darker_gray"/>
android:background="@color/fake_paragraphs"/>


</RelativeLayout>
1 change: 1 addition & 0 deletions app/src/main/res/layout/spinner_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
3 changes: 3 additions & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,7 @@
<color name="black">#000000</color>
<color name="lighter_gray">#DDDDDD</color>
<color name="darker_gray">#939393</color>
<color name="recycler_background">#F8F8F9</color>
<color name="fake_paragraphs">#D9E1E2</color>
<color name="square_background">#DBE9F9</color>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

<resources>
<string name="app_name">Spruce</string>
<string name="recycler_name">Recycler Example</string>

<!-- Menu options -->
<string name="sort_option">Sort Example</string>
Expand Down

0 comments on commit 0c011be

Please sign in to comment.