Merge pull request #15 from odaridavid/improve-code-health

resolve lint issues

Author: odaridavid

app/src/main/assets/cor.md

@@ -6,17 +6,17 @@
 }
 
 <span class="keyword">interface</span> Order {
-    <span class="keyword">val</span> items: <span class="types">Map<String, Int></span>
+    <span class="keyword">val</span> items: <span class="stdlib">Map</span><<span class="types">String, Int</span>>
 }
 
-<span class="keyword">class</span> IceCreamOrder(<span class="keyword">override val</span> items: <span class="types">Map<String, Int></span>) : Order
+<span class="keyword">class</span> IceCreamOrder(<span class="keyword">override val</span> items: <span class="stdlib">Map</span><<span class="types">String, Int</span>>) : Order
 
 <span class="keyword">class</span> IceCreamVendor(<span class="keyword">override val</span> nextHandler: OrderHandler?) : OrderHandler {
     <span class="keyword">override fun</span> handleRequest(order: <span class="types">Order</span>) {
         <span class="keyword">val</span> orderSize = order.items.values.<span class="stdlib">sum()</span>
         <span class="keyword">if</span> (orderSize > <span class="literals">5</span>) {
             <span class="stdlib">println</span>(<span class="string">"Vendor: I'll have to get some"</span>)
-            nextHandler?.handleRequest(order) ?: <span class="stdlib">println</span>(<span class="string">"This is the end buddy"</span>)
+            nextHandler?.handleRequest(order) ?: <span class="keyword">return</span>
         } <span class="keyword">else</span> {
             <span class="stdlib">println</span>(<span class="string">"Order of <span class="string-template">${order.items.keys}</span> coming right up"</span>)
         }
@@ -28,7 +28,7 @@
         <span class="keyword">val</span> orderSize = order.items.values.<span class="stdlib">sum()</span>
         <span class="keyword">if</span> (orderSize > <span class="literals">10</span>) {
             <span class="stdlib">println</span>(<span class="string">"Retailer: Hmm guess I'll have to order more too"</span>)
-            nextHandler?.handleRequest(order) ?: <span class="stdlib">println</span>(<span class="string">"This is the end buddy"</span>)
+            nextHandler?.handleRequest(order) ?: <span class="keyword">return</span>
         } <span class="keyword">else</span> {
             <span class="stdlib">println</span>(<span class="string">"Order of <span class="string-template">${order.items.keys}</span> enroute to vendor"</span>)
         }
@@ -39,7 +39,7 @@
     <span class="keyword">override fun</span> handleRequest(order: <span class="types">Order</span>) {
         <span class="keyword">val</span> orderSize = order.items.values.<span class="stdlib">sum()</span>
         <span class="keyword">if</span> (orderSize > <span class="literals">100</span>) {
-            nextHandler?.handleRequest(order) ?: <span class="stdlib">println</span>(<span class="string">"This is the end buddy"</span>)
+            nextHandler?.handleRequest(order) ?: <span class="keyword">return</span>
         } <span class="keyword">else</span> {
             <span class="stdlib">println</span>(<span class="string">"Factory: Order of <span class="string-template">${order.items.keys}</span> coming enroute to retailer"</span>)
         }

app/src/main/java/com/github/odaridavid/designpatterns/patterns/chainofresponsibility/ChainOfResponsibilityPattern.kt

@@ -29,7 +29,7 @@ internal class IceCreamVendor(override val nextHandler: OrderHandler?) : OrderHa
         val orderSize = order.items.values.sum()
         if (orderSize > 5) {
             println("Vendor: I'll have to get some")
-            nextHandler?.handleRequest(order) ?: println("This is the end buddy")
+            nextHandler?.handleRequest(order) ?:return
         } else {
             println("OrderTransaction of ${order.items.keys} coming right up")
         }
@@ -41,7 +41,7 @@ internal class IceCreamRetailer(override val nextHandler: OrderHandler?) : Order
         val orderSize = order.items.values.sum()
         if (orderSize > 10) {
             println("Retailer: Hmm guess I'll have to order more too")
-            nextHandler?.handleRequest(order) ?: println("This is the end buddy")
+            nextHandler?.handleRequest(order) ?:return
         } else {
             println("OrderTransaction of ${order.items.keys} enroute to vendor")
         }
@@ -52,7 +52,7 @@ internal class IceCreamFactory(override val nextHandler: OrderHandler?) : OrderH
     override fun handleRequest(order: Order) {
         val orderSize = order.items.values.sum()
         if (orderSize > 100) {
-            nextHandler?.handleRequest(order) ?: println("This is the end buddy")
+            nextHandler?.handleRequest(order) ?:return
         } else {
             println("Factory: OrderTransaction of ${order.items.keys} coming enroute to retailer")
         }

app/src/main/java/com/github/odaridavid/designpatterns/patterns/proxy/ProxyPattern.kt

@@ -24,13 +24,11 @@ internal class RealCar : Car {
     }
 }
 
-class ProxyCar : Car {
+internal class ProxyCar(var key: String = "none") : Car {
+
     private val realCar = RealCar()
-    var key = "none"
 
     override fun drive(): String {
-        return if (key == "none")
-            "No keys available"
-        else realCar.drive()
+        return if (key == "none") "No keys available" else realCar.drive()
     }
 }

app/src/main/java/com/github/odaridavid/designpatterns/ui/DesignPatternsAdapter.kt

@@ -36,10 +36,10 @@ internal class DesignPatternsAdapter(val onClick: (DesignPattern) -> Unit) :
     override fun onBindViewHolder(holder: DesignPatternViewHolder, position: Int): Unit =
         getItem(position).let { holder.bind(it) }
 
-    inner class DesignPatternViewHolder(private val binding: ItemDesignPatternBinding) :
+    internal inner class DesignPatternViewHolder(private val binding: ItemDesignPatternBinding) :
         RecyclerView.ViewHolder(binding.root), View.OnClickListener {
 
-        fun bind(designPattern: DesignPattern) {
+         fun bind(designPattern: DesignPattern) {
             val context = binding.root.context
             binding.patternNameTextView.text = context.getString(designPattern.name)
             binding.root.setOnClickListener(this)

app/src/main/java/com/github/odaridavid/designpatterns/ui/LibrariesAdapter.kt

@@ -36,7 +36,7 @@ internal class LibrariesAdapter(val onClick: (String) -> Unit) :
         return LicenseViewHolder(binding)
     }
 
-    inner class LicenseViewHolder(private val binding: ItemLibraryBinding) :
+    internal inner class LicenseViewHolder(private val binding: ItemLibraryBinding) :
         RecyclerView.ViewHolder(binding.root), View.OnClickListener {
 
         fun bind(library: Library) {

app/src/main/java/com/github/odaridavid/designpatterns/ui/SplashActivity.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.github.odaridavid.designpatterns.helpers.navigateTo
 
-class SplashActivity : AppCompatActivity() {
+internal class SplashActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)