From: Damyan Ivanov Date: Thu, 22 Apr 2021 04:14:08 +0000 (+0000) Subject: use plain 'long' for Currency.id X-Git-Tag: v0.18.0~59 X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=commitdiff_plain;h=e376844a097462eda7562d30e3f542b88f139bda use plain 'long' for Currency.id also make it mutable, like in the rest of the entity classes --- diff --git a/app/src/main/java/net/ktnx/mobileledger/db/Currency.java b/app/src/main/java/net/ktnx/mobileledger/db/Currency.java index 80c72cf5..02e47760 100644 --- a/app/src/main/java/net/ktnx/mobileledger/db/Currency.java +++ b/app/src/main/java/net/ktnx/mobileledger/db/Currency.java @@ -1,3 +1,20 @@ +/* + * Copyright © 2021 Damyan Ivanov. + * This file is part of MoLe. + * MoLe is free software: you can distribute it and/or modify it + * under the term of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your opinion), any later version. + * + * MoLe is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License terms for details. + * + * You should have received a copy of the GNU General Public License + * along with MoLe. If not, see . + */ + package net.ktnx.mobileledger.db; import androidx.annotation.NonNull; @@ -8,8 +25,7 @@ import androidx.room.PrimaryKey; @Entity(tableName = "currencies") public class Currency { @PrimaryKey(autoGenerate = true) - @NonNull - private final Long id; + private long id; @NonNull private String name; @NonNull @@ -17,17 +33,19 @@ public class Currency { @NonNull @ColumnInfo(name = "has_gap") private Boolean hasGap; - public Currency(@NonNull Long id, @NonNull String name, @NonNull String position, + public Currency(long id, @NonNull String name, @NonNull String position, @NonNull Boolean hasGap) { this.id = id; this.name = name; this.position = position; this.hasGap = hasGap; } - @NonNull - public Long getId() { + public long getId() { return id; } + public void setId(long id) { + this.id = id; + } @NonNull public String getName() { return name; diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/CurrencySelectorFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/CurrencySelectorFragment.java index 47f2353e..4ec2abfe 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/CurrencySelectorFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/CurrencySelectorFragment.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2021 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -155,8 +155,8 @@ public class CurrencySelectorFragment extends AppCompatDialogFragment if (!currName.isEmpty()) { DB.get() .getCurrencyDAO() - .insert(new net.ktnx.mobileledger.db.Currency(null, - String.valueOf(tvNewCurrName.getText()), "after", false), null); + .insert(new net.ktnx.mobileledger.db.Currency(0, + String.valueOf(tvNewCurrName.getText()), "after", false)); // FIXME hardcoded position and gap setting }