import net.ktnx.mobileledger.BuildConfig;
import net.ktnx.mobileledger.R;
+import net.ktnx.mobileledger.async.SendTransactionTask;
import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.MobileLedgerProfile;
import net.ktnx.mobileledger.ui.HueRingDialog;
* represents.
*/
public static final String ARG_ITEM_ID = "item_id";
+ public static final String ARG_HUE = "hue";
@NonNls
private static final String HTTPS_URL_START = "https://";
private TextView futureDatesText;
private MobileLedgerProfile.FutureDates futureDates;
private View futureDatesLayout;
+ private TextView apiVersionText;
+ private SendTransactionTask.API apiVersion;
/**
* Mandatory empty constructor for the fragment manager to instantiate the
throw new AssertionError();
profiles.set(index, newProfile);
- ProfilesRecyclerViewAdapter prva = ProfilesRecyclerViewAdapter.getInstance();
- if (prva != null)
- prva.notifyItemChanged(index);
+ ProfilesRecyclerViewAdapter viewAdapter = ProfilesRecyclerViewAdapter.getInstance();
+ if (viewAdapter != null)
+ viewAdapter.notifyItemChanged(index);
if (mProfile.equals(Data.profile.getValue()))
Data.profile.setValue(newProfile);
}
@Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+ Activity context = getActivity();
+ if (context == null)
+ return;
if ((getArguments() != null) && getArguments().containsKey(ARG_ITEM_ID)) {
int index = getArguments().getInt(ARG_ITEM_ID, -1);
appBarLayout.setTitle(getResources().getString(R.string.new_profile_title));
}
}
- }
- @Override
- public void onActivityCreated(@Nullable Bundle savedInstanceState) {
- super.onActivityCreated(savedInstanceState);
- Activity context = getActivity();
- if (context == null)
- return;
FloatingActionButton fab = context.findViewById(R.id.fab);
fab.setOnClickListener(v -> onSaveFabClicked());
-
- profileName.requestFocus();
- }
- private void onSaveFabClicked() {
- if (!checkValidity())
- return;
-
- if (mProfile != null) {
- updateProfileFromUI();
-// debug("profiles", String.format("Selected item is %d", mProfile.getThemeId()));
- mProfile.storeInDB();
- debug("profiles", "profile stored in DB");
- triggerProfileChange();
- }
- else {
- mProfile = new MobileLedgerProfile();
- updateProfileFromUI();
- mProfile.storeInDB();
- final ArrayList<MobileLedgerProfile> profiles = Data.profiles.getValue();
- if (profiles == null)
- throw new AssertionError();
- ArrayList<MobileLedgerProfile> newList = new ArrayList<>(profiles);
- newList.add(mProfile);
- Data.profiles.setValue(newList);
- MobileLedgerProfile.storeProfilesOrder();
-
- // first profile ever?
- if (newList.size() == 1)
- Data.profile.setValue(mProfile);
- }
-
- Activity activity = getActivity();
- if (activity != null)
- activity.finish();
- }
- private void updateProfileFromUI() {
- mProfile.setName(profileName.getText());
- mProfile.setUrl(url.getText());
- mProfile.setPostingPermitted(postingPermitted.isChecked());
- mProfile.setPreferredAccountsFilter(preferredAccountsFilter.getText());
- mProfile.setAuthEnabled(useAuthentication.isChecked());
- mProfile.setAuthUserName(userName.getText());
- mProfile.setAuthPassword(password.getText());
- mProfile.setThemeId(huePickerView.getTag());
- mProfile.setFutureDates(futureDates);
- }
- @Override
- public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
- View rootView = inflater.inflate(R.layout.profile_detail, container, false);
-
- profileName = rootView.findViewById(R.id.profile_name);
- profileNameLayout = rootView.findViewById(R.id.profile_name_layout);
- url = rootView.findViewById(R.id.url);
- urlLayout = rootView.findViewById(R.id.url_layout);
- postingPermitted = rootView.findViewById(R.id.profile_permit_posting);
- futureDatesLayout = rootView.findViewById(R.id.future_dates_layout);
- futureDatesText = rootView.findViewById(R.id.future_dates_text);
- rootView.findViewById(R.id.future_dates_layout)
- .setOnClickListener(v -> {
- MenuInflater mi = new MenuInflater(getContext());
- PopupMenu menu = new PopupMenu(getContext(), v);
- menu.inflate(R.menu.future_dates);
- menu.setOnMenuItemClickListener(item -> {
- switch (item.getItemId()) {
- case R.id.menu_future_dates_30:
- futureDates = MobileLedgerProfile.FutureDates.OneMonth;
- break;
- case R.id.menu_future_dates_60:
- futureDates = MobileLedgerProfile.FutureDates.TwoMonths;
- break;
- case R.id.menu_future_dates_90:
- futureDates = MobileLedgerProfile.FutureDates.ThreeMonths;
- break;
- case R.id.menu_future_dates_180:
- futureDates = MobileLedgerProfile.FutureDates.SixMonths;
- break;
- case R.id.menu_future_dates_365:
- futureDates = MobileLedgerProfile.FutureDates.OneYear;
- break;
- case R.id.menu_future_dates_all:
- futureDates = MobileLedgerProfile.FutureDates.All;
- break;
- default:
- futureDates = MobileLedgerProfile.FutureDates.None;
- }
- futureDatesText.setText(futureDates.getText(getResources()));
- return true;
- });
- menu.show();
- });
- authParams = rootView.findViewById(R.id.auth_params);
- useAuthentication = rootView.findViewById(R.id.enable_http_auth);
- userName = rootView.findViewById(R.id.auth_user_name);
- userNameLayout = rootView.findViewById(R.id.auth_user_name_layout);
- password = rootView.findViewById(R.id.password);
- passwordLayout = rootView.findViewById(R.id.password_layout);
- huePickerView = rootView.findViewById(R.id.btn_pick_ring_color);
- preferredAccountsFilter = rootView.findViewById(R.id.preferred_accounts_filter_filter);
+ profileName = context.findViewById(R.id.profile_name);
+ profileNameLayout = context.findViewById(R.id.profile_name_layout);
+ url = context.findViewById(R.id.url);
+ urlLayout = context.findViewById(R.id.url_layout);
+ postingPermitted = context.findViewById(R.id.profile_permit_posting);
+ futureDatesLayout = context.findViewById(R.id.future_dates_layout);
+ futureDatesText = context.findViewById(R.id.future_dates_text);
+ context.findViewById(R.id.future_dates_layout)
+ .setOnClickListener(v -> {
+ MenuInflater mi = new MenuInflater(context);
+ PopupMenu menu = new PopupMenu(context, v);
+ menu.inflate(R.menu.future_dates);
+ menu.setOnMenuItemClickListener(item -> {
+ switch (item.getItemId()) {
+ case R.id.menu_future_dates_30:
+ futureDates = MobileLedgerProfile.FutureDates.OneMonth;
+ break;
+ case R.id.menu_future_dates_60:
+ futureDates = MobileLedgerProfile.FutureDates.TwoMonths;
+ break;
+ case R.id.menu_future_dates_90:
+ futureDates = MobileLedgerProfile.FutureDates.ThreeMonths;
+ break;
+ case R.id.menu_future_dates_180:
+ futureDates = MobileLedgerProfile.FutureDates.SixMonths;
+ break;
+ case R.id.menu_future_dates_365:
+ futureDates = MobileLedgerProfile.FutureDates.OneYear;
+ break;
+ case R.id.menu_future_dates_all:
+ futureDates = MobileLedgerProfile.FutureDates.All;
+ break;
+ default:
+ futureDates = MobileLedgerProfile.FutureDates.None;
+ }
+ futureDatesText.setText(futureDates.getText(getResources()));
+ return true;
+ });
+ menu.show();
+ });
+ apiVersionText = context.findViewById(R.id.api_version_text);
+ context.findViewById(R.id.api_version_layout)
+ .setOnClickListener(v -> {
+ MenuInflater mi = new MenuInflater(context);
+ PopupMenu menu = new PopupMenu(context, v);
+ menu.inflate(R.menu.api_version);
+ menu.setOnMenuItemClickListener(item -> {
+ switch (item.getItemId()) {
+ case R.id.api_version_menu_html:
+ apiVersion = SendTransactionTask.API.html;
+ break;
+ case R.id.api_version_menu_post_1_14:
+ apiVersion = SendTransactionTask.API.post_1_14;
+ break;
+ case R.id.api_version_menu_pre_1_15:
+ apiVersion = SendTransactionTask.API.pre_1_15;
+ break;
+ case R.id.api_version_menu_auto:
+ default:
+ apiVersion = SendTransactionTask.API.auto;
+ }
+ apiVersionText.setText(apiVersion.getDescription(getResources()));
+ return true;
+ });
+ menu.show();
+ });
+ authParams = context.findViewById(R.id.auth_params);
+ useAuthentication = context.findViewById(R.id.enable_http_auth);
+ userName = context.findViewById(R.id.auth_user_name);
+ userNameLayout = context.findViewById(R.id.auth_user_name_layout);
+ password = context.findViewById(R.id.password);
+ passwordLayout = context.findViewById(R.id.password_layout);
+ huePickerView = context.findViewById(R.id.btn_pick_ring_color);
+ preferredAccountsFilter = context.findViewById(R.id.preferred_accounts_filter_filter);
preferredAccountsFilterLayout =
- rootView.findViewById(R.id.preferred_accounts_accounts_filter_layout);
- insecureWarningText = rootView.findViewById(R.id.insecure_scheme_text);
+ context.findViewById(R.id.preferred_accounts_accounts_filter_layout);
+ insecureWarningText = context.findViewById(R.id.insecure_scheme_text);
useAuthentication.setOnCheckedChangeListener((buttonView, isChecked) -> {
debug("profiles", isChecked ? "auth enabled " : "auth disabled");
hookClearErrorOnFocusListener(userName, userNameLayout);
hookClearErrorOnFocusListener(password, passwordLayout);
- int profileThemeId;
+ final int profileThemeId;
if (mProfile != null) {
profileName.setText(mProfile.getName());
postingPermitted.setChecked(mProfile.isPostingPermitted());
futureDates = mProfile.getFutureDates();
futureDatesText.setText(futureDates.getText(getResources()));
+ apiVersion = mProfile.getApiVersion();
+ apiVersionText.setText(apiVersion.getDescription(getResources()));
url.setText(mProfile.getUrl());
useAuthentication.setChecked(mProfile.isAuthEnabled());
authParams.setVisibility(mProfile.isAuthEnabled() ? View.VISIBLE : View.GONE);
userName.setText(mProfile.isAuthEnabled() ? mProfile.getAuthUserName() : "");
password.setText(mProfile.isAuthEnabled() ? mProfile.getAuthPassword() : "");
preferredAccountsFilter.setText(mProfile.getPreferredAccountsFilter());
- profileThemeId = mProfile.getThemeId();
+ profileThemeId = mProfile.getThemeHue();
}
else {
profileName.setText("");
postingPermitted.setChecked(true);
futureDates = MobileLedgerProfile.FutureDates.None;
futureDatesText.setText(futureDates.getText(getResources()));
+ apiVersion = SendTransactionTask.API.auto;
+ apiVersionText.setText(apiVersion.getDescription(getResources()));
useAuthentication.setChecked(false);
authParams.setVisibility(View.GONE);
userName.setText("");
password.setText("");
preferredAccountsFilter.setText(null);
- profileThemeId = -1;
+ profileThemeId = getArguments().getInt(ARG_HUE, -1);
}
checkInsecureSchemeWithAuth();
d.show();
d.setColorSelectedListener(this);
});
- return rootView;
+
+ profileName.requestFocus();
+ }
+ private void onSaveFabClicked() {
+ if (!checkValidity())
+ return;
+
+ if (mProfile != null) {
+ updateProfileFromUI();
+// debug("profiles", String.format("Selected item is %d", mProfile.getThemeHue()));
+ mProfile.storeInDB();
+ debug("profiles", "profile stored in DB");
+ triggerProfileChange();
+ }
+ else {
+ mProfile = new MobileLedgerProfile();
+ updateProfileFromUI();
+ mProfile.storeInDB();
+ final ArrayList<MobileLedgerProfile> profiles = Data.profiles.getValue();
+ if (profiles == null)
+ throw new AssertionError();
+ ArrayList<MobileLedgerProfile> newList = new ArrayList<>(profiles);
+ newList.add(mProfile);
+ Data.profiles.setValue(newList);
+ MobileLedgerProfile.storeProfilesOrder();
+
+ // first profile ever?
+ if (newList.size() == 1)
+ Data.profile.setValue(mProfile);
+ }
+
+ Activity activity = getActivity();
+ if (activity != null)
+ activity.finish();
+ }
+ private void updateProfileFromUI() {
+ mProfile.setName(profileName.getText());
+ mProfile.setUrl(url.getText());
+ mProfile.setPostingPermitted(postingPermitted.isChecked());
+ mProfile.setPreferredAccountsFilter(preferredAccountsFilter.getText());
+ mProfile.setAuthEnabled(useAuthentication.isChecked());
+ mProfile.setAuthUserName(userName.getText());
+ mProfile.setAuthPassword(password.getText());
+ mProfile.setThemeHue(huePickerView.getTag());
+ mProfile.setFutureDates(futureDates);
+ mProfile.setApiVersion(apiVersion);
+ }
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+
+ return inflater.inflate(R.layout.profile_detail, container, false);
}
private boolean checkUrlValidity() {
boolean valid = true;