Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}
}
dependencies {
classpath 'io.fabric.tools:gradle:1.25.4'
classpath 'io.fabric.tools:gradle:1.26.1'
}
}

Expand All @@ -18,15 +18,15 @@ apply from: 'checkstyle.gradle'
preBuild.dependsOn('Checkstyle')

android {
compileSdkVersion 27
compileSdkVersion 28

defaultConfig {
applicationId "co.lateralview.myapp"
minSdkVersion 21
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true

renderscriptTargetApi 19
Expand Down Expand Up @@ -77,24 +77,26 @@ android {
}

ext {
version_support = '27.1.1'
version_butterknife = "8.8.1"
version_appcompat_ = "1.0.2"
version_material_design = "1.0.0"
version_constraint_layout = "2.0.0-alpha3"
version_butterknife = "9.0.0-rc2"
version_rxjava = '2.1.14'
version_rxandroid = '2.0.2'
version_rxandroid = '2.1.0'
version_dagger = "2.16"
version_retrofit = "2.4.0"
version_leakcanary = "1.5.4"
version_leakcanary = "1.6.2"
version_permission = '3.2.0'
version_firebase = '16.0.0'
version_glide = '4.7.1'
version_glide = '4.8.0'
}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "com.android.support:recyclerview-v7:$version_support"
implementation "com.android.support:design:$version_support"
implementation "com.android.support:support-v13:$version_support"
implementation "com.android.support:appcompat-v7:$version_support"

implementation "androidx.appcompat:appcompat:$version_appcompat_"
implementation "androidx.constraintlayout:constraintlayout:$version_constraint_layout"
implementation "com.google.android.material:material:$version_material_design"

// Dagger 2 - Dependency Injection
implementation "com.google.dagger:dagger:$version_dagger"
Expand Down Expand Up @@ -149,8 +151,8 @@ dependencies {
annotationProcessor "com.github.hotchemi:permissionsdispatcher-processor:$version_permission"

testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.17.0'
testImplementation "org.robolectric:robolectric:3.8"
testImplementation 'org.mockito:mockito-core:2.23.0'
testImplementation "org.robolectric:robolectric:4.0.2"

// Friendly Http Inspector through separate App
debugImplementation 'com.readystatesoftware.chuck:library:1.1.0'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.lateralview.myapp.domain.util;

import android.support.design.widget.Snackbar;
import com.google.android.material.snackbar.Snackbar;

import java.io.Serializable;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import android.media.ExifInterface;
import android.net.Uri;
import android.provider.MediaStore;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;

import java.io.File;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.app.Activity;
import android.net.Uri;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;

import com.soundcloud.android.crop.Crop;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.support.v4.app.Fragment;
import androidx.fragment.app.Fragment;

import java.io.File;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public InternetManager(Context context) {

public Boolean isOnline() {
NetworkInfo netInfo = mConnectivityManager.getActiveNetworkInfo();
return netInfo != null && netInfo.isConnectedOrConnecting();
return netInfo != null && netInfo.isConnected();
}

public boolean onWifi() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.support.v4.app.ShareCompat;
import androidx.core.app.ShareCompat;

import co.lateralview.myapp.infraestructure.manager.implementation.FileManagerImpl;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Environment;
import android.support.annotation.Nullable;
import android.support.v4.content.FileProvider;

import java.io.ByteArrayOutputStream;
import java.io.Closeable;
Expand All @@ -16,6 +14,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;

import androidx.annotation.Nullable;
import androidx.core.content.FileProvider;
import co.lateralview.myapp.infraestructure.manager.interfaces.FileManager;

public class FileManagerImpl implements FileManager {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v4.content.WakefulBroadcastReceiver;
import androidx.legacy.content.WakefulBroadcastReceiver;

import co.lateralview.myapp.application.MyApp;
import co.lateralview.myapp.infraestructure.pushNotification.processor.base.NotificationType;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.content.Context;
import android.content.Intent;
import android.media.RingtoneManager;
import android.support.v4.app.NotificationCompat;
import androidx.core.app.NotificationCompat;

import java.io.Serializable;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,19 @@
import android.content.IntentFilter;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import android.widget.Toast;

import com.google.android.material.snackbar.Snackbar;

import java.lang.ref.WeakReference;
import java.util.ArrayList;
import java.util.List;

import javax.inject.Inject;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import co.lateralview.myapp.R;
import co.lateralview.myapp.application.AppComponent;
import co.lateralview.myapp.application.MyApp;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.lateralview.myapp.ui.activities.base.fragments;

import android.support.v4.app.DialogFragment;
import androidx.fragment.app.DialogFragment;

import co.lateralview.myapp.application.AppComponent;
import co.lateralview.myapp.ui.activities.base.Base;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import android.app.Fragment;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.View;

import javax.inject.Inject;

import androidx.annotation.Nullable;
import co.lateralview.myapp.application.AppComponent;
import co.lateralview.myapp.infraestructure.manager.interfaces.ImageManager;
import co.lateralview.myapp.ui.activities.base.Base;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
import android.app.DatePickerDialog;
import android.app.Dialog;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.widget.DatePicker;

import java.util.Calendar;
import java.util.Date;

import androidx.fragment.app.DialogFragment;

public class DatePickerDialogFragment extends DialogFragment implements
DatePickerDialog.OnDateSetListener {
public static final String TAG = "DatePickerDialogFragment";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.content.Context;
import android.content.DialogInterface;
import android.support.v7.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;

public final class DialogUtils {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import android.app.Activity;
import android.graphics.Color;
import android.support.design.widget.Snackbar;
import com.google.android.material.snackbar.Snackbar;
import android.view.View;
import android.widget.TextView;

Expand Down Expand Up @@ -65,7 +65,7 @@ public static Snackbar createSnackBar(View view, String description, String acti
}

TextView textView = (TextView) snackBarView.findViewById(
android.support.design.R.id.snackbar_text);
com.google.android.material.R.id.snackbar_text);

textView.setOnClickListener(v -> snackbar.dismiss());

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package co.lateralview.myapp.ui.util;

import android.app.Activity;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.ActionMenuView;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;

import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.ActionMenuView;
import androidx.appcompat.widget.Toolbar;
import co.lateralview.myapp.R;

public final class ToolbarUtils {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/co/lateralview/myapp/ui/util/UIUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.os.Build;
import android.support.v4.content.ContextCompat;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.TextAppearanceSpan;
Expand All @@ -30,6 +29,8 @@
import java.net.HttpURLConnection;
import java.net.URL;

import androidx.core.content.ContextCompat;

public abstract class UIUtils {
public static void setStatusBarColor(Activity activity, int color) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">

<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

Expand All @@ -15,9 +15,9 @@
android:layout_height="wrap_content"
layout="@layout/toolbar"/>

</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>

<android.support.v4.widget.NestedScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
Expand All @@ -26,14 +26,14 @@
android:id="@+id/contentMain"
layout="@layout/content_main"/>

</android.support.v4.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>

<android.support.design.widget.FloatingActionButton
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/fab_margin"
android:layout_gravity="bottom|end"
android:src="@android:drawable/ic_input_add"/>

</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/toolbar.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/toolbar_without_elevation.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
Expand Down
Loading