From f64d831e77b532e89343397e204bb01c604ffe3f Mon Sep 17 00:00:00 2001 From: Dan Lew Date: Tue, 15 Dec 2015 15:14:51 -0600 Subject: [PATCH 1/3] Ensured constants are static final (and private if possible) --- .../android/habitica/HabiticaPurchaseVerifier.java | 2 +- .../habitica/ui/adapter/ChatRecyclerViewAdapter.java | 6 +++--- .../ui/adapter/HabitItemRecyclerViewAdapter.java | 4 ++-- .../ui/adapter/SkillTasksRecyclerViewAdapter.java | 2 +- .../habitica/ui/fragments/GemsPurchaseFragment.java | 2 +- .../android/habitica/ui/fragments/TasksFragment.java | 4 ++-- .../android/habitica/userpicture/UserPicture.java | 8 ++++---- .../habitrpgwrapper/lib/models/ChatMessage.java | 2 +- .../habitrpgwrapper/lib/models/tasks/Task.java | 12 ++++++------ 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java b/Habitica/src/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java index 053747583..1e6d3fb0c 100644 --- a/Habitica/src/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java +++ b/Habitica/src/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java @@ -23,7 +23,7 @@ import java.util.Set; public class HabiticaPurchaseVerifier extends BasePurchaseVerifier { private Set purchasedOrderList = new HashSet<>(); - static String PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS"; + private static final String PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS"; private SharedPreferences preferences; public HabiticaPurchaseVerifier(Context context) { diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ChatRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ChatRecyclerViewAdapter.java index 07482ddb2..72340fe3b 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ChatRecyclerViewAdapter.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/ChatRecyclerViewAdapter.java @@ -42,9 +42,9 @@ import de.greenrobot.event.EventBus; * Created by Negue on 20.08.2015. */ public class ChatRecyclerViewAdapter extends RecyclerView.Adapter { - static final int TYPE_DANIEL = 0; - static final int TYPE_NEW_MESSAGE = 1; - static final int TYPE_MESSAGE = 2; + private static final int TYPE_DANIEL = 0; + private static final int TYPE_NEW_MESSAGE = 1; + private static final int TYPE_MESSAGE = 2; private List messages; private Context viewContext; diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java index b47ae0c3a..f1fb9f530 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java @@ -71,8 +71,8 @@ public class HabitItemRecyclerViewAdapter Context context; public int dailyResetOffset; - static final int TYPE_HEADER = 0; - static final int TYPE_CELL = 1; + private static final int TYPE_HEADER = 0; + private static final int TYPE_CELL = 1; private RecyclerView.Adapter parentAdapter; private TagsHelper tagsHelper; private IAdditionalEntries additionalEntries; diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java index 9d4c14f41..ad1a6a55e 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java @@ -30,7 +30,7 @@ public class SkillTasksRecyclerViewAdapter extends RecyclerView.Adapter observableContent; SkillTasksActivity activity; - static final int TYPE_CELL = 1; + private static final int TYPE_CELL = 1; private RecyclerView.Adapter parentAdapter; public SkillTasksRecyclerViewAdapter(String taskType, SkillTasksActivity activity) { diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java index 82cbab636..e8fe52725 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java @@ -30,7 +30,7 @@ import io.fabric.sdk.android.Fabric; */ public class GemsPurchaseFragment extends BaseFragment { - static final int GEMS_TO_ADD = 21; + private static final int GEMS_TO_ADD = 21; private BillingRequests billingRequests; diff --git a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java index dc4c2a527..3225dfd92 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java +++ b/Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java @@ -71,8 +71,8 @@ import retrofit.client.Response; public class TasksFragment extends BaseFragment implements OnCheckedChangeListener { - static final int TASK_CREATED_RESULT = 1; - static final int TASK_UPDATED_RESULT = 2; + private static final int TASK_CREATED_RESULT = 1; + private static final int TASK_UPDATED_RESULT = 2; public ViewPager viewPager; Drawer filterDrawer; diff --git a/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java index 6697703dc..72823613f 100644 --- a/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java +++ b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java @@ -22,10 +22,10 @@ import java.util.concurrent.atomic.AtomicInteger; public class UserPicture { - static Integer width = 140; - static Integer height = 147; - static Integer compactWidth = 103; - static Integer compactHeight = 90; + private static final Integer width = 140; + private static final Integer height = 147; + private static final Integer compactWidth = 103; + private static final Integer compactHeight = 90; private HabitRPGUser user; private ImageView imageView; diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java index bca4aa70b..9acec34d2 100644 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java +++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java @@ -11,7 +11,7 @@ import java.util.HashMap; */ public class ChatMessage { - static HashMap contributorColorDict; + private static final HashMap contributorColorDict; static { contributorColorDict = new HashMap<>(); diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java index fab32482e..d7ec4d302 100644 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java +++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/tasks/Task.java @@ -27,12 +27,12 @@ import java.util.concurrent.TimeUnit; @ModelContainer @Table(databaseName = HabitDatabase.NAME) public class Task extends BaseModel { - public static String TYPE_HABIT = "habit"; - public static String TYPE_TODO = "todo"; - public static String TYPE_DAILY = "daily"; - public static String TYPE_REWARD = "reward"; - public static String FREQUENCY_WEEKLY = "weekly"; - public static String FREQUENCY_DAILY = "daily"; + public static final String TYPE_HABIT = "habit"; + public static final String TYPE_TODO = "todo"; + public static final String TYPE_DAILY = "daily"; + public static final String TYPE_REWARD = "reward"; + public static final String FREQUENCY_WEEKLY = "weekly"; + public static final String FREQUENCY_DAILY = "daily"; @Column From a1a8fb7384193f0dc19aea639ed6e99e06f350cf Mon Sep 17 00:00:00 2001 From: Dan Lew Date: Tue, 15 Dec 2015 15:16:05 -0600 Subject: [PATCH 2/3] Ensured constants use ALL_CAPS naming, as per Java convention --- .../habitica/userpicture/UserPicture.java | 12 ++++---- .../lib/models/ChatMessage.java | 28 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java index 72823613f..a19564f90 100644 --- a/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java +++ b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java @@ -22,10 +22,10 @@ import java.util.concurrent.atomic.AtomicInteger; public class UserPicture { - private static final Integer width = 140; - private static final Integer height = 147; - private static final Integer compactWidth = 103; - private static final Integer compactHeight = 90; + private static final Integer WIDTH = 140; + private static final Integer HEIGHT = 147; + private static final Integer COMPACT_WIDTH = 103; + private static final Integer COMPACT_HEIGHT = 90; private HabitRPGUser user; private ImageView imageView; @@ -63,7 +63,7 @@ public class UserPicture { BitmapFactory.Options o = new BitmapFactory.Options(); o.inScaled = false; - Bitmap res = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); + Bitmap res = Bitmap.createBitmap(WIDTH, HEIGHT, Bitmap.Config.ARGB_8888); Canvas myCanvas = new Canvas(res); Integer layerNumber = 0; for (Object layer : this.layers) { @@ -74,7 +74,7 @@ public class UserPicture { layerNumber++; } if (!this.hasPetMount) { - res = Bitmap.createBitmap(res, 25, 18, compactWidth, compactHeight); + res = Bitmap.createBitmap(res, 25, 18, COMPACT_WIDTH, COMPACT_HEIGHT); } BitmapUtils.saveToFile(currentCacheFileName, res); if (this.imageView != null) { diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java index 9acec34d2..4640c2f18 100644 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java +++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/ChatMessage.java @@ -11,20 +11,20 @@ import java.util.HashMap; */ public class ChatMessage { - private static final HashMap contributorColorDict; + private static final HashMap CONTRIBUTOR_COLOR_DICT; static { - contributorColorDict = new HashMap<>(); - contributorColorDict.put(0, R.color.contributor_0); - contributorColorDict.put(1, R.color.contributor_1); - contributorColorDict.put(2, R.color.contributor_2); - contributorColorDict.put(3, R.color.contributor_3); - contributorColorDict.put(4, R.color.contributor_4); - contributorColorDict.put(5, R.color.contributor_5); - contributorColorDict.put(6, R.color.contributor_6); - contributorColorDict.put(7, R.color.contributor_7); - contributorColorDict.put(8, R.color.contributor_mod); - contributorColorDict.put(9, R.color.contributor_staff); + CONTRIBUTOR_COLOR_DICT = new HashMap<>(); + CONTRIBUTOR_COLOR_DICT.put(0, R.color.contributor_0); + CONTRIBUTOR_COLOR_DICT.put(1, R.color.contributor_1); + CONTRIBUTOR_COLOR_DICT.put(2, R.color.contributor_2); + CONTRIBUTOR_COLOR_DICT.put(3, R.color.contributor_3); + CONTRIBUTOR_COLOR_DICT.put(4, R.color.contributor_4); + CONTRIBUTOR_COLOR_DICT.put(5, R.color.contributor_5); + CONTRIBUTOR_COLOR_DICT.put(6, R.color.contributor_6); + CONTRIBUTOR_COLOR_DICT.put(7, R.color.contributor_7); + CONTRIBUTOR_COLOR_DICT.put(8, R.color.contributor_mod); + CONTRIBUTOR_COLOR_DICT.put(9, R.color.contributor_staff); } @@ -51,8 +51,8 @@ public class ChatMessage { if (contributor != null) { - if (contributorColorDict.containsKey(contributor.level)) { - rColor = contributorColorDict.get(contributor.level); + if (CONTRIBUTOR_COLOR_DICT.containsKey(contributor.level)) { + rColor = CONTRIBUTOR_COLOR_DICT.get(contributor.level); } } From d169613478efea6bd72b69e21eb9a0469451d813 Mon Sep 17 00:00:00 2001 From: Dan Lew Date: Tue, 15 Dec 2015 15:16:37 -0600 Subject: [PATCH 3/3] Converted Integer constants -> int Integer isn't necessary and actually just slows things down due to autoboxing. --- .../android/habitica/userpicture/UserPicture.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java index a19564f90..d6cb22bc9 100644 --- a/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java +++ b/Habitica/src/com/habitrpg/android/habitica/userpicture/UserPicture.java @@ -22,10 +22,10 @@ import java.util.concurrent.atomic.AtomicInteger; public class UserPicture { - private static final Integer WIDTH = 140; - private static final Integer HEIGHT = 147; - private static final Integer COMPACT_WIDTH = 103; - private static final Integer COMPACT_HEIGHT = 90; + private static final int WIDTH = 140; + private static final int HEIGHT = 147; + private static final int COMPACT_WIDTH = 103; + private static final int COMPACT_HEIGHT = 90; private HabitRPGUser user; private ImageView imageView;