isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-07 09:38:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to AndroidX (#544)

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-01-05 18:47:01 -06:00
committed by GitHub
parent b3a40efe46 82486c7514
commit 6a91300d82
189 changed files with 468 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java
View File

@@ -23,11 +23,15 @@ import android.appwidget.*;
import android.content.*;
import android.content.res.*;
import android.os.*;
import android.support.annotation.*;
import android.support.test.*;
import android.support.test.filters.*;
import androidx.annotation.NonNull;
import androidx.annotation.StyleRes;
import androidx.test.*;
import androidx.test.filters.*;
import android.util.*;
import androidx.test.platform.app.InstrumentationRegistry;
import junit.framework.*;
import org.isoron.androidbase.*;
@@ -80,8 +84,8 @@ public class BaseAndroidTest extends TestCase
{
if (Looper.myLooper() == null) Looper.prepare();
targetContext = InstrumentationRegistry.getTargetContext();
testContext = InstrumentationRegistry.getContext();
targetContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
testContext = InstrumentationRegistry.getInstrumentation().getContext();
DateUtils.setFixedLocalTime(FIXED_LOCAL_TIME);
setResolution(2.0f);

9
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
View File

@@ -20,7 +20,8 @@
package org.isoron.uhabits;
import android.content.*;
import android.support.test.uiautomator.*;
import androidx.test.uiautomator.*;
import com.linkedin.android.testbutler.*;
@@ -30,8 +31,10 @@ import org.isoron.uhabits.core.ui.screens.habits.list.*;
import org.isoron.uhabits.core.utils.*;
import org.junit.*;
import static android.support.test.InstrumentationRegistry.*;
import static android.support.test.uiautomator.UiDevice.*;
import static androidx.test.InstrumentationRegistry.getContext;
import static androidx.test.InstrumentationRegistry.getTargetContext;
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
import static androidx.test.uiautomator.UiDevice.*;
public class BaseUserInterfaceTest
{

7
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseViewTest.java
View File

@@ -20,11 +20,14 @@
package org.isoron.uhabits;
import android.graphics.*;
import android.support.annotation.*;
import android.support.test.*;
import androidx.annotation.NonNull;
import androidx.test.*;
import android.view.*;
import android.widget.*;
import androidx.test.platform.app.InstrumentationRegistry;
import org.isoron.androidbase.*;
import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.widgets.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.androidbase.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.acceptance;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.acceptance;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.acceptance;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.junit.*;

2
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
View File

@@ -19,7 +19,7 @@
package org.isoron.uhabits.acceptance;
import android.support.test.filters.*;
import androidx.test.filters.*;
import org.isoron.uhabits.*;
import org.junit.*;

22
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
View File

@@ -19,22 +19,24 @@
package org.isoron.uhabits.acceptance.steps;
import android.support.annotation.*;
import android.support.test.espresso.*;
import android.support.test.espresso.contrib.*;
import android.support.test.uiautomator.*;
import android.support.v7.widget.*;
import androidx.annotation.StringRes;
import androidx.test.espresso.*;
import androidx.test.espresso.contrib.*;
import androidx.test.uiautomator.*;
import androidx.appcompat.widget.*;
import androidx.recyclerview.widget.RecyclerView;
import org.isoron.uhabits.*;
import org.isoron.uhabits.R;
import org.isoron.uhabits.activities.habits.list.*;
import static android.os.Build.VERSION.*;
import static android.support.test.espresso.Espresso.*;
import static android.support.test.espresso.action.ViewActions.*;
import static android.support.test.espresso.assertion.PositionAssertions.*;
import static android.support.test.espresso.assertion.ViewAssertions.*;
import static android.support.test.espresso.matcher.ViewMatchers.*;
import static androidx.test.espresso.Espresso.*;
import static androidx.test.espresso.action.ViewActions.*;
import static androidx.test.espresso.assertion.PositionAssertions.*;
import static androidx.test.espresso.assertion.ViewAssertions.*;
import static androidx.test.espresso.matcher.ViewMatchers.*;
import static junit.framework.Assert.*;
import static org.hamcrest.CoreMatchers.*;

10
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/EditHabitSteps.java
View File

@@ -19,14 +19,14 @@
package org.isoron.uhabits.acceptance.steps;
import android.support.test.uiautomator.*;
import androidx.test.uiautomator.*;
import org.isoron.uhabits.*;
import static android.support.test.espresso.Espresso.*;
import static android.support.test.espresso.action.ViewActions.*;
import static android.support.test.espresso.action.ViewActions.closeSoftKeyboard;
import static android.support.test.espresso.matcher.ViewMatchers.*;
import static androidx.test.espresso.Espresso.*;
import static androidx.test.espresso.action.ViewActions.*;
import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
import static androidx.test.espresso.matcher.ViewMatchers.*;
import static org.isoron.uhabits.BaseUserInterfaceTest.*;
public class EditHabitSteps

20
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
View File

@@ -19,7 +19,7 @@
package org.isoron.uhabits.acceptance.steps;
import android.support.test.espresso.*;
import androidx.test.espresso.*;
import android.view.*;
import org.hamcrest.*;
@@ -28,15 +28,15 @@ import org.isoron.uhabits.activities.habits.list.views.*;
import java.util.*;
import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.action.ViewActions.click;
import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withParent;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withParent;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.CoreMatchers.*;
import static org.isoron.uhabits.BaseUserInterfaceTest.device;
import static org.isoron.uhabits.acceptance.steps.CommonSteps.clickText;

2
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
View File

@@ -19,7 +19,7 @@
package org.isoron.uhabits.acceptance.steps;
import android.support.test.uiautomator.*;
import androidx.test.uiautomator.*;
import static android.os.Build.VERSION.SDK_INT;
import static junit.framework.Assert.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/BarChartTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.activities.common.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/FrequencyChartTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.activities.common.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.activities.common.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
View File

@@ -20,8 +20,10 @@
package org.isoron.uhabits.activities.common.views;
import android.graphics.*;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.utils.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.activities.common.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.activities.common.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;

5
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonViewTest.kt
View File

@@ -19,8 +19,9 @@
package org.isoron.uhabits.activities.habits.list.views
import android.support.test.filters.*
import android.support.test.runner.*
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.*
import androidx.test.runner.*
import org.isoron.uhabits.*
import org.isoron.uhabits.core.models.*
import org.isoron.uhabits.utils.*

5
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkPanelViewTest.kt
View File

@@ -19,8 +19,9 @@
package org.isoron.uhabits.activities.habits.list.views
import android.support.test.filters.*
import android.support.test.runner.*
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.*
import androidx.test.runner.*
import org.hamcrest.CoreMatchers.*
import org.hamcrest.MatcherAssert.*
import org.isoron.uhabits.*

5
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewTest.kt
View File

@@ -19,8 +19,9 @@
package org.isoron.uhabits.activities.habits.list.views
import android.support.test.filters.*
import android.support.test.runner.*
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.*
import androidx.test.runner.*
import org.isoron.uhabits.*
import org.isoron.uhabits.core.models.*
import org.junit.*

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HeaderViewTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.activities.habits.list.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.preferences.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.activities.habits.list.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.ui.screens.habits.list.*;

5
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonViewTest.kt
View File

@@ -19,8 +19,9 @@
package org.isoron.uhabits.activities.habits.list.views
import android.support.test.filters.*
import android.support.test.runner.*
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.*
import androidx.test.runner.*
import org.hamcrest.CoreMatchers.*
import org.hamcrest.MatcherAssert.*
import org.isoron.uhabits.*

5
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/NumberPanelViewTest.kt
View File

@@ -19,8 +19,9 @@
package org.isoron.uhabits.activities.habits.list.views
import android.support.test.filters.*
import android.support.test.runner.*
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.*
import androidx.test.runner.*
import org.hamcrest.CoreMatchers.*
import org.hamcrest.MatcherAssert.*
import org.isoron.uhabits.*

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.activities.habits.show.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.view.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.activities.habits.show.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.view.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.activities.habits.show.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.view.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.activities.habits.show.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.view.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.activities.habits.show.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.view.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.activities.habits.show.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.view.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/performance/PerformanceTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.performance;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;

2
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt
View File

@@ -19,7 +19,7 @@
package org.isoron.uhabits.regression
import android.support.test.filters.*
import androidx.test.filters.*
import org.isoron.uhabits.*
import org.junit.*

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.tasks;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.tasks;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.widgets;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.widget.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.widgets;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.widget.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.widgets;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.widget.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.widgets;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.widget.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
View File

@@ -19,10 +19,12 @@
package org.isoron.uhabits.widgets;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import android.widget.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;
import org.junit.*;

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
View File

@@ -19,8 +19,10 @@
package org.isoron.uhabits.widgets.views;
import android.support.test.filters.*;
import android.support.test.runner.*;
import androidx.test.filters.*;
import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*;