app: Do code cleanup

app/src/main/java/com/hippo/widget/BatteryView.java

@@ -73,6 +73,15 @@ public class BatteryView extends AppCompatTextView {
         int height = (int) getTextSize();
         mDrawable.setBounds(0, 0, (int) (height / 0.618f), height);
         setCompoundDrawables(mDrawable, null, null, null);
+    }
+
+    @Override
+    public void setTextColor(int color) {
+        if (mCurrentColor == color) {
+            return;
+        }
+        mCurrentColor = color;
+        super.setTextColor(color);
     }    private final Runnable mCharger = new Runnable() {
 
         private int level = 0;
@@ -88,15 +97,6 @@ public class BatteryView extends AppCompatTextView {
         }
     };
 
-    @Override
-    public void setTextColor(int color) {
-        if (mCurrentColor == color) {
-            return;
-        }
-        mCurrentColor = color;
-        super.setTextColor(color);
-    }
-
     private void startCharger() {
         if (!mIsChargerWorking) {
             getHandler().post(mCharger);
@@ -143,6 +143,8 @@ public class BatteryView extends AppCompatTextView {
         getContext().unregisterReceiver(mIntentReceiver);
     }
 
+
+
     private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
 
         @Override
@@ -175,6 +177,4 @@ public class BatteryView extends AppCompatTextView {
     };
 
 
-
-
 }

app/src/main/java/com/hippo/widget/TextClock.java

@@ -89,6 +89,14 @@ public class TextClock extends AppCompatTextView {
         createTime(mTimeZone);
         // Wait until onAttachedToWindow() to handle the ticker
         chooseFormat(false);
+    }
+
+    private void createTime(String timeZone) {
+        if (timeZone != null) {
+            mTime = Calendar.getInstance(TimeZone.getTimeZone(timeZone));
+        } else {
+            mTime = Calendar.getInstance();
+        }
     }    private final Runnable mTicker = new Runnable() {
         @Override
         public void run() {
@@ -101,14 +109,6 @@ public class TextClock extends AppCompatTextView {
         }
     };
 
-    private void createTime(String timeZone) {
-        if (timeZone != null) {
-            mTime = Calendar.getInstance(TimeZone.getTimeZone(timeZone));
-        } else {
-            mTime = Calendar.getInstance();
-        }
-    }
-
     public CharSequence getFormat12Hour() {
         return mFormat12;
     }
@@ -133,6 +133,17 @@ public class TextClock extends AppCompatTextView {
 
     public boolean is24HourModeEnabled() {
         return DateFormat.is24HourFormat(getContext());
+    }
+
+    public String getTimeZone() {
+        return mTimeZone;
+    }
+
+    public void setTimeZone(String timeZone) {
+        mTimeZone = timeZone;
+
+        createTime(timeZone);
+        onTimeChanged();
     }    private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) {
         @Override
         public void onChange(boolean selfChange) {
@@ -147,17 +158,6 @@ public class TextClock extends AppCompatTextView {
         }
     };
 
-    public String getTimeZone() {
-        return mTimeZone;
-    }
-
-    public void setTimeZone(String timeZone) {
-        mTimeZone = timeZone;
-
-        createTime(timeZone);
-        onTimeChanged();
-    }
-
     /**
      * Selects either one of {@link #getFormat12Hour()} or {@link #getFormat24Hour()}
      * depending on whether the user has selected 24-hour format.