Merge pull request #9 from sabiou/androidx-migration

Migration AndroidX: Refactoring des packages
sabiou · Jun 9, 2020 · e0254d0 · e0254d0
2 parents 16a9579 + 2f96397
commit e0254d0
Show file tree

Hide file tree

Showing 25 changed files with 123 additions and 101 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/xyz/godi/popularmovies/adapters/MovieAdapter.java b/app/src/main/java/xyz/godi/popularmovies/adapters/MovieAdapter.java
@@ -4,13 +4,14 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.squareup.picasso.Picasso;
 
 import java.util.List;

diff --git a/app/src/main/java/xyz/godi/popularmovies/adapters/ReviewAdapter.java b/app/src/main/java/xyz/godi/popularmovies/adapters/ReviewAdapter.java
@@ -1,13 +1,14 @@
 package xyz.godi.popularmovies.adapters;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/app/src/main/java/xyz/godi/popularmovies/adapters/TrailerAdapter.java b/app/src/main/java/xyz/godi/popularmovies/adapters/TrailerAdapter.java
@@ -5,14 +5,15 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.squareup.picasso.Picasso;
 
 import java.util.ArrayList;

diff --git a/app/src/main/java/xyz/godi/popularmovies/data/MovieDAO.java b/app/src/main/java/xyz/godi/popularmovies/data/MovieDAO.java
@@ -1,11 +1,11 @@
 package xyz.godi.popularmovies.data;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Delete;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.Query;
-import android.arch.persistence.room.OnConflictStrategy;
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
 
 import java.util.List;
 

diff --git a/app/src/main/java/xyz/godi/popularmovies/data/MovieDataBase.java b/app/src/main/java/xyz/godi/popularmovies/data/MovieDataBase.java
@@ -1,10 +1,12 @@
 package xyz.godi.popularmovies.data;
 
-import android.arch.persistence.room.Database;
-import android.arch.persistence.room.Room;
-import android.arch.persistence.room.RoomDatabase;
+
 import android.content.Context;
 
+import androidx.room.Database;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
+
 import xyz.godi.popularmovies.model.Movie;
 
 /**

diff --git a/app/src/main/java/xyz/godi/popularmovies/data/MovieRepository.java b/app/src/main/java/xyz/godi/popularmovies/data/MovieRepository.java
@@ -1,9 +1,10 @@
 package xyz.godi.popularmovies.data;
 
 import android.app.Application;
-import android.arch.lifecycle.LiveData;
 import android.os.AsyncTask;
 
+import androidx.lifecycle.LiveData;
+
 import java.util.List;
 
 import xyz.godi.popularmovies.model.Movie;

diff --git a/app/src/main/java/xyz/godi/popularmovies/model/Movie.java b/app/src/main/java/xyz/godi/popularmovies/model/Movie.java
@@ -1,10 +1,11 @@
 package xyz.godi.popularmovies.model;
 
-import android.arch.persistence.room.Entity;
-import android.arch.persistence.room.PrimaryKey;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import androidx.room.Entity;
+import androidx.room.PrimaryKey;
+
 import com.google.gson.annotations.SerializedName;
 
 @Entity

diff --git a/app/src/main/java/xyz/godi/popularmovies/ui/AboutActivity.java b/app/src/main/java/xyz/godi/popularmovies/ui/AboutActivity.java
@@ -1,14 +1,12 @@
 package xyz.godi.popularmovies.ui;
 
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.TextView;
 
-import butterknife.BindView;
+import androidx.appcompat.app.AppCompatActivity;
+
 import de.psdev.licensesdialog.LicensesDialog;
 import de.psdev.licensesdialog.licenses.ApacheSoftwareLicense20;
-import de.psdev.licensesdialog.licenses.GnuLesserGeneralPublicLicense21;
 import de.psdev.licensesdialog.model.Notice;
 import de.psdev.licensesdialog.model.Notices;
 import xyz.godi.popularmovies.R;

diff --git a/app/src/main/java/xyz/godi/popularmovies/ui/DetailsActivity.java b/app/src/main/java/xyz/godi/popularmovies/ui/DetailsActivity.java
@@ -4,24 +4,24 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.os.Parcelable;
-import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ShareCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.RatingBar;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.app.ShareCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
 import com.squareup.picasso.Picasso;
 
 import java.util.List;
@@ -33,16 +33,15 @@
 import retrofit2.Callback;
 import retrofit2.Response;
 import xyz.godi.popularmovies.R;
+import xyz.godi.popularmovies.adapters.ReviewAdapter;
+import xyz.godi.popularmovies.adapters.TrailerAdapter;
 import xyz.godi.popularmovies.api.ApiResponse;
 import xyz.godi.popularmovies.api.RetrofitClient;
 import xyz.godi.popularmovies.api.Service;
 import xyz.godi.popularmovies.data.MovieDataBase;
-import xyz.godi.popularmovies.model.FavoriteMovie;
 import xyz.godi.popularmovies.model.Movie;
 import xyz.godi.popularmovies.model.Review;
 import xyz.godi.popularmovies.model.Video;
-import xyz.godi.popularmovies.adapters.ReviewAdapter;
-import xyz.godi.popularmovies.adapters.TrailerAdapter;
 import xyz.godi.popularmovies.utils.AppBarStateChangeListener;
 import xyz.godi.popularmovies.utils.Config;
 import xyz.godi.popularmovies.utils.ConstantsUtils;

diff --git a/app/src/main/java/xyz/godi/popularmovies/ui/FavoritesActivity.java b/app/src/main/java/xyz/godi/popularmovies/ui/FavoritesActivity.java
@@ -1,27 +1,26 @@
 package xyz.godi.popularmovies.ui;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.res.Configuration;
-import android.os.Handler;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
+import android.os.Handler;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import java.util.List;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import xyz.godi.popularmovies.R;
-import xyz.godi.popularmovies.model.Movie;
 import xyz.godi.popularmovies.adapters.MovieAdapter;
+import xyz.godi.popularmovies.model.Movie;
 import xyz.godi.popularmovies.viewModel.MovieViewModel;
 
 public class FavoritesActivity extends AppCompatActivity {

diff --git a/app/src/main/java/xyz/godi/popularmovies/ui/MainActivity.java b/app/src/main/java/xyz/godi/popularmovies/ui/MainActivity.java
@@ -1,5 +1,6 @@
 package xyz.godi.popularmovies.ui;
 
+import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -8,12 +9,6 @@
 import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.design.widget.Snackbar;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.Menu;
@@ -24,6 +19,13 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import com.google.android.material.snackbar.Snackbar;
+
 import java.util.List;
 
 import butterknife.BindView;

diff --git a/app/src/main/java/xyz/godi/popularmovies/utils/AppBarStateChangeListener.java b/app/src/main/java/xyz/godi/popularmovies/utils/AppBarStateChangeListener.java
@@ -1,6 +1,6 @@
 package xyz.godi.popularmovies.utils;
 
-import android.support.design.widget.AppBarLayout;
+import com.google.android.material.appbar.AppBarLayout;
 
 public abstract class AppBarStateChangeListener implements AppBarLayout.OnOffsetChangedListener {
 

diff --git a/app/src/main/java/xyz/godi/popularmovies/utils/GridSpacingDecoration.java b/app/src/main/java/xyz/godi/popularmovies/utils/GridSpacingDecoration.java
@@ -1,9 +1,10 @@
 package xyz.godi.popularmovies.utils;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 public class GridSpacingDecoration extends RecyclerView.ItemDecoration {
 
     private int spanCount;

diff --git a/app/src/main/java/xyz/godi/popularmovies/utils/ItemOffsetDecoration.java b/app/src/main/java/xyz/godi/popularmovies/utils/ItemOffsetDecoration.java
@@ -2,11 +2,12 @@
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.annotation.DimenRes;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import androidx.annotation.DimenRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class ItemOffsetDecoration extends RecyclerView.ItemDecoration {
 
     private int mItemOffset;

diff --git a/app/src/main/java/xyz/godi/popularmovies/utils/MovieExec.java b/app/src/main/java/xyz/godi/popularmovies/utils/MovieExec.java
@@ -1,6 +1,6 @@
 package xyz.godi.popularmovies.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.concurrent.Executor;
 

diff --git a/app/src/main/java/xyz/godi/popularmovies/viewModel/MovieViewModel.java b/app/src/main/java/xyz/godi/popularmovies/viewModel/MovieViewModel.java
@@ -1,9 +1,10 @@
 package xyz.godi.popularmovies.viewModel;
 
 import android.app.Application;
-import android.arch.lifecycle.AndroidViewModel;
-import android.arch.lifecycle.LiveData;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
 
 import java.util.List;
 

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
@@ -48,4 +48,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_favorites.xml b/app/src/main/res/layout/activity_favorites.xml
@@ -22,18 +22,18 @@
         android:layout_gravity="center"
         android:textAppearance="?android:textAppearanceMedium" />
 
-    <android.support.v4.widget.SwipeRefreshLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:id="@+id/refresh"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/movierecycler"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-        </android.support.v7.widget.RecyclerView>
+        </androidx.recyclerview.widget.RecyclerView>
 
-    </android.support.v4.widget.SwipeRefreshLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
 </FrameLayout>