Skip to content

AndroidX :) #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2019
Merged

AndroidX :) #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 14 additions & 15 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
Expand Down Expand Up @@ -54,20 +54,20 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

// android support libraries
implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion"
implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
implementation "com.android.support:design:$rootProject.supportLibraryVersion"
implementation "com.android.support:support-vector-drawable:$rootProject.supportLibraryVersion"
implementation "com.android.support:animated-vector-drawable:$rootProject.supportLibraryVersion"
implementation "com.android.support.constraint:constraint-layout:$rootProject.constraintLayoutVersion"
implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
implementation "androidx.recyclerview:recyclerview:$rootProject.recyclerViewVersion"
implementation "androidx.cardview:cardview:$rootProject.cardViewVersion"
implementation "com.google.android.material:material:$rootProject.materialVersion"
implementation "androidx.vectordrawable:vectordrawable:$rootProject.vectorDrawableVersion"
implementation "androidx.vectordrawable:vectordrawable-animated:$rootProject.animatedVectorDrawableVersion"
implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayoutVersion"

// network
implementation "com.amitshekhar.android:rx2-android-networking:$rootProject.rx2FastAndroidNetworking"

// database
implementation "android.arch.persistence.room:rxjava2:$rootProject.roomDatabase"
annotationProcessor "android.arch.persistence.room:compiler:$rootProject.roomDatabase"
implementation "androidx.room:room-rxjava2:$rootProject.roomDatabaseVersion"
annotationProcessor "androidx.room:room-compiler:$rootProject.roomDatabaseVersion"

// font
implementation "uk.co.chrisjenx:calligraphy:$rootProject.calligraphyVersion"
Expand Down Expand Up @@ -103,17 +103,16 @@ dependencies {
testAnnotationProcessor "com.google.dagger:dagger-compiler:$rootProject.dagger2Version"

// UI Testing
androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
androidTestImplementation "com.android.support.test.espresso:espresso-intents:$rootProject.espressoVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
androidTestImplementation "androidx.test.espresso:espresso-intents:$rootProject.espressoVersion"
androidTestImplementation "org.mockito:mockito-core:$rootProject.mockitoVersion"
androidTestAnnotationProcessor "com.google.dagger:dagger-compiler:$rootProject.dagger2Version"

// view model
implementation "android.arch.lifecycle:extensions:$rootProject.lifecycle"
annotationProcessor "android.arch.lifecycle:compiler:$rootProject.lifecycle"
implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.lifecycleVersion"
annotationProcessor "androidx.lifecycle:lifecycle-compiler:$rootProject.lifecycleVersion"
}

configurations.all {
resolutionStrategy.force "com.android.support:support-annotations:$supportLibraryVersion"
resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
}
16 changes: 8 additions & 8 deletions app/src/androidTest/java/com/mindorks/framework/mvvm/ui/login/LoginActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

package com.mindorks.framework.mvvm.ui.login;

import static android.support.test.espresso.Espresso.onView;
import static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.test.espresso.matcher.ViewMatchers.withText;

import android.support.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;

import androidx.test.rule.ActivityTestRule;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.mindorks.framework.mvvm.R;
import org.junit.Rule;
import org.junit.Test;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/mindorks/framework/mvvm/ViewModelProviderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.mindorks.framework.mvvm;

import android.arch.lifecycle.ViewModel;
import android.arch.lifecycle.ViewModelProvider;
import androidx.lifecycle.ViewModel;
import androidx.lifecycle.ViewModelProvider;
import com.mindorks.framework.mvvm.data.DataManager;
import com.mindorks.framework.mvvm.ui.about.AboutViewModel;
import com.mindorks.framework.mvvm.ui.feed.FeedViewModel;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/mindorks/framework/mvvm/data/local/db/AppDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package com.mindorks.framework.mvvm.data.local.db;

import android.arch.persistence.room.Database;
import android.arch.persistence.room.RoomDatabase;
import androidx.room.Database;
import androidx.room.RoomDatabase;
import com.mindorks.framework.mvvm.data.local.db.dao.OptionDao;
import com.mindorks.framework.mvvm.data.local.db.dao.QuestionDao;
import com.mindorks.framework.mvvm.data.local.db.dao.UserDao;
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/mindorks/framework/mvvm/data/local/db/dao/OptionDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.mindorks.framework.mvvm.data.local.db.dao;

import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Insert;
import android.arch.persistence.room.OnConflictStrategy;
import android.arch.persistence.room.Query;
import androidx.room.Dao;
import androidx.room.Insert;
import androidx.room.OnConflictStrategy;
import androidx.room.Query;
import com.mindorks.framework.mvvm.data.model.db.Option;
import java.util.List;

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/mindorks/framework/mvvm/data/local/db/dao/QuestionDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.mindorks.framework.mvvm.data.local.db.dao;

import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Insert;
import android.arch.persistence.room.OnConflictStrategy;
import android.arch.persistence.room.Query;
import androidx.room.Dao;
import androidx.room.Insert;
import androidx.room.OnConflictStrategy;
import androidx.room.Query;
import com.mindorks.framework.mvvm.data.model.db.Question;
import java.util.List;

Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/mindorks/framework/mvvm/data/local/db/dao/UserDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

package com.mindorks.framework.mvvm.data.local.db.dao;

import android.arch.persistence.room.Dao;
import android.arch.persistence.room.Delete;
import android.arch.persistence.room.Insert;
import android.arch.persistence.room.OnConflictStrategy;
import android.arch.persistence.room.Query;
import androidx.room.Dao;
import androidx.room.Delete;
import androidx.room.Insert;
import androidx.room.OnConflictStrategy;
import androidx.room.Query;
import com.mindorks.framework.mvvm.data.model.db.User;
import java.util.List;

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/mindorks/framework/mvvm/data/model/db/Option.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.mindorks.framework.mvvm.data.model.db;

import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
import android.arch.persistence.room.ForeignKey;
import android.arch.persistence.room.PrimaryKey;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.ForeignKey;
import androidx.room.PrimaryKey;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/mindorks/framework/mvvm/data/model/db/Question.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package com.mindorks.framework.mvvm.data.model.db;

import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.PrimaryKey;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/mindorks/framework/mvvm/data/model/db/User.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package com.mindorks.framework.mvvm.data.model.db;

import android.arch.persistence.room.ColumnInfo;
import android.arch.persistence.room.Entity;
import android.arch.persistence.room.PrimaryKey;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.PrimaryKey;

/**
* Created by amitshekhar on 07/07/17.
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mindorks/framework/mvvm/di/module/AppModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package com.mindorks.framework.mvvm.di.module;

import android.app.Application;
import android.arch.persistence.room.Room;
import androidx.room.Room;
import android.content.Context;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/mindorks/framework/mvvm/ui/about/AboutFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package com.mindorks.framework.mvvm.ui.about;

import android.arch.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProviders;
import android.os.Bundle;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import com.mindorks.framework.mvvm.BR;
import com.mindorks.framework.mvvm.R;
import com.mindorks.framework.mvvm.ViewModelProviderFactory;
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/mindorks/framework/mvvm/ui/base/BaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
import android.app.ProgressDialog;
import android.content.Context;
import android.content.pm.PackageManager;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.LayoutRes;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.LayoutRes;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import com.mindorks.framework.mvvm.ui.login.LoginActivity;
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/mindorks/framework/mvvm/ui/base/BaseDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.RelativeLayout;
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/java/com/mindorks/framework/mvvm/ui/base/BaseFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
package com.mindorks.framework.mvvm.ui.base;

import android.content.Context;
import android.databinding.DataBindingUtil;
import android.databinding.ViewDataBinding;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ViewDataBinding;
import android.os.Bundle;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import androidx.annotation.LayoutRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mindorks/framework/mvvm/ui/base/BaseViewHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.mindorks.framework.mvvm.ui.base;

import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;

/**
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/mindorks/framework/mvvm/ui/base/BaseViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package com.mindorks.framework.mvvm.ui.base;

import android.arch.lifecycle.ViewModel;
import android.databinding.ObservableBoolean;
import androidx.lifecycle.ViewModel;
import androidx.databinding.ObservableBoolean;
import com.mindorks.framework.mvvm.data.DataManager;
import com.mindorks.framework.mvvm.utils.rx.SchedulerProvider;
import io.reactivex.disposables.CompositeDisposable;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mindorks/framework/mvvm/ui/custom/RoundedImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.support.v7.widget.AppCompatImageView;
import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet;
import android.util.Log;

Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/mindorks/framework/mvvm/ui/feed/FeedActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@

package com.mindorks.framework.mvvm.ui.feed;

import android.arch.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProviders;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.NavUtils;
import android.support.v4.app.TaskStackBuilder;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.Fragment;
import androidx.core.app.NavUtils;
import androidx.core.app.TaskStackBuilder;
import android.view.MenuItem;
import com.mindorks.framework.mvvm.BR;
import com.mindorks.framework.mvvm.R;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/mindorks/framework/mvvm/ui/feed/FeedPagerAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

package com.mindorks.framework.mvvm.ui.feed;

import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import com.mindorks.framework.mvvm.ui.feed.blogs.BlogFragment;
import com.mindorks.framework.mvvm.ui.feed.opensource.OpenSourceFragment;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mindorks/framework/mvvm/ui/feed/blogs/BlogAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import android.content.Intent;
import android.net.Uri;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import com.mindorks.framework.mvvm.data.model.api.BlogResponse;
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/mindorks/framework/mvvm/ui/feed/blogs/BlogFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

package com.mindorks.framework.mvvm.ui.feed.blogs;

import android.arch.lifecycle.ViewModelProviders;
import androidx.lifecycle.ViewModelProviders;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.widget.DefaultItemAnimator;
import android.support.v7.widget.LinearLayoutManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.view.View;
import com.mindorks.framework.mvvm.BR;
import com.mindorks.framework.mvvm.R;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mindorks/framework/mvvm/ui/feed/blogs/BlogFragmentModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.mindorks.framework.mvvm.ui.feed.blogs;

import android.support.v7.widget.LinearLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import com.mindorks.framework.mvvm.data.DataManager;
import com.mindorks.framework.mvvm.utils.rx.SchedulerProvider;
import dagger.Module;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mindorks/framework/mvvm/ui/feed/blogs/BlogItemViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.mindorks.framework.mvvm.ui.feed.blogs;

import android.databinding.ObservableField;
import androidx.databinding.ObservableField;
import com.mindorks.framework.mvvm.data.model.api.BlogResponse;

/**
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/mindorks/framework/mvvm/ui/feed/blogs/BlogViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package com.mindorks.framework.mvvm.ui.feed.blogs;

import android.arch.lifecycle.LiveData;
import android.arch.lifecycle.MutableLiveData;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.MutableLiveData;
import com.mindorks.framework.mvvm.data.DataManager;
import com.mindorks.framework.mvvm.data.model.api.BlogResponse;
import com.mindorks.framework.mvvm.ui.base.BaseViewModel;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/mindorks/framework/mvvm/ui/feed/opensource/OpenSourceAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import android.content.Intent;
import android.net.Uri;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down
Loading