Skip to content

Commit

Permalink
fixes #22
Browse files Browse the repository at this point in the history
  • Loading branch information
@burntcookie90
burntcookie90 committed Oct 27, 2014
1 parent e019831 commit 9fdf98b
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 33 deletions.
38 changes: 22 additions & 16 deletions app/src/main/res/layout/fragment_story_comments.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,38 +23,44 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<LinearLayout
<RelativeLayout
android:id="@+id/button_bar"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_alignParentBottom="true"
android:background="@android:color/holo_orange_dark">

<Button
android:id="@+id/prev_top_level"
android:layout_width="0dp"
android:layout_alignParentLeft="true"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_weight="1"
android:background="@drawable/navigation_up"
android:visibility="visible"/>
android:visibility="visible"
tools:ignore="RtlHardcoded"/>

<Button
android:id="@+id/open_link"
android:layout_width="0dp"
android:id="@+id/next_top_level"
android:layout_alignParentRight="true"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_weight="4"
android:background="@drawable/orange_button"
android:text="@string/show_link"
android:visibility="visible"/>
android:background="@drawable/navigation_down"
android:visibility="visible"
tools:ignore="RtlHardcoded"/>

<Button
android:id="@+id/next_top_level"
android:layout_width="0dp"
android:id="@+id/open_link"
android:layout_toRightOf="@id/prev_top_level"
android:layout_toLeftOf="@id/next_top_level"
android:layout_width="wrap_content"
android:layout_height="42dp"
android:layout_weight="1"
android:background="@drawable/navigation_down"
android:visibility="visible"/>
</LinearLayout>
android:background="@drawable/orange_button"
android:text="@string/show_link"
android:visibility="visible"
tools:ignore="RtlHardcoded"/>
</RelativeLayout>

<io.dwak.holohackernews.app.widget.SmoothSwipeRefreshLayout
android:id="@+id/swipe_container"
Expand Down
42 changes: 25 additions & 17 deletions app/src/main/res/layout/view_story_link.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<io.dwak.holohackernews.app.widget.ReboundRevealRelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:fab="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:animateLayoutChanges="true"
Expand All @@ -16,39 +17,45 @@
android:layout_centerInParent="true"
android:background="@android:color/holo_orange_light"/>

<LinearLayout
<RelativeLayout
android:id="@+id/button_bar"
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_below="@id/progress_bar"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:background="@android:color/holo_orange_dark"
android:orientation="horizontal">

<Button
android:id="@+id/web_back"
android:layout_width="0dp"
android:layout_alignParentLeft="true"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_weight="1"
android:background="@drawable/web_back"
android:visibility="visible"/>
android:visibility="visible"
tools:ignore="RtlHardcoded"/>

<Button
android:id="@+id/close_link"
android:layout_width="0dp"
android:id="@+id/web_forward"
android:layout_alignParentRight="true"
android:layout_width="42dp"
android:layout_height="42dp"
android:layout_weight="6"
android:background="@drawable/orange_button"
android:text="@string/show_comments"
android:visibility="visible"/>
android:background="@drawable/web_forward"
android:visibility="visible"
tools:ignore="RtlHardcoded"/>

<Button
android:id="@+id/web_forward"
android:layout_width="0dp"
android:id="@+id/close_link"
android:layout_width="wrap_content"
android:layout_height="42dp"
android:layout_weight="1"
android:background="@drawable/web_forward"
android:visibility="visible"/>
</LinearLayout>
android:layout_toRightOf="@id/web_back"
android:layout_toLeftOf="@id/web_forward"
android:background="@drawable/orange_button"
android:text="@string/show_comments"
android:visibility="visible"
tools:ignore="RtlHardcoded"/>
</RelativeLayout>

<io.dwak.holohackernews.app.widget.ObservableWebView
android:id="@+id/story_web_view"
Expand All @@ -68,5 +75,6 @@
android:layout_margin="16dp"
android:src="@drawable/ic_action_readability"
fab:fab_colorNormal="@color/system_bar_tint"
fab:fab_colorPressed="@color/list_selector_orange"/>
fab:fab_colorPressed="@color/list_selector_orange"
tools:ignore="RtlHardcoded"/>
</io.dwak.holohackernews.app.widget.ReboundRevealRelativeLayout>

0 comments on commit 9fdf98b

Please sign in to comment.