Merge branch 'less-hungarian-naming'

Author: yawnoc

CHANGELOG.md

@@ -4,6 +4,7 @@
 ## [Unreleased]
 
 - Rewrote `addCodePointsToSet` as `toCodePointSet`
+- Eliminated suffix Hungarian notation outside method names
 - Tweaked Help > Miscellaneous explanations
   - Put Function column before Action column in table
   - Moved 'Retract keyboard' explanation into table

app/src/main/java/io/github/yawnoc/strokeinput/CandidatesViewAdapter.java

@@ -27,12 +27,12 @@ public class CandidatesViewAdapter
 {
   private CandidateListener candidateListener;
   private final LayoutInflater layoutInflater;
-  private final List<String> candidateList;
+  private final List<String> candidates;
 
-  CandidatesViewAdapter(final Context context, final List<String> candidateList)
+  CandidatesViewAdapter(final Context context, final List<String> candidates)
   {
     this.layoutInflater = LayoutInflater.from(context);
-    this.candidateList = candidateList;
+    this.candidates = candidates;
   }
 
   public interface CandidateListener
@@ -46,10 +46,10 @@ public void setCandidateListener(final CandidateListener candidateListener)
   }
 
   @SuppressLint("NotifyDataSetChanged")
-  public void updateCandidateList(final List<String> candidateList)
+  public void updateCandidates(final List<String> candidates)
   {
-    this.candidateList.clear();
-    this.candidateList.addAll(candidateList);
+    this.candidates.clear();
+    this.candidates.addAll(candidates);
     notifyDataSetChanged();
   }
 
@@ -64,14 +64,14 @@ public ButtonHolder onCreateViewHolder(@NonNull final ViewGroup viewGroup, final
   @Override
   public void onBindViewHolder(@NonNull final ButtonHolder buttonHolder, final int candidateIndex)
   {
-    final String candidate = candidateList.get(candidateIndex);
+    final String candidate = candidates.get(candidateIndex);
     buttonHolder.candidateButton.setText(candidate);
   }
 
   @Override
   public int getItemCount()
   {
-    return candidateList.size();
+    return candidates.size();
   }
 
   public class ButtonHolder

app/src/main/java/io/github/yawnoc/strokeinput/InputContainer.java

@@ -143,9 +143,9 @@ public void setStrokeDigitSequence(final String strokeDigitSequence)
     strokeSequenceBar.setStrokeDigitSequence(strokeDigitSequence);
   }
 
-  public void setCandidateList(final List<String> candidateList)
+  public void setCandidates(final List<String> candidates)
   {
-    candidatesViewAdapter.updateCandidateList(candidateList);
+    candidatesViewAdapter.updateCandidates(candidates);
     candidatesView.scrollToPosition(0);
   }
 

app/src/main/java/io/github/yawnoc/strokeinput/Key.java

@@ -167,7 +167,9 @@ public boolean containsPoint(final int x, final int y)
         &&
       (this.isExtendedRight || x <= this.x + this.width)
         &&
-      this.y <= y && y <= this.y + this.height
+      this.y <= y
+        &&
+      y <= this.y + this.height
     );
   }
 

app/src/main/java/io/github/yawnoc/strokeinput/KeyPreviewPlane.java

@@ -39,7 +39,7 @@ public class KeyPreviewPlane
   private int width;
   private int height;
   private int keyboardHeight;
-  private final List<Key> keyList = new ArrayList<>();
+  private final List<Key> keys = new ArrayList<>();
   private Key latestKey;
   private int shiftMode = KeyboardView.SHIFT_DISABLED;
 
@@ -77,7 +77,7 @@ private void initialiseDismissalHandler()
               public void handleMessage(@NonNull Message message)
               {
                 Key key = (Key) message.obj;
-                keyList.remove(key);
+                keys.remove(key);
                 invalidate();
               }
             };
@@ -117,17 +117,17 @@ public void updateShiftMode(final int shiftMode)
 
   public void showPreviewAt(final Key key)
   {
-    if (key != null && !keyList.contains(key) && key.isPreviewable)
+    if (key != null && !keys.contains(key) && key.isPreviewable)
     {
-      keyList.add(key);
+      keys.add(key);
     }
     latestKey = key;
     invalidate();
   }
 
   public void movePreviewTo(final Key key)
   {
-    keyList.remove(latestKey);
+    keys.remove(latestKey);
     showPreviewAt(key);
   }
 
@@ -141,15 +141,15 @@ public void dismissLatest()
 
   public void dismissAllImmediately()
   {
-    keyList.clear();
+    keys.clear();
     latestKey = null;
     invalidate();
   }
 
   @Override
   public void onDraw(@NonNull final Canvas canvas)
   {
-    for (final Key key : keyList)
+    for (final Key key : keys)
     {
       final int keyPreviewWidth = (int) (key.previewMagnification * key.width);
       final int keyPreviewHeight = (int) (key.previewMagnification * key.height);

app/src/main/java/io/github/yawnoc/strokeinput/Keyboard.java

@@ -69,7 +69,7 @@ public class Keyboard
   private final Context applicationContext;
   private int width;
   private int height, naturalHeight;
-  private final List<Key> keyList;
+  private final List<Key> keys;
   public int fillColour;
 
   // Key properties
@@ -107,15 +107,15 @@ public Keyboard(final Context context, final int layoutResourceId)
     defaultKeyTextSizePx = (int) Valuey.pxFromSp(DEFAULT_KEY_TEXT_SIZE_SP, displayMetrics);
     defaultKeyPreviewMarginYPx = (int) Valuey.pxFromDp(DEFAULT_KEY_PREVIEW_MARGIN_Y_DP, displayMetrics);
 
-    keyList = new ArrayList<>();
+    keys = new ArrayList<>();
 
     makeKeyboard(context, resources.getXml(layoutResourceId));
     adjustKeyboardHeight();
   }
 
-  public List<Key> getKeyList()
+  public List<Key> getKeys()
   {
-    return keyList;
+    return keys;
   }
 
   public int getWidth()
@@ -176,7 +176,7 @@ private void makeKeyboard(final Context context, final XmlResourceParser xmlReso
               case KEY_TAG:
                 inKey = true;
                 key = new Key(row, x, y, resources, xmlResourceParser);
-                keyList.add(key);
+                keys.add(key);
                 break;
             }
             break;
@@ -210,7 +210,7 @@ else if (inRow)
   public void correctKeyboardWidth(int inputContainerWidth)
   {
     final float correctionFactor = ((float) inputContainerWidth) / screenWidth;
-    for (final Key key : keyList)
+    for (final Key key : keys)
     {
       key.x = (int) (key.naturalX * correctionFactor);
       key.width = (int) (key.naturalWidth * correctionFactor);
@@ -224,7 +224,7 @@ public void adjustKeyboardHeight()
     final float userAdjustmentFactor = MainActivity.keyboardHeightAdjustmentProgressToFactor(userAdjustmentProgress);
     final float actualAdjustmentFactor =
             Math.min(userAdjustmentFactor, KEYBOARD_HEIGHT_MAX_FRACTION * screenHeight / naturalHeight);
-    for (final Key key : keyList)
+    for (final Key key : keys)
     {
       key.y = (int) (key.naturalY * actualAdjustmentFactor);
       key.height = (int) (key.naturalHeight * actualAdjustmentFactor);

app/src/main/java/io/github/yawnoc/strokeinput/KeyboardView.java

@@ -72,7 +72,7 @@ public class KeyboardView
   private LinearLayout mainInputPlane;
   private KeyPreviewPlane keyPreviewPlane;
   private Keyboard keyboard;
-  private List<Key> keyList;
+  private List<Key> keys;
 
   // Active key
   private Key activeKey;
@@ -196,7 +196,7 @@ public void setKeyboard(final Keyboard keyboard)
   {
     keyboardListener.saveKeyboard(keyboard);
     this.keyboard = keyboard;
-    keyList = keyboard.getKeyList();
+    keys = keyboard.getKeys();
     keyboardFillPaint.setColor(keyboard.fillColour);
     if (shiftMode != SHIFT_PERSISTENT)
     {
@@ -256,7 +256,7 @@ public void onDraw(@NonNull final Canvas canvas)
 
     canvas.drawRect(keyboardRectangle, keyboardFillPaint);
 
-    for (final Key key : keyList)
+    for (final Key key : keys)
     {
       keyRectangle.set(0, 0, key.width, key.height);
 
@@ -623,7 +623,7 @@ private void sendShiftUpEvent(boolean shouldRedrawKeyboard)
 
   private Key getKeyAtPoint(final int x, final int y)
   {
-    for (final Key key : keyList)
+    for (final Key key : keys)
     {
       if (key.containsPoint(x, y))
       {