leanote/leanote-android
1
0
Fork 0
mirror of https://github.com/leanote/leanote-android.git synced 2025-10-17 16:07:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fetch notes when sign in; modify some text;

Browse Source
This commit is contained in:
houxg
2016-11-22 16:07:02 +08:00
parent d27dfb62a5
commit 3bd976f27f
6 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@@ -19,7 +19,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name="org.houxg.leamonax.ui.LeaLaunchActivity">
<activity android:name="org.houxg.leamonax.ui.LaunchActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

4
app/src/main/java/org/houxg/leamonax/ui/LeaLaunchActivity.java → app/src/main/java/org/houxg/leamonax/ui/LaunchActivity.java
View File

@@ -8,7 +8,7 @@ import org.houxg.leamonax.model.Account;
import org.houxg.leamonax.network.ApiProvider;
import org.houxg.leamonax.service.AccountService;
public class LeaLaunchActivity extends Activity {
public class LaunchActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -17,7 +17,7 @@ public class LeaLaunchActivity extends Activity {
if (AccountService.isSignedIn()) {
Account account = AccountService.getCurrent();
ApiProvider.getInstance().init(account.getHost());
intent = new Intent(this, MainActivity.class);
intent = MainActivity.getOpenIntent(this, false);
} else {
intent = new Intent(this, SignInActivity.class);
}

2
app/src/main/java/org/houxg/leamonax/ui/MainActivity.java
View File

@@ -87,7 +87,7 @@ public class MainActivity extends BaseActivity implements NotebookAdapter.Notebo
getSupportActionBar().setHomeAsUpIndicator(R.drawable.ic_menu_white);
if (savedInstanceState == null) {
mNoteFragment = NoteFragment.newInstance();
mNoteFragment = NoteFragment.newInstance(getIntent().getBooleanExtra(EXT_SHOULD_RELOAD, false));
getFragmentManager().beginTransaction().add(R.id.container, mNoteFragment, TAG_NOTE_FRAGMENT).commit();
} else {
mNoteFragment = (NoteFragment) getFragmentManager().findFragmentByTag(TAG_NOTE_FRAGMENT);

35
app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java
View File

@@ -32,6 +32,7 @@ import org.houxg.leamonax.model.Note;
import org.houxg.leamonax.model.SyncEvent;
import org.houxg.leamonax.service.NoteService;
import org.houxg.leamonax.utils.DisplayUtils;
import org.houxg.leamonax.utils.NetworkUtils;
import org.houxg.leamonax.utils.ToastUtils;
import java.util.Locale;
@@ -48,6 +49,7 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis
private static final String TAG = "NoteFragment";
private static final String EXT_SCROLL_POSITION = "ext_scroll_position";
private static final String EXT_SHOULD_FETCH_NOTES = "ext_should_fetch_notes";
public static final int RECENT_NOTES = -1;
@@ -64,8 +66,12 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis
public NoteFragment() {
}
public static NoteFragment newInstance() {
return new NoteFragment();
public static NoteFragment newInstance(boolean shouldFetchNotes) {
NoteFragment fragment = new NoteFragment();
Bundle bundle = new Bundle();
bundle.putBoolean(EXT_SHOULD_FETCH_NOTES, shouldFetchNotes);
fragment.setArguments(bundle);
return fragment;
}
@Nullable
@@ -87,8 +93,7 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis
mSwipeRefresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
//TODO:check network
NoteSyncService.startServiceForNote(getActivity());
syncNotes();
}
});
@@ -108,12 +113,30 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis
return view;
}
private void syncNotes() {
if (!NetworkUtils.isNetworkAvailable(getActivity())) {
ToastUtils.showNetworkUnavailable(getActivity());
return;
}
NoteSyncService.startServiceForNote(getActivity());
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
EventBus.getDefault().register(this);
if (savedInstanceState == null) {
mAdapter.loadFromLocal();
if (getArguments().getBoolean(EXT_SHOULD_FETCH_NOTES, false)) {
mSwipeRefresh.postDelayed(new Runnable() {
@Override
public void run() {
Log.i(TAG, "fetch notes");
mSwipeRefresh.setRefreshing(true);
syncNotes();
}
}, 200);
}
}
if (savedInstanceState != null) {
mScrollPosition = savedInstanceState.getFloat(EXT_SCROLL_POSITION, 0);
@@ -149,10 +172,6 @@ public class NoteFragment extends Fragment implements NoteAdapter.NoteAdapterLis
}
}
public void loadNoteWithTag(String tag) {
mAdapter.loadFromLocal();
}
@Override
public void onClickNote(Note note) {
startActivity(NotePreviewActivity.getOpenIntent(getActivity(), note.getId()));

2
app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java
View File

@@ -155,7 +155,7 @@ public class SignInActivity extends BaseActivity implements TextWatcher {
startActivity(intent);
finish();
} else {
ToastUtils.show(SignInActivity.this, R.string.wron_email_or_password);
ToastUtils.show(SignInActivity.this, R.string.email_or_password_incorrect);
}
}
});

2
app/src/main/res/values/strings.xml
View File

@@ -29,7 +29,7 @@
<string name="change_password_failed">Change password failed</string>
<string name="choose_notebook">Choose notebook</string>
<string name="delete_note_failed">Delete note failed</string>
<string name="wron_email_or_password">Wrong email or password</string>
<string name="email_or_password_incorrect">Email or password is incorrect</string>
<string name="network_error">Network error</string>
<string name="untitled">Untitled</string>
<string name="time_yesterday">Yesterday %s</string>