rename 'iter' variable to 'iterator'

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/AccountListParser.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/AccountListParser.java
index e3f0e384b4da23d6a20f1fd2944875b5d97c2162..f3773a52850d5c354c8a9c163469a80fb27bc7df 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/AccountListParser.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/AccountListParser.java
@@ -28,18 +28,18 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class AccountListParser {
 
-    private final MappingIterator<ParsedLedgerAccount> iter;
+    private final MappingIterator<ParsedLedgerAccount> iterator;
 
     public AccountListParser(InputStream input) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         ObjectReader reader = mapper.readerFor(ParsedLedgerAccount.class);
 
-        iter = reader.readValues(input);
+        iterator = reader.readValues(input);
     }
     public ParsedLedgerAccount nextAccount() {
-        if (!iter.hasNext()) return null;
+        if (!iterator.hasNext()) return null;
 
-        ParsedLedgerAccount next = iter.next();
+        ParsedLedgerAccount next = iterator.next();
 
         if (next.getAname().equalsIgnoreCase("root")) return nextAccount();
 

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/TransactionListParser.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/TransactionListParser.java
index 805668507a4c2065aad1c676904d494818190e5b..742c595757103ce34cb94ea1458a8cac09cee47e 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_14/TransactionListParser.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_14/TransactionListParser.java
@@ -26,15 +26,15 @@ import java.io.InputStream;
 
 public class TransactionListParser {
 
-    private final MappingIterator<ParsedLedgerTransaction> iter;
+    private final MappingIterator<ParsedLedgerTransaction> iterator;
 
     public TransactionListParser(InputStream input) throws IOException {
 
         ObjectMapper mapper = new ObjectMapper();
         ObjectReader reader = mapper.readerFor(ParsedLedgerTransaction.class);
-        iter = reader.readValues(input);
+        iterator = reader.readValues(input);
     }
     public ParsedLedgerTransaction nextTransaction() {
-        return iter.hasNext() ? iter.next() : null;
+        return iterator.hasNext() ? iterator.next() : null;
     }
 }

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/AccountListParser.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/AccountListParser.java
index 8e71cbd09d3a72cd448eda5bd6c95e0a43bfd18b..d999b4571768912b365078a7539e8b270988ce20 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/AccountListParser.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/AccountListParser.java
@@ -28,18 +28,18 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class AccountListParser {
 
-    private final MappingIterator<ParsedLedgerAccount> iter;
+    private final MappingIterator<ParsedLedgerAccount> iterator;
 
     public AccountListParser(InputStream input) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         ObjectReader reader = mapper.readerFor(ParsedLedgerAccount.class);
 
-        iter = reader.readValues(input);
+        iterator = reader.readValues(input);
     }
     public ParsedLedgerAccount nextAccount() {
-        if (!iter.hasNext()) return null;
+        if (!iterator.hasNext()) return null;
 
-        ParsedLedgerAccount next = iter.next();
+        ParsedLedgerAccount next = iterator.next();
 
         if (next.getAname().equalsIgnoreCase("root")) return nextAccount();
 

diff --git a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/TransactionListParser.java b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/TransactionListParser.java
index c6210746aa138e6e46d3a3d51167271374345d92..940deee4ff02de44385187524c74455fffd3c6fb 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/json/v1_15/TransactionListParser.java
+++ b/app/src/main/java/net/ktnx/mobileledger/json/v1_15/TransactionListParser.java
@@ -26,15 +26,15 @@ import java.io.InputStream;
 
 public class TransactionListParser {
 
-    private final MappingIterator<ParsedLedgerTransaction> iter;
+    private final MappingIterator<ParsedLedgerTransaction> iterator;
 
     public TransactionListParser(InputStream input) throws IOException {
 
         ObjectMapper mapper = new ObjectMapper();
         ObjectReader reader = mapper.readerFor(ParsedLedgerTransaction.class);
-        iter = reader.readValues(input);
+        iterator = reader.readValues(input);
     }
     public ParsedLedgerTransaction nextTransaction() {
-        return iter.hasNext() ? iter.next() : null;
+        return iterator.hasNext() ? iterator.next() : null;
     }
 }

diff --git a/app/src/main/res/layout-w900dp/profile_list.xml b/app/src/main/res/layout-w900dp/profile_list.xml
deleted file mode 100644 (file)
index 3701f3a..0000000
--- a/app/src/main/res/layout-w900dp/profile_list.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright © 2019 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 <https://www.gnu.org/licenses/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginLeft="16dp"
-    android:layout_marginRight="16dp"
-    android:baselineAligned="false"
-    android:divider="?android:attr/dividerHorizontal"
-    android:orientation="horizontal"
-    android:showDividers="middle"
-    tools:context=".ui.activity.ProfileListActivity">
-
-    <!--
-    This layout is a two-pane layout for the Profiles
-    master/detail flow.
-    
-    -->
-
-    <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/profile_list"
-        android:name="net.ktnx.mobileledger.ui.activity.ProfileListFragment"
-        android:layout_width="@dimen/item_width"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        app:layoutManager="LinearLayoutManager"
-        tools:context="net.ktnx.mobileledger.ui.activity.ProfileListActivity"
-        tools:listitem="@layout/profile_list_content" />
-
-    <FrameLayout
-        android:id="@+id/profile_detail_container"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="3" />
-
-</LinearLayout>
\ No newline at end of file