diff --git a/Habitica/AndroidManifestTesting.xml b/Habitica/AndroidManifestTesting.xml index 38f1dbc99..a22b7fb94 100644 --- a/Habitica/AndroidManifestTesting.xml +++ b/Habitica/AndroidManifestTesting.xml @@ -125,16 +125,6 @@ - - - - diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 066c22ae2..1926512e8 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -104,7 +104,6 @@ dependencies { testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2' testImplementation 'org.robolectric:robolectric:3.8' testImplementation 'org.robolectric:shadows-multidex:3.8' - testImplementation 'org.robolectric:shadows-support-v4:3.3.2' testImplementation 'org.mockito:mockito-core:2.8.9' testImplementation 'org.powermock:powermock-api-mockito2:1.7.0' testImplementation 'org.powermock:powermock-module-junit4-rule-agent:1.7.0' @@ -114,11 +113,11 @@ dependencies { debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.2' releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.2' //Push Notifications - implementation 'com.google.firebase:firebase-core:16.0.9' - implementation 'com.google.firebase:firebase-messaging:18.0.0' - implementation 'com.google.firebase:firebase-config:17.0.0' - implementation 'com.google.firebase:firebase-perf:17.0.2' - implementation 'com.google.android.gms:play-services-auth:16.0.1' + implementation 'com.google.firebase:firebase-core:17.0.0' + implementation 'com.google.firebase:firebase-messaging:19.0.1' + implementation 'com.google.firebase:firebase-config:18.0.0' + implementation 'com.google.firebase:firebase-perf:18.0.1' + implementation 'com.google.android.gms:play-services-auth:17.0.0' implementation 'io.realm:android-adapters:3.1.0' implementation(project(':seeds-sdk')) { exclude group: 'com.google.android.gms' diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml index d788a514c..c803a4a27 100644 --- a/Habitica/res/values-bg/strings.xml +++ b/Habitica/res/values-bg/strings.xml @@ -300,21 +300,17 @@ Използване Хранене Излюпване на любимец с %s - Вие излюпихте %s! + Вие излюпихте %1$s %2$s! Вие опитомихте %s. Да се качваме! Затваряне Споделяне Вие нахранихте своя(та/то) %s! Вие закупихте %s Вие закупихте награда - Обикновени - Магическа отвара - Мисия - Редки - Обикновени - Магическа отвара - Мисия - Редки + Обикновени + Магическа отвара + Мисия + Редки Световна мисия Нуждаете се от почивка? Идете в странноприемницата на Даниел, за да спрете някои от по-трудните механики на Хабитика:\n\n • Пропуснатите ежедневни задачи няма да Ви нараняват;\n diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml index cf81a7f0f..4e167a6d3 100644 --- a/Habitica/res/values-de/strings.xml +++ b/Habitica/res/values-de/strings.xml @@ -268,9 +268,7 @@ Kostüm tragen Ausgerüstet Bist Du sicher, dass Du diese Quest abbrechen willst? Alle angenommenen Einladungen gehen verloren. Der Questbesitzer erhält die Questschriftrolle zurück. - Questeinladung Bist Du sicher? Nur %1$d von %2$d Party-Mitglieder nehmen an der Quest teil. Quests starten automatisch, wenn alle Spieler die Einladung angenommen oder abgelehnt haben. - Du wurdest eingeladen, an einer Quest teilzunehmen! vor einem Tag vor %d Tagen Vor 1 Minute @@ -300,21 +298,13 @@ Nutzen Füttern Haustier mit %s ausbrüten - Du hast ein %s ausgebrütet! + Du hast ein %1$s %2$s ausgebrütet! Du hast %s gezähmt, auf geht\'s! Schließen Teilen Du hast Dein/e/n %s gefüttert! Du hast %s gekauft Du hast eine Belohnung gekauft - Standard - Magisches Schlüpfelixier - Quest - Spezial - Standard - Magisches Schlüpfelixier - Quest - Spezial Weltenquest Brauchst du eine Pause? Kehre in Daniels Gasthaus ein, um ein paar von Habiticas schwierigeren Spielmechaniken zu pausieren:\n\n • Verpasste Tagesaufgaben fügen dir keinen Schaden zu\n diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml index 4276f2cf5..0ace6d26c 100644 --- a/Habitica/res/values-en-rGB/strings.xml +++ b/Habitica/res/values-en-rGB/strings.xml @@ -289,7 +289,7 @@ Use Feed Hatch pet with %s - You hatched a %s! + You hatched a %1$s %2$s! Close Share You fed your %s! diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml index 1815762c5..165746430 100644 --- a/Habitica/res/values-es/strings.xml +++ b/Habitica/res/values-es/strings.xml @@ -300,17 +300,17 @@ Usar Alimentar Criar mascota con %s - ¡Ha nacido un/a %s! + ¡Ha nacido un/a %1$s %2$s! Has domado %s, ¡vamos a dar un paseo! Cerrar Compartir ¡Tu %s ha comido! Has comprado %s Has obtenido una recompensa. - Estandar - Poción Mágica - Misión - Raro + Estandar + Poción Mágica + Misión + Raro Estandar Poción Mágica Misión diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml index 7dc779a49..43a4bb2bb 100644 --- a/Habitica/res/values-fr/strings.xml +++ b/Habitica/res/values-fr/strings.xml @@ -300,21 +300,13 @@ Utiliser Nourrir Faire éclore le familier avec %s - Votre %s a éclos ! + Votre %1$s %2$s a éclos ! Vous avez dompté %s, partez en promenade ensemble ! Fermer Partager Vous avez nourri votre %s ! Vous avez acheté %s Vous avez acheté une récompense - Standard - Potion magique - Quête - Rare - Standard - Potion magique - Quête - Rare Quête mondiale Besoin de repos ? Reposez vous à l\'Auberge de Daniel pour faire une pause des effets de jeu les plus compliqués :\n\n • Les quotidiennes manquées ne vous infligeront pas de dégâts\n diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml index 446b6b08e..4f52b1c7a 100644 --- a/Habitica/res/values-hr-rHR/strings.xml +++ b/Habitica/res/values-hr-rHR/strings.xml @@ -302,17 +302,17 @@ Koristi Nahrani Izlegni ljubimca s %s - %s se izlegao/la! + %1$s %2$s se izlegao/la! Pripitomio/la si %s, hajdemo jahati! Zatvori Podijeli Nahranio/la si svoju/ga %s! Kupio/la si %s Kupio/la si nagradu - Standardni - Čarobnih napitaka - Pustolovni - Rijetki + Standardni + Čarobnih napitaka + Pustolovni + Rijetki Standardne Čarobnih napitaka Pustolovne diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml index fff4692c5..e42afa8d7 100644 --- a/Habitica/res/values-in/strings.xml +++ b/Habitica/res/values-in/strings.xml @@ -290,16 +290,16 @@ Gunakan Beri makan Tetaskan dengan %s - Kamu menetaskan seekor %s + Kamu menetaskan seekor %1$s %2$s Tutup Bagikan Kamu memberi makan %s! %s telah dibeli Kamu membeli sebuah hadiah - Standard - Ramuan Ajaib - Misi - Langka + Standard + Ramuan Ajaib + Misi + Langka Standard Ramuan Ajaib Misi diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml index 7c231204c..e6c454fb9 100644 --- a/Habitica/res/values-it/strings.xml +++ b/Habitica/res/values-it/strings.xml @@ -300,21 +300,13 @@ Usa Dai da mangiare Fai nascere un animale con %s - È nato un %s! + È nato un %1$s %2$s! Hai domato %s, inizia a cavalcare! Chiudi Condividi Hai dato da mangiare al tuo %s! Hai comprato %s Hai comprato una ricompensa - Base - Pozione Magica - Missione - Rari - Base - Pozione Magica - Missione - Rare World Quest Bisogno di una pausa ? Riposati alla locanda di Daniel per mettere in pausa le meccaniche di gioco più difficili di Habitica:\n\n • Le Daily non completate non faranno diminuire la tua salute\n diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml index f6af47d2a..d5ea62594 100644 --- a/Habitica/res/values-iw/strings.xml +++ b/Habitica/res/values-iw/strings.xml @@ -248,7 +248,7 @@ השתמשו האכילו הבקיעו חיית מחמד עם %s - הבקעתם %1s! + הבקעתם %1$s %2$s! סיגרו שתפו האכלתם את ה %s שלכם! diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml index 101768ca2..c791a17db 100644 --- a/Habitica/res/values-ja/strings.xml +++ b/Habitica/res/values-ja/strings.xml @@ -301,17 +301,17 @@ 連れていく えさをやる %s でペットをかえす - %sが生まれた! + %1$s %2$sが生まれた! %sを手なずけた！さあ、乗ってみよう！ 閉じる 共有する %sにえさをやった! %sを購入しました 報酬をを購入しました - ふつうの - 魔法の薬 - クエスト - レアな + ふつうの + 魔法の薬 + クエスト + レアな ふつうの 魔法の薬 クエスト diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml index 71e5a4062..f5af8bd50 100644 --- a/Habitica/res/values-ko/strings.xml +++ b/Habitica/res/values-ko/strings.xml @@ -297,16 +297,16 @@ 사용 먹이주기 %s 으로 펫 부화 - 당신은 %s 를 부화시켰습니다! + 당신은 %1$s %2$s 를 부화시켰습니다! 닫기 나누기 %s 에게 먹이를 줬습니다! %s 를 구매했습니다 보상을 구매했습니다 - 기본 펫 - 마법물약 펫 - 퀘스트 펫 - 희귀 펫 + 기본 펫 + 마법물약 펫 + 퀘스트 펫 + 희귀 펫 기본 탑승펫 마법 물약 탑승펫 퀘스트 탑승펫 diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml index 73d6d8ebc..828abc7bb 100644 --- a/Habitica/res/values-lt/strings.xml +++ b/Habitica/res/values-lt/strings.xml @@ -255,7 +255,7 @@ Naudoti Maitinti Užauginti gyvūną su %s - Užauginai %s! + Užauginai %1$s %2$s! Uždaryti Dalintis Pašėrei savo %s! diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml index 8a4b80fec..0028aab4a 100644 --- a/Habitica/res/values-nl/strings.xml +++ b/Habitica/res/values-nl/strings.xml @@ -300,17 +300,17 @@ Gebruik Voeder Laat huisdier uitkomen met %s - Je hebt een %s laten uitkomen! + Je hebt een %1$s %2$s laten uitkomen! Je hebt %s afgericht, laten we een ridje maken! Sluiten Delen Je hebt je %s gevoederd! Je hebt %s gekocht Je hebt een beloning gekocht - Standaard - Toverdrankje - Queeste - Zeldzaam + Standaard + Toverdrankje + Queeste + Zeldzaam Standaard Magisch Drankje Queeste diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml index 37a5cea96..a1ebfbd0c 100644 --- a/Habitica/res/values-pl/strings.xml +++ b/Habitica/res/values-pl/strings.xml @@ -292,16 +292,16 @@ Użyj Nakarm Wykluj za pomocą %s - Wyklułeś/as %s! + Wyklułeś/as %1$s %2$s! Zamknij Podziel się Nakarmiłeś/aś %s! Kupiłeś %s Kupiłeś nagrodę - Standardowe - Eliksir Magiczny - Misja - Rzadkie + Standardowe + Eliksir Magiczny + Misja + Rzadkie Standardowe Eliksir Magiczny Misja diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml index 3747375db..de8377c6b 100644 --- a/Habitica/res/values-pt-rBR/strings.xml +++ b/Habitica/res/values-pt-rBR/strings.xml @@ -300,17 +300,17 @@ Usar Alimentar Chocar mascote com %s - Você chocou um %s! + Você chocou um %1$s %2$s! Você domou %s, vamos dar um passeio ! Fechar Compartilhar Você alimentou seu %s! Você comprou %s Você comprou uma recompensa - Base - Poção Mágica - Missão - Especial + Base + Poção Mágica + Missão + Especial Base Poção Mágica Missão diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml index 792fef950..a1a6c9e78 100644 --- a/Habitica/res/values-pt-rPT/strings.xml +++ b/Habitica/res/values-pt-rPT/strings.xml @@ -283,16 +283,16 @@ Usar Alimentar Nascimento do animal com %s - Chocou um %s! + Chocou um %1$s %2$s! Fechar Partilhar Alimentou o seu %s! Comprou %s Comprou uma recompensa - Padrão - Porção Mágica - Missão - Raro + Padrão + Porção Mágica + Missão + Raro Padrão Porção Mágica Missão diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml index c008c6498..79340ba79 100644 --- a/Habitica/res/values-ru/strings.xml +++ b/Habitica/res/values-ru/strings.xml @@ -298,17 +298,17 @@ Использовать Покормить Вылупить питомца с помощью %s - У вас вылупился %s! + У вас вылупился %1$s %2$s! "Вы приручили %s, пора покататься! " Закрыть Поделиться Вы покормили вашего %s! Вы купили %s Вы купили награду - Обычные - Магический эликсир - Квест - Редкие питомцы + Обычные + Магический эликсир + Квест + Редкие питомцы Основные скакуны Магический эликсир Квест diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml index b607fde3c..b4d77bbfb 100644 --- a/Habitica/res/values-tr/strings.xml +++ b/Habitica/res/values-tr/strings.xml @@ -300,17 +300,17 @@ Kullan Besle Evcil hayvanı %s ile üret - %s ürettin! + %1$s %2$s ürettin! Bir %s ehlileştirdin. Kapat Paylaş %s besledin! %s satın aldın Bir ödül satın aldın - Standart - Büyülü İksir - Görev - Nadir + Standart + Büyülü İksir + Görev + Nadir Standart Büyülü İksir Görev diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml index 7a4d7d8a7..1fc7a1058 100644 --- a/Habitica/res/values-zh-rTW/strings.xml +++ b/Habitica/res/values-zh-rTW/strings.xml @@ -298,17 +298,17 @@ 用 餵 用 %s 孵化寵物 - 你孵化了一隻 %s！ + 你孵化了一隻 %1$s %2$s！ 你馴服了%s，讓我們騎上牠吧！ 關閉 分享 你餵食了你的%s！ 你購買了%s 你購買了一個獎勵 - 基本寵物 - 神奇藥水寵物 - 劇情任務寵物 - 稀有寵物 + 基本寵物 + 神奇藥水寵物 + 劇情任務寵物 + 稀有寵物 基本坐騎 神奇藥水坐騎 劇情任務坐騎 diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml index e576b1325..9a441eb2b 100644 --- a/Habitica/res/values-zh/strings.xml +++ b/Habitica/res/values-zh/strings.xml @@ -302,17 +302,17 @@ 使用 喂食 用%s孵化宠物 - 你孵化了一个 %s！ + 你孵化了一个 %1$s %2$s！ 您驯服了%s，我们去骑一圈吧！ 关闭 分享 你喂食了你的%s！ 你购买了%s 你购买了一个奖励 - 基本宠物 - 神奇药水宠物 - 剧情任务宠物 - 稀有宠物 + 基本宠物 + 神奇药水宠物 + 剧情任务宠物 + 稀有宠物 基本坐骑 神奇药水坐骑 剧情任务坐骑 diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index f98b6341e..79f990a3d 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -329,7 +329,7 @@ Use Feed Hatch pet with %s - You hatched a %s! + You hatched a %1$s %2$s! You have tamed %s, let\'s go for a ride! Close Share diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt index dfb4a2774..d0a592274 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/MainNavigationController.kt @@ -3,6 +3,7 @@ package com.habitrpg.android.habitica.helpers import android.os.Bundle import androidx.navigation.NavController import androidx.navigation.NavDirections +import java.lang.IllegalArgumentException import java.lang.ref.WeakReference import java.util.* @@ -18,14 +19,18 @@ object MainNavigationController { fun navigate(transactionId: Int, args: Bundle? = null) { if (Math.abs((lastNavigation?.time ?: 0) - Date().time) > 500) { lastNavigation = Date() - navController?.get()?.navigate(transactionId, args) + try { + navController?.get()?.navigate(transactionId, args) + } catch (_: IllegalArgumentException) {} } } fun navigate(directions: NavDirections) { if (Math.abs((lastNavigation?.time ?: 0) - Date().time) > 500) { lastNavigation = Date() + try { navController?.get()?.navigate(directions) + } catch (_: IllegalArgumentException) {} } } } \ No newline at end of file diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt index 378477620..6cfb37914 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ItemRecyclerAdapter.kt @@ -209,7 +209,6 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection?, autoUpdate: val egg = hatchingItem as Egg hatchPetSubject.onNext(Pair(firstItem, egg)) } - fragment?.dismiss() } else if (isFeeding) { val event = FeedCommand() event.usingPet = feedingPet @@ -217,7 +216,6 @@ class ItemRecyclerAdapter(data: OrderedRealmCollection?, autoUpdate: EventBus.getDefault().post(event) fragment?.dismiss() } - } } } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt index e1f23da63..55517d23d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.kt @@ -192,6 +192,7 @@ class ItemRecyclerFragment : BaseFragment() { private fun hatchPet(potion: HatchingPotion, egg: Egg) { compositeSubscription.add(this.inventoryRepository.hatchPet(egg, potion) { + dismiss() val petWrapper = View.inflate(context, R.layout.pet_imageview, null) as? FrameLayout val petImageView = petWrapper?.findViewById(R.id.pet_imageview) as? SimpleDraweeView diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt index ab9617480..666e8729f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt @@ -17,6 +17,7 @@ import com.habitrpg.android.habitica.data.ApiClient import com.habitrpg.android.habitica.data.InventoryRepository import com.habitrpg.android.habitica.data.TaskRepository import com.habitrpg.android.habitica.data.UserRepository +import com.habitrpg.android.habitica.extensions.setScaledPadding import com.habitrpg.android.habitica.extensions.subscribeWithErrorHandler import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.helpers.SoundManager @@ -217,6 +218,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + recyclerView.setScaledPadding(context, 0, 0, 0, 48) recyclerView.adapter = recyclerAdapter as? androidx.recyclerview.widget.RecyclerView.Adapter<*> recyclerAdapter?.filter() diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt index a75927170..617a8e282 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.kt @@ -14,6 +14,7 @@ import com.habitrpg.android.habitica.helpers.AppConfigManager import com.habitrpg.android.habitica.helpers.RxErrorHandler import com.habitrpg.android.habitica.helpers.TaskFilterHelper import com.habitrpg.android.habitica.models.tasks.Task +import com.habitrpg.android.habitica.models.user.User import com.habitrpg.android.habitica.ui.activities.TaskFormActivity import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.views.tasks.TaskFilterDialog @@ -37,6 +38,13 @@ class TasksFragment : BaseMainFragment() { private var filterMenuItem: MenuItem? = null + override var user: User? + get() = super.user + set(value) { + super.user = value + viewFragmentsDictionary?.values?.forEach { it.user = value } + } + private val activeFragment: TaskRecyclerViewFragment? get() = viewFragmentsDictionary?.get(viewPager?.currentItem) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt index e158f4a62..ad9b46e0e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/navigation/HabiticaBottomNavigationView.kt @@ -87,7 +87,7 @@ class HabiticaBottomNavigationView @JvmOverloads constructor( animateButtonTap() true } - addButton.setOnTouchListener { v, event -> + addButton.setOnTouchListener { _, event -> if (event.action == MotionEvent.ACTION_DOWN) { val animX = ObjectAnimator.ofFloat(addButton, "scaleX", 1f, 1.1f) animX.duration = 100 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java index 046d9fe87..c71546a90 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/HabitButtonWidgetProvider.java @@ -50,12 +50,10 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider { HabitButtonWidgetProvider.class); int[] allWidgetIds = appWidgetManager.getAppWidgetIds(thisWidget); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - for (int widgetId : allWidgetIds) { - Bundle options = appWidgetManager.getAppWidgetOptions(widgetId); - appWidgetManager.partiallyUpdateAppWidget(widgetId, - sizeRemoteViews(context, options, widgetId)); - } + for (int widgetId : allWidgetIds) { + Bundle options = appWidgetManager.getAppWidgetOptions(widgetId); + appWidgetManager.partiallyUpdateAppWidget(widgetId, + sizeRemoteViews(context, options, widgetId)); } // Build the intent to call the service diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java index 4b7272242..83044e062 100644 --- a/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/models/UserTest.java @@ -4,6 +4,8 @@ import com.habitrpg.android.habitica.BuildConfig; import com.habitrpg.android.habitica.models.inventory.Mount; import com.habitrpg.android.habitica.models.inventory.Pet; import com.habitrpg.android.habitica.models.user.Items; +import com.habitrpg.android.habitica.models.user.OwnedMount; +import com.habitrpg.android.habitica.models.user.OwnedPet; import com.habitrpg.android.habitica.models.user.User; import org.junit.Before; @@ -30,12 +32,12 @@ public class UserTest { @Test public void getPetsFoundCount_shouldReturnSumOfAllPetEntries() { - RealmList pets = new RealmList<>(); - pets.add(new Pet()); - pets.add(new Pet()); - pets.add(new Pet()); - pets.add(new Pet()); - pets.add(new Pet()); + RealmList pets = new RealmList<>(); + pets.add(new OwnedPet()); + pets.add(new OwnedPet()); + pets.add(new OwnedPet()); + pets.add(new OwnedPet()); + pets.add(new OwnedPet()); user.getItems().setPets(pets); assertEquals(5, user.getPetsFoundCount()); @@ -48,12 +50,12 @@ public class UserTest { @Test public void getMountsTamedCount_shouldReturnSumOfAllMountEntries() { - RealmList mounts = new RealmList<>(); - mounts.add(new Mount()); - mounts.add(new Mount()); - mounts.add(new Mount()); - mounts.add(new Mount()); - mounts.add(new Mount()); + RealmList mounts = new RealmList<>(); + mounts.add(new OwnedMount()); + mounts.add(new OwnedMount()); + mounts.add(new OwnedMount()); + mounts.add(new OwnedMount()); + mounts.add(new OwnedMount()); user.getItems().setMounts(mounts); assertEquals(5, user.getMountsTamedCount());