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

Changes

Browse Source
This commit is contained in:
serso
2016-01-16 15:32:21 +01:00
parent 4323c688c5
commit 45a71817c8
35 changed files with 384 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/layout/fragment_history.xml
View File

@@ -23,9 +23,9 @@
-->
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
a:id="@+id/main_fragment_layout"
style="@style/CppFragment"
xmlns:a="http://schemas.android.com/apk/res/android"
a:layout_width="match_parent"
a:layout_height="match_parent">
@@ -41,10 +41,13 @@
a:layout_width="match_parent"
a:layout_height="match_parent">
<ListView style="@style/CppListView" />
<android.support.v7.widget.RecyclerView
a:id="@+id/history_recyclerview"
a:layout_width="match_parent"
a:layout_height="match_parent" />
<com.melnykov.fab.FloatingActionButton
a:id="@+id/fab"
a:id="@+id/history_fab"
style="@style/CppFab"
a:src="@drawable/ic_delete_white_36dp" />
</FrameLayout>

27
app/src/main/res/layout/fragment_history_item.xml
View File

@@ -23,20 +23,29 @@
-->
<LinearLayout
style="@style/CppListItem.TwoLines"
xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/CppListViewItem"
a:orientation="vertical">
<TextView
a:id="@+id/history_item"
style="@style/CppListViewItemTextPrimary.History"
a:layout_width="fill_parent"
a:layout_height="fill_parent" />
a:id="@+id/history_item_value"
style="@style/CppListItemText.Primary"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:ellipsize="end"
a:maxLines="2" />
<TextView
a:id="@+id/history_time"
style="@style/CppListViewItemTextSecondary"
a:layout_width="fill_parent"
a:layout_height="fill_parent" />
a:id="@+id/history_item_comment"
style="@style/CppListItemText.Secondary.OneLine"
a:layout_width="match_parent"
a:layout_height="wrap_content" />
<TextView
a:id="@+id/history_item_time"
style="@style/CppListItemText.Secondary.OneLine"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:textSize="@dimen/list_item_text_size_small"
a:gravity="center_vertical|end"/>
</LinearLayout>

4
app/src/main/res/layout/math_entity.xml
View File

@@ -24,14 +24,14 @@
<LinearLayout
xmlns:a="http://schemas.android.com/apk/res/android"
style="@style/CppListViewItem"
style="@style/CppListItem"
a:layout_width="match_parent"
a:layout_height="wrap_content"
a:orientation="vertical">
<TextView
a:id="@+id/math_entity_text"
style="@style/CppListViewItemTextPrimary"
style="@style/CppListItemText.Primary"
a:layout_width="match_parent"
a:layout_height="wrap_content" />

47
app/src/main/res/layout/saved_history_item.xml
View File

@@ -1,47 +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"
style="@style/CppListViewItem"
a:orientation="vertical">
<TextView
a:id="@+id/history_item"
style="@style/CppListViewItemTextPrimary.History"
a:layout_width="fill_parent"
a:layout_height="fill_parent" />
<TextView
a:id="@+id/history_item_comment"
style="@style/CppListViewItemTextSecondary"
a:layout_width="fill_parent"
a:layout_height="fill_parent" />
<TextView
a:id="@+id/history_time"
style="@style/CppListViewItemTextSecondary"
a:layout_width="fill_parent"
a:layout_height="fill_parent" />
</LinearLayout>

2
app/src/main/res/values-ar/text_strings.xml
View File

@@ -104,7 +104,7 @@
<string name="c_save_history">سجل المحفوظات</string>
<string name="c_edit_history">سجل التعديلات</string>
<string name="c_edit">تعديل</string>
<string name="c_saved_history">السجل المحفوظ</string>
<string name="cpp_history_tab_saved">السجل المحفوظ</string>
<string name="c_history_already_saved">السجل محفوظ مسبقاً!</string>
<string name="c_history_must_be_saved">يجب أن يتم حفظ السجل قبل التعديل!</string>
<string name="c_history_was_removed">تمت إزالة السجل بنجاح!</string>

2
app/src/main/res/values-cs/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">Uložit historii</string>
<string name="c_edit_history">Upravit historii</string>
<string name="c_edit">Upravit</string>
<string name="c_saved_history">Uložená historie</string>
<string name="cpp_history_tab_saved">Uložená historie</string>
<string name="c_history_already_saved">Historie již byla uložena!</string>
<string name="c_history_must_be_saved">Historie musí být uložena před úpravou!</string>
<string name="c_history_was_removed">Historie byla úspěšně odebrána!</string>

2
app/src/main/res/values-de/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">Verlauf speichern</string>
<string name="c_edit_history">Verlauf ändern</string>
<string name="c_edit">Ändern</string>
<string name="c_saved_history">Gespeicherter Verlauf</string>
<string name="cpp_history_tab_saved">Gespeicherter Verlauf</string>
<string name="c_history_already_saved">Verlauf wurde bereits gespeichert!</string>
<string name="c_history_must_be_saved">Verlauf muss vor der Bearbeitung gespeichert werden!</string>
<string name="c_history_was_removed">Verlauf wurde erfolgreich gelöscht!</string>

2
app/src/main/res/values-es/text_strings.xml
View File

@@ -106,7 +106,7 @@
<string name="c_save_history">Guardar el historial de</string>
<string name="c_edit_history">Modificar la historia</string>
<string name="c_edit">modificar</string>
<string name="c_saved_history">La historia guardada</string>
<string name="cpp_history_tab_saved">La historia guardada</string>
<string name="c_history_already_saved">La historia se salvó ya!</string>
<string name="c_history_must_be_saved">La historia debe ser salvado antes de editar!</string>
<string name="c_history_was_removed">¡El historial se ha eliminado satisfactoriamente!</string>

2
app/src/main/res/values-fi/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">Tallenna historia</string>
<string name="c_edit_history">Muokkaa historia</string>
<string name="c_edit">Mukauta</string>
<string name="c_saved_history">Tallenna historia</string>
<string name="cpp_history_tab_saved">Tallenna historia</string>
<string name="c_history_already_saved">Historia on jo tallennettu!</string>
<string name="c_history_must_be_saved">Historia on tallennettava ennen muokkaamista!</string>
<string name="c_history_was_removed">Historia on poistettu!</string>

2
app/src/main/res/values-fr/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">Enregistrer l\'historique</string>
<string name="c_edit_history">Modifier l\'historique</string>
<string name="c_edit">Modifier</string>
<string name="c_saved_history">Historique enregistré</string>
<string name="cpp_history_tab_saved">Historique enregistré</string>
<string name="c_history_already_saved">L\'historique est déjà enregistré !</string>
<string name="c_history_must_be_saved">L\'historique doit être enregistré avant modification !</string>
<string name="c_history_was_removed">L\'historique a été supprimé avec succès !</string>

2
app/src/main/res/values-it/text_strings.xml
View File

@@ -110,7 +110,7 @@
<string name="c_save_history">Salva storia</string>
<string name="c_edit_history">Modificare la storia</string>
<string name="c_edit">Modificare</string>
<string name="c_saved_history">Storia salvati</string>
<string name="cpp_history_tab_saved">Storia salvati</string>
<string name="c_history_already_saved">La storia era già salvato!</string>
<string name="c_history_must_be_saved">La storia deve essere salvato prima di modificare!</string>
<string name="c_history_was_removed">La cronologia è stata rimossa con successo!</string>

2
app/src/main/res/values-ja/text_strings.xml
View File

@@ -106,7 +106,7 @@
<string name="c_save_history">履歴を保存</string>
<string name="c_edit_history">履歴を編集</string>
<string name="c_edit">編集</string>
<string name="c_saved_history">保存された履歴</string>
<string name="cpp_history_tab_saved">保存された履歴</string>
<string name="c_history_already_saved">履歴はすでに保存されています!</string>
<string name="c_history_must_be_saved">履歴を編集する前に保存してください!</string>
<string name="c_history_was_removed">履歴は正常に削除されました!</string>

2
app/src/main/res/values-nl/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">Geschiedenis opslaan</string>
<string name="c_edit_history">Geschiedenis wijzigen</string>
<string name="c_edit">Wijzigen</string>
<string name="c_saved_history">Opgeslagen geschiedenis</string>
<string name="cpp_history_tab_saved">Opgeslagen geschiedenis</string>
<string name="c_history_already_saved">Geschiedenis was al opgeslaan!</string>
<string name="c_history_must_be_saved">Geschiedenis moet eerst worden opgeslagen om te bewerken!</string>
<string name="c_history_was_removed">Geschiedenis is succesvol verwijderd!</string>

2
app/src/main/res/values-pl/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">Zapisz historię</string>
<string name="c_edit_history">Modyfikuj historię</string>
<string name="c_edit">Modyfikuj</string>
<string name="c_saved_history">Zapisana historia</string>
<string name="cpp_history_tab_saved">Zapisana historia</string>
<string name="c_history_already_saved">Historia została już zachowana!</string>
<string name="c_history_must_be_saved">Historia musi być zapisana przed edycją!</string>
<string name="c_history_was_removed">Historia została pomyślnie usunięta!</string>

2
app/src/main/res/values-pt-rbr/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">Salvar histórico</string>
<string name="c_edit_history">Modificar histórico</string>
<string name="c_edit">Modificar</string>
<string name="c_saved_history">Salvar no histórico</string>
<string name="cpp_history_tab_saved">Salvar no histórico</string>
<string name="c_history_already_saved">O histórico já foi salvo!</string>
<string name="c_history_must_be_saved">O histórico deve ser salvo antes de ser editado!</string>
<string name="c_history_was_removed">O histórico foi removido com sucesso!</string>

2
app/src/main/res/values-pt-rpt/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">Guardar histórico</string>
<string name="c_edit_history">Modificar histórico</string>
<string name="c_edit">Modificar</string>
<string name="c_saved_history">Histórico guardado</string>
<string name="cpp_history_tab_saved">Histórico guardado</string>
<string name="c_history_already_saved">O histórico já foi guardado!</string>
<string name="c_history_must_be_saved">O histórico deve ser guardado antes de ser alterado!</string>
<string name="c_history_was_removed">O histórico foi removido com sucesso!</string>

2
app/src/main/res/values-ru/text_strings.xml
View File

@@ -117,7 +117,7 @@
<string name="c_save_history">Сохранить</string>
<string name="c_edit_history">Изменить</string>
<string name="c_edit">Изменить</string>
<string name="c_saved_history">Сохранённая история</string>
<string name="cpp_history_tab_saved">Сохранённая история</string>
<string name="c_history_already_saved">История уже была сохранена!</string>
<string name="c_history_must_be_saved">История должна быть сохранена перед редактированием!</string>
<string name="c_history_was_removed">История успешно удалена!</string>

2
app/src/main/res/values-tr/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">Geçmişi kaydet</string>
<string name="c_edit_history">Geçmişi düzenle</string>
<string name="c_edit">Düzenle</string>
<string name="c_saved_history">Kayıtlı geçmiş</string>
<string name="cpp_history_tab_saved">Kayıtlı geçmiş</string>
<string name="c_history_already_saved">Geçmiş zaten kaydedildi!</string>
<string name="c_history_must_be_saved">Geçmiş düzenlenmeden önce kaydedilmelidir!</string>
<string name="c_history_was_removed">Geçmiş başarıyla silindi!</string>

2
app/src/main/res/values-uk/text_strings.xml
View File

@@ -108,7 +108,7 @@
<string name="c_save_history">Зберегти історію</string>
<string name="c_edit_history">Змінити історію</string>
<string name="c_edit">Змінити</string>
<string name="c_saved_history">Збережена історія</string>
<string name="cpp_history_tab_saved">Збережена історія</string>
<string name="c_history_already_saved">Історія вже збережена!</string>
<string name="c_history_must_be_saved">Історію необхідно зберегти перед редагуванням!</string>
<string name="c_history_was_removed">Історія успішно видалена!</string>

2
app/src/main/res/values-vi/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">Lưu lịch sử</string>
<string name="c_edit_history">Sửa đổi lịch sử</string>
<string name="c_edit">Điều chỉnh</string>
<string name="c_saved_history">Lịch sử đã lưu</string>
<string name="cpp_history_tab_saved">Lịch sử đã lưu</string>
<string name="c_history_already_saved">Lịch sử đã được lưu!</string>
<string name="c_history_must_be_saved">Lịch sử phải được lưu trước khi chỉnh sửa!</string>
<string name="c_history_was_removed">Lịch sử đã được loại bỏ thành công!</string>

2
app/src/main/res/values-zh-rcn/text_strings.xml
View File

@@ -104,7 +104,7 @@
<string name="c_save_history">保存历史记录</string>
<string name="c_edit_history">修改历史记录</string>
<string name="c_edit">修改</string>
<string name="c_saved_history">已保存历史记录</string>
<string name="cpp_history_tab_saved">已保存历史记录</string>
<string name="c_history_already_saved">记录已保存!</string>
<string name="c_history_must_be_saved">编辑之前必须先保存!</string>
<string name="c_history_was_removed">已成功删除历史记录！</string>

2
app/src/main/res/values-zh-rtw/text_strings.xml
View File

@@ -103,7 +103,7 @@
<string name="c_save_history">儲存歷史紀錄</string>
<string name="c_edit_history">修改歷史紀錄</string>
<string name="c_edit">修改</string>
<string name="c_saved_history">已儲存的歷史紀錄</string>
<string name="cpp_history_tab_saved">已儲存的歷史紀錄</string>
<string name="c_history_already_saved">歷史紀錄已經儲存！</string>
<string name="c_history_must_be_saved">編輯歷史紀錄之前必須先儲存！</string>
<string name="c_history_was_removed">成功刪除歷史紀錄！</string>

19
app/src/main/res/values/colors.xml
View File

@@ -29,14 +29,14 @@
<color name="cpp_button_text">#ffffffff</color>
<color name="cpp_button_text_operator">#ffffff99</color>
<color name="cpp_selected_angle_unit_text">#ffffff99</color>
<color name="cpp_main_bg">#101010</color>
<color name="cpp_main_bg">@color/grey_950</color>
<color name="cpp_main_bg_light">#fff6f1ef</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>
<color name="cpp_metro_button_dark">#ff000000</color>
<color name="cpp_metro_button">@color/cpp_material_grey</color>
<color name="cpp_metro_button_light">@color/cpp_material_grey_light</color>
<color name="cpp_metro_button">@color/grey_900</color>
<color name="cpp_metro_button_light">@color/grey_800</color>
<color name="cpp_metro_blue">#10648c</color>
<color name="cpp_material_blue">#ff0d4663</color>
<color name="cpp_material_blue_lighter">#ff0d668d</color>
@@ -53,12 +53,15 @@
<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>
<color name="cpp_material_actionbar_light">@color/cpp_material_grey_light</color>
<color name="cpp_material_actionbar">@color/grey_900</color>
<color name="cpp_material_actionbar_light">@color/grey_800</color>
<color name="cpp_pane_bg">@color/cpp_material_grey</color>
<color name="cpp_pane_bg">@color/grey_900</color>
<color name="cpp_pane_bg_light">#ffeae5e3</color>
<color name="grey_900">#212121</color>
<color name="grey_950">#101010</color>
<color name="grey_600">#757575</color>
<color name="grey_800">#424242</color>
<color name="blue_grey_800">#37474F</color>
</resources>

39
app/src/main/res/values/styles.xml
View File

@@ -253,15 +253,23 @@
<item name="android:layout_gravity">center_horizontal</item>
</style>
<style name="CppListViewItem">
<style name="CppListItem.OneLine" parent="CppListItem">
<item name="android:minHeight">48dp</item>
</style>
<style name="CppListItem.TwoLines" parent="CppListItem">
<item name="android:minHeight">72dp</item>
</style>
<style name="CppListItem">
<item name="android:paddingLeft">16dp</item>
<item name="android:paddingRight">16dp</item>
<item name="android:paddingBottom">20dp</item>
<item name="android:paddingTop">20dp</item>
<item name="android:paddingBottom">8dp</item>
<item name="android:paddingTop">8dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:minHeight">72dp</item>
<item name="android:gravity">center_vertical|left</item>
<item name="android:background">?android:attr/selectableItemBackground</item>
</style>
<style name="CppFab">
@@ -274,10 +282,23 @@
<item name="fab_colorRipple">?attr/colorControlHighlight</item>
</style>
<style name="CppListViewItemTextPrimary">
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
<style name="CppListItemText">
<item name="android:textSize">@dimen/list_item_text_size</item>
</style>
<style name="CppListItemText.Primary" parent="CppListItemText">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">@dimen/cpp_li_text_size</item>
</style>
<style name="CppListItemText.Secondary" parent="CppListItemText">
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
<style name="CppListItemText.Secondary.OneLine" parent="CppListItemText.Secondary">
<item name="android:singleLine">true</item>
<item name="android:minLines">1</item>
<item name="android:maxLines">1</item>
<item name="android:ellipsize">end</item>
</style>
<style name="CppListViewItemTextSecondary">
@@ -286,7 +307,7 @@
<item name="android:textSize">@dimen/cpp_li_secondary_text_size</item>
</style>
<style name="CppListViewItemTextPrimary.History" parent="CppListViewItemTextPrimary">
<style name="CppListViewItemTextPrimary.History" parent="CppListItemText.Primary">
<item name="android:maxLines">2</item>
<item name="android:ellipsize">end</item>
</style>
@@ -321,4 +342,6 @@
<item name="android:backgroundSplit">@color/cpp_material_actionbar_light</item>
</style>
<dimen name="list_item_text_size">16sp</dimen>
<dimen name="list_item_text_size_small">14sp</dimen>
</resources>

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

@@ -103,7 +103,8 @@
<string name="c_save_history">Save history</string>
<string name="c_edit_history">Modify history</string>
<string name="c_edit">Modify</string>
<string name="c_saved_history">Saved history</string>
<string name="cpp_history_tab_saved">Saved</string>
<string name="cpp_history_tab_recent">Recent</string>
<string name="c_history_already_saved">History was already saved!</string>
<string name="c_history_must_be_saved">History must be saved before editing!</string>
<string name="c_history_was_removed">History has been successfully removed!</string>

18
app/src/main/res/values/theme.xml
View File

@@ -33,9 +33,11 @@
<item name="cpp_main_bg">@color/cpp_main_bg</item>
<item name="cpp_pane_bg">@drawable/pane</item>
<item name="cpp_fab_bg">@color/cpp_material_grey</item>
<item name="cpp_fab_bg">@color/grey_900</item>
<item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Dialog" parent="@style/Theme.AppCompat.Dialog">
@@ -50,9 +52,11 @@
<item name="cpp_main_bg">@color/cpp_main_bg</item>
<item name="cpp_pane_bg">@drawable/pane</item>
<item name="cpp_fab_bg">@color/cpp_material_grey</item>
<item name="cpp_fab_bg">@color/grey_900</item>
<item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Dialog.Alert" parent="@style/Theme.AppCompat.Dialog.Alert">
@@ -62,9 +66,11 @@
<item name="cpp_main_bg">@color/cpp_main_bg</item>
<item name="cpp_pane_bg">@drawable/pane</item>
<item name="cpp_fab_bg">@color/cpp_material_grey</item>
<item name="cpp_fab_bg">@color/grey_900</item>
<item name="cpp_text_color">@color/cpp_text</item>
<item name="cpp_text_color_error">@color/cpp_text_error</item>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Light" parent="@style/Theme.AppCompat.Light.DarkActionBar">
@@ -81,6 +87,8 @@
<item name="cpp_fab_bg">@color/cpp_material_light</item>
<item name="cpp_text_color">@color/cpp_text_inverse</item>
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Light.Dialog" parent="@style/Theme.AppCompat.Light.Dialog">
@@ -98,6 +106,8 @@
<item name="cpp_fab_bg">@color/cpp_material_light</item>
<item name="cpp_text_color">@color/cpp_text_inverse</item>
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Light.Dialog.Alert" parent="@style/Theme.AppCompat.Light.Dialog.Alert">
@@ -110,6 +120,8 @@
<item name="cpp_fab_bg">@color/cpp_material_light</item>
<item name="cpp_text_color">@color/cpp_text_inverse</item>
<item name="cpp_text_color_error">@color/cpp_text_inverse_error</item>
<item name="android:listDivider">@drawable/divider</item>
</style>
<style name="Cpp.Theme.Wizard" parent="Cpp.Theme.Material">