From e1ef66e9c526f505f0268d5e2ec0b6a0391dc3c7 Mon Sep 17 00:00:00 2001 From: cdhiraj40 Date: Wed, 20 Oct 2021 16:39:10 +0530 Subject: [PATCH 1/4] #2717 converted Matcher.java to Kotlin --- .../kiwix/kiwixmobile/testutils/Matcher.kt | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.kt diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.kt new file mode 100644 index 000000000..69a0160e8 --- /dev/null +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.kt @@ -0,0 +1,45 @@ +/* + * Kiwix Android + * Copyright (c) 2019 Kiwix + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package org.kiwix.kiwixmobile.testutils + +import android.view.View +import android.view.ViewGroup +import org.hamcrest.Description +import org.hamcrest.Matcher +import org.hamcrest.TypeSafeMatcher + +object Matcher { + fun childAtPosition( + parentMatcher: Matcher, + position: Int + ): Matcher { + return object : TypeSafeMatcher() { + override fun describeTo(description: Description) { + description.appendText("Child at position $position in parent ") + parentMatcher.describeTo(description) + } + + public override fun matchesSafely(view: View): Boolean { + val parent = view.parent + return (parent is ViewGroup && parentMatcher.matches(parent) && + view == parent.getChildAt(position)) + } + } + } +} From 314ff6f8dc40a4b11590685b0196f91e51fa1239 Mon Sep 17 00:00:00 2001 From: cdhiraj40 Date: Wed, 20 Oct 2021 16:50:24 +0530 Subject: [PATCH 2/4] kiwix#2719 converted matcher.java to matcher.kt #issue#2719 proper file formating --- .../kiwix/kiwixmobile/testutils/Matcher.java | 45 ------------------- .../kiwix/kiwixmobile/testutils/Matcher.kt | 34 +++++++------- 2 files changed, 19 insertions(+), 60 deletions(-) delete mode 100644 app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.java diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.java b/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.java deleted file mode 100644 index 28022c283..000000000 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Kiwix Android - * Copyright (c) 2019 Kiwix - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -package org.kiwix.kiwixmobile.testutils; - -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewParent; -import org.hamcrest.Description; -import org.hamcrest.TypeSafeMatcher; - -public class Matcher { - public static org.hamcrest.Matcher childAtPosition( - final org.hamcrest.Matcher parentMatcher, final int position) { - return new TypeSafeMatcher() { - @Override - public void describeTo(Description description) { - description.appendText("Child at position " + position + " in parent "); - parentMatcher.describeTo(description); - } - - @Override - public boolean matchesSafely(View view) { - ViewParent parent = view.getParent(); - return parent instanceof ViewGroup && parentMatcher.matches(parent) - && view.equals(((ViewGroup) parent).getChildAt(position)); - } - }; - } -} diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.kt index 69a0160e8..88c5e92b9 100644 --- a/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.kt +++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/testutils/Matcher.kt @@ -1,6 +1,6 @@ /* * Kiwix Android - * Copyright (c) 2019 Kiwix + * Copyright (c) 2021 Kiwix * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -24,21 +24,25 @@ import org.hamcrest.Description import org.hamcrest.Matcher import org.hamcrest.TypeSafeMatcher -object Matcher { - fun childAtPosition( - parentMatcher: Matcher, - position: Int - ): Matcher { - return object : TypeSafeMatcher() { - override fun describeTo(description: Description) { - description.appendText("Child at position $position in parent ") - parentMatcher.describeTo(description) - } +class Matcher { + companion object { + @JvmStatic + fun childAtPosition( + parentMatcher: Matcher, + position: Int + ): Matcher { + return object : TypeSafeMatcher() { + override fun describeTo(description: Description) { + description.appendText("Child at position $position in parent ") + parentMatcher.describeTo(description) + } - public override fun matchesSafely(view: View): Boolean { - val parent = view.parent - return (parent is ViewGroup && parentMatcher.matches(parent) && - view == parent.getChildAt(position)) + public override fun matchesSafely(view: View): Boolean { + val parent = view.parent + return parent is ViewGroup && parentMatcher.matches(parent) && view == parent.getChildAt( + position + ) + } } } } From 63c19e412bd522a047e2f764524c912fbadb452c Mon Sep 17 00:00:00 2001 From: Dhiraj Chauhan Date: Sat, 4 Dec 2021 17:24:57 +0530 Subject: [PATCH 3/4] #2636 Added Nightly Status Badge in Readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6dd4bff4f..13eae9fba 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ pieces in Java). [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Public Chat](https://img.shields.io/badge/public-chat-green)](https://chat.kiwix.org) [![Slack](https://img.shields.io/badge/Slack-chat-E01E5A)](https://kiwixoffline.slack.com) +[![Nightly](https://github.com/kiwix/kiwix-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/kiwix/kiwix-android/actions/workflows/nightly.yml) ## Build Instructions From a58cf146300ee71acf7aa3a174965634fab5258a Mon Sep 17 00:00:00 2001 From: Dhiraj Chauhan Date: Sat, 4 Dec 2021 17:54:08 +0530 Subject: [PATCH 4/4] added NIghtly Badge beside CI --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13eae9fba..467995768 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,12 @@ Kiwix Android is written in [Kotlin](https://kotlinlang.org/) (with a few old pieces in Java). [![Build Status](https://github.com/kiwix/kiwix-android/workflows/CI/badge.svg?query=branch%3Adevelop+workflow%3ANightly)](https://github.com/kiwix/kiwix-android/actions?query=workflow%3ANightly+branch%3Adevelop) +[![Nightly](https://github.com/kiwix/kiwix-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/kiwix/kiwix-android/actions/workflows/nightly.yml) [![codecov](https://codecov.io/gh/kiwix/kiwix-android/branch/develop/graph/badge.svg)](https://codecov.io/gh/kiwix/kiwix-android) [![CodeFactor](https://www.codefactor.io/repository/github/kiwix/kiwix-android/badge)](https://www.codefactor.io/repository/github/kiwix/kiwix-android) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![Public Chat](https://img.shields.io/badge/public-chat-green)](https://chat.kiwix.org) [![Slack](https://img.shields.io/badge/Slack-chat-E01E5A)](https://kiwixoffline.slack.com) -[![Nightly](https://github.com/kiwix/kiwix-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/kiwix/kiwix-android/actions/workflows/nightly.yml) ## Build Instructions