isoron
/
loop
mirror of https://github.com/iSoron/uhabits.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
pull/605/head
Alinson S. Xavier 6 years ago
parent 889ce9faef 58d8c799ce
commit 22fcecb48c
191 changed files with 473 additions and 323 deletions
Show Stats Download Patch File Download Diff File

4
android/android-base/build.gradle
Unescape View File

@ -23,8 +23,8 @@ android {
dependencies { dependencies {
implementation "com.google.dagger:dagger:$DAGGER_VERSION" implementation "com.google.dagger:dagger:$DAGGER_VERSION"
implementation "com.android.support:design:$SUPPORT_LIBRARY_VERSION" implementation 'com.google.android.material:material:1.0.0'
implementation "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION" implementation 'androidx.appcompat:appcompat:1.0.0'
implementation "org.apache.commons:commons-lang3:3.5" implementation "org.apache.commons:commons-lang3:3.5"
annotationProcessor "com.google.dagger:dagger-compiler:$DAGGER_VERSION" annotationProcessor "com.google.dagger:dagger-compiler:$DAGGER_VERSION"

3
android/android-base/src/main/java/org/isoron/androidbase/AndroidBugReporter.java
Unescape View File

@ -21,9 +21,10 @@ package org.isoron.androidbase;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.view.*; import android.view.*;
import androidx.annotation.NonNull;
import java.io.*; import java.io.*;
import java.text.*; import java.text.*;
import java.util.*; import java.util.*;

6
android/android-base/src/main/java/org/isoron/androidbase/AndroidDirFinder.java
Unescape View File

@ -20,8 +20,10 @@
package org.isoron.androidbase; package org.isoron.androidbase;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.support.v4.content.*; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.*;
import android.util.*; import android.util.*;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;

3
android/android-base/src/main/java/org/isoron/androidbase/BaseExceptionHandler.java
Unescape View File

@ -19,7 +19,8 @@
package org.isoron.androidbase; package org.isoron.androidbase;
import android.support.annotation.*; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.isoron.androidbase.activities.*; import org.isoron.androidbase.activities.*;

3
android/android-base/src/main/java/org/isoron/androidbase/SSLContextProvider.java
Unescape View File

@ -20,9 +20,8 @@
package org.isoron.androidbase; package org.isoron.androidbase;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import org.isoron.androidbase.*; import androidx.annotation.NonNull;
import java.io.*; import java.io.*;
import java.security.*; import java.security.*;

5
android/android-base/src/main/java/org/isoron/androidbase/activities/BaseActivity.java
Unescape View File

@ -21,8 +21,9 @@ package org.isoron.androidbase.activities;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.support.v7.app.*; import androidx.annotation.Nullable;
import androidx.appcompat.app.*;
import android.view.*; import android.view.*;
import org.isoron.androidbase.*; import org.isoron.androidbase.*;

4
android/android-base/src/main/java/org/isoron/androidbase/activities/BaseMenu.java
Unescape View File

@ -19,9 +19,11 @@
package org.isoron.androidbase.activities; package org.isoron.androidbase.activities;
import android.support.annotation.*;
import android.view.*; import android.view.*;
import androidx.annotation.MenuRes;
import androidx.annotation.NonNull;
/** /**
* Base class for all the menus in the application. * Base class for all the menus in the application.
* <p> * <p>

6
android/android-base/src/main/java/org/isoron/androidbase/activities/BaseRootView.java
Unescape View File

@ -20,8 +20,10 @@
package org.isoron.androidbase.activities; package org.isoron.androidbase.activities;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.support.v7.widget.Toolbar; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;

20
android/android-base/src/main/java/org/isoron/androidbase/activities/BaseScreen.java
Unescape View File

@ -24,15 +24,19 @@ import android.graphics.*;
import android.graphics.drawable.*; import android.graphics.drawable.*;
import android.net.*; import android.net.*;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.support.design.widget.*; import androidx.annotation.NonNull;
import android.support.v4.content.res.*; import androidx.annotation.Nullable;
import android.support.v7.app.*; import androidx.annotation.StringRes;
import android.support.v7.view.ActionMode; import androidx.core.content.res.*;
import android.support.v7.widget.Toolbar; import androidx.appcompat.app.*;
import androidx.appcompat.view.ActionMode;
import androidx.appcompat.widget.Toolbar;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import com.google.android.material.snackbar.Snackbar;
import org.isoron.androidbase.*; import org.isoron.androidbase.*;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;
@ -40,7 +44,7 @@ import java.io.*;
import static android.os.Build.VERSION.SDK_INT; import static android.os.Build.VERSION.SDK_INT;
import static android.os.Build.VERSION_CODES.LOLLIPOP; import static android.os.Build.VERSION_CODES.LOLLIPOP;
import static android.support.v4.content.FileProvider.getUriForFile; import static androidx.core.content.FileProvider.getUriForFile;
/** /**
* Base class for all screens in the application. * Base class for all screens in the application.
@ -214,7 +218,7 @@ public class BaseScreen
if (snackbar == null) if (snackbar == null)
{ {
snackbar = Snackbar.make(rootView, stringId, Snackbar.LENGTH_SHORT); snackbar = Snackbar.make(rootView, stringId, Snackbar.LENGTH_SHORT);
int tvId = android.support.design.R.id.snackbar_text; int tvId = R.id.snackbar_text;
TextView tv = (TextView) snackbar.getView().findViewById(tvId); TextView tv = (TextView) snackbar.getView().findViewById(tvId);
tv.setTextColor(Color.WHITE); tv.setTextColor(Color.WHITE);
} }

5
android/android-base/src/main/java/org/isoron/androidbase/activities/BaseSelectionMenu.java
Unescape View File

@ -19,8 +19,9 @@
package org.isoron.androidbase.activities; package org.isoron.androidbase.activities;
import android.support.annotation.*; import androidx.annotation.NonNull;
import android.support.v7.view.ActionMode; import androidx.annotation.Nullable;
import androidx.appcompat.view.ActionMode;
import android.view.*; import android.view.*;
/** /**

4
android/android-base/src/main/java/org/isoron/androidbase/utils/FileUtils.java
Unescape View File

@ -20,9 +20,11 @@
package org.isoron.androidbase.utils; package org.isoron.androidbase.utils;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import java.io.*; import java.io.*;
public abstract class FileUtils public abstract class FileUtils

6
android/android-base/src/main/java/org/isoron/androidbase/utils/InterfaceUtils.java
Unescape View File

@ -22,8 +22,10 @@ package org.isoron.androidbase.utils;
import android.content.*; import android.content.*;
import android.content.res.*; import android.content.res.*;
import android.graphics.*; import android.graphics.*;
import android.support.annotation.*;
import android.support.v4.view.*; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;

4
android/android-base/src/main/java/org/isoron/androidbase/utils/StyledResources.java
Unescape View File

@ -22,7 +22,9 @@ package org.isoron.androidbase.utils;
import android.content.*; import android.content.*;
import android.content.res.*; import android.content.res.*;
import android.graphics.drawable.*; import android.graphics.drawable.*;
import android.support.annotation.*;
import androidx.annotation.AttrRes;
import androidx.annotation.NonNull;
import org.isoron.androidbase.*; import org.isoron.androidbase.*;

2
android/android-pickers/build.gradle
Unescape View File

@ -20,5 +20,5 @@ android {
} }
dependencies { dependencies {
implementation "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION" implementation 'androidx.appcompat:appcompat:1.0.0'
} }

4
android/android-pickers/src/main/java/com/android/colorpicker/ColorPickerDialog.java
Unescape View File

@ -18,8 +18,8 @@ package com.android.colorpicker;
import android.app.*; import android.app.*;
import android.os.*; import android.os.*;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;

8
android/android-pickers/src/main/java/com/android/datetimepicker/date/MonthView.java
Unescape View File

@ -21,13 +21,15 @@ import android.content.res.*;
import android.graphics.*; import android.graphics.*;
import android.graphics.Paint.*; import android.graphics.Paint.*;
import android.os.*; import android.os.*;
import android.support.v4.view.*; import androidx.core.view.*;
import android.support.v4.view.accessibility.*; import androidx.core.view.accessibility.*;
import android.support.v4.widget.*; import androidx.core.widget.*;
import android.text.format.*; import android.text.format.*;
import android.view.*; import android.view.*;
import android.view.accessibility.*; import android.view.accessibility.*;
import androidx.customview.widget.ExploreByTouchHelper;
import com.android.*; import com.android.*;
import com.android.datetimepicker.*; import com.android.datetimepicker.*;
import com.android.datetimepicker.date.MonthAdapter.*; import com.android.datetimepicker.date.MonthAdapter.*;

2
android/android-pickers/src/main/java/com/android/datetimepicker/time/TimePickerDialog.java
Unescape View File

@ -23,7 +23,7 @@ import android.app.*;
import android.content.*; import android.content.*;
import android.content.res.*; import android.content.res.*;
import android.os.*; import android.os.*;
import android.support.v7.app.*; import androidx.appcompat.app.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.view.View.*; import android.view.View.*;

6
android/gradle.properties
Unescape View File

@ -1,5 +1,5 @@
VERSION_CODE = 49 VERSION_CODE = 50
VERSION_NAME = 1.8.6 VERSION_NAME = 1.8.7
MIN_SDK_VERSION = 21 MIN_SDK_VERSION = 21
TARGET_SDK_VERSION = 29 TARGET_SDK_VERSION = 29
@ -14,3 +14,5 @@ BUILD_TOOLS_VERSION = 3.5.3
org.gradle.parallel=false org.gradle.parallel=false
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms2048m -Xmx2048m -XX:MaxPermSize=2048m org.gradle.jvmargs=-Xms2048m -Xmx2048m -XX:MaxPermSize=2048m
android.useAndroidX=true
android.enableJetifier=true

24
android/uhabits-android/build.gradle
Unescape View File

@ -31,7 +31,7 @@ android {
targetSdkVersion TARGET_SDK_VERSION as Integer targetSdkVersion TARGET_SDK_VERSION as Integer
applicationId "org.isoron.uhabits" applicationId "org.isoron.uhabits"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {
@ -76,10 +76,10 @@ dependencies {
implementation project(":android-base") implementation project(":android-base")
implementation project(":android-pickers") implementation project(":android-pickers")
implementation "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION" implementation 'androidx.appcompat:appcompat:1.0.0'
implementation "com.android.support:design:$SUPPORT_LIBRARY_VERSION" implementation 'com.google.android.material:material:1.0.0'
implementation "com.android.support:preference-v14:$SUPPORT_LIBRARY_VERSION" implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation "com.android.support:support-v4:$SUPPORT_LIBRARY_VERSION" implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation "com.github.paolorotolo:appintro:3.4.0" implementation "com.github.paolorotolo:appintro:3.4.0"
implementation "com.google.dagger:dagger:$DAGGER_VERSION" implementation "com.google.dagger:dagger:$DAGGER_VERSION"
implementation "com.jakewharton:butterknife:8.6.1-SNAPSHOT" implementation "com.jakewharton:butterknife:8.6.1-SNAPSHOT"
@ -91,19 +91,19 @@ dependencies {
compileOnly "javax.annotation:jsr250-api:1.0" compileOnly "javax.annotation:jsr250-api:1.0"
compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" compileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION" kapt "com.google.dagger:dagger-compiler:$DAGGER_VERSION"
kapt "com.jakewharton:butterknife-compiler:9.0.0" kapt "com.jakewharton:butterknife-compiler:10.2.1"
annotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" annotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
androidTestImplementation "com.android.support.test.espresso:espresso-contrib:2.2.2" androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.0'
androidTestImplementation "com.android.support.test.espresso:espresso-core:2.2.2" androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
androidTestImplementation "com.android.support.test.uiautomator:uiautomator-v18:2.1.1" androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
androidTestImplementation "com.google.dagger:dagger:$DAGGER_VERSION" androidTestImplementation "com.google.dagger:dagger:$DAGGER_VERSION"
androidTestImplementation "com.linkedin.testbutler:test-butler-library:1.3.1" androidTestImplementation "com.linkedin.testbutler:test-butler-library:1.3.1"
androidTestCompileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" androidTestCompileOnly "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
androidTestAnnotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION" androidTestAnnotationProcessor "com.google.auto.factory:auto-factory:$AUTO_FACTORY_VERSION"
androidTestImplementation "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION" androidTestImplementation 'androidx.annotation:annotation:1.0.0'
androidTestImplementation "com.android.support.test:rules:0.5" androidTestImplementation 'androidx.test:rules:1.1.1'
androidTestImplementation "com.android.support.test:runner:0.5" androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation "com.google.guava:guava:24.1-android" androidTestImplementation "com.google.guava:guava:24.1-android"
androidTestImplementation project(":uhabits-core") androidTestImplementation project(":uhabits-core")
kaptAndroidTest "com.google.dagger:dagger-compiler:$DAGGER_VERSION" kaptAndroidTest "com.google.dagger:dagger-compiler:$DAGGER_VERSION"

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

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

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

@ -20,7 +20,8 @@
package org.isoron.uhabits; package org.isoron.uhabits;
import android.content.*; import android.content.*;
import android.support.test.uiautomator.*;
import androidx.test.uiautomator.*;
import com.linkedin.android.testbutler.*; 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.isoron.uhabits.core.utils.*;
import org.junit.*; import org.junit.*;
import static android.support.test.InstrumentationRegistry.*; import static androidx.test.InstrumentationRegistry.getContext;
import static android.support.test.uiautomator.UiDevice.*; import static androidx.test.InstrumentationRegistry.getTargetContext;
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
import static androidx.test.uiautomator.UiDevice.*;
public class BaseUserInterfaceTest public class BaseUserInterfaceTest
{ {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -19,7 +19,7 @@
package org.isoron.uhabits.acceptance.steps; 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 android.os.Build.VERSION.SDK_INT;
import static junit.framework.Assert.*; import static junit.framework.Assert.*;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -19,8 +19,10 @@
package org.isoron.uhabits.activities.habits.list.views; package org.isoron.uhabits.activities.habits.list.views;
import android.support.test.filters.*; import androidx.test.filters.*;
import android.support.test.runner.*; import androidx.test.runner.*;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.core.ui.screens.habits.list.*; 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
Unescape View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -19,7 +19,7 @@
package org.isoron.uhabits.regression package org.isoron.uhabits.regression
import android.support.test.filters.* import androidx.test.filters.*
import org.isoron.uhabits.* import org.isoron.uhabits.*
import org.isoron.uhabits.acceptance.steps.CommonSteps.* import org.isoron.uhabits.acceptance.steps.CommonSteps.*
import org.isoron.uhabits.acceptance.steps.CommonSteps.Screen.* import org.isoron.uhabits.acceptance.steps.CommonSteps.Screen.*

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
android/uhabits-android/src/main/AndroidManifest.xml
Unescape View File

@ -210,7 +210,7 @@
</receiver> </receiver>
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="org.isoron.uhabits" android:authorities="org.isoron.uhabits"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true">

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/AndroidThemeSwitcher.kt
Unescape View File

@ -21,7 +21,7 @@ package org.isoron.uhabits.activities
import android.content.res.Configuration.* import android.content.res.Configuration.*
import android.os.Build.VERSION.* import android.os.Build.VERSION.*
import android.support.v4.content.* import androidx.core.content.*
import org.isoron.androidbase.activities.* import org.isoron.androidbase.activities.*
import org.isoron.uhabits.* import org.isoron.uhabits.*
import org.isoron.uhabits.core.preferences.* import org.isoron.uhabits.core.preferences.*

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutRootView.java
Unescape View File

@ -20,9 +20,10 @@
package org.isoron.uhabits.activities.about; package org.isoron.uhabits.activities.about;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.NonNull;
import org.isoron.androidbase.activities.*; import org.isoron.androidbase.activities.*;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.BuildConfig; import org.isoron.uhabits.BuildConfig;

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/about/AboutScreen.java
Unescape View File

@ -19,9 +19,10 @@
package org.isoron.uhabits.activities.about; package org.isoron.uhabits.activities.about;
import android.support.annotation.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.NonNull;
import org.isoron.androidbase.activities.*; import org.isoron.androidbase.activities.*;
import org.isoron.uhabits.core.ui.screens.about.*; import org.isoron.uhabits.core.ui.screens.about.*;
import org.isoron.uhabits.intents.*; import org.isoron.uhabits.intents.*;

5
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.java
Unescape View File

@ -20,8 +20,9 @@
package org.isoron.uhabits.activities.common.dialogs; package org.isoron.uhabits.activities.common.dialogs;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.support.v7.app.*; import androidx.annotation.NonNull;
import androidx.appcompat.app.*;
import com.google.auto.factory.*; import com.google.auto.factory.*;

8
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.java
Unescape View File

@ -22,9 +22,11 @@ package org.isoron.uhabits.activities.common.dialogs;
import android.app.*; import android.app.*;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.support.v7.app.AlertDialog; import androidx.annotation.NonNull;
import android.support.v7.app.*; import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.*;
import android.util.*; import android.util.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt
Unescape View File

@ -20,7 +20,7 @@
package org.isoron.uhabits.activities.common.dialogs package org.isoron.uhabits.activities.common.dialogs
import android.content.* import android.content.*
import android.support.v7.app.* import androidx.appcompat.app.*
import android.text.* import android.text.*
import android.view.* import android.view.*
import android.view.inputmethod.* import android.view.inputmethod.*

8
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.java
Unescape View File

@ -22,10 +22,10 @@ package org.isoron.uhabits.activities.common.dialogs;
import android.app.Dialog; import android.app.Dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.support.v7.app.AppCompatDialogFragment; import androidx.appcompat.app.AppCompatDialogFragment;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.core.models.WeekdayList; import org.isoron.uhabits.core.models.WeekdayList;

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
Unescape View File

@ -21,9 +21,11 @@ package org.isoron.uhabits.activities.common.views;
import android.content.*; import android.content.*;
import android.graphics.*; import android.graphics.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.activities.habits.list.views.*; import org.isoron.uhabits.activities.habits.list.views.*;

5
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
Unescape View File

@ -20,9 +20,10 @@
package org.isoron.uhabits.activities.common.views; package org.isoron.uhabits.activities.common.views;
import android.os.*; import android.os.*;
import android.support.v4.os.*; import androidx.core.os.*;
import androidx.customview.view.AbsSavedState;
public class BundleSavedState extends android.support.v4.view.AbsSavedState public class BundleSavedState extends AbsSavedState
{ {
public static final Parcelable.Creator<BundleSavedState> CREATOR = public static final Parcelable.Creator<BundleSavedState> CREATOR =
ParcelableCompat.newCreator( ParcelableCompat.newCreator(

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/FrequencyChart.java
Unescape View File

@ -21,9 +21,10 @@ package org.isoron.uhabits.activities.common.views;
import android.content.*; import android.content.*;
import android.graphics.*; import android.graphics.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import androidx.annotation.NonNull;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
Unescape View File

@ -22,10 +22,12 @@ package org.isoron.uhabits.activities.common.views;
import android.content.*; import android.content.*;
import android.graphics.*; import android.graphics.*;
import android.graphics.Paint.*; import android.graphics.Paint.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/RingView.java
Unescape View File

@ -21,11 +21,12 @@ package org.isoron.uhabits.activities.common.views;
import android.content.*; import android.content.*;
import android.graphics.*; import android.graphics.*;
import android.support.annotation.*;
import android.text.*; import android.text.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import androidx.annotation.Nullable;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.utils.*; import org.isoron.uhabits.utils.*;

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/ScoreChart.java
Unescape View File

@ -21,9 +21,11 @@ package org.isoron.uhabits.activities.common.views;
import android.content.*; import android.content.*;
import android.graphics.*; import android.graphics.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;

6
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialog.java
Unescape View File

@ -22,8 +22,10 @@ package org.isoron.uhabits.activities.habits.edit;
import android.app.*; import android.app.*;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.support.v7.app.*; import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.*;
import android.text.format.*; import android.text.format.*;
import android.view.*; import android.view.*;

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitDialogFactory.java
Unescape View File

@ -20,7 +20,8 @@
package org.isoron.uhabits.activities.habits.edit; package org.isoron.uhabits.activities.habits.edit;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import androidx.annotation.NonNull;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;

7
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ExampleEditText.java
Unescape View File

@ -20,11 +20,12 @@
package org.isoron.uhabits.activities.habits.edit.views; package org.isoron.uhabits.activities.habits.edit.views;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.text.*; import android.text.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.widget.*;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatEditText;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
@ -35,7 +36,7 @@ import static org.isoron.uhabits.utils.AttributeSetUtils.*;
* An EditText that shows an example usage when there is no text * An EditText that shows an example usage when there is no text
* currently set. The example disappears when the widget gains focus. * currently set. The example disappears when the widget gains focus.
*/ */
public class ExampleEditText extends EditText public class ExampleEditText extends AppCompatEditText
implements View.OnFocusChangeListener implements View.OnFocusChangeListener
{ {

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/FrequencyPanel.java
Unescape View File

@ -22,11 +22,13 @@ package org.isoron.uhabits.activities.habits.edit.views;
import android.annotation.*; import android.annotation.*;
import android.content.*; import android.content.*;
import android.content.res.*; import android.content.res.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/NameDescriptionPanel.java
Unescape View File

@ -22,11 +22,13 @@ package org.isoron.uhabits.activities.habits.edit.views;
import android.content.*; import android.content.*;
import android.content.res.*; import android.content.res.*;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.activities.common.views.*; import org.isoron.uhabits.activities.common.views.*;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/ReminderPanel.java
Unescape View File

@ -21,11 +21,13 @@ package org.isoron.uhabits.activities.habits.edit.views;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.datetimepicker.time.*; import com.android.datetimepicker.time.*;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/views/TargetPanel.java
Unescape View File

@ -21,11 +21,13 @@ package org.isoron.uhabits.activities.habits.edit.views;
import android.content.*; import android.content.*;
import android.content.res.*; import android.content.res.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.view.*; import android.view.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import java.text.DecimalFormat; import java.text.DecimalFormat;

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsRootView.kt
Unescape View File

@ -22,7 +22,7 @@ package org.isoron.uhabits.activities.habits.list
import android.content.* import android.content.*
import android.os.Build.VERSION.* import android.os.Build.VERSION.*
import android.os.Build.VERSION_CODES.* import android.os.Build.VERSION_CODES.*
import android.support.v7.widget.Toolbar import androidx.appcompat.widget.Toolbar
import android.view.ViewGroup.LayoutParams.* import android.view.ViewGroup.LayoutParams.*
import android.widget.* import android.widget.*
import org.isoron.androidbase.activities.* import org.isoron.androidbase.activities.*

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
Unescape View File

@ -21,7 +21,7 @@ package org.isoron.uhabits.activities.habits.list
import android.app.* import android.app.*
import android.content.* import android.content.*
import android.support.annotation.* import androidx.annotation.*
import dagger.* import dagger.*
import org.isoron.androidbase.activities.* import org.isoron.androidbase.activities.*
import org.isoron.androidbase.utils.* import org.isoron.androidbase.utils.*

7
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListAdapter.java
Unescape View File

@ -19,10 +19,13 @@
package org.isoron.uhabits.activities.habits.list.views; package org.isoron.uhabits.activities.habits.list.views;
import android.support.annotation.*; import androidx.annotation.NonNull;
import android.support.v7.widget.*; import androidx.annotation.Nullable;
import androidx.appcompat.widget.*;
import android.view.*; import android.view.*;
import androidx.recyclerview.widget.RecyclerView;
import org.isoron.androidbase.activities.*; import org.isoron.androidbase.activities.*;
import org.isoron.uhabits.activities.habits.list.*; import org.isoron.uhabits.activities.habits.list.*;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;

6
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardListView.kt
Unescape View File

@ -21,9 +21,9 @@ package org.isoron.uhabits.activities.habits.list.views
import android.content.* import android.content.*
import android.os.* import android.os.*
import android.support.v7.widget.* import androidx.appcompat.widget.*
import android.support.v7.widget.helper.* import androidx.recyclerview.widget.*
import android.support.v7.widget.helper.ItemTouchHelper.* import androidx.recyclerview.widget.ItemTouchHelper.*
import android.view.* import android.view.*
import com.google.auto.factory.* import com.google.auto.factory.*
import dagger.* import dagger.*

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardViewHolder.kt
Unescape View File

@ -19,7 +19,8 @@
package org.isoron.uhabits.activities.habits.list.views package org.isoron.uhabits.activities.habits.list.views
import android.support.v7.widget.* import androidx.appcompat.widget.*
import android.view.* import android.view.*
import androidx.recyclerview.widget.RecyclerView
class HabitCardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) class HabitCardViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)

5
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitRootView.java
Unescape View File

@ -21,8 +21,9 @@ package org.isoron.uhabits.activities.habits.show;
import android.content.*; import android.content.*;
import android.os.*; import android.os.*;
import android.support.annotation.*;
import android.support.v7.widget.*; import androidx.annotation.NonNull;
import androidx.appcompat.widget.*;
import org.isoron.androidbase.activities.*; import org.isoron.androidbase.activities.*;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
Unescape View File

@ -19,7 +19,7 @@
package org.isoron.uhabits.activities.habits.show; package org.isoron.uhabits.activities.habits.show;
import android.support.annotation.*; import androidx.annotation.NonNull;
import org.isoron.androidbase.activities.*; import org.isoron.androidbase.activities.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenu.java
Unescape View File

@ -19,9 +19,10 @@
package org.isoron.uhabits.activities.habits.show; package org.isoron.uhabits.activities.habits.show;
import android.support.annotation.*;
import android.view.*; import android.view.*;
import androidx.annotation.NonNull;
import org.isoron.androidbase.activities.*; import org.isoron.androidbase.activities.*;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.core.preferences.Preferences; import org.isoron.uhabits.core.preferences.Preferences;

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/BarCard.java
Unescape View File

@ -20,10 +20,11 @@
package org.isoron.uhabits.activities.habits.show.views; package org.isoron.uhabits.activities.habits.show.views;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.Nullable;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.activities.common.views.*; import org.isoron.uhabits.activities.common.views.*;

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCard.java
Unescape View File

@ -20,10 +20,11 @@
package org.isoron.uhabits.activities.habits.show.views; package org.isoron.uhabits.activities.habits.show.views;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.Nullable;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.activities.common.views.*; import org.isoron.uhabits.activities.common.views.*;

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HabitCard.java
Unescape View File

@ -20,10 +20,12 @@
package org.isoron.uhabits.activities.habits.show.views; package org.isoron.uhabits.activities.habits.show.views;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;
import org.isoron.uhabits.core.models.memory.*; import org.isoron.uhabits.core.models.memory.*;

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/HistoryCard.java
Unescape View File

@ -20,10 +20,11 @@
package org.isoron.uhabits.activities.habits.show.views; package org.isoron.uhabits.activities.habits.show.views;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.Nullable;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.activities.common.views.*; import org.isoron.uhabits.activities.common.views.*;

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/OverviewCard.java
Unescape View File

@ -20,12 +20,12 @@
package org.isoron.uhabits.activities.habits.show.views; package org.isoron.uhabits.activities.habits.show.views;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.NonNull;
import org.isoron.androidbase.utils.*; import org.isoron.androidbase.utils.*;
import org.isoron.uhabits.*;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.activities.common.views.*; import org.isoron.uhabits.activities.common.views.*;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;

4
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/ScoreCard.java
Unescape View File

@ -20,10 +20,12 @@
package org.isoron.uhabits.activities.habits.show.views; package org.isoron.uhabits.activities.habits.show.views;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.widget.*; import android.widget.*;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.activities.common.views.*; import org.isoron.uhabits.activities.common.views.*;

2
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/views/StreakCard.java
Unescape View File

@ -20,11 +20,9 @@
package org.isoron.uhabits.activities.habits.show.views; package org.isoron.uhabits.activities.habits.show.views;
import android.content.*; import android.content.*;
import android.support.annotation.*;
import android.util.*; import android.util.*;
import android.widget.*; import android.widget.*;
import org.isoron.uhabits.*;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.activities.common.views.*; import org.isoron.uhabits.activities.common.views.*;
import org.isoron.uhabits.core.models.*; import org.isoron.uhabits.core.models.*;

8
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.java
Unescape View File

@ -24,10 +24,14 @@ import android.content.*;
import android.net.*; import android.net.*;
import android.os.*; import android.os.*;
import android.provider.*; import android.provider.*;
import android.support.annotation.*;
import android.support.v7.preference.*;
import android.util.*; import android.util.*;
import androidx.annotation.Nullable;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
import org.isoron.uhabits.R; import org.isoron.uhabits.R;
import org.isoron.uhabits.*; import org.isoron.uhabits.*;
import org.isoron.uhabits.core.preferences.*; import org.isoron.uhabits.core.preferences.*;

4
android/uhabits-android/src/main/java/org/isoron/uhabits/automation/EditSettingRootView.kt
Unescape View File

@ -21,8 +21,8 @@ package org.isoron.uhabits.automation
import android.R.layout.* import android.R.layout.*
import android.content.* import android.content.*
import android.support.v7.widget.* import androidx.appcompat.widget.*
import android.support.v7.widget.Toolbar import androidx.appcompat.widget.Toolbar
import android.widget.* import android.widget.*
import butterknife.* import butterknife.*
import org.isoron.androidbase.activities.* import org.isoron.androidbase.activities.*

2
android/uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt
Unescape View File

@ -64,7 +64,7 @@ class PendingIntentFactory
FLAG_UPDATE_CURRENT) FLAG_UPDATE_CURRENT)
fun showHabit(habit: Habit): PendingIntent = fun showHabit(habit: Habit): PendingIntent =
android.support.v4.app.TaskStackBuilder androidx.core.app.TaskStackBuilder
.create(context) .create(context)
.addNextIntentWithParentStack( .addNextIntentWithParentStack(
intentFactory.startShowHabitActivity( intentFactory.startShowHabitActivity(

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save