Rearrange imports

gyrodraw · Dec 19, 2018 · aee5af0 · aee5af0
1 parent 414d863
commit aee5af0
Show file tree

Hide file tree

Showing 28 changed files with 166 additions and 133 deletions.
diff --git a/app/src/main/java/ch/epfl/sweng/SDP/BaseActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/BaseActivity.java
@@ -1,9 +1,5 @@
 package ch.epfl.sweng.SDP;
 
-import static android.view.View.VISIBLE;
-import static ch.epfl.sweng.SDP.firebase.AccountAttributes.STATUS;
-import static ch.epfl.sweng.SDP.utils.OnlineStatus.ONLINE;
-
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Typeface;
@@ -16,6 +12,11 @@
 import android.view.WindowManager;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+
+import com.google.firebase.database.DataSnapshot;
+
+import java.util.HashMap;
+
 import ch.epfl.sweng.SDP.auth.Account;
 import ch.epfl.sweng.SDP.auth.ConstantsWrapper;
 import ch.epfl.sweng.SDP.firebase.FbDatabase;
@@ -27,8 +28,10 @@
 import ch.epfl.sweng.SDP.utils.ImageStorageManager;
 import ch.epfl.sweng.SDP.utils.OnlineStatus;
 import ch.epfl.sweng.SDP.utils.TypefaceLibrary;
-import com.google.firebase.database.DataSnapshot;
-import java.util.HashMap;
+
+import static android.view.View.VISIBLE;
+import static ch.epfl.sweng.SDP.firebase.AccountAttributes.STATUS;
+import static ch.epfl.sweng.SDP.utils.OnlineStatus.ONLINE;
 
 /**
  * Class containing useful and widely used methods. It should be inherited by all the other

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/MainActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/MainActivity.java
@@ -8,14 +8,14 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import ch.epfl.sweng.SDP.home.HomeActivity;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.database.DataSnapshot;
 
 import ch.epfl.sweng.SDP.auth.LoginActivity;
 import ch.epfl.sweng.SDP.firebase.FbDatabase;
 import ch.epfl.sweng.SDP.firebase.OnSuccessValueEventListener;
+import ch.epfl.sweng.SDP.home.HomeActivity;
 import ch.epfl.sweng.SDP.utils.GlideUtils;
 import ch.epfl.sweng.SDP.utils.network.ConnectivityWrapper;
 

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/firebase/FbAuthentication.java b/app/src/main/java/ch/epfl/sweng/SDP/firebase/FbAuthentication.java
@@ -2,9 +2,6 @@
 
 import android.content.Context;
 
-import ch.epfl.sweng.SDP.BaseActivity;
-import ch.epfl.sweng.SDP.R;
-
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
 import com.firebase.ui.auth.AuthUI.IdpConfig.GoogleBuilder;
@@ -14,6 +11,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import ch.epfl.sweng.SDP.BaseActivity;
+import ch.epfl.sweng.SDP.R;
+
 /**
  * Utility wrapper class over {@link FirebaseAuth} and {@link AuthUI}.
  */

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/firebase/FbFunctions.java b/app/src/main/java/ch/epfl/sweng/SDP/firebase/FbFunctions.java
@@ -2,8 +2,6 @@
 
 import android.support.annotation.NonNull;
 
-import ch.epfl.sweng.SDP.auth.Account;
-
 import com.google.android.gms.tasks.Continuation;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.functions.FirebaseFunctions;
@@ -12,6 +10,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import ch.epfl.sweng.SDP.auth.Account;
+
 /**
  * Utility wrapper class over {@link FirebaseFunctions}.
  */

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/RankingFragment.java b/app/src/main/java/ch/epfl/sweng/SDP/game/RankingFragment.java
@@ -1,11 +1,5 @@
 package ch.epfl.sweng.SDP.game;
 
-import static ch.epfl.sweng.SDP.firebase.RoomAttributes.FINISHED;
-import static ch.epfl.sweng.SDP.firebase.RoomAttributes.RANKING;
-import static ch.epfl.sweng.SDP.utils.LayoutUtils.bounceButton;
-import static ch.epfl.sweng.SDP.utils.LayoutUtils.isPointInsideView;
-import static ch.epfl.sweng.SDP.utils.LayoutUtils.pressButton;
-
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Typeface;
@@ -20,6 +14,15 @@
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
+
+import com.google.firebase.database.DataSnapshot;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import ch.epfl.sweng.SDP.R;
 import ch.epfl.sweng.SDP.auth.Account;
 import ch.epfl.sweng.SDP.firebase.FbDatabase;
@@ -31,12 +34,12 @@
 import ch.epfl.sweng.SDP.utils.RankingUtils;
 import ch.epfl.sweng.SDP.utils.SortUtils;
 import ch.epfl.sweng.SDP.utils.TypefaceLibrary;
-import com.google.firebase.database.DataSnapshot;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+
+import static ch.epfl.sweng.SDP.firebase.RoomAttributes.FINISHED;
+import static ch.epfl.sweng.SDP.firebase.RoomAttributes.RANKING;
+import static ch.epfl.sweng.SDP.utils.LayoutUtils.bounceButton;
+import static ch.epfl.sweng.SDP.utils.LayoutUtils.isPointInsideView;
+import static ch.epfl.sweng.SDP.utils.LayoutUtils.pressButton;
 
 /**
  * A custom {@link ListFragment} used for displaying the final ranking at the end of the game.

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/StarAnimationView.java b/app/src/main/java/ch/epfl/sweng/SDP/game/StarAnimationView.java
@@ -10,11 +10,11 @@
 import android.util.AttributeSet;
 import android.view.View;
 
-import ch.epfl.sweng.SDP.R;
-
 import java.util.ArrayList;
 import java.util.Random;
 
+import ch.epfl.sweng.SDP.R;
+
 /**
  * Class representing the animation of stars when a player votes for the current picture.
  */

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/VotingPageActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/game/VotingPageActivity.java
@@ -1,11 +1,5 @@
 package ch.epfl.sweng.SDP.game;
 
-import static ch.epfl.sweng.SDP.firebase.RoomAttributes.RANKING;
-import static ch.epfl.sweng.SDP.firebase.RoomAttributes.STATE;
-import static ch.epfl.sweng.SDP.firebase.RoomAttributes.TIMER;
-import static ch.epfl.sweng.SDP.firebase.RoomAttributes.USERS;
-import static ch.epfl.sweng.SDP.game.LoadingScreenActivity.ROOM_ID;
-
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Build;
@@ -19,6 +13,17 @@
 import android.widget.RatingBar;
 import android.widget.RatingBar.OnRatingBarChangeListener;
 import android.widget.TextView;
+
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.DatabaseReference;
+import com.google.firebase.database.ValueEventListener;
+import com.google.firebase.storage.FirebaseStorage;
+import com.google.firebase.storage.StorageReference;
+
+import java.util.HashMap;
+
 import ch.epfl.sweng.SDP.NoBackPressActivity;
 import ch.epfl.sweng.SDP.R;
 import ch.epfl.sweng.SDP.auth.Account;
@@ -35,14 +40,12 @@
 import ch.epfl.sweng.SDP.utils.ImageSharer;
 import ch.epfl.sweng.SDP.utils.ImageStorageManager;
 import ch.epfl.sweng.SDP.utils.network.ConnectivityWrapper;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
-import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.DatabaseReference;
-import com.google.firebase.database.ValueEventListener;
-import com.google.firebase.storage.FirebaseStorage;
-import com.google.firebase.storage.StorageReference;
-import java.util.HashMap;
+
+import static ch.epfl.sweng.SDP.firebase.RoomAttributes.RANKING;
+import static ch.epfl.sweng.SDP.firebase.RoomAttributes.STATE;
+import static ch.epfl.sweng.SDP.firebase.RoomAttributes.TIMER;
+import static ch.epfl.sweng.SDP.firebase.RoomAttributes.USERS;
+import static ch.epfl.sweng.SDP.game.LoadingScreenActivity.ROOM_ID;
 
 /**
  * Class representing the voting phase of an online game, where players vote for the drawings.

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/DrawingActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/DrawingActivity.java
@@ -1,7 +1,5 @@
 package ch.epfl.sweng.SDP.game.drawing;
 
-import static ch.epfl.sweng.SDP.shop.ColorsShop.getColorIdFromString;
-
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
@@ -15,13 +13,18 @@
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
+
+import com.google.android.gms.common.util.ArrayUtils;
+
+import java.util.LinkedList;
+import java.util.List;
+
 import ch.epfl.sweng.SDP.NoBackPressActivity;
 import ch.epfl.sweng.SDP.R;
 import ch.epfl.sweng.SDP.auth.Account;
 import ch.epfl.sweng.SDP.shop.ShopItem;
-import com.google.android.gms.common.util.ArrayUtils;
-import java.util.LinkedList;
-import java.util.List;
+
+import static ch.epfl.sweng.SDP.shop.ColorsShop.getColorIdFromString;
 
 /**
  * Abstract class representing the drawing page of the game.

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/DrawingItems.java b/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/DrawingItems.java
@@ -8,14 +8,16 @@
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
 import ch.epfl.sweng.SDP.R;
 import ch.epfl.sweng.SDP.game.drawing.items.BumpingItem;
 import ch.epfl.sweng.SDP.game.drawing.items.Item;
 import ch.epfl.sweng.SDP.game.drawing.items.Items;
 import ch.epfl.sweng.SDP.game.drawing.items.RandomItemGenerator;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
 
 /**
  * Utility class containing methods related to the special items mode.

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/DrawingOfflineActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/DrawingOfflineActivity.java
@@ -1,7 +1,5 @@
 package ch.epfl.sweng.SDP.game.drawing;
 
-import static ch.epfl.sweng.SDP.utils.LayoutUtils.isPointInsideView;
-
 import android.os.Bundle;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
@@ -10,14 +8,18 @@
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+
+import java.util.HashMap;
+import java.util.Random;
+
 import ch.epfl.sweng.SDP.R;
 import ch.epfl.sweng.SDP.game.drawing.items.Item;
 import ch.epfl.sweng.SDP.home.HomeActivity;
 import ch.epfl.sweng.SDP.localDatabase.LocalDbForImages;
 import ch.epfl.sweng.SDP.localDatabase.LocalDbHandlerForImages;
 import ch.epfl.sweng.SDP.utils.LayoutUtils;
-import java.util.HashMap;
-import java.util.Random;
+
+import static ch.epfl.sweng.SDP.utils.LayoutUtils.isPointInsideView;
 
 /**
  * Class representing the offline practice mode. The user has the choice of

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/DrawingOnlineActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/DrawingOnlineActivity.java
@@ -1,18 +1,19 @@
 package ch.epfl.sweng.SDP.game.drawing;
 
-import static ch.epfl.sweng.SDP.firebase.RoomAttributes.STATE;
-import static ch.epfl.sweng.SDP.firebase.RoomAttributes.TIMER;
-import static ch.epfl.sweng.SDP.firebase.RoomAttributes.UPLOAD_DRAWING;
-import static ch.epfl.sweng.SDP.game.LoadingScreenActivity.ROOM_ID;
-import static ch.epfl.sweng.SDP.game.WaitingPageActivity.WINNING_WORD;
-import static ch.epfl.sweng.SDP.game.drawing.FeedbackTextView.timeIsUpTextFeedback;
-
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import android.widget.TextView;
+
+import com.google.android.gms.tasks.OnCompleteListener;
+import com.google.android.gms.tasks.Task;
+import com.google.firebase.database.DataSnapshot;
+import com.google.firebase.database.ValueEventListener;
+import com.google.firebase.storage.StorageTask;
+import com.google.firebase.storage.UploadTask.TaskSnapshot;
+
 import ch.epfl.sweng.SDP.R;
 import ch.epfl.sweng.SDP.auth.Account;
 import ch.epfl.sweng.SDP.firebase.FbDatabase;
@@ -22,12 +23,13 @@
 import ch.epfl.sweng.SDP.localDatabase.LocalDbHandlerForImages;
 import ch.epfl.sweng.SDP.matchmaking.GameStates;
 import ch.epfl.sweng.SDP.utils.network.ConnectivityWrapper;
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
-import com.google.firebase.database.DataSnapshot;
-import com.google.firebase.database.ValueEventListener;
-import com.google.firebase.storage.StorageTask;
-import com.google.firebase.storage.UploadTask.TaskSnapshot;
+
+import static ch.epfl.sweng.SDP.firebase.RoomAttributes.STATE;
+import static ch.epfl.sweng.SDP.firebase.RoomAttributes.TIMER;
+import static ch.epfl.sweng.SDP.firebase.RoomAttributes.UPLOAD_DRAWING;
+import static ch.epfl.sweng.SDP.game.LoadingScreenActivity.ROOM_ID;
+import static ch.epfl.sweng.SDP.game.WaitingPageActivity.WINNING_WORD;
+import static ch.epfl.sweng.SDP.game.drawing.FeedbackTextView.timeIsUpTextFeedback;
 
 /**
  * Class representing the drawing phase of an online game in normal mode.

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/DrawingOnlineItemsActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/DrawingOnlineItemsActivity.java
@@ -5,12 +5,12 @@
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
-import ch.epfl.sweng.SDP.R;
-import ch.epfl.sweng.SDP.game.drawing.items.Item;
-
 import java.util.HashMap;
 import java.util.Random;
 
+import ch.epfl.sweng.SDP.R;
+import ch.epfl.sweng.SDP.game.drawing.items.Item;
+
 /**
  * Class representing the drawing phase of an online game in special mode.
  */

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/IntCurver.java b/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/IntCurver.java
@@ -1,9 +1,9 @@
 package ch.epfl.sweng.SDP.game.drawing;
 
-import static ch.epfl.sweng.SDP.utils.Preconditions.checkPrecondition;
-
 import java.util.Arrays;
 
+import static ch.epfl.sweng.SDP.utils.Preconditions.checkPrecondition;
+
 /**
  * This class helps smoothing new cursor position values by remembering older values and returning
  * an average.

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/items/Item.java b/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/items/Item.java
@@ -1,14 +1,15 @@
 package ch.epfl.sweng.SDP.game.drawing.items;
 
-import static ch.epfl.sweng.SDP.utils.Preconditions.checkPrecondition;
-
 import android.content.Context;
 import android.os.Build;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
+
 import ch.epfl.sweng.SDP.R;
 import ch.epfl.sweng.SDP.game.drawing.PaintView;
 
+import static ch.epfl.sweng.SDP.utils.Preconditions.checkPrecondition;
+
 /**
  * Abstract class representing an item.
  */

diff --git a/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/items/RandomItemGenerator.java b/app/src/main/java/ch/epfl/sweng/SDP/game/drawing/items/RandomItemGenerator.java
@@ -1,13 +1,13 @@
 package ch.epfl.sweng.SDP.game.drawing.items;
 
-import ch.epfl.sweng.SDP.game.drawing.PaintView;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Random;
 
+import ch.epfl.sweng.SDP.game.drawing.PaintView;
+
 /**
  * Class representing a random {@link Item} generator.
  */