diff options
Diffstat (limited to 'fmapp2/res/layout/fmradio.xml')
-rw-r--r-- | fmapp2/res/layout/fmradio.xml | 129 |
1 files changed, 31 insertions, 98 deletions
diff --git a/fmapp2/res/layout/fmradio.xml b/fmapp2/res/layout/fmradio.xml index 4aef544..c78f563 100644 --- a/fmapp2/res/layout/fmradio.xml +++ b/fmapp2/res/layout/fmradio.xml @@ -26,9 +26,9 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/fmradio" - android:background="@drawable/bg" + android:background="@color/background_color" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical"> @@ -37,17 +37,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:layout_marginTop="3dp" - android:layout_alignParentTop="true"> - - <ImageView android:id="@+id/btn_onoff" - android:src="@drawable/btn_onoff" - android:layout_alignParentLeft="true" - android:layout_marginLeft="15dp" - android:clickable="true" - android:focusable="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_marginTop="3dp"> <TextView android:id="@+id/sleep_msg_tv" android:textAppearance="?android:attr/textAppearanceMedium" @@ -66,6 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center" + android:visibility="gone" android:layout_marginLeft="2dp" android:layout_marginRight="2dp" android:layout_toLeftOf="@+id/btn_silent" @@ -75,49 +66,40 @@ android:textStyle="bold" android:text="@string/prog_service_string"/> - <ImageView android:id="@+id/btn_silent" - android:src="@drawable/ic_silent_mode_off" - android:layout_toLeftOf="@+id/btn_speaker_earphone" - android:layout_width="wrap_content" - android:layout_marginRight="10dp" - android:clickable="true" - android:focusable="true" - android:layout_height="wrap_content" /> - - <ImageView android:id="@+id/btn_speaker_earphone" - android:src="@drawable/btn_earphone" - android:layout_alignParentRight="true" - android:layout_marginRight="15dp" - android:clickable="true" - android:focusable="true" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - </RelativeLayout> <LinearLayout android:id="@+id/stationinfo_layout" android:layout_width="fill_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:orientation="horizontal" - android:layout_marginTop="5dp" - android:layout_below="@+id/layout_on_off"> + android:layout_weight="1"> <!-- This included layout contains Station Information to display --> <include layout="@layout/station_info" /> </LinearLayout> - <com.caf.fmradio.HorizontalNumberPicker - android:id="@+id/fm_picker" - android:layout_width="fill_parent" - android:layout_height="200dp" - android:layout_marginBottom="50dp" - android:layout_below="@+id/stationinfo_layout"/> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="155dp"> + + <com.caf.fmradio.HorizontalNumberPicker + android:id="@+id/fm_picker" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/picker_background_color"/> + + <ImageView + android:src="@drawable/seeker" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + </RelativeLayout> + <HorizontalScrollView android:layout_width="fill_parent" android:layout_height="60dp" - android:layout_alignParentBottom="true" android:scrollbars="none"> <LinearLayout android:id="@+id/favorite_list" @@ -126,77 +108,28 @@ android:orientation="horizontal"> <Button android:id="@+id/presets_button_1" - style="@style/ButtonStripLeft" - android:text="@string/add_station" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="15sp" - android:singleLine="true" - android:layout_width="80dp" - android:layout_weight="1" - android:layout_height="wrap_content"/> + style="@style/ButtonStripButtons"/> <Button android:id="@+id/presets_button_2" - style="@style/ButtonStripMiddle" - android:text="@string/add_station" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="15sp" - android:singleLine="true" - android:layout_width="80dp" - android:layout_weight="1" - android:layout_height="wrap_content"/> + style="@style/ButtonStripButtons"/> <Button android:id="@+id/presets_button_3" - style="@style/ButtonStripMiddle" - android:text="@string/add_station" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="15sp" - android:singleLine="true" - android:layout_width="80dp" - android:layout_weight="1" - android:layout_height="wrap_content"/> + style="@style/ButtonStripButtons"/> <Button android:id="@+id/presets_button_4" - style="@style/ButtonStripMiddle" - android:text="@string/add_station" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="15sp" - android:singleLine="true" - android:layout_width="80dp" - android:layout_weight="1" - android:layout_height="wrap_content"/> + style="@style/ButtonStripButtons"/> <Button android:id="@+id/presets_button_5" - style="@style/ButtonStripMiddle" - android:text="@string/add_station" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="15sp" - android:singleLine="true" - android:layout_width="80dp" - android:layout_weight="1" - android:layout_height="wrap_content"/> + style="@style/ButtonStripButtons"/> <Button android:id="@+id/presets_button_6" - style="@style/ButtonStripMiddle" - android:text="@string/add_station" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="15sp" - android:singleLine="true" - android:layout_width="80dp" - android:layout_weight="1" - android:layout_height="wrap_content"/> + style="@style/ButtonStripButtons"/> <Button android:id="@+id/presets_button_7" - style="@style/ButtonStripRight" - android:text="@string/add_station" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textSize="15sp" - android:singleLine="true" - android:layout_width="80dp" - android:layout_weight="1" - android:layout_height="wrap_content"/> + style="@style/ButtonStripButtons"/> </LinearLayout> </HorizontalScrollView> -</RelativeLayout> +</LinearLayout> |