Rework numpad
This commit is contained in:
Margaux Clerc
parent
f9c8e4fbd8
commit
0cdd8073f8
28 changed files with 47 additions and 306 deletions
BIN
res/drawable-xhdpi/numpad_0_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_0_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
BIN
res/drawable-xhdpi/numpad_1_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_1_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
BIN
res/drawable-xhdpi/numpad_2_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_2_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.8 KiB |
BIN
res/drawable-xhdpi/numpad_3_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_3_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
BIN
res/drawable-xhdpi/numpad_4_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_4_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
BIN
res/drawable-xhdpi/numpad_5_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_5_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
BIN
res/drawable-xhdpi/numpad_6_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_6_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
BIN
res/drawable-xhdpi/numpad_7_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_7_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
BIN
res/drawable-xhdpi/numpad_8_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_8_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.8 KiB |
BIN
res/drawable-xhdpi/numpad_9_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_9_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 708 B After Width: | Height: | Size: 708 B |
BIN
res/drawable-xhdpi/numpad_hash_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_hash_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 675 B |
BIN
res/drawable-xhdpi/numpad_star_over.png
Normal file
BIN
res/drawable-xhdpi/numpad_star_over.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_8" />
|
||||
android:drawable="@drawable/numpad_8_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_8" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_5" />
|
||||
android:drawable="@drawable/numpad_5_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_5" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_4" />
|
||||
android:drawable="@drawable/numpad_4_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_4" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_9" />
|
||||
android:drawable="@drawable/numpad_9_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_9" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_1" />
|
||||
android:drawable="@drawable/numpad_1_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_1" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_7" />
|
||||
android:drawable="@drawable/numpad_7_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_7" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_sharp" />
|
||||
android:drawable="@drawable/numpad_hash_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_sharp" />
|
||||
android:drawable="@drawable/numpad_hash" />
|
||||
</selector>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_6" />
|
||||
android:drawable="@drawable/numpad_6_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_6" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_star" />
|
||||
android:drawable="@drawable/numpad_star_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_star" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_3" />
|
||||
android:drawable="@drawable/numpad_3_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_3" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_2" />
|
||||
android:drawable="@drawable/numpad_2_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_2" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true"
|
||||
android:drawable="@drawable/numpad_0" />
|
||||
android:drawable="@drawable/numpad_0_over" />
|
||||
<item
|
||||
android:drawable="@drawable/numpad_0" />
|
||||
</selector>
|
||||
|
|
|
|||
|
|
@ -79,10 +79,11 @@
|
|||
<org.linphone.ui.Numpad
|
||||
android:contentDescription="@string/content_description_numpad"
|
||||
android:id="@+id/Dialer"
|
||||
android:layout_centerInParent="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="10dp"
|
||||
android:layout_above="@id/controls"
|
||||
android:layout_below="@id/AddressBar" />
|
||||
android:layout_below="@id/AddressBar"
|
||||
android:layout_centerInParent="true"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
|
|||
|
|
@ -1,291 +1,30 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_margin="20dp"
|
||||
android:layout_weight="1">
|
||||
android:layout_width="match_parent" android:layout_height="match_parent" android:shrinkColumns="*" >
|
||||
|
||||
<TableRow android:layout_weight="1">
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
<TableRow android:layout_weight="1" android:gravity="center">
|
||||
<org.linphone.ui.Digit android:id="@+id/Digit1" android:text="1" style="@style/DialerDigit" android:background="@drawable/numpad_one" android:soundEffectsEnabled="true"/>
|
||||
<org.linphone.ui.Digit android:id="@+id/Digit2" android:text="2" style="@style/DialerDigit" android:background="@drawable/numpad_two" android:soundEffectsEnabled="true" />
|
||||
<org.linphone.ui.Digit android:id="@+id/Digit3" android:text="3" style="@style/DialerDigit" android:background="@drawable/numpad_three" android:soundEffectsEnabled="true" />
|
||||
</TableRow>
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/Digit1"
|
||||
android:text="1"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
<TableRow android:layout_weight="1" android:gravity="center">
|
||||
<org.linphone.ui.Digit android:id="@+id/Digit4" android:text="4" style="@style/DialerDigit" android:background="@drawable/numpad_four" android:soundEffectsEnabled="true" />
|
||||
<org.linphone.ui.Digit android:id="@+id/Digit5" android:text="5" style="@style/DialerDigit" android:background="@drawable/numpad_five" android:soundEffectsEnabled="true" />
|
||||
<org.linphone.ui.Digit android:id="@+id/Digit6" android:text="6" style="@style/DialerDigit" android:background="@drawable/numpad_six" android:soundEffectsEnabled="true" />
|
||||
</TableRow>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_one"/>
|
||||
<TableRow android:layout_weight="1" android:gravity="center">
|
||||
<org.linphone.ui.Digit android:id="@+id/Digit7" android:text="7" style="@style/DialerDigit" android:background="@drawable/numpad_seven" android:soundEffectsEnabled="true" />
|
||||
<org.linphone.ui.Digit android:id="@+id/Digit8" android:text="8" style="@style/DialerDigit" android:background="@drawable/numpad_eight" android:soundEffectsEnabled="true" />
|
||||
<org.linphone.ui.Digit android:id="@+id/Digit9" android:text="9" style="@style/DialerDigit" android:background="@drawable/numpad_nine" android:soundEffectsEnabled="true" />
|
||||
</TableRow>
|
||||
|
||||
<TableRow android:layout_weight="1" android:gravity="center">
|
||||
<org.linphone.ui.Digit android:id="@+id/DigitStar" android:text="*" style="@style/DialerDigit" android:background="@drawable/numpad_star" android:soundEffectsEnabled="true" />
|
||||
<org.linphone.ui.Digit android:id="@+id/Digit00" android:text="0+" style="@style/DialerDigit" android:background="@drawable/numpad_zero" android:soundEffectsEnabled="true" />
|
||||
<org.linphone.ui.Digit android:id="@+id/DigitHash" android:text="#" style="@style/DialerDigit" android:background="@drawable/numpad_sharp" android:soundEffectsEnabled="true" />
|
||||
</TableRow>
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/Digit2"
|
||||
android:text="2"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_two"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/Digit3"
|
||||
android:text="3"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_three"/>
|
||||
|
||||
</RelativeLayout>
|
||||
</TableRow>
|
||||
|
||||
<TableRow android:layout_weight="1">
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/Digit4"
|
||||
android:text="4"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_four"/>
|
||||
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/Digit5"
|
||||
android:text="5"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_five"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/Digit6"
|
||||
android:text="6"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_six"/>
|
||||
|
||||
</RelativeLayout>
|
||||
</TableRow>
|
||||
|
||||
<TableRow android:layout_weight="1">
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/Digit7"
|
||||
android:text="7"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_seven"/>
|
||||
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/Digit8"
|
||||
android:text="8"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_eight"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/Digit9"
|
||||
android:text="9"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_nine"/>
|
||||
|
||||
</RelativeLayout>
|
||||
</TableRow>
|
||||
|
||||
<TableRow android:layout_weight="1">
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/DigitStar"
|
||||
android:text="*"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_star"/>
|
||||
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/Digit00"
|
||||
android:text="0+"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_zero"/>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<org.linphone.ui.Digit
|
||||
android:id="@+id/DigitHash"
|
||||
android:text="#"
|
||||
style="@style/DialerDigit"
|
||||
android:background="@android:color/transparent"
|
||||
android:soundEffectsEnabled="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentLeft="true"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/numpad_sharp"/>
|
||||
|
||||
</RelativeLayout>
|
||||
</TableRow>
|
||||
|
||||
</TableLayout>
|
||||
<!-- android:layout_width="fill_parent" android:layout_height="fill_parent" android:textColor="@android:color/black" android:background="@drawable/clavier_bg" android:textStyle="bold" android:textSize="20sp" android:layout_weight="1" -->
|
||||
|
||||
</TableLayout>
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<style name="DialerDigit" parent="@android:style/TextAppearance.Medium">
|
||||
<item name="android:layout_width">wrap_content</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:layout_gravity">center</item>
|
||||
<item name="android:textColor">@android:color/transparent</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
<item name="android:layout_weight">1</item>
|
||||
</style>
|
||||
<style name="DialerDigit" parent="@android:style/TextAppearance.Medium">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">wrap_content</item>
|
||||
<item name="android:textColor">@android:color/transparent</item>
|
||||
<item name="android:textSize">20sp</item>
|
||||
<item name="android:scaleType">center</item>
|
||||
<item name="android:adjustViewBounds">true</item>
|
||||
<item name="android:layout_margin">10dp</item>
|
||||
</style>
|
||||
|
||||
<declare-styleable name="Numpad">
|
||||
<attr name="play_dtmf">
|
||||
|
|
|
|||
Loading…
Reference in a new issue