diff options
Diffstat (limited to 'vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout')
5 files changed, 136 insertions, 105 deletions
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/edit_remote_key.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/edit_remote_key.xml index 2dfe156..ea20cc2 100644 --- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/edit_remote_key.xml +++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/edit_remote_key.xml @@ -9,7 +9,7 @@ android:id="@+id/hitkLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" + android:clickable="true" android:text="@string/label" /> @@ -26,8 +26,19 @@ <de.androvdr.widget.FontAwesomeButton android:layout_width="wrap_content" android:layout_height="wrap_content" + android:id="@+id/faPicker" android:text="" /> + <de.androvdr.widget.FontAwesomeButton + android:id="@+id/hitkLabelColorPicker" + android:layout_width="wrap_content" + android:textColor="@color/yellow" + android:layout_height="wrap_content" + android:text="" /> + + + + </LinearLayout> <TextView @@ -40,26 +51,4 @@ android:id="@+id/hitkSpinner" android:layout_width="match_parent" android:layout_height="wrap_content" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:visibility="gone"> - - <Button - android:id="@+id/button7" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:layout_weight="1" - android:text="@android:string/cancel" /> - - <Button - android:id="@+id/button6" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@android:string/ok" /> - </LinearLayout> </LinearLayout> diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/fa_search.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/fa_search.xml new file mode 100644 index 0000000..8764059 --- /dev/null +++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/fa_search.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="8dp"> + + <SearchView + android:id="@+id/faSearch" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:iconifiedByDefault="false" /> + + <ListView + android:id="@+id/faItems" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + +</LinearLayout> diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/remote.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/remote.xml index c75d83e..4604b07 100644 --- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/remote.xml +++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/remote.xml @@ -8,45 +8,44 @@ android:padding="5dp"> - <LinearLayout android:id="@+id/resultwrapper" android:layout_width="fill_parent" + android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_height="wrap_content"> - <de.androvdr.widget.AnimatedTextView - android:id="@+id/result" - android:maxLines="1" - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="wrap_content" - android:textSize="10sp" - android:gravity="right" /> - </LinearLayout> + android:layout_alignParentTop="true"> + <de.androvdr.widget.AnimatedTextView + android:id="@+id/result" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="right" + android:maxLines="1" + android:textSize="10sp" /> + </LinearLayout> <LinearLayout android:id="@+id/rows0" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" + android:layout_below="@+id/resultwrapper" android:layout_marginBottom="10dp" - android:layout_below="@+id/resultwrapper"> + android:orientation="horizontal"> <de.androvdr.widget.FontAwesomeButton - style="?android:attr/buttonStyleSmall" + android:id="@+id/Power" + style="?android:attr/buttonStyleSmall" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:tag="Power" - android:text="" - android:id="@+id/Power" /> + android:text="@string/fa_power_off" /> <de.androvdr.widget.FontAwesomeButton style="?android:attr/buttonStyleSmall" @@ -62,13 +61,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:tag="" - /> - - - - - + android:tag="" /> <de.androvdr.widget.FontAwesomeButton @@ -85,10 +78,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_above="@+id/rows1" android:layout_alignParentEnd="true" - android:layout_below="@+id/colorButtons" - android:layout_above="@+id/rows1"> + android:layout_alignParentRight="true" + android:layout_below="@+id/colorButtons"> <de.androvdr.widget.SquareButton android:id="@+id/ok" @@ -104,93 +97,92 @@ <de.androvdr.widget.SquareButton android:id="@+id/right" style="@style/cursorButton" - android:tag="Right" - android:text="▶" android:layout_centerVertical="true" + android:layout_toEndOf="@+id/up" android:layout_toRightOf="@+id/up" - android:layout_toEndOf="@+id/up" /> + android:tag="Right" + android:text="" /> <de.androvdr.widget.SquareButton android:id="@+id/left" style="@style/cursorButton" - android:tag="Left" - android:text="◀" android:layout_centerVertical="true" android:layout_toLeftOf="@+id/ok" - android:layout_toStartOf="@+id/ok" /> + android:layout_toStartOf="@+id/ok" + android:tag="Left" + android:text="" /> <de.androvdr.widget.SquareButton android:id="@+id/up" style="@style/cursorButton" + android:layout_above="@+id/ok" + android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" android:tag="Up" - android:text="▲" - android:layout_above="@+id/ok" - android:layout_centerHorizontal="true" /> + android:text="" /> <de.androvdr.widget.FontAwesomeButton android:id="@+id/ChannelUp" style="@style/volChanButton" - android:tag="Channel+" - android:text="" - android:layout_alignTop="@+id/up" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" /> + android:layout_alignTop="@+id/up" + android:tag="Channel+" + android:text="" /> <de.androvdr.widget.FontAwesomeButton android:id="@+id/VolumeUp" style="@style/volChanButton" android:layout_height="wrap_content" - android:tag="Volume+" - android:text="" - android:layout_alignTop="@+id/up" android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> + android:layout_alignParentStart="true" + android:layout_alignTop="@+id/up" + android:tag="Volume+" + android:text="" /> <de.androvdr.widget.SquareButton android:id="@+id/down" style="@style/cursorButton" - android:layout_gravity="center_horizontal" - - android:tag="Down" - android:text="▼" android:layout_below="@+id/ok" + + android:layout_gravity="center_horizontal" android:layout_toLeftOf="@+id/right" - android:layout_toStartOf="@+id/right" /> + android:layout_toStartOf="@+id/right" + android:tag="Down" + android:text="" /> <de.androvdr.widget.FontAwesomeButton android:id="@+id/ChannelDown" style="@style/volChanButton" - android:tag="Channel-" - android:text="" android:layout_alignBottom="@+id/down" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" /> + android:tag="Channel-" + android:text="" /> <de.androvdr.widget.FontAwesomeButton android:id="@+id/VolumeDown" style="@style/volChanButton" - android:tag="Volume-" - android:text="" android:layout_alignBottom="@+id/down" android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> + android:layout_alignParentStart="true" + android:tag="Volume-" + android:text="" /> </RelativeLayout> - <LinearLayout android:id="@+id/colorButtons" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_alignParentRight="true" android:layout_alignParentEnd="true" - android:layout_below="@+id/rows0"> + android:layout_alignParentRight="true" + android:layout_below="@+id/rows0" + android:orientation="horizontal"> <de.androvdr.widget.FontAwesomeButton @@ -200,33 +192,30 @@ android:layout_height="wrap_content" android:layout_weight="1" android:tag="Red" - android:text="" - android:textColor="@color/red" - /> + android:text="@string/remotesquares" + android:textColor="@color/red" /> <de.androvdr.widget.FontAwesomeButton android:id="@+id/green" style="?android:attr/buttonStyleSmall" - android:layout_width="0dp" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:text="" android:tag="Green" - android:textColor="@color/green" - /> + android:text="@string/remotesquares" + android:textColor="@color/green" /> <de.androvdr.widget.FontAwesomeButton android:id="@+id/yellow" style="?android:attr/buttonStyleSmall" - android:layout_width="0dp" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:tag="Yellow" - android:text="" - android:textColor="@color/yellow" - /> + android:text="@string/remotesquares" + android:textColor="@color/yellow" /> <de.androvdr.widget.FontAwesomeButton @@ -236,9 +225,8 @@ android:layout_height="wrap_content" android:layout_weight="1" android:tag="Blue" - android:text="" - android:textColor="@color/blue" - /> + android:text="@string/remotesquares" + android:textColor="@color/blue" /> </LinearLayout> @@ -248,10 +236,10 @@ android:id="@+id/rows1" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_above="@+id/rows2" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - android:orientation="horizontal" - android:layout_above="@+id/rows2"> + android:orientation="horizontal"> <de.androvdr.widget.FontAwesomeButton style="?android:attr/buttonStyleSmall" @@ -260,7 +248,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:tag="Mute" - android:text="" /> + android:text="@string/fa_mute" /> <de.androvdr.widget.FontAwesomeButton @@ -295,13 +283,13 @@ <LinearLayout + android:id="@+id/rows2" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:id="@+id/rows2" - android:orientation="horizontal" - android:layout_marginTop="10dp" + android:layout_alignParentBottom="true" android:layout_marginBottom="10dp" - android:layout_alignParentBottom="true"> + android:layout_marginTop="10dp" + android:orientation="horizontal"> <de.androvdr.widget.FontAwesomeButton style="?android:attr/buttonStyleSmall" @@ -309,7 +297,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:tag="Audio" - android:text="" /> + android:text="@string/f025" /> <de.androvdr.widget.FontAwesomeButton @@ -318,7 +306,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:tag="Subtitles" - android:text="S" /> + android:text="@string/fa_bars" /> <de.androvdr.widget.FontAwesomeButton style="?android:attr/buttonStyleSmall" diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/searchspinner.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/searchspinner.xml new file mode 100644 index 0000000..c71b36f --- /dev/null +++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/searchspinner.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<com.toptoche.searchablespinnerlibrary.SearchableSpinner xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/spinner" + android:entries="@array/font" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/simple_list_item_1_fa.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/simple_list_item_1_fa.xml new file mode 100644 index 0000000..6a493e1 --- /dev/null +++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/layout/simple_list_item_1_fa.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2006 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<de.androvdr.widget.FontAwesomeTextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceListItemSmall" + android:gravity="center_vertical" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:minHeight="?android:attr/listPreferredItemHeightSmall" + android:paddingLeft="?android:attr/listPreferredItemPaddingLeft" + android:paddingRight="?android:attr/listPreferredItemPaddingRight" /> |