迁移至ViewBinding #24

Merged
mbls3xqnp merged 2 commits from baoerjun_branch into master 1 month ago

@ -7,6 +7,11 @@ android {
compileSdk = 34
buildToolsVersion = "34.0.0"
// 启用ViewBinding
buildFeatures {
viewBinding = true
}
defaultConfig {
applicationId = "net.micode.notes"
minSdk = 24

@ -14,6 +14,7 @@ import androidx.core.view.WindowInsetsCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import net.micode.notes.data.Notes;
import net.micode.notes.databinding.ActivityMainBinding;
import net.micode.notes.ui.SidebarFragment;
/**
@ -26,7 +27,7 @@ import net.micode.notes.ui.SidebarFragment;
public class MainActivity extends AppCompatActivity implements SidebarFragment.OnSidebarItemSelectedListener {
private static final String TAG = "MainActivity";
private DrawerLayout drawerLayout;
private ActivityMainBinding binding;
/**
*
@ -41,16 +42,16 @@ public class MainActivity extends AppCompatActivity implements SidebarFragment.O
super.onCreate(savedInstanceState);
// 启用边到边显示模式
EdgeToEdge.enable(this);
setContentView(R.layout.activity_main);
binding = ActivityMainBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
// 初始化DrawerLayout
drawerLayout = findViewById(R.id.drawer_layout);
if (drawerLayout != null) {
if (binding.drawerLayout != null) {
// 设置侧栏在左侧
drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, Gravity.LEFT);
binding.drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, Gravity.LEFT);
// 设置监听器:侧栏关闭时更新状态
drawerLayout.addDrawerListener(new DrawerLayout.DrawerListener() {
binding.drawerLayout.addDrawerListener(new DrawerLayout.DrawerListener() {
@Override
public void onDrawerSlide(View drawerView, float slideOffset) {
// 侧栏滑动时
@ -74,7 +75,7 @@ public class MainActivity extends AppCompatActivity implements SidebarFragment.O
}
// 设置窗口边距监听器,自动适配系统栏
ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main_content), (v, insets) -> {
ViewCompat.setOnApplyWindowInsetsListener(binding.mainContent, (v, insets) -> {
// 获取系统栏边距
Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
// 设置视图内边距以适配系统栏
@ -152,11 +153,14 @@ public class MainActivity extends AppCompatActivity implements SidebarFragment.O
*
*/
private void closeSidebar() {
if (drawerLayout != null) {
drawerLayout.closeDrawer(Gravity.LEFT);
if (binding.drawerLayout != null) {
binding.drawerLayout.closeDrawer(Gravity.LEFT);
}
}
}
//test
@Override
protected void onDestroy() {
super.onDestroy();
binding = null;
}
}

@ -20,10 +20,11 @@ import java.text.DateFormatSymbols;
import java.util.Calendar;
import net.micode.notes.R;
import net.micode.notes.databinding.DatetimePickerBinding;
import android.content.Context;
import android.text.format.DateFormat;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.NumberPicker;
@ -72,6 +73,7 @@ public class DateTimePicker extends FrameLayout {
private final NumberPicker mHourSpinner;
private final NumberPicker mMinuteSpinner;
private final NumberPicker mAmPmSpinner;
private final DatetimePickerBinding binding;
private Calendar mDate;
private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK];
@ -281,19 +283,19 @@ public class DateTimePicker extends FrameLayout {
// 判断当前是否为下午
mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY;
// 加载布局
inflate(context, R.layout.datetime_picker, this);
binding = DatetimePickerBinding.inflate(LayoutInflater.from(context), this, true);
// 初始化日期选择器
mDateSpinner = (NumberPicker) findViewById(R.id.date);
mDateSpinner = binding.date;
mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL);
mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL);
mDateSpinner.setOnValueChangedListener(mOnDateChangedListener);
// 初始化小时选择器
mHourSpinner = (NumberPicker) findViewById(R.id.hour);
mHourSpinner = binding.hour;
mHourSpinner.setOnValueChangedListener(mOnHourChangedListener);
// 初始化分钟选择器
mMinuteSpinner = (NumberPicker) findViewById(R.id.minute);
mMinuteSpinner = binding.minute;
mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL);
mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL);
mMinuteSpinner.setOnLongPressUpdateInterval(100);
@ -301,7 +303,7 @@ public class DateTimePicker extends FrameLayout {
// 初始化上午/下午选择器
String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings();
mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm);
mAmPmSpinner = binding.amPm;
mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL);
mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL);
mAmPmSpinner.setDisplayedValues(stringsForAmPm);

@ -76,6 +76,8 @@ import java.util.regex.Pattern;
import androidx.appcompat.app.AppCompatActivity;
import com.google.android.material.appbar.MaterialToolbar;
import net.micode.notes.databinding.NoteEditBinding;
public class NoteEditActivity extends AppCompatActivity implements OnClickListener,
NoteSettingChangedListener, OnTextViewChangeListener {
@ -166,19 +168,61 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
private String mUserQuery;
private Pattern mPattern;
private NoteEditBinding binding;
/**
* ID
*/
private View getBgSelectorView(int viewId) {
switch (viewId) {
case R.id.iv_bg_yellow_select:
return binding.ivBgYellowSelect;
case R.id.iv_bg_red_select:
return binding.ivBgRedSelect;
case R.id.iv_bg_blue_select:
return binding.ivBgBlueSelect;
case R.id.iv_bg_green_select:
return binding.ivBgGreenSelect;
case R.id.iv_bg_white_select:
return binding.ivBgWhiteSelect;
default:
throw new IllegalArgumentException("Unknown view ID: " + viewId);
}
}
/**
* ID
*/
private View getFontSelectorView(int viewId) {
switch (viewId) {
case R.id.iv_small_select:
return binding.ivSmallSelect;
case R.id.iv_medium_select:
return binding.ivMediumSelect;
case R.id.iv_large_select:
return binding.ivLargeSelect;
case R.id.iv_super_select:
return binding.ivSuperSelect;
default:
throw new IllegalArgumentException("Unknown view ID: " + viewId);
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
this.setContentView(R.layout.note_edit);
// 使用ViewBinding设置布局
binding = NoteEditBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
// 初始化Toolbar使用MaterialToolbar与列表页面一致
MaterialToolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
setSupportActionBar(binding.toolbar);
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);
}
toolbar.setNavigationOnClickListener(v -> finish());
binding.toolbar.setNavigationOnClickListener(v -> finish());
if (savedInstanceState == null && !initActivityState(getIntent())) {
finish();
@ -311,19 +355,19 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
* </p>
*/
private void initResources() {
mHeadViewPanel = findViewById(R.id.note_title);
mHeadViewPanel = binding.noteTitle;
mNoteHeaderHolder = new HeadViewHolder();
mNoteHeaderHolder.tvModified = findViewById(R.id.tv_modified_date);
mNoteHeaderHolder.ivAlertIcon = findViewById(R.id.iv_alert_icon);
mNoteHeaderHolder.tvAlertDate = findViewById(R.id.tv_alert_date);
mNoteHeaderHolder.ibSetBgColor = findViewById(R.id.btn_set_bg_color);
mNoteHeaderHolder.tvModified = binding.tvModifiedDate;
mNoteHeaderHolder.ivAlertIcon = binding.ivAlertIcon;
mNoteHeaderHolder.tvAlertDate = binding.tvAlertDate;
mNoteHeaderHolder.ibSetBgColor = binding.btnSetBgColor;
mNoteHeaderHolder.ibSetBgColor.setOnClickListener(this);
mNoteHeaderHolder.tvCharCount = findViewById(R.id.tv_char_count);
mNoteHeaderHolder.etTitle = findViewById(R.id.et_title);
mNoteHeaderHolder.tvCharCount = binding.tvCharCount;
mNoteHeaderHolder.etTitle = binding.etTitle;
mNoteEditor = findViewById(R.id.note_edit_view);
mNoteEditorPanel = findViewById(R.id.sv_note_edit);
mNoteBgColorSelector = findViewById(R.id.note_bg_color_selector);
mNoteEditor = binding.noteEditView;
mNoteEditorPanel = binding.svNoteEdit;
mNoteBgColorSelector = binding.noteBgColorSelector;
mNoteEditor.addTextChangedListener(new TextWatcher() {
@Override
@ -364,13 +408,48 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
// 设置背景颜色选择器的点击事件
for (int id : sBgSelectorBtnsMap.keySet()) {
ImageView iv = findViewById(id);
ImageView iv;
switch (id) {
case R.id.iv_bg_yellow:
iv = binding.ivBgYellow;
break;
case R.id.iv_bg_red:
iv = binding.ivBgRed;
break;
case R.id.iv_bg_blue:
iv = binding.ivBgBlue;
break;
case R.id.iv_bg_green:
iv = binding.ivBgGreen;
break;
case R.id.iv_bg_white:
iv = binding.ivBgWhite;
break;
default:
throw new IllegalArgumentException("Unknown view ID: " + id);
}
iv.setOnClickListener(this);
}
mFontSizeSelector = findViewById(R.id.font_size_selector);
mFontSizeSelector = binding.fontSizeSelector;
for (int id : sFontSizeBtnsMap.keySet()) {
View view = findViewById(id);
View view;
switch (id) {
case R.id.ll_font_small:
view = binding.llFontSmall;
break;
case R.id.ll_font_normal:
view = binding.llFontNormal;
break;
case R.id.ll_font_large:
view = binding.llFontLarge;
break;
case R.id.ll_font_super:
view = binding.llFontSuper;
break;
default:
throw new IllegalArgumentException("Unknown view ID: " + id);
}
view.setOnClickListener(this);
}
@ -384,7 +463,7 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
if (mFontSizeId >= TextAppearanceResources.getResourcesSize()) {
mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE;
}
mEditTextList = findViewById(R.id.note_edit_list);
mEditTextList = binding.noteEditList;
}
@Override
@ -416,7 +495,10 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
}
mNoteHeaderHolder.etTitle.setText(mWorkingNote.getTitle());
for (Integer id : sBgSelectorSelectionMap.keySet()) {
findViewById(sBgSelectorSelectionMap.get(id)).setVisibility(View.GONE);
View view = getBgSelectorView(sBgSelectorSelectionMap.get(id));
if (view != null) {
view.setVisibility(View.GONE);
}
}
mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
@ -549,6 +631,12 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
clearSettingState();
}
@Override
protected void onDestroy() {
super.onDestroy();
binding = null;
}
/**
*
* <p>
@ -590,18 +678,28 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
int id = v.getId();
if (id == R.id.btn_set_bg_color) {
mNoteBgColorSelector.setVisibility(View.VISIBLE);
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.VISIBLE);
View bgView = getBgSelectorView(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId()));
if (bgView != null) {
bgView.setVisibility(View.VISIBLE);
}
} else if (sBgSelectorBtnsMap.containsKey(id)) {
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.GONE);
View bgView = getBgSelectorView(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId()));
if (bgView != null) {
bgView.setVisibility(View.GONE);
}
mWorkingNote.setBgColorId(sBgSelectorBtnsMap.get(id));
mNoteBgColorSelector.setVisibility(View.GONE);
} else if (sFontSizeBtnsMap.containsKey(id)) {
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.GONE);
View fontView = getFontSelectorView(sFontSelectorSelectionMap.get(mFontSizeId));
if (fontView != null) {
fontView.setVisibility(View.GONE);
}
mFontSizeId = sFontSizeBtnsMap.get(id);
mSharedPrefs.edit().putInt(PREFERENCE_FONT_SIZE, mFontSizeId).commit();
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
fontView = getFontSelectorView(sFontSelectorSelectionMap.get(mFontSizeId));
if (fontView != null) {
fontView.setVisibility(View.VISIBLE);
}
if (mWorkingNote.getCheckListMode() == TextNote.MODE_CHECK_LIST) {
getWorkingText();
switchToListMode(mWorkingNote.getContent());
@ -660,8 +758,10 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
* </p>
*/
public void onBackgroundColorChanged() {
findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
View.VISIBLE);
View bgView = getBgSelectorView(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId()));
if (bgView != null) {
bgView.setVisibility(View.VISIBLE);
}
mNoteEditorPanel.setBackgroundResource(mWorkingNote.getBgColorResId());
mHeadViewPanel.setBackgroundResource(mWorkingNote.getTitleBgResId());
}
@ -745,7 +845,10 @@ public class NoteEditActivity extends AppCompatActivity implements OnClickListen
break;
case R.id.menu_font_size:
mFontSizeSelector.setVisibility(View.VISIBLE);
findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE);
View fontView = getFontSelectorView(sFontSelectorSelectionMap.get(mFontSizeId));
if (fontView != null) {
fontView.setVisibility(View.VISIBLE);
}
break;
case R.id.menu_list_mode:
mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ?

@ -29,8 +29,6 @@ import androidx.appcompat.view.ActionMode;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.WindowInsets;
import android.view.WindowInsetsController;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.Button;
@ -42,10 +40,8 @@ import android.widget.TextView;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModel;
@ -54,6 +50,7 @@ import androidx.lifecycle.ViewModelProvider;
import net.micode.notes.R;
import net.micode.notes.data.Notes;
import net.micode.notes.data.NotesRepository;
import net.micode.notes.databinding.NoteListBinding;
import net.micode.notes.tool.SecurityManager;
import net.micode.notes.ui.NoteInfoAdapter;
import net.micode.notes.viewmodel.NotesListViewModel;
@ -87,13 +84,9 @@ public class NotesListActivity extends AppCompatActivity
private static final int REQUEST_CODE_CHECK_PASSWORD_FOR_LOCK = 105;
private NotesListViewModel viewModel;
private ListView notesListView;
private androidx.appcompat.widget.Toolbar toolbar;
private NoteListBinding binding;
private NoteInfoAdapter adapter;
private DrawerLayout drawerLayout;
private FloatingActionButton fabNewNote;
private LinearLayout breadcrumbContainer;
private LinearLayout breadcrumbItems;
private View sidebarFragment;
// 多选模式状态
private boolean isMultiSelectMode = false;
@ -120,16 +113,12 @@ public class NotesListActivity extends AppCompatActivity
// 启用边缘到边缘显示
WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
setContentView(R.layout.note_list);
binding = NoteListBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
// 处理窗口insets状态栏和导航栏
View mainView = findViewById(android.R.id.content);
ViewCompat.setOnApplyWindowInsetsListener(mainView, (v, windowInsets) -> {
Insets insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
// 设置内容区域的padding以避免被状态栏遮挡
v.setPadding(insets.left, insets.top, insets.right, insets.bottom);
return WindowInsetsCompat.CONSUMED;
});
// 注意CoordinatorLayout和AppBarLayout会自动处理WindowInsets
// FAB也会自动避开导航栏
// 不需要手动设置padding
initViewModel();
@ -137,12 +126,12 @@ public class NotesListActivity extends AppCompatActivity
if (savedInstanceState != null) {
mPendingNodeIdToOpen = savedInstanceState.getLong(KEY_PENDING_NODE_ID, -1);
mPendingNodeTypeToOpen = savedInstanceState.getInt(KEY_PENDING_NODE_TYPE, -1);
long savedFolderId = savedInstanceState.getLong(KEY_CURRENT_FOLDER_ID, Notes.ID_ROOT_FOLDER);
if (savedFolderId != Notes.ID_ROOT_FOLDER) {
viewModel.setCurrentFolderId(savedFolderId);
}
Log.d(TAG, "Restored pending node: " + mPendingNodeIdToOpen + ", type: " + mPendingNodeTypeToOpen + ", folder: " + savedFolderId);
}
@ -194,23 +183,20 @@ public class NotesListActivity extends AppCompatActivity
*
*/
private void initViews() {
notesListView = findViewById(R.id.notes_list);
toolbar = findViewById(R.id.toolbar);
drawerLayout = findViewById(R.id.drawer_layout);
// 初始化面包屑导航
breadcrumbContainer = findViewById(R.id.breadcrumb_container);
breadcrumbItems = findViewById(R.id.breadcrumb_items);
// 特殊处理Fragment标签不会在ViewBinding中生成字段
// 必须使用findViewById获取<fragment>标签声明的Fragment实例
// 这是Android ViewBinding的已知限制不是遗漏
sidebarFragment = findViewById(R.id.sidebar_fragment);
// 设置适配器
adapter = new NoteInfoAdapter(this);
notesListView.setAdapter(adapter);
binding.notesList.setAdapter(adapter);
adapter.setOnNoteButtonClickListener(this);
adapter.setOnNoteItemClickListener(this);
adapter.setOnNoteItemLongClickListener(this);
// 设置点击监听
notesListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
binding.notesList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Object item = parent.getItemAtPosition(position);
@ -222,8 +208,7 @@ public class NotesListActivity extends AppCompatActivity
});
// 初始化 Toolbar
toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
setSupportActionBar(binding.toolbar);
if (getSupportActionBar() != null) {
getSupportActionBar().setTitle(R.string.app_name);
}
@ -232,16 +217,13 @@ public class NotesListActivity extends AppCompatActivity
updateToolbarForNormalMode();
// 设置 Toolbar 的汉堡菜单按钮点击监听器(打开侧栏)
toolbar.setNavigationOnClickListener(v -> {
if (drawerLayout != null) {
drawerLayout.openDrawer(findViewById(R.id.sidebar_fragment));
}
binding.toolbar.setNavigationOnClickListener(v -> {
binding.drawerLayout.openDrawer(sidebarFragment);
});
// Set FAB click event
fabNewNote = findViewById(R.id.btn_new_note);
if (fabNewNote != null) {
fabNewNote.setOnClickListener(v -> {
if (binding.btnNewNote != null) {
binding.btnNewNote.setOnClickListener(v -> {
Intent intent = new Intent(NotesListActivity.this, NoteEditActivity.class);
intent.setAction(Intent.ACTION_INSERT_OR_EDIT);
intent.putExtra(Notes.INTENT_EXTRA_FOLDER_ID, viewModel.getCurrentFolderId());
@ -334,10 +316,10 @@ public class NotesListActivity extends AppCompatActivity
public void onChanged(Boolean refreshNeeded) {
if (refreshNeeded != null && refreshNeeded) {
// 通知侧栏刷新
SidebarFragment sidebarFragment = (SidebarFragment) getSupportFragmentManager()
SidebarFragment sidebarFrag = (SidebarFragment) getSupportFragmentManager()
.findFragmentById(R.id.sidebar_fragment);
if (sidebarFragment != null) {
sidebarFragment.refreshFolderTree();
if (sidebarFrag != null) {
sidebarFrag.refreshFolderTree();
}
// 重置刷新状态
viewModel.getSidebarRefreshNeeded().setValue(false);
@ -352,11 +334,11 @@ public class NotesListActivity extends AppCompatActivity
* @param path
*/
private void updateBreadcrumb(List<NotesRepository.NoteInfo> path) {
if (breadcrumbItems == null || path == null) {
if (binding.breadcrumbInclude == null || binding.breadcrumbInclude.breadcrumbItems == null || path == null) {
return;
}
breadcrumbItems.removeAllViews();
binding.breadcrumbInclude.breadcrumbItems.removeAllViews();
for (int i = 0; i < path.size(); i++) {
NotesRepository.NoteInfo folder = path.get(i);
@ -367,12 +349,12 @@ public class NotesListActivity extends AppCompatActivity
separator.setText(" > ");
separator.setTextSize(14);
separator.setTextColor(android.R.color.darker_gray);
breadcrumbItems.addView(separator);
binding.breadcrumbInclude.breadcrumbItems.addView(separator);
}
// 创建面包屑项
TextView breadcrumbItem = (TextView) getLayoutInflater()
.inflate(R.layout.breadcrumb_item, breadcrumbItems, false);
.inflate(R.layout.breadcrumb_item, binding.breadcrumbInclude.breadcrumbItems, false);
breadcrumbItem.setText(folder.title);
// 如果是当前文件夹(最后一个),高亮显示且不可点击
@ -385,7 +367,7 @@ public class NotesListActivity extends AppCompatActivity
breadcrumbItem.setOnClickListener(v -> viewModel.enterFolder(targetFolderId));
}
breadcrumbItems.addView(breadcrumbItem);
binding.breadcrumbInclude.breadcrumbItems.addView(breadcrumbItem);
}
}
@ -569,8 +551,8 @@ public class NotesListActivity extends AppCompatActivity
private void enterMultiSelectMode() {
isMultiSelectMode = true;
// 隐藏FAB按钮
if (fabNewNote != null) {
fabNewNote.setVisibility(View.GONE);
if (binding.btnNewNote != null) {
binding.btnNewNote.setVisibility(View.GONE);
}
// 更新toolbar为多选模式
updateToolbarForMultiSelectMode();
@ -582,8 +564,8 @@ public class NotesListActivity extends AppCompatActivity
private void exitMultiSelectMode() {
isMultiSelectMode = false;
// 显示FAB按钮
if (fabNewNote != null) {
fabNewNote.setVisibility(View.VISIBLE);
if (binding.btnNewNote != null) {
binding.btnNewNote.setVisibility(View.VISIBLE);
}
// 清除选中状态
viewModel.clearSelection();
@ -599,22 +581,22 @@ public class NotesListActivity extends AppCompatActivity
* Toolbar
*/
private void updateToolbarForMultiSelectMode() {
if (toolbar == null) return;
if (binding.toolbar == null) return;
// 设置标题为选中数量
int selectedCount = viewModel.getSelectedCount();
String title = getString(R.string.menu_select_title, selectedCount);
toolbar.setTitle(title);
binding.toolbar.setTitle(title);
// 设置导航图标为返回(取消多选)
toolbar.setNavigationIcon(androidx.appcompat.R.drawable.abc_ic_ab_back_material);
toolbar.setNavigationOnClickListener(v -> exitMultiSelectMode());
binding.toolbar.setNavigationIcon(androidx.appcompat.R.drawable.abc_ic_ab_back_material);
binding.toolbar.setNavigationOnClickListener(v -> exitMultiSelectMode());
// 移除普通模式的菜单(如果有)
toolbar.getMenu().clear();
binding.toolbar.getMenu().clear();
// 直接在toolbar上添加操作按钮不在三点菜单中
Menu menu = toolbar.getMenu();
Menu menu = binding.toolbar.getMenu();
// 删除按钮
MenuItem deleteItem = menu.add(Menu.NONE, R.id.multi_select_delete, 1, getString(R.string.menu_delete));
@ -644,36 +626,34 @@ public class NotesListActivity extends AppCompatActivity
* Toolbar
*/
private void updateToolbarForNormalMode() {
if (toolbar == null) return;
if (binding.toolbar == null) return;
// 清除多选模式菜单
toolbar.getMenu().clear();
binding.toolbar.getMenu().clear();
// 设置标题
if (viewModel.isTrashMode()) {
toolbar.setTitle(R.string.menu_trash);
binding.toolbar.setTitle(R.string.menu_trash);
} else {
toolbar.setTitle(R.string.app_name);
binding.toolbar.setTitle(R.string.app_name);
// 添加普通模式菜单
toolbar.inflateMenu(R.menu.note_list);
binding.toolbar.inflateMenu(R.menu.note_list);
}
// 设置导航图标为汉堡菜单
toolbar.setNavigationIcon(android.R.drawable.ic_menu_sort_by_size);
toolbar.setNavigationOnClickListener(v -> {
if (drawerLayout != null) {
drawerLayout.openDrawer(findViewById(R.id.sidebar_fragment));
}
binding.toolbar.setNavigationIcon(android.R.drawable.ic_menu_sort_by_size);
binding.toolbar.setNavigationOnClickListener(v -> {
binding.drawerLayout.openDrawer(sidebarFragment);
});
// 如果是回收站模式,不显示新建按钮
if (viewModel.isTrashMode()) {
if (fabNewNote != null) {
fabNewNote.setVisibility(View.GONE);
if (binding.btnNewNote != null) {
binding.btnNewNote.setVisibility(View.GONE);
}
} else {
if (fabNewNote != null) {
fabNewNote.setVisibility(View.VISIBLE);
if (binding.btnNewNote != null) {
binding.btnNewNote.setVisibility(View.VISIBLE);
}
}
}
@ -834,15 +814,6 @@ public class NotesListActivity extends AppCompatActivity
return super.onContextItemSelected(item);
}
/**
*
*/
@Override
protected void onDestroy() {
super.onDestroy();
// 清理资源
}
private void updateSelectionState(int position, boolean selected) {
Log.d("NotesListActivity", "===== updateSelectionState called =====");
Log.d("NotesListActivity", "position: " + position + ", selected: " + selected);
@ -878,8 +849,8 @@ public class NotesListActivity extends AppCompatActivity
// 跳转到指定文件夹
viewModel.enterFolder(folderId);
// 关闭侧栏
if (drawerLayout != null) {
drawerLayout.closeDrawer(findViewById(R.id.sidebar_fragment));
if (binding.drawerLayout != null) {
binding.drawerLayout.closeDrawer(sidebarFragment);
}
}
@ -888,8 +859,8 @@ public class NotesListActivity extends AppCompatActivity
// 跳转到回收站
viewModel.enterFolder(Notes.ID_TRASH_FOLER);
// 关闭侧栏
if (drawerLayout != null) {
drawerLayout.closeDrawer(findViewById(R.id.sidebar_fragment));
if (binding.drawerLayout != null) {
binding.drawerLayout.closeDrawer(sidebarFragment);
}
}
@ -917,11 +888,11 @@ public class NotesListActivity extends AppCompatActivity
@Override
public void onSettingsSelected() {
// 打开设置页面
Intent intent = new Intent(this, NotesPreferenceActivity.class);
Intent intent = new Intent(this, net.micode.notes.ui.NotesPreferenceActivity.class);
startActivity(intent);
// 关闭侧栏
if (drawerLayout != null) {
drawerLayout.closeDrawer(findViewById(R.id.sidebar_fragment));
if (binding.drawerLayout != null) {
binding.drawerLayout.closeDrawer(sidebarFragment);
}
}
@ -988,8 +959,8 @@ public class NotesListActivity extends AppCompatActivity
@Override
public void onCloseSidebar() {
// 关闭侧栏
if (drawerLayout != null) {
drawerLayout.closeDrawer(findViewById(R.id.sidebar_fragment));
if (binding.drawerLayout != null) {
binding.drawerLayout.closeDrawer(sidebarFragment);
}
}
@ -1006,9 +977,9 @@ public class NotesListActivity extends AppCompatActivity
if (isMultiSelectMode) {
// 多选模式:退出多选模式
exitMultiSelectMode();
} else if (drawerLayout != null && drawerLayout.isDrawerOpen(findViewById(R.id.sidebar_fragment))) {
} else if (binding.drawerLayout != null && binding.drawerLayout.isDrawerOpen(sidebarFragment)) {
// 侧栏打开:关闭侧栏
drawerLayout.closeDrawer(findViewById(R.id.sidebar_fragment));
binding.drawerLayout.closeDrawer(sidebarFragment);
} else if (viewModel.getCurrentFolderId() != Notes.ID_ROOT_FOLDER &&
viewModel.getCurrentFolderId() != Notes.ID_CALL_RECORD_FOLDER) {
// 子文件夹:返回上一级
@ -1021,4 +992,10 @@ public class NotesListActivity extends AppCompatActivity
moveTaskToBack(true);
}
}
@Override
protected void onDestroy() {
super.onDestroy();
binding = null;
}
}

@ -45,6 +45,7 @@ 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.databinding.SettingsHeaderBinding;
// Google Tasks同步功能已禁用
// import net.micode.notes.gtask.remote.GTaskSyncService;
import net.micode.notes.tool.SecurityManager;
@ -110,6 +111,11 @@ public class NotesPreferenceActivity extends PreferenceActivity {
*/
private GTaskReceiver mReceiver;
/**
*
*/
private SettingsHeaderBinding mHeaderBinding;
/**
*
*/
@ -155,8 +161,8 @@ public class NotesPreferenceActivity extends PreferenceActivity {
// registerReceiver(mReceiver, filter);
// }
mOriAccounts = null;
View header = LayoutInflater.from(this).inflate(R.layout.settings_header, null);
getListView().addHeaderView(header, null, true);
mHeaderBinding = SettingsHeaderBinding.inflate(getLayoutInflater());
getListView().addHeaderView(mHeaderBinding.getRoot(), null, true);
loadSecurityPreference();
}
@ -208,6 +214,7 @@ public class NotesPreferenceActivity extends PreferenceActivity {
// if (mReceiver != null) {
// unregisterReceiver(mReceiver);
// }
mHeaderBinding = null;
super.onDestroy();
}
@ -323,8 +330,8 @@ public class NotesPreferenceActivity extends PreferenceActivity {
* </p>
*/
private void loadSyncButton() {
Button syncButton = (Button) findViewById(R.id.preference_sync_button);
TextView lastSyncTimeView = (TextView) findViewById(R.id.prefenerece_sync_status_textview);
Button syncButton = mHeaderBinding.preferenceSyncButton;
TextView lastSyncTimeView = mHeaderBinding.prefenereceSyncStatusTextview;
// Google Tasks同步功能已禁用
// set button state

@ -15,6 +15,7 @@ import android.widget.TextView;
import android.widget.Toast;
import net.micode.notes.R;
import net.micode.notes.databinding.ActivityPasswordBinding;
import net.micode.notes.tool.SecurityManager;
import java.util.List;
@ -27,19 +28,16 @@ public class PasswordActivity extends Activity {
private int mMode; // 0: Check, 1: Setup
private int mPasswordType;
private TextView mTvPrompt;
private EditText mEtPin;
private LockPatternView mLockPatternView;
private TextView mTvError;
private Button mBtnCancel;
private ActivityPasswordBinding binding;
private String mFirstInput = null; // For setup confirmation
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_password);
binding = ActivityPasswordBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot());
String action = getIntent().getAction();
if (ACTION_SETUP_PASSWORD.equals(action)) {
@ -56,13 +54,7 @@ public class PasswordActivity extends Activity {
}
private void initViews() {
mTvPrompt = findViewById(R.id.tv_prompt);
mEtPin = findViewById(R.id.et_pin);
mLockPatternView = findViewById(R.id.lock_pattern_view);
mTvError = findViewById(R.id.tv_error);
mBtnCancel = findViewById(R.id.btn_cancel);
mBtnCancel.setOnClickListener(v -> {
binding.btnCancel.setOnClickListener(v -> {
setResult(RESULT_CANCELED);
finish();
});
@ -70,19 +62,19 @@ public class PasswordActivity extends Activity {
private void setupViews() {
if (mMode == 1) { // Setup
mTvPrompt.setText("请设置密码");
binding.tvPrompt.setText("请设置密码");
} else { // Check
mTvPrompt.setText("请输入密码");
binding.tvPrompt.setText("请输入密码");
}
if (mPasswordType == SecurityManager.TYPE_PIN) {
mEtPin.setVisibility(View.VISIBLE);
mLockPatternView.setVisibility(View.GONE);
mEtPin.requestFocus(); // Auto focus
binding.etPin.setVisibility(View.VISIBLE);
binding.lockPatternView.setVisibility(View.GONE);
binding.etPin.requestFocus(); // Auto focus
setupPinLogic();
} else if (mPasswordType == SecurityManager.TYPE_PATTERN) {
mEtPin.setVisibility(View.GONE);
mLockPatternView.setVisibility(View.VISIBLE);
binding.etPin.setVisibility(View.GONE);
binding.lockPatternView.setVisibility(View.VISIBLE);
setupPatternLogic();
} else {
// Should not happen
@ -91,10 +83,10 @@ public class PasswordActivity extends Activity {
}
private void setupPinLogic() {
mEtPin.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_DONE ||
binding.etPin.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == EditorInfo.IME_ACTION_DONE ||
(event != null && event.getKeyCode() == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_DOWN)) {
handleInput(mEtPin.getText().toString());
handleInput(binding.etPin.getText().toString());
return true;
}
return false;
@ -102,10 +94,10 @@ public class PasswordActivity extends Activity {
}
private void setupPatternLogic() {
mLockPatternView.setOnPatternListener(new LockPatternView.OnPatternListener() {
binding.lockPatternView.setOnPatternListener(new LockPatternView.OnPatternListener() {
@Override
public void onPatternStart() {
mTvError.setVisibility(View.INVISIBLE);
binding.tvError.setVisibility(View.INVISIBLE);
}
@Override
@ -117,9 +109,9 @@ public class PasswordActivity extends Activity {
@Override
public void onPatternDetected(List<LockPatternView.Cell> pattern) {
if (pattern.size() < 3) {
mTvError.setText("连接至少3个点");
mTvError.setVisibility(View.VISIBLE);
mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
binding.tvError.setText("连接至少3个点");
binding.tvError.setVisibility(View.VISIBLE);
binding.lockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
return;
}
handleInput(LockPatternView.patternToString(pattern));
@ -129,30 +121,30 @@ public class PasswordActivity extends Activity {
private void handleInput(String input) {
if (TextUtils.isEmpty(input)) return;
mTvError.setVisibility(View.INVISIBLE);
binding.tvError.setVisibility(View.INVISIBLE);
if (mMode == 0) { // Check
if (SecurityManager.getInstance(this).checkPassword(input)) {
setResult(RESULT_OK);
finish();
} else {
mTvError.setText("密码错误");
mTvError.setVisibility(View.VISIBLE);
binding.tvError.setText("密码错误");
binding.tvError.setVisibility(View.VISIBLE);
if (mPasswordType == SecurityManager.TYPE_PATTERN) {
mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
binding.lockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
} else {
mEtPin.setText("");
binding.etPin.setText("");
}
}
} else { // Setup
if (mFirstInput == null) {
// First entry
mFirstInput = input;
mTvPrompt.setText("请再次输入以确认");
binding.tvPrompt.setText("请再次输入以确认");
if (mPasswordType == SecurityManager.TYPE_PATTERN) {
mLockPatternView.clearPattern();
binding.lockPatternView.clearPattern();
} else {
mEtPin.setText("");
binding.etPin.setText("");
}
} else {
// Second entry
@ -162,19 +154,25 @@ public class PasswordActivity extends Activity {
setResult(RESULT_OK);
finish();
} else {
mTvError.setText("两次输入不一致,请重试");
mTvError.setVisibility(View.VISIBLE);
binding.tvError.setText("两次输入不一致,请重试");
binding.tvError.setVisibility(View.VISIBLE);
// Reset to start
mFirstInput = null;
mTvPrompt.setText("请设置密码");
binding.tvPrompt.setText("请设置密码");
if (mPasswordType == SecurityManager.TYPE_PATTERN) {
mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
mLockPatternView.postDelayed(() -> mLockPatternView.clearPattern(), 1000);
binding.lockPatternView.setDisplayMode(LockPatternView.DisplayMode.Wrong);
binding.lockPatternView.postDelayed(() -> binding.lockPatternView.clearPattern(), 1000);
} else {
mEtPin.setText("");
binding.etPin.setText("");
}
}
}
}
}
@Override
protected void onDestroy() {
super.onDestroy();
binding = null;
}
}

@ -42,6 +42,7 @@ import androidx.recyclerview.widget.RecyclerView;
import net.micode.notes.R;
import net.micode.notes.data.Notes;
import net.micode.notes.data.NotesRepository;
import net.micode.notes.databinding.SidebarLayoutBinding;
import net.micode.notes.viewmodel.FolderListViewModel;
import java.util.ArrayList;
@ -61,14 +62,8 @@ public class SidebarFragment extends Fragment {
private static final String TAG = "SidebarFragment";
private static final int MAX_FOLDER_NAME_LENGTH = 50;
// 视图组件
private RecyclerView rvFolderTree;
private TextView tvRootFolder;
private TextView menuSync;
private TextView menuLogin;
private TextView menuExport;
private TextView menuSettings;
private TextView menuTrash;
// ViewBinding
private SidebarLayoutBinding binding;
// 适配器和数据
private FolderTreeAdapter adapter;
@ -148,17 +143,24 @@ public class SidebarFragment extends Fragment {
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
return inflater.inflate(R.layout.sidebar_layout, container, false);
binding = SidebarLayoutBinding.inflate(inflater, container, false);
return binding.getRoot();
}
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
initViews(view);
initViews();
setupListeners();
observeViewModel();
}
@Override
public void onDestroyView() {
super.onDestroyView();
binding = null;
}
/**
*
*/
@ -171,68 +173,57 @@ public class SidebarFragment extends Fragment {
/**
*
*/
private void initViews(View view) {
rvFolderTree = view.findViewById(R.id.rv_folder_tree);
tvRootFolder = view.findViewById(R.id.tv_root_folder);
menuSync = view.findViewById(R.id.menu_sync);
menuLogin = view.findViewById(R.id.menu_login);
menuExport = view.findViewById(R.id.menu_export);
menuSettings = view.findViewById(R.id.menu_settings);
menuTrash = view.findViewById(R.id.menu_trash);
private void initViews() {
// 设置RecyclerView
rvFolderTree.setLayoutManager(new LinearLayoutManager(requireContext()));
binding.rvFolderTree.setLayoutManager(new LinearLayoutManager(requireContext()));
adapter = new FolderTreeAdapter(new ArrayList<>(), viewModel);
adapter.setOnFolderItemClickListener(this::handleFolderItemClick);
rvFolderTree.setAdapter(adapter);
binding.rvFolderTree.setAdapter(adapter);
}
/**
*
*/
private void setupListeners() {
View view = getView();
if (view == null) return;
// 根文件夹(单击展开/收起,双击跳转)
setupFolderClickListener(tvRootFolder, Notes.ID_ROOT_FOLDER);
setupFolderClickListener(binding.tvRootFolder, Notes.ID_ROOT_FOLDER);
// 关闭侧栏
view.findViewById(R.id.btn_close_sidebar).setOnClickListener(v -> {
binding.btnCloseSidebar.setOnClickListener(v -> {
if (listener != null) {
listener.onCloseSidebar();
}
});
// 创建文件夹
view.findViewById(R.id.btn_create_folder).setOnClickListener(v -> showCreateFolderDialog());
binding.btnCreateFolder.setOnClickListener(v -> showCreateFolderDialog());
// 菜单项
menuSync.setOnClickListener(v -> {
binding.menuSync.setOnClickListener(v -> {
if (listener != null) {
listener.onSyncSelected();
}
});
menuLogin.setOnClickListener(v -> {
binding.menuLogin.setOnClickListener(v -> {
if (listener != null) {
listener.onLoginSelected();
}
});
menuExport.setOnClickListener(v -> {
binding.menuExport.setOnClickListener(v -> {
if (listener != null) {
listener.onExportSelected();
}
});
menuSettings.setOnClickListener(v -> {
binding.menuSettings.setOnClickListener(v -> {
if (listener != null) {
listener.onSettingsSelected();
}
});
menuTrash.setOnClickListener(v -> {
binding.menuTrash.setOnClickListener(v -> {
if (listener != null) {
listener.onTrashSelected();
}

@ -24,28 +24,30 @@
android:layout_height="match_parent"
android:background="@drawable/list_background">
<!-- 主内容区域 -->
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- AppBarLayout替代传统 ActionBar -->
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Material3.ActionBar">
<!-- 主内容区域 -->
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<!-- AppBarLayout替代传统 ActionBar -->
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.Material3.ActionBar"
android:fitsSystemWindows="true">
<!-- Toolbar现代替代 ActionBar 的标准组件,带汉堡菜单按钮 -->
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:title="@string/app_name"
app:navigationIcon="@android:drawable/ic_menu_sort_by_size"
app:layout_scrollFlags="scroll|enterAlways|snap" />
<!-- Toolbar现代替代 ActionBar 的标准组件,带汉堡菜单按钮 -->
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:title="@string/app_name"
app:navigationIcon="@android:drawable/ic_menu_sort_by_size"
app:layout_scrollFlags="scroll|enterAlways|snap" />
</com.google.android.material.appbar.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<!-- 便签列表:使用 NestedScrollView 包裹 ListView 以支持滚动 -->
<androidx.core.widget.NestedScrollView
@ -59,8 +61,10 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- 面包屑导航:显示当前文件夹路径(在列表上方) -->
<include layout="@layout/breadcrumb_layout" />
<!-- 面包屑导航:显示当前文件夹路径(在列表上方) -->
<include
android:id="@+id/breadcrumb_include"
layout="@layout/breadcrumb_layout" />
<!-- 便签列表 -->
<ListView

@ -4,6 +4,10 @@
<item name="colorPrimary">@color/primary_color</item>
<item name="colorOnPrimary">@color/on_primary_color</item>
<item name="android:statusBarColor">@color/primary_color</item>
<!-- 透明导航栏支持edge-to-edge显示 -->
<item name="android:navigationBarColor">@android:color/transparent</item>
<!-- 根据内容自动调整状态栏图标颜色(深色背景=浅色图标) -->
<item name="android:windowLightStatusBar">false</item>
</style>
<style name="Theme.Notesmaster" parent="Base.Theme.Notesmaster" />

@ -1,7 +1,7 @@
#Mon Dec 22 21:06:32 CST 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

Loading…
Cancel
Save