TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add E button to EditVariableFragment

Browse Source
This commit is contained in:
serso
2016-04-10 23:26:55 +02:00
parent 858f3f32b2
commit 13e7a5f9fe
6 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/res/layout/fragment_variable_edit.xml
View File

@@ -65,18 +65,36 @@
tools:ignore="UnusedAttribute" />
</FrameLayout>
<android.support.design.widget.TextInputLayout
a:id="@+id/variable_value_label"
<FrameLayout
a:layout_width="match_parent"
a:layout_height="wrap_content">
<org.solovyev.android.calculator.view.EditTextCompat
a:id="@+id/variable_value"
<android.support.design.widget.TextInputLayout
a:id="@+id/variable_value_label"
a:layout_width="match_parent"
a:layout_height="wrap_content">
<EditText
a:id="@+id/variable_value"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:hint="@string/c_var_value"
a:inputType="numberDecimal|numberSigned" />
</android.support.design.widget.TextInputLayout>
<Button
a:id="@+id/variable_exponent_button"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:hint="@string/c_var_value"
a:inputType="numberDecimal|numberSigned" />
</android.support.design.widget.TextInputLayout>
a:layout_gravity="end|top"
a:background="?attr/selectableItemBackgroundBorderless"
a:minWidth="0dp"
a:padding="@dimen/cpp_image_button_padding"
a:text="@string/cpp_exponent"
a:textAllCaps="false"
a:textAppearance="?android:attr/textAppearanceSmall"
tools:ignore="UnusedAttribute" />
</FrameLayout>
<android.support.design.widget.TextInputLayout
a:layout_width="match_parent"

2
app/src/main/res/values/text_non_translatable.xml
View File

@@ -14,6 +14,8 @@
<string name="dimensions_y_min" translatable="false">Y min</string>
<string name="dimensions_y_max" translatable="false">Y max</string>
<string name="cpp_function_body" translatable="false">f(x, y)</string>
<string name="cpp_show_greek_keyboard" translatable="false">αβγ</string>
<string name="cpp_exponent" translatable="false">E</string>
<string-array name="cpp_prefs_precisions" translatable="false">
<item>0</item>
<item>1</item>

1
app/src/main/res/values/text_strings.xml
View File

@@ -115,7 +115,6 @@
several devices.\n\n
By clicking \'Continue\' button you will be redirected to the Google Play app to make the payment.</string>
<string name="cpp_purchase_title">Purchase</string>
<string name="cpp_show_greek_keyboard" translatable="false">αβγ</string>
<string name="cpp_clear_history_title">Clear history?</string>
<string name="cpp_clear_history_message">All history will be cleared.</string>
<string name="cpp_clear_history">Clear</string>