From b25d771ee9fd50f50b2b5d895b6eb2ac57d1d968 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Tue, 30 Jun 2015 12:09:29 +0200 Subject: [PATCH] reformat code --- .../gadgetbridge/ControlCenter.java | 1 - .../freeyourgadget/gadgetbridge/GB.java | 1 - .../freeyourgadget/gadgetbridge/GBAlarm.java | 33 ++++++++++--------- .../activities/ChartsActivity.java | 19 ++++------- .../adapter/GBAlarmListAdapter.java | 15 ++++----- .../charts/CustomLegendRenderer.java | 2 +- .../gadgetbridge/miband/MiBandSupport.java | 7 ++-- .../gadgetbridge/miband/VibrationProfile.java | 15 +++++---- 8 files changed, 44 insertions(+), 49 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java index 22ca6ede9..ad00ea47a 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.activities.ConfigureAlarms; -import nodomain.freeyourgadget.gadgetbridge.activities.ChartsActivity; import nodomain.freeyourgadget.gadgetbridge.activities.SleepChartActivity; import nodomain.freeyourgadget.gadgetbridge.adapter.GBDeviceAdapter; import nodomain.freeyourgadget.gadgetbridge.discovery.DiscoveryActivity; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java index 9edcb2737..7a86a6ca6 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GB.java @@ -14,7 +14,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java index 7c542a4d6..466f5634b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBAlarm.java @@ -31,7 +31,7 @@ public class GBAlarm implements Parcelable, Comparable { public static final byte ALARM_SAT = 32; public static final byte ALARM_SUN = 64; - public static final String[] DEFAULT_ALARMS = {"2,false,false,0,15,30","1,false,false,96,8,0","0,false,true,31,7,30"}; + public static final String[] DEFAULT_ALARMS = {"2,false,false,0,15,30", "1,false,false,96,8,0", "0,false,true,31,7,30"}; public GBAlarm(int index, boolean enabled, boolean smartWakeup, byte repetition, int hour, int minute) { @@ -43,13 +43,13 @@ public class GBAlarm implements Parcelable, Comparable { this.minute = minute; } - public GBAlarm(String fromPreferences){ + public GBAlarm(String fromPreferences) { String[] tokens = fromPreferences.split(","); //TODO: sanify the string! this.index = Integer.parseInt(tokens[0]); this.enabled = Boolean.parseBoolean(tokens[1]); this.smartWakeup = Boolean.parseBoolean(tokens[2]); - this.repetition = Integer.parseInt(tokens[3]); + this.repetition = Integer.parseInt(tokens[3]); this.hour = Integer.parseInt(tokens[4]); this.minute = Integer.parseInt(tokens[5]); } @@ -61,13 +61,13 @@ public class GBAlarm implements Parcelable, Comparable { int repetition = pc.readInt(); int hour = pc.readInt(); int minute = pc.readInt(); - return new GBAlarm(index, enabled, smartWakeup, (byte)repetition, hour, minute); + return new GBAlarm(index, enabled, smartWakeup, (byte) repetition, hour, minute); } @Override public boolean equals(Object o) { if (o instanceof GBAlarm) { - GBAlarm comp = (GBAlarm)o; + GBAlarm comp = (GBAlarm) o; return comp.getIndex() == getIndex(); } else { return false; @@ -96,9 +96,9 @@ public class GBAlarm implements Parcelable, Comparable { @Override public int compareTo(Object another) { - if (this.getIndex() < ((GBAlarm)another).getIndex()) { + if (this.getIndex() < ((GBAlarm) another).getIndex()) { return -1; - }else if (this.getIndex() > ((GBAlarm)another).getIndex()) { + } else if (this.getIndex() > ((GBAlarm) another).getIndex()) { return 1; } return 0; @@ -109,16 +109,17 @@ public class GBAlarm implements Parcelable, Comparable { } public String getTime() { - return String.format("%02d",this.hour) + ":" + String.format("%02d",this.minute); + return String.format("%02d", this.hour) + ":" + String.format("%02d", this.minute); } - public int getHour(){ + public int getHour() { return this.hour; } - public int getMinute(){ + public int getMinute() { return this.minute; } + public Calendar getAlarmCal() { Calendar alarm = Calendar.getInstance(); alarm.set(Calendar.HOUR_OF_DAY, this.hour); @@ -143,11 +144,11 @@ public class GBAlarm implements Parcelable, Comparable { } public String toPreferences() { - return String.valueOf(this.index)+','+ - String.valueOf(this.enabled)+','+ - String.valueOf(this.smartWakeup)+','+ - String.valueOf(this.repetition)+','+ - String.valueOf(this.hour)+','+ + return String.valueOf(this.index) + ',' + + String.valueOf(this.enabled) + ',' + + String.valueOf(this.smartWakeup) + ',' + + String.valueOf(this.repetition) + ',' + + String.valueOf(this.hour) + ',' + String.valueOf(this.minute); } @@ -188,7 +189,7 @@ public class GBAlarm implements Parcelable, Comparable { while (iterator.hasNext()) { String alarmString = iterator.next(); - if(this.equals(new GBAlarm(alarmString))) { + if (this.equals(new GBAlarm(alarmString))) { iterator.remove(); break; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ChartsActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ChartsActivity.java index 742a784a4..2371d3526 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ChartsActivity.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ChartsActivity.java @@ -1,19 +1,12 @@ package nodomain.freeyourgadget.gadgetbridge.activities; -import java.util.Locale; - -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.app.NavUtils; -import android.support.v7.app.ActionBarActivity; -import android.support.v7.app.ActionBar; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.app.FragmentPagerAdapter; import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentPagerAdapter; +import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.view.ViewPager; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -21,6 +14,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import java.util.Locale; + import nodomain.freeyourgadget.gadgetbridge.R; public class ChartsActivity extends FragmentActivity { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java index 3abf16221..046cd2982 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBAlarmListAdapter.java @@ -13,7 +13,6 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; import java.util.Set; import nodomain.freeyourgadget.gadgetbridge.GBAlarm; @@ -34,13 +33,13 @@ public class GBAlarmListAdapter extends ArrayAdapter { this.alarmList = alarmList; } - public GBAlarmListAdapter(Context context,Set preferencesAlarmListSet) { + public GBAlarmListAdapter(Context context, Set preferencesAlarmListSet) { super(context, 0, new ArrayList()); this.mContext = context; alarmList = new ArrayList(); - for (String alarmString : preferencesAlarmListSet) { + for (String alarmString : preferencesAlarmListSet) { alarmList.add(new GBAlarm(alarmString)); } @@ -50,7 +49,7 @@ public class GBAlarmListAdapter extends ArrayAdapter { public void setAlarmList(Set preferencesAlarmListSet) { alarmList = new ArrayList(); - for (String alarmString : preferencesAlarmListSet) { + for (String alarmString : preferencesAlarmListSet) { alarmList.add(new GBAlarm(alarmString)); } @@ -64,8 +63,8 @@ public class GBAlarmListAdapter extends ArrayAdapter { public void update(GBAlarm alarm) { for (GBAlarm a : alarmList) { - if(alarm.equals(a)) { - a = alarm; + if (alarm.equals(a)) { + a = alarm; } } alarm.store(); @@ -129,12 +128,12 @@ public class GBAlarmListAdapter extends ArrayAdapter { view.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - ((ConfigureAlarms)mContext).configureAlarm(alarm); + ((ConfigureAlarms) mContext).configureAlarm(alarm); } }); alarmTime.setText(alarm.getTime()); isEnabled.setChecked(alarm.isEnabled()); - if(alarm.isSmartWakeup()) { + if (alarm.isSmartWakeup()) { isSmartWakeup.setVisibility(TextView.VISIBLE); } else { isSmartWakeup.setVisibility(TextView.GONE); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/CustomLegendRenderer.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/CustomLegendRenderer.java index 38406e137..86bb2246f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/CustomLegendRenderer.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/charts/CustomLegendRenderer.java @@ -10,7 +10,7 @@ import com.github.mikephil.charting.utils.ViewPortHandler; /** * A legend renderer that does *not* calculate the labels and colors automatically * from the data sets or the data entries. - * + *

* Instead, they have to be provided manually, because otherwise the legend will * be empty. */ diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java index 50356f3cf..125976019 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/MiBandSupport.java @@ -152,12 +152,13 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport { /** * Sends a custom notification to the Mi Band. + * * @param vibrationProfile specifies how and how often the Band shall vibrate. * @param flashTimes * @param flashColour * @param originalColour * @param flashDuration - * @param extraAction an extra action to be executed after every vibration and flash sequence. Allows to abort the repetition, for example. + * @param extraAction an extra action to be executed after every vibration and flash sequence. Allows to abort the repetition, for example. * @param builder */ private void sendCustomNotification(VibrationProfile vibrationProfile, int flashTimes, int flashColour, int originalColour, long flashDuration, BtLEAction extraAction, TransactionBuilder builder) { @@ -566,10 +567,10 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport { private void queueAlarm(GBAlarm alarm, TransactionBuilder builder, BluetoothGattCharacteristic characteristic) { Calendar alarmCal = alarm.getAlarmCal(); - byte[] alarmMessage = new byte[] { + byte[] alarmMessage = new byte[]{ (byte) MiBandService.COMMAND_SET_TIMER, (byte) alarm.getIndex(), - (byte) (alarm.isEnabled() ? 1: 0), + (byte) (alarm.isEnabled() ? 1 : 0), (byte) (alarmCal.get(Calendar.YEAR) - 2000), (byte) alarmCal.get(Calendar.MONTH), (byte) alarmCal.get(Calendar.DATE), diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/VibrationProfile.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/VibrationProfile.java index 5596a0a1a..7aff51c14 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/VibrationProfile.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/miband/VibrationProfile.java @@ -20,22 +20,22 @@ public class VibrationProfile { return new VibrationProfile(id, new int[]{100, 0}, repeat); } if (ID_SHORT.equals(id)) { - return new VibrationProfile(id, new int[] {200, 200}, repeat); + return new VibrationProfile(id, new int[]{200, 200}, repeat); } if (ID_LONG.equals(id)) { - return new VibrationProfile(id, new int[] {500, 1000}, repeat); + return new VibrationProfile(id, new int[]{500, 1000}, repeat); } if (ID_WATERDROP.equals(id)) { - return new VibrationProfile(id, new int[] {100, 1500}, repeat); + return new VibrationProfile(id, new int[]{100, 1500}, repeat); } if (ID_RING.equals(id)) { return new VibrationProfile(id, new int[]{300, 200, 600, 2000}, repeat); } if (ID_ALARM_CLOCK.equals(id)) { - return new VibrationProfile(id, new int[] {30, 35, 30, 35, 30, 35, 30, 800}, repeat); + return new VibrationProfile(id, new int[]{30, 35, 30, 35, 30, 35, 30, 800}, repeat); } // medium - return new VibrationProfile(id, new int[] {300, 600}, repeat); + return new VibrationProfile(id, new int[]{300, 600}, repeat); } private final String id; @@ -45,9 +45,10 @@ public class VibrationProfile { /** * Creates a new profile instance. - * @param id the ID, used as preference key. + * + * @param id the ID, used as preference key. * @param onOffSequence a sequence of alternating on and off durations, in milliseconds - * @param repeat how ofoften the sequence shall be repeated + * @param repeat how ofoften the sequence shall be repeated */ public VibrationProfile(String id, int[] onOffSequence, short repeat) { this.id = id;