hollorol/Clockplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create landscape layout for StopwatchFragment

Browse Source
This commit is contained in:
Phillip Hsu 2016-08-30 02:20:17 -07:00
parent c0553b85b7
commit be9aca1ede
2 changed files with 65 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/philliphsu/clock2/stopwatch/StopwatchFragment.java
View File

@ -200,7 +200,8 @@ public class StopwatchFragment extends RecyclerViewFragment<
} else {
// I verified the bar was visible already without this, so we probably don't need this,
// but it's just a safety measure..
mSeekBar.setVisibility(View.VISIBLE);
// ACTUALLY NOT A SAFETY MEASURE!
// mSeekBar.setVisibility(View.VISIBLE);
ProgressBarUtils.setProgress(mSeekBar, getCurrentLapProgressRatio());
}
} else {

115
app/src/main/res/layout-land/fragment_stopwatch.xml
View File

@ -1,71 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="match_parent">
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="match_parent">
<com.philliphsu.clock2.stopwatch.ChronometerWithMillis
android:id="@+id/chronometer"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
android:background="@color/colorPrimary"
android:gravity="center_horizontal"
android:textSize="@dimen/text_size_display_3"
style="@style/TextAppearance.AppCompat.Inverse"
android:layout_marginBottom="8dp"/>
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_above="@+id/mini_fab_layout">
<!-- RecyclerView -->
<include layout="@layout/fragment_recycler_view"/>
<com.philliphsu.clock2.stopwatch.ChronometerWithMillis
android:id="@+id/chronometer"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:padding="16dp"
android:background="@color/colorPrimary"
android:gravity="center"
android:textSize="@dimen/text_size_display_3"
style="@style/TextAppearance.AppCompat.Inverse"/>
</LinearLayout>
<include layout="@layout/fragment_recycler_view"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:layout_marginTop="8dp"/>
</LinearLayout>
<!-- TODO: dimen resource for height -->
<android.support.v7.widget.GridLayout
android:id="@id/mini_fab_layout"
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_alignParentBottom="true"
app:columnCount="2">
<android.support.design.widget.FloatingActionButton
android:id="@+id/new_lap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_add_lap_24dp"
android:tint="@android:color/white"
android:visibility="invisible"
app:layout_columnWeight="1"
app:layout_gravity="center"
app:fabSize="mini"
app:backgroundTint="@color/colorPrimary"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/stop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_stop_24dp"
android:tint="@android:color/white"
android:visibility="invisible"
app:layout_columnWeight="1"
app:layout_gravity="center"
app:fabSize="mini"
app:backgroundTint="@color/colorPrimary"/>
</android.support.v7.widget.GridLayout>
</RelativeLayout>
<com.philliphsu.clock2.UntouchableSeekBar
android:id="@+id/seek_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_anchor="@id/chronometer"
app:layout_anchorGravity="bottom"
app:layout_anchor="@id/mini_fab_layout"
app:layout_anchorGravity="top"
android:paddingStart="0dp"
android:paddingEnd="0dp"/>
<!-- TODO: dimen resource for height -->
<android.support.v7.widget.GridLayout
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_gravity="bottom"
app:columnCount="2">
<android.support.design.widget.FloatingActionButton
android:id="@+id/new_lap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_add_lap_24dp"
android:tint="@android:color/white"
android:visibility="invisible"
app:layout_columnWeight="1"
app:layout_gravity="center"
app:fabSize="mini"
app:backgroundTint="@color/colorPrimary"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/stop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_stop_24dp"
android:tint="@android:color/white"
android:visibility="invisible"
app:layout_columnWeight="1"
app:layout_gravity="center"
app:fabSize="mini"
app:backgroundTint="@color/colorPrimary"/>
</android.support.v7.widget.GridLayout>
</android.support.design.widget.CoordinatorLayout>