Delete .travis.yml

.travis.yml

@@ -1,22 +0,0 @@
-language: android
-jdk: oraclejdk8
-
-env:
-  matrix:
-    - ANDROID_TARGET=android-21 ANDROID_ABI=armeabi-v7a
-
-android:
-  components:
-    - tools # to get the new `repository-11.xml`
-    - tools # see https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943)
-    - platform-tools
-    - build-tools-28.0.3
-    - android-28
-
-  licenses:
-    - '.+'
-
-before_install:
-  - yes | sdkmanager "platforms;android-28"
-script:
-  - ./gradlew build connectedCheck

README.md

@@ -1,6 +1,5 @@
 ## Nock Nock
 
-[![Build Status](https://travis-ci.org/afollestad/nock-nock.svg)](https://travis-ci.org/afollestad/nock-nock)
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square)](https://www.apache.org/licenses/LICENSE-2.0.html)
 
 ![Showcase](https://raw.githubusercontent.com/afollestad/nock-nock/master/art/showcase5.png)

app/build.gradle

@@ -20,6 +20,10 @@ android {
     sourceCompatibility 1.8
     targetCompatibility 1.8
   }
+
+  packagingOptions {
+    exclude 'META-INF/atomicfu.kotlin_module'
+  }
 }
 
 dependencies {

app/src/main/java/com/afollestad/nocknock/ui/DarkModeSwitchActivity.kt

@@ -55,8 +55,7 @@ abstract class DarkModeSwitchActivity : AppCompatActivity() {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
       return UNKNOWN
     }
-    val currentNightMode = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-    return when (currentNightMode) {
+    return when (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) {
       Configuration.UI_MODE_NIGHT_YES -> return ENABLED
       Configuration.UI_MODE_NIGHT_NO -> return DISABLED
       else -> UNKNOWN

app/src/main/java/com/afollestad/nocknock/ui/main/MainActivity.kt

@@ -24,7 +24,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.list.listItems
-import com.afollestad.materialdialogs.list.listItemsSingleChoice
 import com.afollestad.nocknock.R
 import com.afollestad.nocknock.adapter.SiteAdapter
 import com.afollestad.nocknock.adapter.TagAdapter
@@ -35,9 +34,6 @@ import com.afollestad.nocknock.notifications.NockNotificationManager
 import com.afollestad.nocknock.ui.DarkModeSwitchActivity
 import com.afollestad.nocknock.ui.NightMode.UNKNOWN
 import com.afollestad.nocknock.utilities.providers.IntentProvider
-import com.afollestad.nocknock.utilities.ui.toast
-import com.afollestad.nocknock.viewUrl
-import com.afollestad.nocknock.viewUrlWithApp
 import com.afollestad.nocknock.viewcomponents.livedata.toViewVisibility
 import kotlinx.android.synthetic.main.activity_main.fab
 import kotlinx.android.synthetic.main.activity_main.list
@@ -105,7 +101,6 @@ class MainActivity : DarkModeSwitchActivity() {
         when (item.itemId) {
           R.id.about -> AboutDialog.show(this@MainActivity)
           R.id.dark_mode -> toggleDarkMode()
-          R.id.support_me -> supportMe()
         }
         return@setOnMenuItemClickListener true
       }
@@ -151,20 +146,4 @@ class MainActivity : DarkModeSwitchActivity() {
       viewSite(model)
     }
   }
-
-  private fun supportMe() {
-    MaterialDialog(this).show {
-      title(R.string.support_me)
-      message(R.string.support_me_message, html = true, lineHeightMultiplier = 1.4f)
-      listItemsSingleChoice(R.array.donation_options) { _, index, _ ->
-        when (index) {
-          0 -> viewUrl("https://paypal.me/AidanFollestad")
-          1 -> viewUrlWithApp("https://cash.me/\$afollestad", pkg = "com.squareup.cash")
-          2 -> viewUrlWithApp("https://venmo.com/afollestad", pkg = "com.venmo")
-        }
-        toast(R.string.thank_you)
-      }
-      positiveButton(R.string.next)
-    }
-  }
 }

app/src/main/res/menu/menu_main.xml

@@ -7,7 +7,4 @@
       android:id="@+id/dark_mode"
       android:checkable="true"
       android:title="@string/dark_mode"/>
-  <item
-      android:id="@+id/support_me"
-      android:title="@string/support_me"/>
 </menu>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

app/src/main/res/values/arrays.xml

@@ -13,10 +13,4 @@
     <item>JavaScript Evaluation</item>
   </string-array>
 
-  <string-array name="donation_options">
-    <item>via PayPal</item>
-    <item>via Cash App</item>
-    <item>via Venmo</item>
-  </string-array>
-
 </resources>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#758F9A</color>
+</resources>

app/src/main/res/values/strings.xml

@@ -14,6 +14,7 @@
         <a href=\'https://www.linkedin.com/in/afollestad\'>LinkedIn</a>
         <br/><br/><i>Nock Nock is open source! Check out the <a href=\'https://github.com/afollestad/nock-nock\'>GitHub page</a>!</i>
         <br/>Icon by <a href=\'https://plus.google.com/+KevinAguilarC\'>Kevin Aguilar</a> of <b>221 Pixels</b>.
+        <br/>View the <a href=\'https://af.codes/privacypolicies/nocknock.html\'>Privacy Policy</a>.
   ]]></string>
   <string name="dark_mode">Dark Mode</string>
 
@@ -84,14 +85,6 @@
     exception to pass custom error messages to Nock Nock.
   </string>
 
-  <string name="support_me">Donate</string>
-  <string name="support_me_message"><![CDATA[
-      <b>Nock Nock</b> was created and is maintained by one person. Donations are <b>much</b>
-      appreciated and encourage continued support.
-  ]]></string>
-  <string name="thank_you">Thank you very much!</string>
-  <string name="next">Next</string>
-
   <string name="install_web_browser">Please install a web browser app, such as Google Chrome.</string>
 
 </resources>

common/build.gradle

@@ -12,6 +12,10 @@ android {
     versionName versions.publishVersion
   }
 
+  packagingOptions {
+    exclude 'META-INF/atomicfu.kotlin_module'
+  }
+
   // For Mozilla Rhino
   lintOptions {
     abortOnError false

data/build.gradle

@@ -14,6 +14,10 @@ android {
 
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
+
+  packagingOptions {
+    exclude 'META-INF/atomicfu.kotlin_module'
+  }
 }
 
 dependencies {

data/src/androidTest/java/com/afollestad/nocknock/data/AppDatabaseTest.kt

@@ -431,9 +431,30 @@ class AppDatabaseTest() {
 
     val allSites = db.allSites()
     assertThat(allSites.size).isEqualTo(3)
-    assertThat(allSites[0]).isEqualTo(MOCK_MODEL_1)
-    assertThat(allSites[1]).isEqualTo(MOCK_MODEL_2)
-    assertThat(allSites[2]).isEqualTo(MOCK_MODEL_3)
+    assertThat(allSites[0]).isEqualTo(
+        MOCK_MODEL_1.copy(
+            headers = listOf(
+                MOCK_MODEL_1.headers.first().copy(id = 1),
+                MOCK_MODEL_1.headers.last().copy(id = 2)
+            )
+        )
+    )
+    assertThat(allSites[1]).isEqualTo(
+        MOCK_MODEL_2.copy(
+            headers = listOf(
+                MOCK_MODEL_2.headers.first().copy(id = 3),
+                MOCK_MODEL_2.headers.last().copy(id = 4)
+            )
+        )
+    )
+    assertThat(allSites[2]).isEqualTo(
+        MOCK_MODEL_3.copy(
+            headers = listOf(
+                MOCK_MODEL_3.headers.first().copy(id = 5),
+                MOCK_MODEL_3.headers.last().copy(id = 6)
+            )
+        )
+    )
   }
 
   @Test fun extension_put_getSite() {
@@ -470,10 +491,12 @@ class AppDatabaseTest() {
     )
     val updatedHeaders = listOf(
         modelToUpdate.headers.first().copy(
+            id = 7,
             key = "One",
             value = "Hello"
         ),
         modelToUpdate.headers.last().copy(
+            id = 8,
             key = "Two",
             value = "Hey"
         )

dependencies.gradle

@@ -3,23 +3,23 @@ ext.versions = [
     minSdk              : 21,
     compileSdk          : 28,
     buildTools          : '28.0.3',
-    publishVersion      : '0.8.7',
-    publishVersionCode  : 43,
+    publishVersion      : '0.8.8',
+    publishVersionCode  : 46,
 
     // Plugins
-    gradlePlugin        : '3.3.2',
-    spotlessPlugin      : '3.19.0',
+    gradlePlugin        : '3.4.0',
+    spotlessPlugin      : '3.22.0',
     versionPlugin       : '0.21.0',
     googleServices      : '4.2.0',
     fabricPlugin        : '1.+',
 
     // Misc
-    okHttp              : '3.14.0',
+    okHttp              : '3.14.1',
     rhino               : '1.7.10',
 
     // Kotlin
-    kotlin              : '1.3.21',
-    coroutines          : '1.1.1',
+    kotlin              : '1.3.30',
+    coroutines          : '1.2.0',
     koin                : '1.0.2',
 
     // Google/AndroidX
@@ -30,16 +30,16 @@ ext.versions = [
     googleMaterial      : '1.0.0',
     room                : '2.0.0',
     lifecycle           : '2.0.0',
-    firebaseCore        : '16.0.7',
+    firebaseCore        : '16.0.8',
 
     // Rx
-    rxJava              : '2.2.7',
+    rxJava              : '2.2.8',
     rxBinding           : '3.0.0-alpha1',
 
     // afollestad
-    materialDialogs     : '2.0.3',
+    materialDialogs     : '2.8.1',
     rxkPrefs            : '1.2.5',
-    vvalidator          : '0.3.1',
+    vvalidator          : '0.4.1',
 
     // Debugging
     timber              : '4.7.1',
@@ -47,12 +47,12 @@ ext.versions = [
 
     // Unit testing
     junit               : '4.12',
-    mockito             : '2.25.0',
+    mockito             : '2.27.0',
     mockitoKotlin       : '2.1.0',
-    truth               : '0.43',
+    truth               : '0.44',
 
     // UI testing
     androidxTestRunner  : '1.1.1',
     androidxTest        : '1.1.0',
-    archTesting         : '2.0.0'
+    archTesting         : '2.0.1'
 ]

viewcomponents/src/main/java/com/afollestad/nocknock/viewcomponents/headers/HeaderStackLayout.kt

@@ -56,9 +56,22 @@ class HeaderStackLayout(
 
   override fun onClick(v: View) {
     val index = v.tag as Int
-    list.removeViewAt(index)
-    headers.removeAt(index)
-    postLiveData()
+    check(index >= 0 || index < list.childCount) {
+      "Index $index is out of bounds in the header stack (size ${list.childCount})."
+    }
+    list.post {
+      list.removeViewAt(index)
+      headers.removeAt(index)
+      invalidateTags()
+      postLiveData()
+    }
+  }
+
+  private fun invalidateTags() {
+    for (i in 0 until list.childCount) {
+      val entry = list.getChildAt(i) as HeaderItemLayout
+      entry.btnRemove.tag = i
+    }
   }
 
   private fun addEntry(forHeader: Header) {
@@ -67,9 +80,7 @@ class HeaderStackLayout(
 
     val li = LayoutInflater.from(context)
     val entry = li.inflate(R.layout.header_stack_item, list, false) as HeaderItemLayout
-    list.addView(entry)
-
-    entry.run {
+    list.addView(entry.apply {
       inputKey.setText(forHeader.key)
       inputKey.post { entry.inputKey.requestFocus() }
       attachHeader(forHeader, this@HeaderStackLayout)
@@ -77,6 +88,6 @@ class HeaderStackLayout(
 
       btnRemove.tag = headers.size - 1
       btnRemove.setOnClickListener(this@HeaderStackLayout)
-    }
+    })
   }
 }