From bb5de74748b6b9bb77824c8ec5f3ca153b73d90d Mon Sep 17 00:00:00 2001 From: Jana Hoch Date: Tue, 28 Feb 2023 22:35:58 +0530 Subject: [PATCH 01/10] DbHelper | created db version 6 with notes as a column in records table --- .../moneytracker/repo/DbHelper.java | 59 ++++++++++++++++++- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java index 8c6a38a..8bcf8a0 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java @@ -15,7 +15,7 @@ public class DbHelper extends SQLiteOpenHelper { /* DB_VERSION = 1 */ public static final String DB_NAME = "database"; - public static final int DB_VERSION = 5; + public static final int DB_VERSION = 6; public static final String TABLE_RECORDS = "records"; public static final String TABLE_CATEGORIES = "categories"; @@ -59,6 +59,9 @@ public class DbHelper extends SQLiteOpenHelper { public static final String ARCHIVED_COLUMN = "archived"; public static final String COLOR_COLUMN = "color"; + /* DB_VERSION = 6 */ + public static final String NOTES_COLUMN = "notes"; + public DbHelper(Context context) { super(context, DB_NAME, null, DB_VERSION); } @@ -69,7 +72,8 @@ public void onCreate(SQLiteDatabase db) { //createDbVersion2(db); //createDbVersion3(db); //createDbVersion4(db); - createDbVersion5(db); + //createDbVersion5(db); + createDbVersion6(db); } @Override @@ -158,6 +162,14 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { db.setTransactionSuccessful(); db.endTransaction(); } + + if (oldVersion < 6) { + db.beginTransaction(); + + /* Add notes column to the records table */ + db.execSQL("ALTER TABLE " + TABLE_RECORDS + " ADD COLUMN " + + NOTES_COLUMN + " TEXT;"); + } } @SuppressWarnings("unused") @@ -325,6 +337,49 @@ private void createDbVersion5(SQLiteDatabase db) { insertDefaultAccount(db); } + private void createDbVersion6(SQLiteDatabase db) { + db.execSQL("CREATE TABLE " + TABLE_RECORDS + "(" + + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT," + + TIME_COLUMN + " INTEGER," + + TYPE_COLUMN + " INTEGER," + + TITLE_COLUMN + " TEXT," + + CATEGORY_ID_COLUMN + " INTEGER," + + NOTES_COLUMN + "TEXT," + + PRICE_COLUMN + " INTEGER," + + ACCOUNT_ID_COLUMN + " INTEGER," + + CURRENCY_COLUMN + " TEXT," + + DECIMALS_COLUMN + " INTEGER);"); + + db.execSQL("CREATE TABLE " + TABLE_CATEGORIES + "(" + + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT," + + NAME_COLUMN + " TEXT" + ");"); + + db.execSQL("CREATE TABLE " + TABLE_ACCOUNTS + "(" + + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT," + + CREATED_AT_COLUMN + " INTEGER," + + TITLE_COLUMN + " TEXT," + + CUR_SUM_COLUMN + " INTEGER," + + CURRENCY_COLUMN + " TEXT," + + DECIMALS_COLUMN + " INTEGER," + + GOAL_COLUMN + " REAL," + + ARCHIVED_COLUMN + " INTEGER," + + COLOR_COLUMN + " INTEGER);"); + + db.execSQL("CREATE TABLE " + TABLE_TRANSFERS + "(" + + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT," + + TIME_COLUMN + " INTEGER," + + FROM_ACCOUNT_ID_COLUMN + " INTEGER," + + TO_ACCOUNT_ID_COLUMN + " INTEGER," + + FROM_AMOUNT_COLUMN + " INTEGER," + + TO_AMOUNT_COLUMN + " INTEGER," + + DECIMALS_FROM_COLUMN + " INTEGER," + + DECIMALS_TO_COLUMN + " INTEGER);"); + + createRatesTable(db); + + insertDefaultAccount(db); + } + private void createRatesTable(SQLiteDatabase db) { db.execSQL("CREATE TABLE " + TABLE_RATES + "(" + ID_COLUMN + " INTEGER PRIMARY KEY AUTOINCREMENT," From 584af9bc122405aea8cd31343ba42f3c116b7924 Mon Sep 17 00:00:00 2001 From: Jana Hoch Date: Wed, 1 Mar 2023 22:09:49 +0530 Subject: [PATCH 02/10] Updated Record obj to add new variable notes --- .../moneytracker/entity/data/Record.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java index 02506a0..3c12caf 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java @@ -19,57 +19,62 @@ public class Record extends BaseEntity implements Parcelable { private final int type; private final String title; private final Category category; + private final String notes; private final long price; private final Account account; private final String currency; private final long decimals; - public Record(long id, long time, int type, String title, long categoryId, long price, - long accountId, String currency, long decimals) { + public Record(long id, long time, int type, String title, long categoryId, String notes, + long price, long accountId, String currency, long decimals) { this.id = id; this.time = time; this.type = type; this.title = title; this.category = new Category(categoryId, null); + this.notes = notes; this.price = price; this.account = new Account(accountId, null, -1, null, 0, -1, false, -1); this.currency = currency; this.decimals = decimals; } - public Record(long id, long time, int type, String title, Category category, long price, - Account account, String currency, long decimals) { + public Record(long id, long time, int type, String title, Category category, String notes, + long price, Account account, String currency, long decimals) { this.id = id; this.time = time; this.type = type; this.title = title; this.category = category; + this.notes = notes; this.price = price; this.account = account; this.currency = currency; this.decimals = decimals; } - public Record(long id, long time, int type, String title, Category category, double price, - Account account, String currency) { + public Record(long id, long time, int type, String title, Category category, String notes, + double price, Account account, String currency) { this.id = id; this.time = time; this.type = type; this.title = title; this.category = category; + this.notes = notes; this.account = account; this.currency = currency; this.price = getLong(price); this.decimals = getDecimal(price); } - public Record(long time, int type, String title, Category category, double price, Account account, - String currency) { + public Record(long time, int type, String title, Category category, String notes, double price, + Account account, String currency) { this.id = -1; this.time = time; this.type = type; this.title = title; this.category = category; + this.notes = notes; this.account = account; this.currency = currency; this.price = getLong(price); @@ -82,6 +87,7 @@ protected Record(Parcel in) { type = in.readInt(); title = in.readString(); category = in.readParcelable(Category.class.getClassLoader()); + notes = in.readString(); price = in.readLong(); account = in.readParcelable(Account.class.getClassLoader()); currency = in.readString(); @@ -118,6 +124,9 @@ public Category getCategory() { return category; } + @Nullable + public String getNotes() { return notes; } + public long getPrice() { return price; } @@ -173,6 +182,7 @@ public String toString() { sb.append("time = ").append(time).append(", "); sb.append("category = ").append(category).append(", "); + sb.append("notes = ").append(notes).append(", "); sb.append("price = ").append(price).append(", "); sb.append("account = ").append(account).append(", "); sb.append("currency = ").append(currency).append(", "); @@ -191,6 +201,7 @@ public boolean equals(Object o) { && this.type == record.getType() && equals(this.title, record.getTitle()) && this.category.equals(record.getCategory()) + && equals(this.notes, record.getNotes()) && this.price == record.getPrice() && this.account.equals(record.getAccount()) && equals(this.currency, record.getCurrency()) @@ -210,6 +221,7 @@ public void writeToParcel(Parcel dest, int flags) { dest.writeInt(type); dest.writeString(title); dest.writeParcelable(category, 0); + dest.writeString(notes); dest.writeLong(price); dest.writeParcelable(account, 0); dest.writeString(currency); From 9c8391ad330b405cc63cef252af49403e22d4792 Mon Sep 17 00:00:00 2001 From: Jana Hoch Date: Wed, 1 Mar 2023 22:12:12 +0530 Subject: [PATCH 03/10] Updated RecordRepo to handle notes --- .../blogspot/e_kanivets/moneytracker/repo/data/RecordRepo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/RecordRepo.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/RecordRepo.java index 60de34f..c9096ac 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/RecordRepo.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/RecordRepo.java @@ -44,6 +44,7 @@ protected ContentValues contentValues(@Nullable Record record) { contentValues.put(DbHelper.TYPE_COLUMN, record.getType()); contentValues.put(DbHelper.TITLE_COLUMN, record.getTitle()); contentValues.put(DbHelper.CATEGORY_ID_COLUMN, record.getCategory().getId()); + contentValues.put(DbHelper.NOTES_COLUMN, record.getNotes()); contentValues.put(DbHelper.PRICE_COLUMN, record.getPrice()); contentValues.put(DbHelper.ACCOUNT_ID_COLUMN, record.getAccount().getId()); contentValues.put(DbHelper.CURRENCY_COLUMN, record.getCurrency()); @@ -64,6 +65,7 @@ protected List getListFromCursor(Cursor cursor) { int typeColIndex = cursor.getColumnIndex(DbHelper.TYPE_COLUMN); int titleColIndex = cursor.getColumnIndex(DbHelper.TITLE_COLUMN); int categoryColIndex = cursor.getColumnIndex(DbHelper.CATEGORY_ID_COLUMN); + int notesColIndex = cursor.getColumnIndex(DbHelper.NOTES_COLUMN); int priceColIndex = cursor.getColumnIndex(DbHelper.PRICE_COLUMN); int accountIdColIndex = cursor.getColumnIndex(DbHelper.ACCOUNT_ID_COLUMN); int currencyColIndex = cursor.getColumnIndex(DbHelper.CURRENCY_COLUMN); @@ -75,6 +77,7 @@ protected List getListFromCursor(Cursor cursor) { cursor.getInt(typeColIndex), cursor.getString(titleColIndex), cursor.getLong(categoryColIndex), + cursor.getString(notesColIndex), cursor.getLong(priceColIndex), cursor.getLong(accountIdColIndex), cursor.getString(currencyColIndex), From 6ea699287cce45e2396e54606434c330988d9c2d Mon Sep 17 00:00:00 2001 From: Jana Hoch Date: Thu, 2 Mar 2023 14:37:18 +0530 Subject: [PATCH 04/10] Fixed a typo in DbHelper --- .../com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java index 8bcf8a0..4351a8a 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java @@ -344,7 +344,7 @@ private void createDbVersion6(SQLiteDatabase db) { + TYPE_COLUMN + " INTEGER," + TITLE_COLUMN + " TEXT," + CATEGORY_ID_COLUMN + " INTEGER," - + NOTES_COLUMN + "TEXT," + + NOTES_COLUMN + " TEXT," + PRICE_COLUMN + " INTEGER," + ACCOUNT_ID_COLUMN + " INTEGER," + CURRENCY_COLUMN + " TEXT," From 2d2bc9ecbffadecaa1932969909a056479051ad5 Mon Sep 17 00:00:00 2001 From: Jana Hoch Date: Thu, 2 Mar 2023 17:07:43 +0530 Subject: [PATCH 05/10] Export Import notes as well --- .../controller/external/ExportController.java | 2 ++ .../moneytracker/controller/external/Head.java | 3 ++- .../controller/external/ImportController.java | 14 +++++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ExportController.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ExportController.java index 8493275..fa5cf21 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ExportController.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ExportController.java @@ -33,6 +33,7 @@ public List getRecordsForExport(long fromDate, long toDate) { sb.append(Head.TIME).append(Head.DELIMITER); sb.append(Head.TITLE).append(Head.DELIMITER); sb.append(Head.CATEGORY).append(Head.DELIMITER); + sb.append(Head.NOTES).append(Head.DELIMITER); sb.append(Head.PRICE).append(Head.DELIMITER); sb.append(Head.CURRENCY); @@ -53,6 +54,7 @@ public List getRecordsForExport(long fromDate, long toDate) { category = categoryController.read(record.getCategory().getId()); sb.append(category == null ? "NONE" : category.getName()).append(Head.DELIMITER); + sb.append(record.getNotes()).append(Head.DELIMITER); sb.append(record.getType() == 0 ? record.getFullPrice() : -record.getFullPrice()).append(Head.DELIMITER); sb.append(record.getCurrency() == null ? DbHelper.DEFAULT_ACCOUNT_CURRENCY diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/Head.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/Head.java index 396c9a3..ab1ea19 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/Head.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/Head.java @@ -10,8 +10,9 @@ public interface Head { String TIME = "time"; String TITLE = "title"; String CATEGORY = "category"; + String NOTES = "notes"; String PRICE = "price"; String CURRENCY = "currency"; String DELIMITER = ";"; - int COLUMN_COUNT = 5; + int COLUMN_COUNT = 7; } diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ImportController.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ImportController.java index 132a843..552c32a 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ImportController.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/external/ImportController.java @@ -35,15 +35,19 @@ public List importRecordsFromCsv(@Nullable String csv) { if (words.length != Head.COLUMN_COUNT) continue; String timeCol = words[0]; - String titleCol = words[1]; - String categoryCol = words[2]; - String priceCol = words[3]; - String currencyCol = words[4]; + String accountIdCol = words[1]; + String titleCol = words[2]; + String categoryCol = words[3]; + String notesCol = words[4]; + String priceCol = words[5]; + String currencyCol = words[6]; + try { long time = Long.parseLong(timeCol); String title = titleCol.trim(); String categoryName = categoryCol.trim(); + String notes = notesCol.trim(); double price = Double.parseDouble(priceCol); String currency = currencyCol.trim(); @@ -57,7 +61,7 @@ public List importRecordsFromCsv(@Nullable String csv) { Category category = new Category(categoryName); Account account = new Account(-1, "MOCK", -1, currency, 0, -1, false, 0); - Record record = new Record(time, type, title, category, Math.abs(price), account, currency); + Record record = new Record(time, type, title, category, notes, Math.abs(price), account, currency); Record createdRecord = recordController.create(record); if (createdRecord != null) recordList.add(createdRecord); } catch (Exception e) { From e491766d967d2d068f23ace3c81394e1aa43535b Mon Sep 17 00:00:00 2001 From: Jana Hoch Date: Fri, 3 Mar 2023 12:59:08 +0530 Subject: [PATCH 06/10] Added Notes feature --- app/src/main/AndroidManifest.xml | 2 +- .../edit/fragment/AccountOperationsFragment.kt | 3 ++- .../activity/record/AddRecordActivity.kt | 7 +++++-- .../controller/data/RecordController.java | 4 ++-- .../e_kanivets/moneytracker/entity/RecordItem.kt | 4 ++-- .../moneytracker/entity/data/Record.java | 2 +- .../moneytracker/report/record/RecordReport.java | 4 ++-- app/src/main/res/layout/content_add_record.xml | 14 ++++++++++++++ app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 14 files changed, 35 insertions(+), 11 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 873586d..beec760 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,7 +30,7 @@ android:name=".activity.record.AddRecordActivity" android:screenOrientation="portrait" android:theme="@style/Theme.Default" - android:windowSoftInputMode="adjustResize" /> + android:windowSoftInputMode="adjustPan" /> etTitle.setText(record.title) etCategory.setText(record.category?.name.orEmpty()) + etNotes.setText(record.notes) etPrice.setText(formatController.formatPrecisionNone(record.fullPrice)) } } @@ -102,6 +103,7 @@ class AddRecordActivity : BaseBackActivity() { // Restrict ';' for input, because it's used as delimiter when exporting etTitle.filters = arrayOf(SemicolonInputFilter()) etCategory.filters = arrayOf(SemicolonInputFilter()) + etNotes.filters = arrayOf(SemicolonInputFilter()) tvDate.setOnClickListener { selectDate() } tvTime.setOnClickListener { selectTime() } @@ -262,6 +264,7 @@ class AddRecordActivity : BaseBackActivity() { var title = etTitle.text.toString().trim() val category = etCategory.text.toString().trim() + val notes = etNotes.text.toString().trim() val price = etPrice.text.toString().toDouble() val account = accountList[spinnerAccount.selectedItemPosition] @@ -271,10 +274,10 @@ class AddRecordActivity : BaseBackActivity() { if (mode == Mode.MODE_ADD) { recordController.create(Record(timestamp, type, title, - Category(category), price, account, account.currency)) + Category(category), notes, price, account, account.currency)) } else if (mode == Mode.MODE_EDIT) { recordController.update(Record(record?.id ?: -1, - timestamp, type, title, Category(category), price, account, account.currency)) + timestamp, type, title, Category(category), notes, price, account, account.currency)) } autoCompleter.addRecordTitleCategoryPair(title, category) diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/RecordController.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/RecordController.java index 47cd596..1bd2b70 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/RecordController.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/controller/data/RecordController.java @@ -115,7 +115,7 @@ record = validateRecord(record); completedRecordList.add( new Record(record.getId(), record.getTime(), record.getType(), record.getTitle(), category, - record.getPrice(), account, currency, record.getDecimals())); + record.getNotes(), record.getPrice(), account, currency, record.getDecimals())); } return completedRecordList; @@ -143,6 +143,6 @@ private Record validateRecord(@NonNull Record record) { Category category = categoryController.readOrCreate(record.getCategory().getName()); return new Record(record.getId(), record.getTime(), record.getType(), record.getTitle(), category, - record.getPrice(), record.getAccount(), record.getCurrency(), record.getDecimals()); + record.getNotes(), record.getPrice(), record.getAccount(), record.getCurrency(), record.getDecimals()); } } diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/RecordItem.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/RecordItem.kt index 9a4f625..bd9bc42 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/RecordItem.kt +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/RecordItem.kt @@ -4,7 +4,7 @@ sealed class RecordItem { data class Header(val date: String) : RecordItem() - data class Record(val title: String, val categoryName: String, val fullPrice: Double, val currency: String, val isIncome: Boolean) : RecordItem() { - constructor(record: com.blogspot.e_kanivets.moneytracker.entity.data.Record) : this(record.title, record.category?.name?.toString().orEmpty(), record.fullPrice, record.currency, record.isIncome) + data class Record(val title: String, val categoryName: String, val notes: String, val fullPrice: Double, val currency: String, val isIncome: Boolean) : RecordItem() { + constructor(record: com.blogspot.e_kanivets.moneytracker.entity.data.Record) : this(record.title, record.category?.name?.toString().orEmpty(), record.notes, record.fullPrice, record.currency, record.isIncome) } } \ No newline at end of file diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java index 3c12caf..8bdafbd 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java @@ -124,7 +124,7 @@ public Category getCategory() { return category; } - @Nullable + public String getNotes() { return notes; } public long getPrice() { diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/report/record/RecordReport.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/report/record/RecordReport.java index 60366e9..e276aa7 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/report/record/RecordReport.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/report/record/RecordReport.java @@ -141,8 +141,8 @@ private List convertRecordList(List recordList) { int decConvertedPrice = (int) Math.round(convertedPrice * 100 - intConvertedPrice * 100); Record convertedRecord = new Record(record.getId(), record.getTime(), record.getType(), - record.getTitle(), record.getCategory(), intConvertedPrice, record.getAccount(), - currency, decConvertedPrice); + record.getTitle(), record.getCategory(), record.getNotes(), intConvertedPrice, + record.getAccount(), currency, decConvertedPrice); convertedRecordList.add(convertedRecord); } diff --git a/app/src/main/res/layout/content_add_record.xml b/app/src/main/res/layout/content_add_record.xml index b6923ed..76385d1 100644 --- a/app/src/main/res/layout/content_add_record.xml +++ b/app/src/main/res/layout/content_add_record.xml @@ -125,4 +125,18 @@ android:singleLine="true" /> + + + + + diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6893338..5531af9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -130,4 +130,5 @@ Êtes-vous sûr de vouloir supprimer le fichier %1$s ? Il ne pourra plus être restauré. La date de fin ne peut être antérieure à celle de début + Notes diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 2d3078c..b39c764 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -146,4 +146,5 @@ %1$s (%2$d) A data final não pode ser anterior a data inicial + anotações diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 3c2b2c3..618b754 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -131,5 +131,6 @@ Операции Дата конца не может быть раньше даты начала + примечания diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 495a091..2e2ae25 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -131,4 +131,5 @@ Операції Дата початку не може бути раніше за дату кінця + Нотатки diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 7874beb..b684ba2 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -120,5 +120,6 @@ 操作 开始日期不能早于结束日期 + 笔记 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8c8e480..2252e41 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,6 +4,7 @@ Money Tracker Title Category + Notes Price Add income Add expense From abfe7038194b61e69fa5eb42c158a3bee0ca592a Mon Sep 17 00:00:00 2001 From: Jana Hoch Date: Mon, 6 Mar 2023 20:00:29 +0530 Subject: [PATCH 07/10] Fixed spacing issue --- app/src/main/res/values-ru/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 618b754..f0e0421 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -131,6 +131,6 @@ Операции Дата конца не может быть раньше даты начала - примечания + примечания From 0669331f398ff184dd02ee2ef21904b2ddad6d2f Mon Sep 17 00:00:00 2001 From: Jana Hoch Date: Mon, 6 Mar 2023 20:02:32 +0530 Subject: [PATCH 08/10] Capitalized notes in Portuguese strings.xml --- app/src/main/res/values-pt-rBR/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b39c764..557b4f5 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -146,5 +146,5 @@ %1$s (%2$d) A data final não pode ser anterior a data inicial - anotações + Anotações From 610cc4834b30bc81351585fc0b4588bca33a69a2 Mon Sep 17 00:00:00 2001 From: Jana Hoch Date: Mon, 6 Mar 2023 20:32:38 +0530 Subject: [PATCH 09/10] Fix app crash on upgrade. --- .../blogspot/e_kanivets/moneytracker/repo/DbHelper.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java index 4351a8a..0806bd5 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/DbHelper.java @@ -169,6 +169,14 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { /* Add notes column to the records table */ db.execSQL("ALTER TABLE " + TABLE_RECORDS + " ADD COLUMN " + NOTES_COLUMN + " TEXT;"); + + /* Set the notes as empty string for all the record*/ + ContentValues contentValues = new ContentValues(); + contentValues.put(NOTES_COLUMN, ""); + db.update(DbHelper.TABLE_RECORDS, contentValues, null, null); + + db.setTransactionSuccessful(); + db.endTransaction(); } } From 867e68d9e08d432740b509c95ca7a605cde3ba00 Mon Sep 17 00:00:00 2001 From: Jana Hoch Date: Mon, 6 Mar 2023 20:40:26 +0530 Subject: [PATCH 10/10] Localized Account Transfer string and added all the translation. --- .../activity/account/edit/fragment/AccountOperationsFragment.kt | 2 +- app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt index c7f0734..0b549d3 100644 --- a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt +++ b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/edit/fragment/AccountOperationsFragment.kt @@ -59,7 +59,7 @@ class AccountOperationsFragment : BaseFragment() { val type = if (it.fromAccountId == account.id) Record.TYPE_EXPENSE else Record.TYPE_INCOME val title = constructRecordTitle(type, it) val category = Category(getString(R.string.transfer).toLowerCase()) - val notes = "Account Transfer" + val notes = getString(R.string.account_transfer) val price = if (type == Record.TYPE_EXPENSE) it.fromAmount else it.toAmount val decimals = if (type == Record.TYPE_EXPENSE) it.fromDecimals else it.toDecimals diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5531af9..466cc75 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -131,4 +131,5 @@ La date de fin ne peut être antérieure à celle de début Notes + Transfert de compte diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 557b4f5..e98da5f 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -147,4 +147,5 @@ %1$s (%2$d) A data final não pode ser anterior a data inicial Anotações + Transferência de Conta diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f0e0421..6cbba6c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -132,5 +132,6 @@ Дата конца не может быть раньше даты начала примечания + Перевод счета diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2e2ae25..72fa5f9 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -132,4 +132,5 @@ Дата початку не може бути раніше за дату кінця Нотатки + Переказ рахунку diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index b684ba2..edf82e3 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -121,5 +121,6 @@ 开始日期不能早于结束日期 笔记 + 账户转账 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2252e41..3c65b9b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -147,4 +147,5 @@ %1$s (%2$d) End date can\'t be earlier than start date + Account Transfer