X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfileDetailActivity.java;h=1b88f480254b5129bbd921ba8efdd65395dc0634;hb=f5d585d79f8c263476c8fb78ada15f04472d9a91;hp=23d22f55007db84c65b75e30dac187032d058d75;hpb=998dd32a089d199a2569069415755eb3169b35b0;p=mobile-ledger.git diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java index 23d22f55..1b88f480 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2021 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -17,46 +17,73 @@ package net.ktnx.mobileledger.ui.profiles; +import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; -import android.util.Log; import android.view.Menu; import android.view.MenuItem; -import android.view.View; + +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.widget.Toolbar; +import androidx.lifecycle.ViewModelProvider; + +import com.google.android.material.appbar.CollapsingToolbarLayout; import net.ktnx.mobileledger.R; +import net.ktnx.mobileledger.db.DB; +import net.ktnx.mobileledger.db.Profile; import net.ktnx.mobileledger.model.Data; -import net.ktnx.mobileledger.model.MobileLedgerProfile; -import net.ktnx.mobileledger.ui.activity.ProfileListActivity; +import net.ktnx.mobileledger.ui.activity.CrashReportingActivity; +import net.ktnx.mobileledger.utils.Colors; + +import org.jetbrains.annotations.NotNull; + +import static net.ktnx.mobileledger.utils.Logger.debug; /** * An activity representing a single Profile detail screen. This * activity is only used on narrow width devices. On tablet-size devices, * item details are presented side-by-side with a list of items - * in a {@link ProfileListActivity}. + * in a ProfileListActivity (not really). */ -public class ProfileDetailActivity extends AppCompatActivity { - private MobileLedgerProfile profile; +public class ProfileDetailActivity extends CrashReportingActivity { + private ProfileDetailFragment mFragment; + public static void start(Context context, @Nullable Profile profile) { + Intent starter = new Intent(context, ProfileDetailActivity.class); + if (profile != null) { + starter.putExtra(ProfileDetailFragment.ARG_ITEM_ID, profile.getId()); + starter.putExtra(ProfileDetailFragment.ARG_ITEM_ID, profile.getTheme()); + } + context.startActivity(starter); + } + @NotNull + private ProfileDetailModel getModel() { + return new ViewModelProvider(this).get(ProfileDetailModel.class); + } @Override protected void onCreate(Bundle savedInstanceState) { + final long id = getIntent().getLongExtra(ProfileDetailFragment.ARG_ITEM_ID, -1); + + DB.get() + .getProfileDAO() + .getById(id) + .observe(this, this::setProfile); + + int themeHue = getIntent().getIntExtra(ProfileDetailFragment.ARG_HUE, -1); + super.onCreate(savedInstanceState); + if (themeHue == -1) { + themeHue = Colors.getNewProfileThemeHue(Data.profiles.getValue()); + } + Colors.setupTheme(this, themeHue); + final ProfileDetailModel model = getModel(); + model.initialThemeHue = themeHue; + model.setThemeId(themeHue); setContentView(R.layout.activity_profile_detail); Toolbar toolbar = findViewById(R.id.detail_toolbar); setSupportActionBar(toolbar); - FloatingActionButton fab = findViewById(R.id.fab); - fab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - Snackbar.make(view, "Replace with your own detail action", Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); - } - }); // Show the Up button in the action bar. ActionBar actionBar = getSupportActionBar(); @@ -74,59 +101,41 @@ public class ProfileDetailActivity extends AppCompatActivity { // http://developer.android.com/guide/components/fragments.html // if (savedInstanceState == null) { - final int index = getIntent().getIntExtra(ProfileDetailFragment.ARG_ITEM_ID, -1); - - if (index != -1) { - profile = Data.profiles.get(index); - if (profile == null) throw new AssertionError( - String.format("Can't get profile " + "(index:%d) from the global list", - index)); - } - // Create the detail fragment and add it to the activity // using a fragment transaction. Bundle arguments = new Bundle(); - arguments.putInt(ProfileDetailFragment.ARG_ITEM_ID, index); - ProfileDetailFragment fragment = new ProfileDetailFragment(); - fragment.setArguments(arguments); + arguments.putInt(ProfileDetailFragment.ARG_HUE, themeHue); + mFragment = new ProfileDetailFragment(); + mFragment.setArguments(arguments); getSupportFragmentManager().beginTransaction() - .add(R.id.profile_detail_container, fragment).commit(); + .add(R.id.profile_detail_container, mFragment) + .commit(); + } + } + private void setProfile(Profile profile) { + ProfileDetailModel model = new ViewModelProvider(this).get(ProfileDetailModel.class); + CollapsingToolbarLayout appBarLayout = findViewById(R.id.toolbar_layout); + if (appBarLayout != null) { + if (profile != null) + appBarLayout.setTitle(profile.getName()); + else + appBarLayout.setTitle(getResources().getString(R.string.new_profile_title)); } + model.setValuesFromProfile(profile); } @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); - Log.d("profiles", "[activity] Creating profile details options menu"); - getMenuInflater().inflate(R.menu.profile_details, menu); - MenuItem menuDeleteProfile = menu.findItem(R.id.menuDelete); - menuDeleteProfile.setOnMenuItemClickListener(item -> { - Log.d("profiles", String.format("[activity] deleting profile %s", profile.getUuid())); - profile.removeFromDB(); - Data.profiles.remove(profile); - if (Data.profile.get().equals(profile)) { - Log.d("profiles", "[activity] selecting profile 0"); - Data.setCurrentProfile(Data.profiles.get(0)); - } - finish(); - return true; - }); - - menuDeleteProfile.setVisible((profile != null) && (Data.profiles.size() > 1)); + debug("profiles", "[activity] Creating profile details options menu"); + if (mFragment != null) + mFragment.onCreateOptionsMenu(menu, getMenuInflater()); return true; } - @Override public boolean onOptionsItemSelected(MenuItem item) { - int id = item.getItemId(); - if (id == android.R.id.home) { - // This ID represents the Home or Up button. In the case of this - // activity, the Up button is shown. For - // more details, see the Navigation pattern on Android Design: - // - // http://developer.android.com/design/patterns/navigation.html#up-vs-back - // - navigateUpTo(new Intent(this, ProfileListActivity.class)); + if (item.getItemId() == android.R.id.home) { + finish(); return true; } return super.onOptionsItemSelected(item);