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

Cleanup, some lint issues fixes

Browse Source
This commit is contained in:
serso
2015-02-19 11:23:07 +01:00
parent c4a5ee38ab
commit 423dcb6fbe
34 changed files with 33 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android-app/src/main/res/drawable-hdpi/ab_clock.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
android-app/src/main/res/drawable-hdpi/ab_plus.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 238 B

BIN
android-app/src/main/res/drawable-hdpi/ab_remove.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 515 B

BIN
android-app/src/main/res/drawable-hdpi/ic_delete_grey600_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 258 B

BIN
android-app/src/main/res/drawable-mdpi/ab_clock.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 870 B

BIN
android-app/src/main/res/drawable-mdpi/ab_plus.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 214 B

BIN
android-app/src/main/res/drawable-mdpi/ab_remove.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 424 B

BIN
android-app/src/main/res/drawable-mdpi/ic_delete_grey600_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 196 B

BIN
android-app/src/main/res/drawable-xhdpi/ab_clock.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
android-app/src/main/res/drawable-xhdpi/ab_plus.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 238 B

BIN
android-app/src/main/res/drawable-xhdpi/ab_remove.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 489 B

BIN
android-app/src/main/res/drawable-xhdpi/ic_delete_grey600_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 290 B

BIN
android-app/src/main/res/drawable-xxhdpi/ic_delete_grey600_48dp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 411 B

52
android-app/src/main/res/drawable/metro_green_list_item.xml
View File

@@ -1,52 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ 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.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="false"
a:drawable="@android:color/transparent"/>
<item a:state_focused="false" a:state_selected="true" a:state_pressed="false"
a:drawable="@color/cpp_metro_green"/>
<!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="false"
a:drawable="@color/cpp_metro_green"/>
<item a:state_focused="true" a:state_selected="true" a:state_pressed="false"
a:drawable="@color/cpp_metro_green"/>
<!-- Pressed -->
<!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="true"
a:drawable="@color/cpp_metro_green"/>
<item a:state_focused="false" a:state_selected="true" a:state_pressed="true"
a:drawable="@color/cpp_metro_green"/>
<!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="true"
a:drawable="@color/cpp_metro_green"/>
<item a:state_focused="true" a:state_selected="true" a:state_pressed="true"
a:drawable="@color/cpp_metro_green"/>
</selector>

51
android-app/src/main/res/drawable/metro_purple_list_item.xml
View File

@@ -1,51 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ 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.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<selector xmlns:a="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="false"
a:drawable="@android:color/transparent"/>
<item a:state_focused="false" a:state_selected="true" a:state_pressed="false"
a:drawable="@color/cpp_metro_purple"/>
<!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="false"
a:drawable="@color/cpp_metro_purple"/>
<item a:state_focused="true" a:state_selected="true" a:state_pressed="false"
a:drawable="@color/cpp_metro_purple"/>
<!-- Pressed -->
<!-- Non focused states -->
<item a:state_focused="false" a:state_selected="false" a:state_pressed="true"
a:drawable="@color/cpp_metro_purple"/>
<item a:state_focused="false" a:state_selected="true" a:state_pressed="true"
a:drawable="@color/cpp_metro_purple"/>
<!-- Focused states -->
<item a:state_focused="true" a:state_selected="false" a:state_pressed="true"
a:drawable="@color/cpp_metro_purple"/>
<item a:state_focused="true" a:state_selected="true" a:state_pressed="true"
a:drawable="@color/cpp_metro_purple"/>
</selector>

32
android-app/src/main/res/layout/calc_plot_view.xml
View File

@@ -1,32 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ 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.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout a:id="@+id/plot_view_container"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="fill_parent"
a:layout_height="fill_parent"
a:orientation="vertical">
</LinearLayout>

29
android-app/src/main/res/layout/cpp_simple_button_like.xml
View File

@@ -1,29 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ 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.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<ImageButton a:id="@id/cpp_button_like"
style="@style/cpp_simple_metro_control_image_button_style"
xmlns:a="http://schemas.android.com/apk/res/android"
a:contentDescription="Like"
a:src="@drawable/kb_share" />

18
android-app/src/main/res/layout/cpp_unit_converter.xml
View File

@@ -78,15 +78,6 @@
a:orientation="horizontal"
a:paddingBottom="10dp">
<Button
a:id="@+id/unit_converter_ok_button"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:paddingLeft="15dp"
a:paddingRight="15dp"
a:singleLine="true"
a:text="@android:string/ok" />
<Button
a:id="@+id/unit_converter_copy_button"
a:layout_width="wrap_content"
@@ -105,6 +96,15 @@
a:paddingRight="15dp"
a:singleLine="true" />
<Button
a:id="@+id/unit_converter_ok_button"
a:layout_width="wrap_content"
a:layout_height="wrap_content"
a:paddingLeft="15dp"
a:paddingRight="15dp"
a:singleLine="true"
a:text="@android:string/ok" />
</LinearLayout>
</LinearLayout>

35
android-app/src/main/res/layout/cpp_wiki_page.xml
View File

@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ 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.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:orientation="vertical">
<WebView
a:id="@+id/cpp_wiki_webview"
a:layout_width="match_parent"
a:layout_height="match_parent" />
</LinearLayout>

66
android-app/src/main/res/layout/cpp_wizard.xml
View File

@@ -1,66 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ 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.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout a:id="@+id/wizard_layout"
style="@style/CppDialog"
xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical">
<FrameLayout
a:id="@id/acl_wizard_content"
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1"
a:gravity="center"
a:orientation="vertical"
a:padding="6dp" />
<LinearLayout
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
<Button
a:id="@id/acl_wizard_prev_button"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:lines="1"
a:maxLines="1"
a:singleLine="true"
a:text="@string/cpp_wizard_back" />
<Button
a:id="@id/acl_wizard_next_button"
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:lines="1"
a:maxLines="1"
a:singleLine="true"
a:text="@string/cpp_wizard_next" />
</LinearLayout>
</LinearLayout>

30
android-app/src/main/res/layout/main_empty_multi_pane.xml
View File

@@ -1,30 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ 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.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout a:id="@+id/main_layout"
style="@style/CppMain.Multipane"
xmlns:a="http://schemas.android.com/apk/res/android"
a:orientation="vertical">
</LinearLayout>

39
android-app/src/main/res/layout/math_entity.xml
View File

@@ -22,36 +22,23 @@
~ Site: http://se.solovyev.org
-->
<LinearLayout style="@style/CppListViewItem"
<LinearLayout
style="@style/CppListViewItem"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="horizontal">
a:orientation="vertical">
<LinearLayout
a:layout_width="0dp"
a:layout_height="wrap_content"
a:layout_weight="1"
a:orientation="vertical">
<TextView
a:id="@+id/math_entity_text"
style="@style/CppListViewItemTextPrimary"
a:layout_width="match_parent"
a:layout_height="wrap_content"/>
<TextView
a:id="@+id/math_entity_text"
style="@style/CppListViewItemTextPrimary"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<TextView
a:id="@+id/math_entity_short_description"
style="@style/CppListViewItemTextSecondary"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
</LinearLayout>
<ImageView
a:id="@+id/math_entity_description_imageview"
a:layout_width="wrap_content"
a:layout_height="match_parent"
a:scaleType="centerInside"
a:visibility="gone" />
<TextView
a:id="@+id/math_entity_short_description"
style="@style/CppListViewItemTextSecondary"
a:layout_width="match_parent"
a:layout_height="wrap_content"/>
</LinearLayout>

35
android-app/src/main/res/layout/matrix_edit_fragment_item.xml
View File

@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2013 serso aka se.solovyev
~
~ 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.
~
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ Contact details
~
~ Email: se.solovyev@gmail.com
~ Site: http://se.solovyev.org
-->
<LinearLayout xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent">
<EditText
a:id="@+id/matrix_element_edittext"
a:layout_width="match_parent"
a:layout_height="match_parent"
a:text="test" />
</LinearLayout>

3
android-app/src/main/res/layout/widget_layout.xml
View File

@@ -16,7 +16,8 @@
<LinearLayout
a:layout_width="match_parent"
a:layout_height="0dp"
a:layout_weight="1">
a:layout_weight="1"
a:baselineAligned="false">
<include
layout="@layout/cpp_simple_button_equals"

7
android-app/src/main/res/values/arrays.xml
View File

@@ -126,13 +126,6 @@
<item>@string/p_green_line_color</item>
<item>@string/p_grey_line_color</item>
</string-array>
<string-array name="cpp_plot_line_color_values" translatable="false">
<item>white</item>
<item>blue</item>
<item>red</item>
<item>green</item>
<item>grey</item>
</string-array>
<string-array name="cpp_modes">
<item>@string/cpp_wizard_mode_simple</item>

10
android-app/src/main/res/values/colors.xml
View File

@@ -21,8 +21,6 @@
-->
<resources>
<color name="cpp_list_divider">#ff2e2e2e</color>
<color name="cpp_text">#ffe6e6e6</color>
<color name="cpp_text_error">@color/cpp_text_inverse</color>
<color name="cpp_text_inverse">#424242</color>
@@ -30,13 +28,9 @@
<color name="cpp_button_text">#ffffffff</color>
<color name="cpp_button_text_operator">#ffffff99</color>
<color name="cpp_button_text_ce">#ffffffff</color>
<color name="cpp_selected_angle_unit_text">#ffffff99</color>
<color name="cpp_main_bg">#101010</color>
<color name="cpp_main_bg_light">#fff6f1ef</color>
<color name="cpp_wizard_primary">#FAFAFA</color>
<color name="cpp_wizard_secondary">#9E9E9E</color>
<color name="cpp_wizard_overscroll">#FAFAFA</color>
<color name="cpp_wizard_button_normal">#424242</color>
<color name="cpp_wizard_button_disabled">#616161</color>
<color name="cpp_wizard_button_pressed">#757575</color>
@@ -49,18 +43,16 @@
<color name="cpp_material_light">#ff37b295</color>
<color name="cpp_material_light_darker">#ff309e84</color>
<color name="cpp_material_light_disabled">#c1d2ef</color>
<color name="cpp_metro_blue_dark">#ff092c39</color>
<color name="cpp_metro_green">#088e3a</color>
<color name="cpp_metro_purple">#651456</color>
<color name="cpp_widget_cursor">#ff707070</color>
<color name="cpp_text_primary">#ddffffff</color>
<color name="cpp_text_secondary">#89ffffff</color>
<color name="cpp_widget_ripple">#40ffffff</color>
<color name="cpp_status_bar">#ff131313</color>
<color name="cpp_status_bar_light">#262626</color>
<color name="cpp_wizard_disabled_text">#66ffffff</color>
<color name="cpp_material_accent">#FAFAFA</color>
<color name="cpp_material_grey">#212121</color>
<color name="cpp_material_grey_light">#393939</color>
<color name="cpp_material_actionbar">@color/cpp_material_grey</color>

1
android-app/src/main/res/values/dimens.xml
View File

@@ -14,7 +14,6 @@
<dimen name="cpp_fragment_title_text_size">20sp</dimen>
<dimen name="cpp_keyboard_button_text_size">30dp</dimen>
<dimen name="cpp_button_text_size">20dp</dimen>
<dimen name="cpp_display_text_size_mobile">25sp</dimen>
<dimen name="cpp_editor_text_size_mobile">25sp</dimen>

12
android-app/src/main/res/values/theme.xml
View File

@@ -27,9 +27,9 @@
<item name="android:colorPrimary">@color/cpp_metro_button</item>
<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="android:colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
<item name="colorAccent">@color/cpp_material_accent</item>
<item name="android:colorAccent">@color/cpp_material_accent</item>
<item name="android:colorEdgeEffect">@color/cpp_material_accent</item>
<item name="android:statusBarColor">@color/cpp_status_bar</item>
<item name="android:windowBackground">@color/cpp_main_bg</item>
@@ -49,9 +49,9 @@
<item name="android:colorPrimary">@color/cpp_metro_button</item>
<item name="colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="android:colorPrimaryDark">@color/cpp_metro_button_dark</item>
<item name="colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorAccent">@color/cpp_wizard_primary</item>
<item name="android:colorEdgeEffect">@color/cpp_wizard_overscroll</item>
<item name="colorAccent">@color/cpp_material_accent</item>
<item name="android:colorAccent">@color/cpp_material_accent</item>
<item name="android:colorEdgeEffect">@color/cpp_material_accent</item>
<item name="android:statusBarColor">@color/cpp_status_bar</item>
<item name="android:windowNoTitle">false</item>

3
android-app/src/main/res/xml/ga.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools"
tools:ignore="UnusedResources">
<string name="ga_trackingId">UA-28724009-2</string>
<bool name="ga_reportUncaughtExceptions">true</bool>
<bool name="ga_autoActivityTracking">true</bool>