From e8127a22fba408371ae33c05079b8db4f5eebf29 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 20 Jul 2020 08:08:54 -0700
Subject: [PATCH] cleanup and update version strings

commented out more of variable line-thickness since the ability to set
has been removed.
---
 xwords4/android/app/build.gradle                     |  4 ++--
 xwords4/android/app/src/main/assets/changes.html     |  3 ++-
 .../java/org/eehouse/android/xw4/BoardCanvas.java    | 12 +++++++-----
 .../main/java/org/eehouse/android/xw4/XWPrefs.java   |  1 -
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 1bd74364b..d7356d9e1 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -1,6 +1,6 @@
 def INITIAL_CLIENT_VERS = 9
-def VERSION_CODE_BASE = 156
-def VERSION_NAME = '4.4.160'
+def VERSION_CODE_BASE = 157
+def VERSION_NAME = '4.4.161'
 def FABRIC_API_KEY = System.getenv("FABRIC_API_KEY")
 def BUILD_INFO_NAME = "build-info.txt"
 
diff --git a/xwords4/android/app/src/main/assets/changes.html b/xwords4/android/app/src/main/assets/changes.html
index f4c1eadb1..f8726bef1 100644
--- a/xwords4/android/app/src/main/assets/changes.html
+++ b/xwords4/android/app/src/main/assets/changes.html
@@ -27,8 +27,8 @@
   <h3>New with this release</h3>
   <ul>
       <li>Remove under-construction image that flashed by as a thumbnail was loading</li>
-      <li>Change how dialogs are handled internally. You should NOT notice!</li>
       <li>Make color of line separating board tiles configurable</li>
+      <li>Change how dialogs are handled internally. You should NOT notice!</li>
   </ul>
 
   <p>(The full changelog
@@ -36,6 +36,7 @@
 
   <h3>Coming soon</h3>
   <ul>
+      <li>Add filtering to the wordlist browser</li>
       <li>Improve move-via-NFC</li>
       <li>Support duplicate-style play (popular in France)</li>
       <li>Improve play-by-data-sms workaround
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
index a2e6d1a62..c8a23f33c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
@@ -443,11 +443,13 @@ public class BoardCanvas extends Canvas implements DrawCtx {
             // frame the cell
             int frameColor = m_otherColors[CommonPrefs.COLOR_CELLLINE];
             m_strokePaint.setColor( adjustColor(frameColor) );
-            // PENDING: fetch/calculate this a lot less frequently!!
-            int linePct = XWPrefs.getPrefsInt( m_activity, R.string.key_board_line_pct, 1 );
-            linePct = Math.min( 25, linePct );
-            int width = Math.max(1, (rect.width() * linePct) / 100);
-            m_strokePaint.setStrokeWidth( width );
+            if ( false ) {
+                // PENDING: fetch/calculate this a lot less frequently!!
+                int linePct = XWPrefs.getPrefsInt( m_activity, R.string.key_board_line_pct, 1 );
+                linePct = Math.min( 25, linePct );
+                int width = Math.max(1, (rect.width() * linePct) / 100);
+                m_strokePaint.setStrokeWidth( width );
+            }
             drawRect( rect, m_strokePaint );
 
             drawCrosshairs( rect, flags );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
index 5a61fe028..6f5e342c8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
@@ -220,7 +220,6 @@ public class XWPrefs {
                 try {
                     result = Integer.parseInt( asStr );
                 } catch ( Exception ex ) {
-                    result = defaultValue;
                 }
             }
         }