From 5fc1569099272ed3b8977d24613446d7e2b7ee79 Mon Sep 17 00:00:00 2001 From: Aidan Follestad Date: Thu, 18 Apr 2019 16:19:10 -0700 Subject: [PATCH] Remove donation options --- .travis.yml | 2 +- app/build.gradle | 4 ++++ .../nocknock/ui/main/MainActivity.kt | 21 ------------------- app/src/main/res/menu/menu_main.xml | 3 --- app/src/main/res/values/arrays.xml | 6 ------ 5 files changed, 5 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index b7dd08b..cf91e91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,11 +20,11 @@ env: - # Emulator Management: Create, Start and Wait before_script: + - android list target - echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a - emulator -avd test -no-skin -no-audio -no-window & - android-wait-for-emulator - adb shell input keyevent 82 & - script: - - android list target - ./gradlew build connectedCheck diff --git a/app/build.gradle b/app/build.gradle index 4b02af4..d6b315e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,6 +20,10 @@ android { sourceCompatibility 1.8 targetCompatibility 1.8 } + + packagingOptions { + exclude 'META-INF/atomicfu.kotlin_module' + } } dependencies { diff --git a/app/src/main/java/com/afollestad/nocknock/ui/main/MainActivity.kt b/app/src/main/java/com/afollestad/nocknock/ui/main/MainActivity.kt index 7b59bf1..aec76d8 100644 --- a/app/src/main/java/com/afollestad/nocknock/ui/main/MainActivity.kt +++ b/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) - } - } } diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index b3b1727..5f2f23f 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/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"/> - diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index db28598..84ad226 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -13,10 +13,4 @@ JavaScript Evaluation - - via PayPal - via Cash App - via Venmo - -