From f47ad9529c1d2102ed5a4a22afc2b166b28b60b4 Mon Sep 17 00:00:00 2001 From: MikkoAyaka <3401286177@qq.com> Date: Fri, 19 May 2023 17:34:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BA=86=E4=BE=BF=E7=AD=BE?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BB=A5=20Markdown=20=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notes/ui/activities/NoteEditActivity.java | 10 ++++++++++ .../notes/ui/activities/NotesListActivity.java | 7 ++----- .../ui/activities/NotesPreferenceActivity.java | 16 +++------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java b/src/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java index 1339016..854297f 100644 --- a/src/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java +++ b/src/src/main/java/net/micode/notes/ui/activities/NoteEditActivity.java @@ -43,6 +43,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; import android.view.WindowManager; +import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; @@ -180,6 +181,15 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } initResources(); + Button previewBtn = (Button) this.findViewById(R.id.preview_btn); + previewBtn.setOnClickListener((e)->{ + // jump to preview layout + Intent intent = new Intent(); + intent.setClass(NoteEditActivity.this,PreviewActivity.class); + getWorkingText(); + PreviewActivity.text = mWorkingNote.getContent(); + startActivity(intent); + }); } /** diff --git a/src/src/main/java/net/micode/notes/ui/activities/NotesListActivity.java b/src/src/main/java/net/micode/notes/ui/activities/NotesListActivity.java index 10a192f..dc45586 100644 --- a/src/src/main/java/net/micode/notes/ui/activities/NotesListActivity.java +++ b/src/src/main/java/net/micode/notes/ui/activities/NotesListActivity.java @@ -63,7 +63,6 @@ import android.widget.Toast; import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.remote.GTaskSyncService; import net.micode.notes.model.WorkingNote; import net.micode.notes.tool.BackupUtils; import net.micode.notes.tool.DataUtils; @@ -775,8 +774,6 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt if (mState == ListEditState.NOTE_LIST) { getMenuInflater().inflate(R.menu.note_list, menu); // set sync or sync_cancel - menu.findItem(R.id.menu_sync).setTitle( - GTaskSyncService.isSyncing() ? R.string.menu_sync_cancel : R.string.menu_sync); } else if (mState == ListEditState.SUB_FOLDER) { getMenuInflater().inflate(R.menu.sub_folder, menu); } else if (mState == ListEditState.CALL_RECORD_FOLDER) { @@ -801,9 +798,9 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt case R.id.menu_sync: { if (isSyncMode()) { if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { - GTaskSyncService.startSync(this); + } else { - GTaskSyncService.cancelSync(this); + } } else { startPreferenceActivity(); diff --git a/src/src/main/java/net/micode/notes/ui/activities/NotesPreferenceActivity.java b/src/src/main/java/net/micode/notes/ui/activities/NotesPreferenceActivity.java index a705a89..94c2a1e 100644 --- a/src/src/main/java/net/micode/notes/ui/activities/NotesPreferenceActivity.java +++ b/src/src/main/java/net/micode/notes/ui/activities/NotesPreferenceActivity.java @@ -43,7 +43,6 @@ import android.widget.Toast; import net.micode.notes.R; import net.micode.notes.data.Notes; import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.gtask.remote.GTaskSyncService; public class NotesPreferenceActivity extends PreferenceActivity { @@ -78,7 +77,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { mAccountCategory = (PreferenceCategory) findPreference(PREFERENCE_SYNC_ACCOUNT_KEY); mReceiver = new GTaskReceiver(); IntentFilter filter = new IntentFilter(); - filter.addAction(GTaskSyncService.GTASK_SERVICE_BROADCAST_NAME); registerReceiver(mReceiver, filter); mOriAccounts = null; @@ -131,7 +129,7 @@ public class NotesPreferenceActivity extends PreferenceActivity { accountPref.setSummary(getString(R.string.preferences_account_summary)); accountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() { public boolean onPreferenceClick(Preference preference) { - if (!GTaskSyncService.isSyncing()) { + if (false) { if (TextUtils.isEmpty(defaultAccount)) { // the first time to set account showSelectAccountAlertDialog(); @@ -157,26 +155,23 @@ public class NotesPreferenceActivity extends PreferenceActivity { TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview); // set button state - if (GTaskSyncService.isSyncing()) { + if (false) { syncButton.setText(getString(R.string.preferences_button_sync_cancel)); syncButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - GTaskSyncService.cancelSync(NotesPreferenceActivity.this); } }); } else { syncButton.setText(getString(R.string.preferences_button_sync_immediately)); syncButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { - GTaskSyncService.startSync(NotesPreferenceActivity.this); } }); } syncButton.setEnabled(!TextUtils.isEmpty(getSyncAccountName(this))); // set last sync time - if (GTaskSyncService.isSyncing()) { - lastSyncTimeView.setText(GTaskSyncService.getProgressString()); + if (false) { lastSyncTimeView.setVisibility(View.VISIBLE); } else { long lastSyncTime = getLastSyncTime(this); @@ -363,11 +358,6 @@ public class NotesPreferenceActivity extends PreferenceActivity { @Override public void onReceive(Context context, Intent intent) { refreshUI(); - if (intent.getBooleanExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_IS_SYNCING, false)) { - TextView syncStatus = (TextView) findViewById(R.id.prefenerece_sync_status_textview); - syncStatus.setText(intent - .getStringExtra(GTaskSyncService.GTASK_SERVICE_BROADCAST_PROGRESS_MSG)); - } } }