diff --git a/app/src/main/java/ch/epfl/sweng/SDP/BaseActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/BaseActivity.java index e176f309..579a6ae5 100644 --- 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 index 8dc9d18a..cdf168b7 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/MainActivity.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/MainActivity.java @@ -8,7 +8,6 @@ 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; @@ -16,6 +15,7 @@ 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 index 48bcf76c..60c8b233 100644 --- 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 index c82e95c3..dfcef4a8 100644 --- 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 index 4e04f17f..bd56b96a 100644 --- 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 index 23f516e6..75b7630c 100644 --- 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 index 4c4644d1..62d8b32d 100644 --- 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 index 7b87c53c..e41c760a 100644 --- 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 index a0efa39e..d53935e8 100644 --- 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 index 41bd3399..d11b4384 100644 --- 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 index cdd5a2b6..7fa22eba 100644 --- 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 index b7a569bc..30cdc807 100644 --- 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 index 534103e0..f48d2259 100644 --- 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 index a581bbb0..2536a3ac 100644 --- 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 index 4a99d0ad..c3056d78 100644 --- 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. */ diff --git a/app/src/main/java/ch/epfl/sweng/SDP/home/HomeActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/home/HomeActivity.java index edcbd8c4..8101067c 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/home/HomeActivity.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/home/HomeActivity.java @@ -1,22 +1,5 @@ package ch.epfl.sweng.SDP.home; -import static ch.epfl.sweng.SDP.firebase.AccountAttributes.FRIENDS; -import static ch.epfl.sweng.SDP.firebase.AccountAttributes.USERNAME; -import static ch.epfl.sweng.SDP.firebase.FbDatabase.checkForDatabaseError; -import static ch.epfl.sweng.SDP.firebase.FbDatabase.getAccountAttribute; -import static ch.epfl.sweng.SDP.utils.LayoutUtils.bounceButton; -import static ch.epfl.sweng.SDP.utils.LayoutUtils.getLeagueColorId; -import static ch.epfl.sweng.SDP.utils.LayoutUtils.getLeagueImageId; -import static ch.epfl.sweng.SDP.utils.LayoutUtils.getLeagueTextId; -import static ch.epfl.sweng.SDP.utils.LayoutUtils.getMainAmplitude; -import static ch.epfl.sweng.SDP.utils.LayoutUtils.getMainFrequency; -import static ch.epfl.sweng.SDP.utils.LayoutUtils.isPointInsideView; -import static ch.epfl.sweng.SDP.utils.LayoutUtils.pressButton; -import static ch.epfl.sweng.SDP.utils.OnlineStatus.OFFLINE; -import static ch.epfl.sweng.SDP.utils.OnlineStatus.ONLINE; -import static ch.epfl.sweng.SDP.utils.OnlineStatus.changeOnlineStatus; -import static ch.epfl.sweng.SDP.utils.OnlineStatus.changeToOfflineOnDisconnect; - import android.app.Dialog; import android.content.Context; import android.content.Intent; @@ -33,6 +16,14 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; + +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.DatabaseError; +import com.google.firebase.database.DatabaseReference; +import com.google.firebase.database.ValueEventListener; + import ch.epfl.sweng.SDP.MainActivity; import ch.epfl.sweng.SDP.NoBackPressActivity; import ch.epfl.sweng.SDP.R; @@ -52,12 +43,23 @@ import ch.epfl.sweng.SDP.utils.LayoutUtils.AnimMode; import ch.epfl.sweng.SDP.utils.OnSwipeTouchListener; 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.DatabaseError; -import com.google.firebase.database.DatabaseReference; -import com.google.firebase.database.ValueEventListener; + +import static ch.epfl.sweng.SDP.firebase.AccountAttributes.FRIENDS; +import static ch.epfl.sweng.SDP.firebase.AccountAttributes.USERNAME; +import static ch.epfl.sweng.SDP.firebase.FbDatabase.checkForDatabaseError; +import static ch.epfl.sweng.SDP.firebase.FbDatabase.getAccountAttribute; +import static ch.epfl.sweng.SDP.utils.LayoutUtils.bounceButton; +import static ch.epfl.sweng.SDP.utils.LayoutUtils.getLeagueColorId; +import static ch.epfl.sweng.SDP.utils.LayoutUtils.getLeagueImageId; +import static ch.epfl.sweng.SDP.utils.LayoutUtils.getLeagueTextId; +import static ch.epfl.sweng.SDP.utils.LayoutUtils.getMainAmplitude; +import static ch.epfl.sweng.SDP.utils.LayoutUtils.getMainFrequency; +import static ch.epfl.sweng.SDP.utils.LayoutUtils.isPointInsideView; +import static ch.epfl.sweng.SDP.utils.LayoutUtils.pressButton; +import static ch.epfl.sweng.SDP.utils.OnlineStatus.OFFLINE; +import static ch.epfl.sweng.SDP.utils.OnlineStatus.ONLINE; +import static ch.epfl.sweng.SDP.utils.OnlineStatus.changeOnlineStatus; +import static ch.epfl.sweng.SDP.utils.OnlineStatus.changeToOfflineOnDisconnect; /** * Class representing the homepage of the app. diff --git a/app/src/main/java/ch/epfl/sweng/SDP/home/battleLog/BattleLogActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/home/battleLog/BattleLogActivity.java index 4dca64b5..675eef7b 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/home/battleLog/BattleLogActivity.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/home/battleLog/BattleLogActivity.java @@ -7,6 +7,8 @@ import android.widget.ScrollView; import android.widget.TextView; +import java.util.List; + import ch.epfl.sweng.SDP.NoBackPressActivity; import ch.epfl.sweng.SDP.R; import ch.epfl.sweng.SDP.localDatabase.LocalDbForGameResults; @@ -14,8 +16,6 @@ import ch.epfl.sweng.SDP.utils.GlideUtils; import ch.epfl.sweng.SDP.utils.LayoutUtils; -import java.util.List; - /** * Class representing the battle log. */ diff --git a/app/src/main/java/ch/epfl/sweng/SDP/home/battleLog/GameResultLayout.java b/app/src/main/java/ch/epfl/sweng/SDP/home/battleLog/GameResultLayout.java index aa89bd45..52c01875 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/home/battleLog/GameResultLayout.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/home/battleLog/GameResultLayout.java @@ -1,7 +1,5 @@ package ch.epfl.sweng.SDP.home.battleLog; -import static ch.epfl.sweng.SDP.utils.RankingUtils.addSignToNumber; - import android.content.Context; import android.content.res.Resources; import android.graphics.Typeface; @@ -10,9 +8,13 @@ import android.widget.LinearLayout; import android.widget.LinearLayout.LayoutParams; import android.widget.TextView; + +import java.util.List; + import ch.epfl.sweng.SDP.R; import ch.epfl.sweng.SDP.utils.TypefaceLibrary; -import java.util.List; + +import static ch.epfl.sweng.SDP.utils.RankingUtils.addSignToNumber; /** * Class that manages the view part of GameResult. diff --git a/app/src/main/java/ch/epfl/sweng/SDP/home/leaderboard/Leaderboard.java b/app/src/main/java/ch/epfl/sweng/SDP/home/leaderboard/Leaderboard.java index 82ebca20..e1328998 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/home/leaderboard/Leaderboard.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/home/leaderboard/Leaderboard.java @@ -1,19 +1,22 @@ package ch.epfl.sweng.SDP.home.leaderboard; -import static ch.epfl.sweng.SDP.firebase.FbDatabase.getAllFriends; -import static ch.epfl.sweng.SDP.firebase.FbDatabase.getUserById; -import static ch.epfl.sweng.SDP.firebase.FbDatabase.getUsers; - import android.content.Context; import android.support.annotation.NonNull; import android.widget.LinearLayout; + +import com.google.firebase.database.DataSnapshot; + +import java.util.LinkedList; +import java.util.TreeSet; + import ch.epfl.sweng.SDP.auth.Account; import ch.epfl.sweng.SDP.firebase.OnSuccessValueEventListener; import ch.epfl.sweng.SDP.home.FriendsRequestState; import ch.epfl.sweng.SDP.utils.TestUsers; -import com.google.firebase.database.DataSnapshot; -import java.util.LinkedList; -import java.util.TreeSet; + +import static ch.epfl.sweng.SDP.firebase.FbDatabase.getAllFriends; +import static ch.epfl.sweng.SDP.firebase.FbDatabase.getUserById; +import static ch.epfl.sweng.SDP.firebase.FbDatabase.getUsers; /** * Helper class to manage and display data from Firebase. diff --git a/app/src/main/java/ch/epfl/sweng/SDP/localDatabase/LocalDbForGameResults.java b/app/src/main/java/ch/epfl/sweng/SDP/localDatabase/LocalDbForGameResults.java index fe5fd59e..e48700a8 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/localDatabase/LocalDbForGameResults.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/localDatabase/LocalDbForGameResults.java @@ -2,10 +2,10 @@ import android.content.Context; -import ch.epfl.sweng.SDP.home.battleLog.GameResult; - import java.util.List; +import ch.epfl.sweng.SDP.home.battleLog.GameResult; + /** * Interface representing a generic handler for the local database, responsible of operations * involving {@link GameResult}. diff --git a/app/src/main/java/ch/epfl/sweng/SDP/matchmaking/Matchmaker.java b/app/src/main/java/ch/epfl/sweng/SDP/matchmaking/Matchmaker.java index d4ef105b..f0c7d384 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/matchmaking/Matchmaker.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/matchmaking/Matchmaker.java @@ -1,11 +1,11 @@ package ch.epfl.sweng.SDP.matchmaking; +import com.google.android.gms.tasks.Task; + import ch.epfl.sweng.SDP.auth.Account; import ch.epfl.sweng.SDP.firebase.FbDatabase; import ch.epfl.sweng.SDP.firebase.FbFunctions; -import com.google.android.gms.tasks.Task; - /** * Singleton class that represents the matchmaker. */ diff --git a/app/src/main/java/ch/epfl/sweng/SDP/shop/ShopActivity.java b/app/src/main/java/ch/epfl/sweng/SDP/shop/ShopActivity.java index 80ff7544..1be9e0e0 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/shop/ShopActivity.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/shop/ShopActivity.java @@ -1,7 +1,5 @@ package ch.epfl.sweng.SDP.shop; -import static ch.epfl.sweng.SDP.utils.LayoutUtils.bounceButton; - import android.app.Dialog; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -12,6 +10,11 @@ import android.widget.LinearLayout; import android.widget.LinearLayout.LayoutParams; import android.widget.TextView; + +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; + import ch.epfl.sweng.SDP.NoBackPressActivity; import ch.epfl.sweng.SDP.R; import ch.epfl.sweng.SDP.auth.Account; @@ -19,9 +22,8 @@ import ch.epfl.sweng.SDP.utils.GlideUtils; import ch.epfl.sweng.SDP.utils.LayoutUtils; import ch.epfl.sweng.SDP.utils.OnSwipeTouchListener; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; + +import static ch.epfl.sweng.SDP.utils.LayoutUtils.bounceButton; /** * This activity represents the shop and allows the purchase of items such as colors. diff --git a/app/src/main/java/ch/epfl/sweng/SDP/shop/ShopItem.java b/app/src/main/java/ch/epfl/sweng/SDP/shop/ShopItem.java index cab8f684..7af9ced6 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/shop/ShopItem.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/shop/ShopItem.java @@ -11,12 +11,12 @@ import android.widget.RelativeLayout; import android.widget.TextView; -import ch.epfl.sweng.SDP.R; -import ch.epfl.sweng.SDP.utils.TypefaceLibrary; - import java.util.Comparator; import java.util.Objects; +import ch.epfl.sweng.SDP.R; +import ch.epfl.sweng.SDP.utils.TypefaceLibrary; + import static ch.epfl.sweng.SDP.shop.ColorsShop.getColorIdFromString; import static ch.epfl.sweng.SDP.utils.Preconditions.checkPrecondition; diff --git a/app/src/main/java/ch/epfl/sweng/SDP/utils/GlideUtils.java b/app/src/main/java/ch/epfl/sweng/SDP/utils/GlideUtils.java index 718175b3..ff7b83fd 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/utils/GlideUtils.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/utils/GlideUtils.java @@ -2,11 +2,11 @@ import android.widget.ImageView; +import com.bumptech.glide.Glide; + import ch.epfl.sweng.SDP.BaseActivity; import ch.epfl.sweng.SDP.R; -import com.bumptech.glide.Glide; - /** * Utility class used to display animations using Glide. */ diff --git a/app/src/main/java/ch/epfl/sweng/SDP/utils/ImageSharer.java b/app/src/main/java/ch/epfl/sweng/SDP/utils/ImageSharer.java index 34b715da..517312e2 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/utils/ImageSharer.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/utils/ImageSharer.java @@ -7,8 +7,7 @@ import android.support.annotation.NonNull; import android.support.annotation.VisibleForTesting; import android.util.Log; -import ch.epfl.sweng.SDP.auth.Account; -import ch.epfl.sweng.SDP.firebase.FbStorage; + import com.facebook.share.model.ShareLinkContent; import com.facebook.share.model.SharePhoto; import com.facebook.share.model.SharePhotoContent; @@ -19,6 +18,9 @@ import com.google.firebase.storage.StorageReference; import com.google.firebase.storage.UploadTask; +import ch.epfl.sweng.SDP.auth.Account; +import ch.epfl.sweng.SDP.firebase.FbStorage; + /** * This class is responsible for sharing images to Facebook. */ diff --git a/app/src/main/java/ch/epfl/sweng/SDP/utils/ImageStorageManager.java b/app/src/main/java/ch/epfl/sweng/SDP/utils/ImageStorageManager.java index d62b95f5..5f0fef7e 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/utils/ImageStorageManager.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/utils/ImageStorageManager.java @@ -1,7 +1,5 @@ package ch.epfl.sweng.SDP.utils; -import static android.support.v4.content.ContextCompat.checkSelfPermission; - import android.app.Activity; import android.content.Context; import android.content.pm.PackageManager; @@ -13,12 +11,16 @@ import android.support.v4.app.ActivityCompat; import android.util.Log; import android.widget.Toast; + +import java.io.File; +import java.io.FileOutputStream; + import ch.epfl.sweng.SDP.R; import ch.epfl.sweng.SDP.auth.Account; import ch.epfl.sweng.SDP.localDatabase.LocalDbForImages; import ch.epfl.sweng.SDP.localDatabase.LocalDbHandlerForImages; -import java.io.File; -import java.io.FileOutputStream; + +import static android.support.v4.content.ContextCompat.checkSelfPermission; /** * This class is responsible for saving images to the device storage. diff --git a/app/src/main/java/ch/epfl/sweng/SDP/utils/TestUsers.java b/app/src/main/java/ch/epfl/sweng/SDP/utils/TestUsers.java index 4d91b6a6..22a8f3fe 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/utils/TestUsers.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/utils/TestUsers.java @@ -1,11 +1,11 @@ package ch.epfl.sweng.SDP.utils; -import static ch.epfl.sweng.SDP.utils.Preconditions.checkPrecondition; - import java.util.Arrays; import java.util.Collections; import java.util.List; +import static ch.epfl.sweng.SDP.utils.Preconditions.checkPrecondition; + /** * This class contains the IDs of all users on Firebase that were created for testing purposes. It * implements a method for checking if a given user is a real or a test user. diff --git a/app/src/main/java/ch/epfl/sweng/SDP/utils/network/ConnectivityWrapper.java b/app/src/main/java/ch/epfl/sweng/SDP/utils/network/ConnectivityWrapper.java index 8a0d02fb..99ef172a 100644 --- a/app/src/main/java/ch/epfl/sweng/SDP/utils/network/ConnectivityWrapper.java +++ b/app/src/main/java/ch/epfl/sweng/SDP/utils/network/ConnectivityWrapper.java @@ -1,16 +1,17 @@ package ch.epfl.sweng.SDP.utils.network; -import static ch.epfl.sweng.SDP.firebase.RoomAttributes.ONLINE_STATUS; - import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.support.annotation.VisibleForTesting; + import ch.epfl.sweng.SDP.firebase.FbDatabase; import ch.epfl.sweng.SDP.game.WaitingPageActivity; +import static ch.epfl.sweng.SDP.firebase.RoomAttributes.ONLINE_STATUS; + /** * A wrapper class that registers and unregisters the network receiver. It provides * also utility methods to update or check connectivity status.