From 9fc964d2191f987c6ba26274d9af005e944f2bfa Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Tue, 17 Dec 2019 21:31:07 +0200 Subject: [PATCH] whitespace and wrapping --- .../model/MobileLedgerProfile.java | 22 +++-- .../mobileledger/ui/DatePickerFragment.java | 4 +- .../ui/activity/NewTransactionItemHolder.java | 3 +- .../ui/profiles/ProfileDetailFragment.java | 96 ++++++++++++------- app/src/main/res/layout/profile_detail.xml | 4 +- 5 files changed, 83 insertions(+), 46 deletions(-) diff --git a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java index a1258271..e17948f3 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -22,6 +22,9 @@ import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.util.SparseArray; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import net.ktnx.mobileledger.App; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.DbOpQueue; @@ -35,9 +38,6 @@ import java.util.List; import java.util.Locale; import java.util.UUID; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import static net.ktnx.mobileledger.utils.Logger.debug; public final class MobileLedgerProfile { @@ -95,7 +95,9 @@ public final class MobileLedgerProfile { item.setPreferredAccountsFilter(cursor.getString(9)); item.setFutureDates(cursor.getInt(10)); list.add(item); - if (item.getUuid().equals(currentProfileUUID)) result = item; + if (item.getUuid() + .equals(currentProfileUUID)) + result = item; } } Data.profiles.setValue(list); @@ -264,11 +266,13 @@ public final class MobileLedgerProfile { debug("profile", "returning default value for " + name); result = default_value; } - else debug("profile", String.format("option %s=%s", name, result)); + else + debug("profile", String.format("option %s=%s", name, result)); return result; } - else return default_value; + else + return default_value; } catch (Exception e) { debug("db", "returning default value for " + name, e); @@ -335,7 +339,8 @@ public final class MobileLedgerProfile { public LedgerAccount loadAccount(SQLiteDatabase db, String accName) { LedgerAccount acc = tryLoadAccount(db, accName); - if (acc == null) throw new RuntimeException("Unable to load account with name " + accName); + if (acc == null) + throw new RuntimeException("Unable to load account with name " + accName); return acc; } @@ -377,7 +382,8 @@ public final class MobileLedgerProfile { return this.themeId; } public void setThemeId(Object o) { - setThemeId(Integer.valueOf(String.valueOf(o)).intValue()); + setThemeId(Integer.valueOf(String.valueOf(o)) + .intValue()); } public void setThemeId(int themeId) { // debug("profile", String.format("Profile.setThemeId(%d) called", themeId)); diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java index 8ccb6c4e..ecaca2f2 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/DatePickerFragment.java @@ -55,8 +55,8 @@ public class DatePickerFragment extends AppCompatDialogFragment int month = c.get(GregorianCalendar.MONTH); int day = c.get(GregorianCalendar.DAY_OF_MONTH); long todayStamp = c.getTimeInMillis(); - TextView date = - Objects.requireNonNull(getActivity()).findViewById(R.id.new_transaction_date); + TextView date = Objects.requireNonNull(getActivity()) + .findViewById(R.id.new_transaction_date); CharSequence present = date.getText(); diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java index 667c0452..9ee32ea7 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/NewTransactionItemHolder.java @@ -248,7 +248,8 @@ class NewTransactionItemHolder extends RecyclerView.ViewHolder focused = tvAccount.requestFocus(); tvAccount.dismissDropDown(); if (focused) - Misc.showSoftKeyboard((NewTransactionActivity) tvAccount.getContext()); + Misc.showSoftKeyboard( + (NewTransactionActivity) tvAccount.getContext()); } } diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java index 4c547488..3f74bfa2 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java @@ -118,7 +118,8 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue String.format("[fragment] removing profile %s", mProfile.getUuid())); mProfile.removeFromDB(); ArrayList oldList = Data.profiles.getValue(); - if (oldList == null) throw new AssertionError(); + if (oldList == null) + throw new AssertionError(); ArrayList newList = new ArrayList<>(oldList); newList.remove(mProfile); Data.profiles.setValue(newList); @@ -128,14 +129,15 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue } final FragmentActivity activity = getActivity(); - if (activity != null) activity.finish(); + if (activity != null) + activity.finish(); }); builder.show(); return false; }); final ArrayList profiles = Data.profiles.getValue(); - menuDeleteProfile - .setVisible((mProfile != null) && (profiles != null) && (profiles.size() > 1)); + menuDeleteProfile.setVisible( + (mProfile != null) && (profiles != null) && (profiles.size() > 1)); if (BuildConfig.DEBUG) { final MenuItem menuWipeProfileData = menu.findItem(R.id.menuWipeData); @@ -146,20 +148,24 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue private boolean onWipeDataMenuClicked() { // this is a development option, so no confirmation mProfile.wipeAllData(); - if (mProfile.equals(Data.profile.getValue())) triggerProfileChange(); + if (mProfile.equals(Data.profile.getValue())) + triggerProfileChange(); return true; } private void triggerProfileChange() { int index = Data.getProfileIndex(mProfile); MobileLedgerProfile newProfile = new MobileLedgerProfile(mProfile); final ArrayList profiles = Data.profiles.getValue(); - if (profiles == null) throw new AssertionError(); + if (profiles == null) + throw new AssertionError(); profiles.set(index, newProfile); ProfilesRecyclerViewAdapter prva = ProfilesRecyclerViewAdapter.getInstance(); - if (prva != null) prva.notifyItemChanged(index); + if (prva != null) + prva.notifyItemChanged(index); - if (mProfile.equals(Data.profile.getValue())) Data.profile.setValue(newProfile); + if (mProfile.equals(Data.profile.getValue())) + Data.profile.setValue(newProfile); } @Override public void onCreate(Bundle savedInstanceState) { @@ -172,11 +178,14 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue mProfile = profiles.get(index); Activity activity = this.getActivity(); - if (activity == null) throw new AssertionError(); + if (activity == null) + throw new AssertionError(); CollapsingToolbarLayout appBarLayout = activity.findViewById(R.id.toolbar_layout); if (appBarLayout != null) { - if (mProfile != null) appBarLayout.setTitle(mProfile.getName()); - else appBarLayout.setTitle(getResources().getString(R.string.new_profile_title)); + if (mProfile != null) + appBarLayout.setTitle(mProfile.getName()); + else + appBarLayout.setTitle(getResources().getString(R.string.new_profile_title)); } } } @@ -184,7 +193,8 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); Activity context = getActivity(); - if (context == null) return; + if (context == null) + return; FloatingActionButton fab = context.findViewById(R.id.fab); fab.setOnClickListener(v -> onSaveFabClicked()); @@ -192,7 +202,8 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue profileName.requestFocus(); } private void onSaveFabClicked() { - if (!checkValidity()) return; + if (!checkValidity()) + return; if (mProfile != null) { updateProfileFromUI(); @@ -206,18 +217,21 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue updateProfileFromUI(); mProfile.storeInDB(); final ArrayList profiles = Data.profiles.getValue(); - if (profiles == null) throw new AssertionError(); + if (profiles == null) + throw new AssertionError(); ArrayList newList = new ArrayList<>(profiles); newList.add(mProfile); Data.profiles.setValue(newList); MobileLedgerProfile.storeProfilesOrder(); // first profile ever? - if (newList.size() == 1) Data.profile.setValue(mProfile); + if (newList.size() == 1) + Data.profile.setValue(mProfile); } Activity activity = getActivity(); - if (activity != null) activity.finish(); + if (activity != null) + activity.finish(); } private void updateProfileFromUI() { mProfile.setName(profileName.getText()); @@ -290,7 +304,8 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> { debug("profiles", isChecked ? "auth enabled " : "auth disabled"); authParams.setVisibility(isChecked ? View.VISIBLE : View.GONE); - if (isChecked) userName.requestFocus(); + if (isChecked) + userName.requestFocus(); checkInsecureSchemeWithAuth(); }); @@ -366,7 +381,8 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue private boolean checkUrlValidity() { boolean valid = true; - String val = String.valueOf(url.getText()).trim(); + String val = String.valueOf(url.getText()) + .trim(); if (val.isEmpty()) { valid = false; urlLayout.setError(getResources().getText(R.string.err_profile_url_empty)); @@ -374,8 +390,10 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue try { URL url = new URL(val); String host = url.getHost(); - if (host == null || host.isEmpty()) throw new MalformedURLException("Missing host"); - String protocol = url.getProtocol().toUpperCase(); + if (host == null || host.isEmpty()) + throw new MalformedURLException("Missing host"); + String protocol = url.getProtocol() + .toUpperCase(); if (!protocol.equals("HTTP") && !protocol.equals("HTTPS")) { valid = false; urlLayout.setError(getResources().getText(R.string.err_invalid_url)); @@ -392,16 +410,21 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue boolean showWarning = false; if (useAuthentication.isChecked()) { - String urlText = url.getText().toString(); - if (urlText.startsWith("http") && !urlText.startsWith("https")) showWarning = true; + String urlText = url.getText() + .toString(); + if (urlText.startsWith("http") && !urlText.startsWith("https")) + showWarning = true; } - if (showWarning) insecureWarningText.setVisibility(View.VISIBLE); - else insecureWarningText.setVisibility(View.GONE); + if (showWarning) + insecureWarningText.setVisibility(View.VISIBLE); + else + insecureWarningText.setVisibility(View.GONE); } private void hookClearErrorOnFocusListener(TextView view, TextInputLayout layout) { view.setOnFocusChangeListener((v, hasFocus) -> { - if (hasFocus) layout.setError(null); + if (hasFocus) + layout.setError(null); }); view.addTextChangedListener(new TextWatcher() { @Override @@ -420,26 +443,33 @@ public class ProfileDetailFragment extends Fragment implements HueRingDialog.Hue boolean valid = true; String val = String.valueOf(profileName.getText()); - if (val.trim().isEmpty()) { + if (val.trim() + .isEmpty()) + { valid = false; profileNameLayout.setError(getResources().getText(R.string.err_profile_name_empty)); } - if (!checkUrlValidity()) valid = false; + if (!checkUrlValidity()) + valid = false; if (useAuthentication.isChecked()) { val = String.valueOf(userName.getText()); - if (val.trim().isEmpty()) { + if (val.trim() + .isEmpty()) + { valid = false; - userNameLayout - .setError(getResources().getText(R.string.err_profile_user_name_empty)); + userNameLayout.setError( + getResources().getText(R.string.err_profile_user_name_empty)); } val = String.valueOf(password.getText()); - if (val.trim().isEmpty()) { + if (val.trim() + .isEmpty()) + { valid = false; - passwordLayout - .setError(getResources().getText(R.string.err_profile_password_empty)); + passwordLayout.setError( + getResources().getText(R.string.err_profile_password_empty)); } } diff --git a/app/src/main/res/layout/profile_detail.xml b/app/src/main/res/layout/profile_detail.xml index 4c8bba39..d76fdab5 100644 --- a/app/src/main/res/layout/profile_detail.xml +++ b/app/src/main/res/layout/profile_detail.xml @@ -16,8 +16,8 @@ -->