Skip to content

Commit 9162bd0

Browse files
committed
Code refactoring only (nothing to see here, move along)
Extracted UI argument keys into own class aggregation
1 parent da62690 commit 9162bd0

61 files changed

Lines changed: 510 additions & 429 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@
4848
android:label="@string/app_name"
4949
android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
5050
<activity
51-
android:name=".ui.accounts.AccountsActivity"
51+
android:name=".ui.account.AccountsActivity"
5252
android:label="@string/app_name">
5353
<intent-filter>
5454
<action android:name="android.intent.action.MAIN" />
5555
<category android:name="android.intent.category.LAUNCHER" />
5656
</intent-filter>
5757
</activity>
5858
<activity android:name=".ui.settings.SettingsActivity"/>
59-
<activity android:name=".ui.transactions.TransactionsActivity"
59+
<activity android:name=".ui.transaction.TransactionsActivity"
6060
android:configChanges="orientation|screenSize">
6161
</activity>
6262
<activity android:name=".ui.widget.WidgetConfigurationActivity"

app/res/layout/list_item_account.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
limitations under the License.
1616
-->
1717

18-
<org.gnucash.android.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
18+
<org.gnucash.android.ui.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
1919
android:layout_width="match_parent"
2020
android:layout_height="?android:attr/listPreferredItemHeight"
2121
android:gravity="center_vertical"
@@ -62,4 +62,4 @@
6262
android:focusable="false"
6363
android:contentDescription="@string/description_add_transaction_icon"/>
6464

65-
</org.gnucash.android.util.CheckableLinearLayout>
65+
</org.gnucash.android.ui.util.CheckableLinearLayout>

app/res/layout/list_item_transaction.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
limitations under the License.
1616
-->
1717

18-
<org.gnucash.android.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
18+
<org.gnucash.android.ui.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
1919
android:layout_width="match_parent"
2020
android:layout_height="match_parent"
2121
android:orientation="vertical">
@@ -63,4 +63,4 @@
6363
android:layout_marginRight="12dp"
6464
style="@style/ListItemText"/>
6565
</LinearLayout>
66-
</org.gnucash.android.util.CheckableLinearLayout>
66+
</org.gnucash.android.ui.util.CheckableLinearLayout>

app/res/menu/account_actions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:showAsAction="always"/>
2323

2424
<item android:id="@+id/menu_recurring_transactions"
25-
android:title="@string/menu_item_scheduled_transactions"
25+
android:title="@string/menu_scheduled_transactions"
2626
android:icon="@drawable/content_event_holo_dark"
2727
android:showAsAction="never|withText"
2828
android:orderInCategory="4" />

app/res/values-de/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@
289289
<item>Haben</item>
290290
<item>Soll</item>
291291
</string-array>
292-
<string name="delete_all_transactions_confirmation_message">Wollen Sie wirklich ALLE Buchungen l&#246;schen?</string>
293-
<string name="delete_transaction_confirmation_message">Wollen Sie wirklich diese Buchung l&#246;schen?</string>
292+
<string name="msg_delete_all_transactions_confirmation">Wollen Sie wirklich ALLE Buchungen l&#246;schen?</string>
293+
<string name="msg_delete_transaction_confirmation">Wollen Sie wirklich diese Buchung l&#246;schen?</string>
294294
<string name="title_export_preference_category">Exportieren</string>
295295
<string name="title_export_all_transactions">Alle Buchungen exportieren</string>
296296
<string name="title_always_delete_exported_transactions">Alle exportierten Buchungen l&#246;schen</string>
@@ -383,11 +383,11 @@
383383
<string name="title_all_accounts">Alle</string>
384384
<string name="summary_create_default_accounts">Erstellt die häufig verwendete standard GnuCash Konten</string>
385385
<string name="title_create_default_accounts">Standard Konten erstellen</string>
386-
<string name="message_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
386+
<string name="msg_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
387387
account structure.\n\nIf you wish to replace currently existing accounts, delete them first before proceeding!
388388
</string>
389-
<string name="menu_item_scheduled_transactions">Eingeplante Buchungen</string>
390-
<string name="message_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
389+
<string name="menu_scheduled_transactions">Eingeplante Buchungen</string>
390+
<string name="msg_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
391391
a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also
392392
available in app Settings so you can decide later.
393393
</string>

app/res/values-el/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@
295295
<item>ΠΙΣΤΩΣΗ</item>
296296
<item>ΧΡΕΩΣΗ</item>
297297
</string-array>
298-
<string name="delete_all_transactions_confirmation_message">Σίγουρα θέλετε να διαγράψετε ΌΛΕΣ τις κινήσεις;</string>
299-
<string name="delete_transaction_confirmation_message">Σίγουρα θέλετε να διαγράψετε αυτή τη κίνηση;</string>
298+
<string name="msg_delete_all_transactions_confirmation">Σίγουρα θέλετε να διαγράψετε ΌΛΕΣ τις κινήσεις;</string>
299+
<string name="msg_delete_transaction_confirmation">Σίγουρα θέλετε να διαγράψετε αυτή τη κίνηση;</string>
300300
<string name="title_export_preference_category">Εξαγωγή</string>
301301
<string name="title_export_all_transactions">Εξαγωγή όλων των κινήσεων</string>
302302
<string name="title_always_delete_exported_transactions">Διαγραφή εξηγμένων κινήσεων</string>
@@ -399,11 +399,11 @@
399399
<string name="title_all_accounts">All</string>
400400
<string name="summary_create_default_accounts">Creates default GnuCash commonly-used account structure</string>
401401
<string name="title_create_default_accounts">Create default accounts</string>
402-
<string name="message_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
402+
<string name="msg_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
403403
account structure.\n\nIf you wish to replace currently existing accounts, delete them first before proceeding!
404404
</string>
405-
<string name="menu_item_scheduled_transactions">Scheduled Transactions</string>
406-
<string name="message_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
405+
<string name="menu_scheduled_transactions">Scheduled Transactions</string>
406+
<string name="msg_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
407407
a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also
408408
available in app Settings so you can decide later.
409409
</string>

app/res/values-es-rMX/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@
289289
<item>ABONO</item>
290290
<item>CARGO</item>
291291
</string-array>
292-
<string name="delete_all_transactions_confirmation_message">&#191;Est&#225; seguro de borrar TODAS las transacciones?</string>
293-
<string name="delete_transaction_confirmation_message">&#191;Est&#225; seguro de borrar esta transacci&#243;n?</string>
292+
<string name="msg_delete_all_transactions_confirmation">&#191;Est&#225; seguro de borrar TODAS las transacciones?</string>
293+
<string name="msg_delete_transaction_confirmation">&#191;Est&#225; seguro de borrar esta transacci&#243;n?</string>
294294
<string name="title_export_preference_category">Exportaci&#243;n</string>
295295
<string name="title_export_all_transactions">Exportar todas las transacciones</string>
296296
<string name="title_always_delete_exported_transactions">Borrar las transacciones exportadas</string>
@@ -383,10 +383,10 @@
383383
<string name="title_all_accounts">All</string>
384384
<string name="summary_create_default_accounts">Creates default GnuCash commonly-used account structure</string>
385385
<string name="title_create_default_accounts">Create default accounts</string>
386-
<string name="message_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
386+
<string name="msg_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
387387
account structure.\n\nIf you wish to replace currently existing accounts, delete them first before proceeding!
388388
</string>
389-
<string name="message_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
389+
<string name="msg_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
390390
a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also
391391
available in app Settings so you can decide later.
392392
</string>
@@ -396,6 +396,6 @@
396396
<item>SEMANAL</item>
397397
<item>MENSUAL</item>
398398
</string-array>
399-
<string name="menu_item_scheduled_transactions">Scheduled Transactions</string>
399+
<string name="menu_scheduled_transactions">Scheduled Transactions</string>
400400
<string name="title_scheduled_transactions">Scheduled Transactions</string>
401401
</resources>

app/res/values-es/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@
289289
<item>ABONO</item>
290290
<item>CARGO</item>
291291
</string-array>
292-
<string name="delete_all_transactions_confirmation_message">&#191;Borrar TODAS las transacciones?</string>
293-
<string name="delete_transaction_confirmation_message">&#191;Borrar esta transacci&#243;n?</string>
292+
<string name="msg_delete_all_transactions_confirmation">&#191;Borrar TODAS las transacciones?</string>
293+
<string name="msg_delete_transaction_confirmation">&#191;Borrar esta transacci&#243;n?</string>
294294
<string name="title_export_preference_category">Exportaci&#243;n</string>
295295
<string name="title_export_all_transactions">Exportar todas las transacciones</string>
296296
<string name="title_always_delete_exported_transactions">Borrar las transacciones exportadas</string>
@@ -383,16 +383,16 @@
383383
<string name="title_all_accounts">Todas</string>
384384
<string name="summary_create_default_accounts">Crea una estructura por defecto de cuentas GnuCash com&#250;nmente usadas</string>
385385
<string name="title_create_default_accounts">Crear cuentas por defecto</string>
386-
<string name="message_confirm_create_default_accounts_setting">Se crear&#225;n nuevas cuentas por defecto adem&#225;s de la estructura ya existente.\n\nSi desea reemplazar las cuentas ya existentes b&#243;rrelas primero antes de seguir.
386+
<string name="msg_confirm_create_default_accounts_setting">Se crear&#225;n nuevas cuentas por defecto adem&#225;s de la estructura ya existente.\n\nSi desea reemplazar las cuentas ya existentes b&#243;rrelas primero antes de seguir.
387387
</string>
388-
<string name="message_confirm_create_default_accounts_first_run">&#161;Bienvenido a GnuCash Android! \nPuede crear una jerarqu&#237;a de cuentas com&#250;nmente usadas o importar su propia estructura de cuentas GnuCash. \n\nAmbas opciones est&#225;n disponibles en las opciones de la aplicaci&#243; por si quiere decidirlo m&#225;s tarde.
388+
<string name="msg_confirm_create_default_accounts_first_run">&#161;Bienvenido a GnuCash Android! \nPuede crear una jerarqu&#237;a de cuentas com&#250;nmente usadas o importar su propia estructura de cuentas GnuCash. \n\nAmbas opciones est&#225;n disponibles en las opciones de la aplicaci&#243; por si quiere decidirlo m&#225;s tarde.
389389
</string>
390390
<string-array name="recurrence_period_strings">
391391
<item>NINGUNO</item>
392392
<item>DIARIO</item>
393393
<item>SEMANAL</item>
394394
<item>MENSUAL</item>
395395
</string-array>
396-
<string name="menu_item_scheduled_transactions">Scheduled Transactions</string>
396+
<string name="menu_scheduled_transactions">Scheduled Transactions</string>
397397
<string name="title_scheduled_transactions">Scheduled Transactions</string>
398398
</resources>

app/res/values-fr/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@
289289
<item>CREDIT</item>
290290
<item>DEBIT</item>
291291
</string-array>
292-
<string name="delete_all_transactions_confirmation_message">Etes vous s&#251;re de vouloir supprimer TOUTES les transactions?</string>
293-
<string name="delete_transaction_confirmation_message">Etes vous s&#251;re de vouloir supprimer cette transaction?</string>
292+
<string name="msg_delete_all_transactions_confirmation">Etes vous s&#251;re de vouloir supprimer TOUTES les transactions?</string>
293+
<string name="msg_delete_transaction_confirmation">Etes vous s&#251;re de vouloir supprimer cette transaction?</string>
294294
<string name="title_export_preference_category">Export</string>
295295
<string name="title_export_all_transactions">Exporter toutes les transactions</string>
296296
<string name="title_always_delete_exported_transactions">Supprimer les transactions export&#233;es</string>
@@ -381,10 +381,10 @@
381381
<string name="title_all_accounts">Tous</string>
382382
<string name="summary_create_default_accounts">Crée une structure de compte GnuCash par défaut couramment utilisé</string>
383383
<string name="title_create_default_accounts">Crée comptes par défaut</string>
384-
<string name="message_confirm_create_default_accounts_setting">Les nouveaux comptes seront créés en plus de l\'existante
384+
<string name="msg_confirm_create_default_accounts_setting">Les nouveaux comptes seront créés en plus de l\'existante
385385
structure de compte.\n\n Si vous souhaitez remplacer des comptes existants, supprimez-les d\'abord avant de commencer!
386386
</string>
387-
<string name="message_confirm_create_default_accounts_first_run">Bienvenue à GnuCash Android!\n Vous pouvez soit créer
387+
<string name="msg_confirm_create_default_accounts_first_run">Bienvenue à GnuCash Android!\n Vous pouvez soit créer
388388
une hiérarchie de comptes couramment utilisés, importer votre propre structure de compte GnuCash.\n\n Les deux options sont également
389389
disponible dans les paramètres d\'applications de sorte que vous puissiez décider plus tard.</string>
390390
<string-array name="recurrence_period_strings">
@@ -393,6 +393,6 @@
393393
<item>SEMAINE</item>
394394
<item>MENSUEL</item>
395395
</string-array>
396-
<string name="menu_item_scheduled_transactions">Scheduled Transactions</string>
396+
<string name="menu_scheduled_transactions">Scheduled Transactions</string>
397397
<string name="title_scheduled_transactions">Scheduled Transactions</string>
398398
</resources>

app/res/values-hu/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@
288288
<item>CREDIT</item>
289289
<item>DEBIT</item>
290290
</string-array>
291-
<string name="delete_all_transactions_confirmation_message">Are you sure you want to delete ALL transactions?</string>
292-
<string name="delete_transaction_confirmation_message">Are you sure you want to delete this transaction?</string>
291+
<string name="msg_delete_all_transactions_confirmation">Are you sure you want to delete ALL transactions?</string>
292+
<string name="msg_delete_transaction_confirmation">Are you sure you want to delete this transaction?</string>
293293
<string name="title_export_preference_category">Export</string>
294294
<string name="title_export_all_transactions">Export all transactions</string>
295295
<string name="title_always_delete_exported_transactions">Delete exported transactions</string>
@@ -382,11 +382,11 @@
382382
<string name="title_all_accounts">All</string>
383383
<string name="summary_create_default_accounts">Creates default GnuCash commonly-used account structure</string>
384384
<string name="title_create_default_accounts">Create default accounts</string>
385-
<string name="message_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
385+
<string name="msg_confirm_create_default_accounts_setting">New accounts will be created in addition to the existing
386386
account structure.\n\nIf you wish to replace currently existing accounts, delete them first before proceeding!
387387
</string>
388-
<string name="menu_item_scheduled_transactions">Scheduled Transactions</string>
389-
<string name="message_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
388+
<string name="menu_scheduled_transactions">Scheduled Transactions</string>
389+
<string name="msg_confirm_create_default_accounts_first_run">Welcome to GnuCash Android! \nYou can either create
390390
a hierarchy of commonly-used accounts, or import your own GnuCash account structure. \n\nBoth options are also
391391
available in app Settings so you can decide later.
392392
</string>

0 commit comments

Comments
 (0)