Skip to content

Commit

Permalink
Changed style of numeric button
Browse files Browse the repository at this point in the history
  • Loading branch information
@aint
aint committed Nov 16, 2014
1 parent f4f2a81 commit 4b075c8
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 94 deletions.
35 changes: 35 additions & 0 deletions app/res/drawable/numeric_button.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape>
<solid
android:color="@color/default_line_indicator_selected_color" />
<corners
android:radius="200dp" />
<stroke
android:width="1dp"
android:color="@color/abs__bright_foreground_disabled_holo_light" />
</shape>
</item>
<item android:state_enabled="false" >
<shape>
<solid
android:color="@color/abs__primary_text_disable_only_holo_dark" />
<corners
android:radius="200dp" />
<stroke
android:width="1dp"
android:color="@color/abs__bright_foreground_disabled_holo_light" />
</shape>
</item>
<item>
<shape>
<solid android:color="@android:color/transparent" />
<corners
android:radius="200dp" />
<stroke
android:width="1dp"
android:color="@color/abs__bright_foreground_disabled_holo_light" />
</shape>
</item>
</selector>
119 changes: 25 additions & 94 deletions app/res/layout/fragment_numeric_keyboard.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,58 +53,25 @@

<EditText
android:id="@+id/passcode1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:cursorVisible="false"
android:focusableInTouchMode="false"
android:hint="*"
android:inputType="textPassword|number"
android:password="true"
android:maxLength="1"
android:textSize="33sp" />
style="@style/PasscodeEditText" />

<EditText
android:id="@+id/passcode2"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:cursorVisible="false"
android:focusableInTouchMode="false"
android:hint="*"
android:inputType="textPassword|number"
android:password="true"
android:maxLength="1"
android:textSize="33sp" />
style="@style/PasscodeEditText" />

<EditText
android:id="@+id/passcode3"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:cursorVisible="false"
android:focusableInTouchMode="false"
android:hint="*"
android:inputType="textPassword|number"
android:password="true"
android:maxLength="1"
android:textSize="33sp" />
style="@style/PasscodeEditText" />

<EditText
android:id="@+id/passcode4"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:cursorVisible="false"
android:focusableInTouchMode="false"
android:hint="*"
android:inputType="textPassword|number"
android:password="true"
android:maxLength="1"
android:textSize="33sp" />
style="@style/PasscodeEditText" />

</LinearLayout>

</LinearLayout>

<LinearLayout android:id="@+id/keypad"
android:layout_width="fill_parent"
<LinearLayout android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_weight="1.2"
Expand All @@ -119,27 +86,18 @@

<Button
android:id="@+id/one_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="1"
android:textSize="25sp" />
style="@style/NumericButton" />

<Button
android:id="@+id/two_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="2"
android:textSize="25sp" />
style="@style/NumericButton" />

<Button
android:id="@+id/three_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="3"
android:textSize="25sp" />
style="@style/NumericButton" />
</LinearLayout>

<LinearLayout android:id="@+id/four_to_six"
Expand All @@ -151,27 +109,18 @@

<Button
android:id="@+id/four_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="4"
android:textSize="25sp" />
style="@style/NumericButton" />

<Button
android:id="@+id/five_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="5"
android:textSize="25sp" />
style="@style/NumericButton" />

<Button
android:id="@+id/six_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="6"
android:textSize="25sp" />
style="@style/NumericButton" />
</LinearLayout>

<LinearLayout android:id="@+id/seven_to_nine"
Expand All @@ -183,60 +132,42 @@

<Button
android:id="@+id/seven_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="7"
android:textSize="25sp" />
style="@style/NumericButton" />

<Button
android:id="@+id/eight_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="8"
android:textSize="25sp" />
style="@style/NumericButton" />

<Button
android:id="@+id/nine_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="9"
android:textSize="25sp" />
style="@style/NumericButton" />
</LinearLayout>

<LinearLayout
android:id="@+id/zero"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:weightSum="3"
android:layout_weight="1">
<LinearLayout android:id="@+id/zero"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:orientation="horizontal"
android:weightSum="3"
android:layout_weight="1">

<Button
android:id="@+id/empty_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text=""
android:textSize="25sp"
android:enabled="false" />
android:enabled="false"
style="@style/NumericButton" />

<Button
android:id="@+id/zero_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:text="0"
android:textSize="25sp"/>
style="@style/NumericButton" />

<ImageButton
android:id="@+id/delete_btn"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:src="@drawable/clear_btn" />
android:src="@drawable/clear_btn"
style="@style/NumericButton" />
</LinearLayout>

</LinearLayout>
Expand Down
21 changes: 21 additions & 0 deletions app/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,25 @@
<item name="android:orientation">vertical</item>
<item name="android:layout_marginBottom">@dimen/form_row_bottom_margin</item>
</style>

<style name="NumericButton" parent="@android:style/Widget.Button">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_margin">1dp</item>
<item name="android:textSize">25sp</item>
<item name="android:background">@drawable/numeric_button</item>
</style>

<style name="PasscodeEditText" parent="@android:style/Widget.EditText">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:cursorVisible">false</item>
<item name="android:focusableInTouchMode">false</item>
<item name="android:inputType">textPassword|number</item>
<item name="android:password">true</item>
<item name="android:maxLength">1</item>
<item name="android:hint">*</item>
<item name="android:textSize">33sp</item>
</style>
</resources>

0 comments on commit 4b075c8

Please sign in to comment.