X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FProfileListActivity.java;h=3a4a51545d2a8bacaa498490f051f7ec349f2c3f;hb=aef5271787fb3b91b74a93efb48c569df0de6575;hp=6932e97828d84f1d4b06049b259cf0ba332e6287;hpb=e809f9bacb61890374d1b9c8c46edeaed8a838b0;p=mobile-ledger.git
diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java
index 6932e978..3a4a5154 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileListActivity.java
@@ -1,18 +1,18 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.ui.activity;
@@ -21,14 +21,14 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.ActionBar;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.support.v7.widget.helper.ItemTouchHelper;
import android.util.Log;
import android.view.LayoutInflater;
+import android.view.Menu;
import android.view.View;
import android.view.ViewGroup;
import android.widget.RadioButton;
@@ -50,10 +50,11 @@ import java.util.Collections;
* item details. On tablets, the activity presents the list of items and
* item details side-by-side using two vertical panes.
*/
-public class ProfileListActivity extends AppCompatActivity {
+public class ProfileListActivity extends CrashReportingActivity {
public static final String ARG_ACTION = "action";
- public static final String ARG_PROFILE_INDEX = "profile_uuid";
+ public static final String ARG_PROFILE_INDEX = "profile_index";
+ public static final int PROFILE_INDEX_NONE = -1;
public static final int ACTION_EDIT_PROFILE = 1;
public static final int ACTION_INVALID = -1;
/**
@@ -61,8 +62,13 @@ public class ProfileListActivity extends AppCompatActivity {
* device.
*/
private boolean mTwoPane;
- private FloatingActionButton fab;
+ private RecyclerView recyclerView;
+ @Override
+ public boolean onSupportNavigateUp() {
+ onBackPressed();
+ return super.onSupportNavigateUp();
+ }
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -71,18 +77,16 @@ public class ProfileListActivity extends AppCompatActivity {
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
toolbar.setTitle(getTitle());
+ final ActionBar supportActionBar = getSupportActionBar();
+ if (supportActionBar != null) {
+ supportActionBar.setDisplayHomeAsUpEnabled(true);
+ supportActionBar.setDisplayShowHomeEnabled(true);
+ }
- RecyclerView recyclerView = findViewById(R.id.profile_list);
+ recyclerView = findViewById(R.id.profile_list);
if (recyclerView == null) throw new AssertionError();
setupRecyclerView(recyclerView);
- fab = findViewById(R.id.fab);
- fab.setOnClickListener(view -> {
- ProfilesRecyclerViewAdapter adapter =
- (ProfilesRecyclerViewAdapter) recyclerView.getAdapter();
- if (adapter != null) adapter.editProfile(recyclerView, null);
- });
-
if (findViewById(R.id.profile_detail_container) != null) {
// The detail container view will be present only in the
// large-screen layouts (res/values-w900dp).
@@ -94,20 +98,23 @@ public class ProfileListActivity extends AppCompatActivity {
int action = getIntent().getIntExtra(ARG_ACTION, ACTION_INVALID);
if (action == ACTION_EDIT_PROFILE) {
Log.d("profiles", "got edit profile action");
- int index = getIntent().getIntExtra(ARG_PROFILE_INDEX, -1);
- if (index >= 0) {
- MobileLedgerProfile profile = Data.profiles.get(index);
- ProfilesRecyclerViewAdapter adapter =
- (ProfilesRecyclerViewAdapter) recyclerView.getAdapter();
- if (adapter != null) adapter.editProfile(recyclerView, profile);
+ int index = getIntent().getIntExtra(ARG_PROFILE_INDEX, PROFILE_INDEX_NONE);
+
+ MobileLedgerProfile profile = (index >= 0) ? Data.profiles.get(index) : null;
+ ProfilesRecyclerViewAdapter adapter = (ProfilesRecyclerViewAdapter) recyclerView.getAdapter();
+ if (adapter != null) {
+ adapter.editProfile(recyclerView, profile);
+
+ // if invoked from the initial screen, get out so that when the new profile
+ // activity finishes the user i navigated to the main activity
+ if ((profile == null) && Data.profiles.getList().isEmpty()) finish();
}
}
}
-
- @Override
- protected void onStart() {
- super.onStart();
- fab.show();
+ void launchNewProfileActivity() {
+ ProfilesRecyclerViewAdapter adapter =
+ (ProfilesRecyclerViewAdapter) recyclerView.getAdapter();
+ if (adapter != null) adapter.editProfile(recyclerView, null);
}
private void setupRecyclerView(@NonNull RecyclerView recyclerView) {
final ProfilesRecyclerViewAdapter adapter = new ProfilesRecyclerViewAdapter(this, mTwoPane);
@@ -137,27 +144,16 @@ public class ProfileListActivity extends AppCompatActivity {
new ItemTouchHelper(cb).attachToRecyclerView(recyclerView);
recyclerView.addItemDecoration(new DividerItemDecoration(recyclerView.getContext(),
DividerItemDecoration.VERTICAL));
-
- recyclerView.setOnFlingListener(new RecyclerView.OnFlingListener() {
- @Override
- public boolean onFling(int dX, int dY) {
-// Log.d("tmp", String.format("fling %d %d", dX, dY));
- if (dY > 0) fab.hide();
- if (dY < 0) fab.show();
- return false;
- }
- });
-
- recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
- @Override
- public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
- super.onScrolled(recyclerView, dx, dy);
- if (dy > 0) fab.hide();
- if (dy < 0) fab.show();
- }
+ }
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.profile_list, menu);
+ menu.findItem(R.id.menu_add_profile).setOnMenuItemClickListener(item -> {
+ launchNewProfileActivity();
+ return true;
});
+ return super.onCreateOptionsMenu(menu);
}
-
public static class ProfilesRecyclerViewAdapter
extends RecyclerView.Adapter {
@@ -189,6 +185,7 @@ public class ProfileListActivity extends AppCompatActivity {
else {
Context context = view.getContext();
Intent intent = new Intent(context, ProfileDetailActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION);
if (index != -1) intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index);
context.startActivity(intent);
@@ -230,7 +227,7 @@ public class ProfileListActivity extends AppCompatActivity {
final MobileLedgerProfile profile = Data.profiles.get(position);
final MobileLedgerProfile currentProfile = Data.profile.get();
Log.d("profiles", String.format("pos %d: %s, current: %s", position, profile.getUuid(),
- currentProfile.getUuid()));
+ (currentProfile == null) ? "" : currentProfile.getUuid()));
holder.itemView.setTag(profile);
holder.mTitle.setText(profile.getName());
holder.mSubTitle.setText(profile.getUrl());