diff --git a/doc/~$羲-开源软件泛读、标注和维护报告文档 .docx b/doc/~$羲-开源软件泛读、标注和维护报告文档 .docx new file mode 100644 index 0000000..e17292c Binary files /dev/null and b/doc/~$羲-开源软件泛读、标注和维护报告文档 .docx differ diff --git a/doc/~$软件的质量分析报告-权静岩，石兆羲，李政谦.docx b/doc/~$软件的质量分析报告-权静岩，石兆羲，李政谦.docx deleted file mode 100644 index eace7ed..0000000 Binary files a/doc/~$软件的质量分析报告-权静岩，石兆羲，李政谦.docx and /dev/null differ diff --git a/doc/~WRL1585.tmp b/doc/~WRL1585.tmp new file mode 100644 index 0000000..89ac801 Binary files /dev/null and b/doc/~WRL1585.tmp differ diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/doc/代码标注/AlarmAlertActivity.java similarity index 63% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java rename to doc/代码标注/AlarmAlertActivity.java index 85723be..cd14c0c 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java +++ b/doc/代码标注/AlarmAlertActivity.java @@ -13,6 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** + * + * @ProjectName: $MiNotes$ + * @Package: $ui$ + * @ClassName: $AlarmAlertActivity.java$ + * @Description: 该类主要构建了一个闹铃提醒页面，以及用户不同选择的解决方案 + * @Author: 石兆羲 + * @CreateDate: $2023/12/21$ + */ package net.micode.notes.ui; @@ -41,23 +50,30 @@ import java.io.IOException; public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener { - private long mNoteId; - private String mSnippet; + private long mNoteId; //文本在数据库中存储的ID号 + private String mSnippet; //闹钟提示时出现的文本内容 private static final int SNIPPET_PREW_MAX_LEN = 60; MediaPlayer mPlayer; @Override protected void onCreate(Bundle savedInstanceState) { + //该部分的功能是：手机锁屏后，如果到了闹钟提示时间就点亮屏幕 super.onCreate(savedInstanceState); - requestWindowFeature(Window.FEATURE_NO_TITLE); + //Bundle类型的数据与Map类型的数据相似，都是以key-value的形式存储数据的 + //saveInstanceState方法是用来保存Activity的状态的 + //能从onCreate的参数savedInsanceState中获得状态数据 + requestWindowFeature(Window.FEATURE_NO_TITLE); //界面显示“无标题“ final Window win = getWindow(); win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); if (!isScreenOn()) { win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON + //保持窗口点亮 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON + //点亮窗口 | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON + //允许在点亮窗口时锁屏 | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); } @@ -66,50 +82,65 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD try { mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId); + //根据ID从数据库中获取标签内容，其中getContentResolver（）是实现数据共享，实例存储。 mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0, SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info) : mSnippet; + //判断标签片段是否达到符合长度 + } catch (IllegalArgumentException e) { e.printStackTrace(); return; } - + //上述代码代码区如果有错误，就会返回所写异常的处理。 mPlayer = new MediaPlayer(); if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { showActionDialog(); + //弹出对话框 playAlarmSound(); + //播放闹钟提示音 } else { finish(); + //结束闹钟操作 } } private boolean isScreenOn() { + //该部分功能是：判断屏幕是否锁屏，调用系统函数判断，返回值一个布尔类型值 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); return pm.isScreenOn(); } private void playAlarmSound() { + //播放闹钟提示音 Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); - + //调用系统的铃声管理URI，得到闹钟提示音 int silentModeStreams = Settings.System.getInt(getContentResolver(), Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) { + //判断系统静音状态，如果静音则闹钟不响，否则响铃 mPlayer.setAudioStreamType(silentModeStreams); } else { mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM); } try { mPlayer.setDataSource(this, url); + //该方法设置了多媒体数据来源，由前文的uri管理决定，该方法没有返回值 mPlayer.prepare(); + //准备同步 mPlayer.setLooping(true); + //设置是否循环播放铃声 mPlayer.start(); + //播放铃声 } catch (IllegalArgumentException e) { // TODO Auto-generated catch block e.printStackTrace(); } catch (SecurityException e) { // TODO Auto-generated catch block e.printStackTrace(); + //e.printStackTrace()函数功能是抛出异常， 还将显示出更深的调用信息 + //System.out.println(e)，这个方法打印出异常，并且输出在哪里出现的异常 } catch (IllegalStateException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -120,38 +151,58 @@ public class AlarmAlertActivity extends Activity implements OnClickListener, OnD } private void showActionDialog() { + //该部分主要构建了一个响铃后的对话框，让用户决定是否关闭闹钟 AlertDialog.Builder dialog = new AlertDialog.Builder(this); + //AlertDialog的构造方法全部是Protected的 + //所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。 + //要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法 + //如这里的dialog就是新建了一个AlertDialog dialog.setTitle(R.string.app_name); + //设置对话框标题 dialog.setMessage(mSnippet); + //设置对话框内容 dialog.setPositiveButton(R.string.notealert_ok, this); + //在对话框中设置“yes”按钮 if (isScreenOn()) { dialog.setNegativeButton(R.string.notealert_enter, this); - } + }//在对话框设置“No”按钮 dialog.show().setOnDismissListener(this); } public void onClick(DialogInterface dialog, int which) { switch (which) { + //用which来选择点击后的操作 case DialogInterface.BUTTON_NEGATIVE: + //如果点击了“No”按钮，就取消操作 Intent intent = new Intent(this, NoteEditActivity.class); + //类间数据传输 intent.setAction(Intent.ACTION_VIEW); + //设置动作属性 intent.putExtra(Intent.EXTRA_UID, mNoteId); + //实现key-value对，EXTRA_UID为key；mNoteId为键 startActivity(intent); + //开始执行动作 break; default: + //确定操作 break; } } public void onDismiss(DialogInterface dialog) { + //用户选择忽略闹钟的操作 stopAlarmSound(); + //停止响铃 finish(); } private void stopAlarmSound() { + //用户选择停止响铃 if (mPlayer != null) { mPlayer.stop(); + //停止播放 mPlayer.release(); + //释放多媒体对象MediaPlayer mPlayer = null; } } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/doc/代码标注/AlarmInitReceiver.java similarity index 56% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java rename to doc/代码标注/AlarmInitReceiver.java index f221202..b1a9529 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java +++ b/doc/代码标注/AlarmInitReceiver.java @@ -13,6 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +/** + * + * @ProjectName: $MiNotes$ + * @Package: $ui$ + * @ClassName: $AlarmInitReciver.java$ + * @Description: 该类主要功能是根据数据库里的闹钟时间创建一个闹钟机制 + * @Author: 石兆羲 + * @CreateDate: $2023/12/23$ + */ package net.micode.notes.ui; @@ -34,17 +43,27 @@ public class AlarmInitReceiver extends BroadcastReceiver { NoteColumns.ID, NoteColumns.ALERTED_DATE }; - + //对数据库的操作，作用是调用ID和设定的闹钟时间 private static final int COLUMN_ID = 0; private static final int COLUMN_ALERTED_DATE = 1; @Override public void onReceive(Context context, Intent intent) { long currentDate = System.currentTimeMillis(); + //System.currentTimeMillis()函数的作用是产生一个当前的毫秒 + //毫秒数是自1970年1月1日0时起的毫秒数 Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI, - PROJECTION, + //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签 + //通过 context.getContentResolver() 获取当前应用程序的 ContentResolver 对象 + //使用 query() 方法对系统中的 Notes 数据库进行查询操作。 + //其中，Notes.CONTENT_NOTE_URI 是一个常量，表示 Notes 数据库中的笔记表对应的 Uri 地址。 + PROJECTION,//字符串数组，包含查询结果的列名 NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE, + //这里定义了两个查询条件： + //笔记的提醒日期晚于某个特定时间； + //笔记的类型为 Notes.TYPE_NOTE new String[] { String.valueOf(currentDate) }, + //将long变量currentDate转化为字符串 null); if (c != null) { @@ -52,11 +71,15 @@ public class AlarmInitReceiver extends BroadcastReceiver { do { long alertDate = c.getLong(COLUMN_ALERTED_DATE); Intent sender = new Intent(context, AlarmReceiver.class); + //Intent用于在不同组件之间传递消息、启动服务、启动活动等。 sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID))); PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0); + //PendingIntent通常用于在未来的某个时间点执行某项操作，比如在特定的时刻启动一个 Activity、发送一个广播或者启动一个服务。 AlarmManager alermManager = (AlarmManager) context .getSystemService(Context.ALARM_SERVICE); alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); + //AlarmManager用于在指定的时间点触发某个操作。它可以用来实现定时任务、闹钟提醒、周期性任务等功能。 + //通过网上查找资料发现，对于闹钟机制的启动，通常需要上面的几个步骤，如新建Intent、PendingIntent以及AlarmManager等 } while (c.moveToNext()); } c.close(); diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/doc/代码标注/AlarmReceiver.java similarity index 70% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java rename to doc/代码标注/AlarmReceiver.java index 54e503b..d58a500 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/AlarmReceiver.java +++ b/doc/代码标注/AlarmReceiver.java @@ -13,7 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +/** + * + * @ProjectName: $MiNotes$ + * @Package: $ui$ + * @ClassName: $AlarmReciver.java$ + * @Description: 该类主要功能启动、实现闹钟功能 + * @Author: 石兆羲 + * @CreateDate: $2023/12/25$ + */ package net.micode.notes.ui; import android.content.BroadcastReceiver; @@ -24,7 +32,10 @@ public class AlarmReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { intent.setClass(context, AlarmAlertActivity.class); + //启动AlarmAlertActivity intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //activity要存在于activity的栈中，而非activity的途径启动activity时必然不存在一个activity的栈 + //所以要新起一个栈装入启动的activity context.startActivity(intent); } } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java b/doc/代码标注/DateTimePicker.java similarity index 74% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java rename to doc/代码标注/DateTimePicker.java index 496b0cd..5977568 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePicker.java +++ b/doc/代码标注/DateTimePicker.java @@ -13,7 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +/** + * + * @ProjectName: $MiNotes$ + * @Package: $ui$ + * @ClassName: $DateTimePicker.java$ + * @Description: 该类主要功能是实现设置闹钟过程中涉及时间变化部分的具体操作 + * @Author: 石兆羲 + * @CreateDate: $2023/12/25$ + */ package net.micode.notes.ui; import java.text.DateFormatSymbols; @@ -29,7 +37,8 @@ import android.widget.FrameLayout; import android.widget.NumberPicker; public class DateTimePicker extends FrameLayout { - + //FrameLayout是布局模板之一 + //所有的子元素全部在屏幕的右上方 private static final boolean DEFAULT_ENABLE_STATE = true; private static final int HOURS_IN_HALF_DAY = 12; @@ -45,13 +54,14 @@ public class DateTimePicker extends FrameLayout { private static final int MINUT_SPINNER_MAX_VAL = 59; private static final int AMPM_SPINNER_MIN_VAL = 0; private static final int AMPM_SPINNER_MAX_VAL = 1; - + //以上语句的作用都是用于初始化控件 private final NumberPicker mDateSpinner; private final NumberPicker mHourSpinner; private final NumberPicker mMinuteSpinner; private final NumberPicker mAmPmSpinner; + //NumberPicker是数字选择器，定义上述四个变量用于表示设置闹钟时需要选择的变量（时、分、秒、日期等） private Calendar mDate; - + //定义了Calendar类型的变量mDate，用于操作时间 private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; private boolean mIsAm; @@ -69,67 +79,91 @@ public class DateTimePicker extends FrameLayout { public void onValueChange(NumberPicker picker, int oldVal, int newVal) { mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal); updateDateControl(); + //OnValueChangeListener，这是时间改变监听器，这里主要是对日期的监听 + //将现在日期的值传递给mDate；updateDateControl是同步操作 + onDateTimeChanged(); + //这段代码是一个事件回调方法 onValueChange 的实现。它是在 NumberPicker 控件的值发生改变时被调用的。 + //在这个方法中，首先根据新旧值的差异，使用 mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal) 方法来更新 mDate 对应的 Calendar 对象，即将日期增加或减少相应的天数。 + //接下来，调用 updateDateControl() 方法来更新与日期相关的控件，更新显示日期的文本或者刷新界面等操作。 + //最后，调用 onDateTimeChanged() 方法来处理日期时间的变化。 } }; private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() { + //这里是对 小时（Hour） 的监听 @Override public void onValueChange(NumberPicker picker, int oldVal, int newVal) { boolean isDateChanged = false; Calendar cal = Calendar.getInstance(); + //声明一个Calendar的变量cal，便于后续的操作 if (!mIs24HourView) { if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; + //这段代码是对于12小时制时，当从晚上的 11 点切换到早上的 12 点时，会将日期向后推一天。 } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -1); isDateChanged = true; } + //这段代码和之前的类似，但是是当从早上的 12 点切换到晚上的 11 点时，会将日期向前推一天。 if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY || oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { mIsAm = !mIsAm; updateAmPmControl(); + //当在凌晨 11 点和中午 12 点之间进行切换时，会切换上午和下午的状态，并更新相关的显示控件。 } } else { if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, 1); isDateChanged = true; + //当从一天的最后一小时切换到第二天的第一小时时，会将日期向后推一天。 } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) { cal.setTimeInMillis(mDate.getTimeInMillis()); cal.add(Calendar.DAY_OF_YEAR, -1); isDateChanged = true; + //当从第二天的第一小时切换到一天的最后一小时时，会将日期向前推一天。 } + } int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY); + //通过数字选择器对newHour的赋值 mDate.set(Calendar.HOUR_OF_DAY, newHour); + //通过set函数将新的Hour值传给mDate onDateTimeChanged(); if (isDateChanged) { setCurrentYear(cal.get(Calendar.YEAR)); setCurrentMonth(cal.get(Calendar.MONTH)); setCurrentDay(cal.get(Calendar.DAY_OF_MONTH)); - } + }//这段代码是在日期发生变化时，将新的日期设置为当前的年月日。 } }; private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() { @Override + //对分钟（Minute）改变的监听 public void onValueChange(NumberPicker picker, int oldVal, int newVal) { int minValue = mMinuteSpinner.getMinValue(); int maxValue = mMinuteSpinner.getMaxValue(); + //获取分钟数字选择器中的最大值和最小值 int offset = 0; + //设置offset，作为小时改变的一个记录数据 if (oldVal == maxValue && newVal == minValue) { offset += 1; + //如果原值为59，新值为0，则offset加1 } else if (oldVal == minValue && newVal == maxValue) { offset -= 1; + //如果原值为0，新值为59，则offset减1 + } if (offset != 0) { - mDate.add(Calendar.HOUR_OF_DAY, offset); - mHourSpinner.setValue(getCurrentHour()); - updateDateControl(); + //如果 offset 不等于 0，表示需要进行偏移操作。接下来的代码会根据偏移值更新日期和小时的值。 + mDate.add(Calendar.HOUR_OF_DAY, offset);//偏移日期，将小时增加或减少。 + mHourSpinner.setValue(getCurrentHour());//小时的选择器设置为当前的小时值。 + updateDateControl();//更新日期相关的显示控件。 int newHour = getCurrentHourOfDay(); if (newHour >= HOURS_IN_HALF_DAY) { mIsAm = false; @@ -137,47 +171,61 @@ public class DateTimePicker extends FrameLayout { } else { mIsAm = true; updateAmPmControl(); - } + }//根据 newHour 的值判断是否超过半天。若超过半天，则将 mIsAm 设置为 false，否则设置为 true。 + //然后调用 updateAmPmControl() 更新上午/下午的显示控件。 } - mDate.set(Calendar.MINUTE, newVal); + mDate.set(Calendar.MINUTE, newVal);//将选择器中的分钟值设置为 newVal，即新选择的分钟值。 onDateTimeChanged(); } }; private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() { + //对AM和PM的监听 @Override - public void onValueChange(NumberPicker picker, int oldVal, int newVal) { + public void onValueChange(NumberPicker picker, int oldVal, int newVal) {//是在上午/下午选择器的值发生变化时的处理逻辑。 mIsAm = !mIsAm; - if (mIsAm) { + if (mIsAm) {//如果 mIsAm 是 true，表示用户选择了上午。前调12小时 mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY); - } else { + } else {//如果 mIsAm 是 false，表示用户选择了下午。后调12小时 mDate.add(Calendar.HOUR_OF_DAY, HOURS_IN_HALF_DAY); } - updateAmPmControl(); + updateAmPmControl();//更新上/下午显示控件 onDateTimeChanged(); + } }; public interface OnDateTimeChangedListener { + //用来监听日期选择器的变化。 void onDateTimeChanged(DateTimePicker view, int year, int month, int dayOfMonth, int hourOfDay, int minute); + /*view：表示触发事件的日期时间选择器。 + year：表示选择的年份。 + month：表示选择的月份，范围是 0-11（0 表示一月）。 + dayOfMonth：表示选择的日期。 + hourOfDay：表示选择的小时数，范围是 0-23。 + minute：表示选择的分钟数，范围是 0-59。*/ } public DateTimePicker(Context context) { this(context, System.currentTimeMillis()); + //通过对数据库的访问，获取当前的系统时间 } public DateTimePicker(Context context, long date) { this(context, date, DateFormat.is24HourFormat(context)); - } + }//上面函数的得到的是一个天文数字（1970至今的秒数），需要DateFormat将其变得有意义 public DateTimePicker(Context context, long date, boolean is24HourView) { super(context); + //获取系统时间 mDate = Calendar.getInstance(); mInitialising = true; mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; inflate(context, R.layout.datetime_picker, this); - + //如果当前Activity里用到别的layout，比如对话框layout + //还要设置这个layout上的其他组件的内容，就必须用inflate()方法先将对话框的layout找出来 + //然后再用findViewById()找到它上面的其它组件 mDateSpinner = (NumberPicker) findViewById(R.id.date); mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL); mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL); @@ -197,19 +245,19 @@ public class DateTimePicker extends FrameLayout { mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL); mAmPmSpinner.setDisplayedValues(stringsForAmPm); mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener); - + //可以看到原有的注释，意思是初始化日期时间选择器中的三个数字选择器和一个上午/下午选择器。 // update controls to initial state updateDateControl(); updateHourControl(); updateAmPmControl(); set24HourView(is24HourView); - + //设置当前时间 // set to current time setCurrentDate(date); setEnabled(isEnabled()); - + //设置内容描述（目的是提高访问性） // set the content descriptions mInitialising = false; } @@ -225,7 +273,7 @@ public class DateTimePicker extends FrameLayout { mHourSpinner.setEnabled(enabled); mAmPmSpinner.setEnabled(enabled); mIsEnabled = enabled; - } + }//这段代码定义了一个名为 setEnabled() 的方法，用于启用或禁用日期时间选择器。 @Override public boolean isEnabled() { @@ -239,7 +287,7 @@ public class DateTimePicker extends FrameLayout { */ public long getCurrentDateInTimeMillis() { return mDate.getTimeInMillis(); - } + }//得到当前秒数 /** * Set the current date @@ -251,7 +299,7 @@ public class DateTimePicker extends FrameLayout { cal.setTimeInMillis(date); setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)); - } + }//设置当前时间，参数date /** * Set the current date @@ -269,7 +317,7 @@ public class DateTimePicker extends FrameLayout { setCurrentDay(dayOfMonth); setCurrentHour(hourOfDay); setCurrentMinute(minute); - } + }//设置当前时间 /** * Get current year @@ -339,7 +387,7 @@ public class DateTimePicker extends FrameLayout { updateDateControl(); onDateTimeChanged(); } - +//上述一大段代码实现的功能是得到year、month、day等值 /** * Get current hour in 24 hour mode, in the range (0~23) * @return The current hour in 24 hour mode @@ -446,7 +494,7 @@ public class DateTimePicker extends FrameLayout { mDateSpinner.setDisplayedValues(mDateDisplayValues); mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2); mDateSpinner.invalidate(); - } + }//一个关于星期几的算法 private void updateAmPmControl() { if (mIs24HourView) { @@ -456,7 +504,7 @@ public class DateTimePicker extends FrameLayout { mAmPmSpinner.setValue(index); mAmPmSpinner.setVisibility(View.VISIBLE); } - } + }//判断上午下午的算法 private void updateHourControl() { if (mIs24HourView) { @@ -465,7 +513,7 @@ public class DateTimePicker extends FrameLayout { } else { mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW); mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW); - } + }//小时的算法 } /** diff --git a/doc/开源软件的质量分析报告-权静岩，石兆羲，李政谦.docx b/doc/开源软件的质量分析报告-权静岩，石兆羲，李政谦.docx deleted file mode 100644 index 7af405e..0000000 Binary files a/doc/开源软件的质量分析报告-权静岩，石兆羲，李政谦.docx and /dev/null differ diff --git a/doc/数量统计(1) .xlsx b/doc/数量统计(1) .xlsx new file mode 100644 index 0000000..fa66f0f Binary files /dev/null and b/doc/数量统计(1) .xlsx differ diff --git a/doc/权静岩+石兆羲-开源软件的质量分析报告.docx b/doc/权静岩+石兆羲-开源软件的质量分析报告.docx new file mode 100644 index 0000000..14917a8 Binary files /dev/null and b/doc/权静岩+石兆羲-开源软件的质量分析报告.docx differ diff --git a/doc/石兆羲-开源软件泛读、标注和维护报告文档 .docx b/doc/石兆羲-开源软件泛读、标注和维护报告文档 .docx index 93d85f2..d5170fe 100644 Binary files a/doc/石兆羲-开源软件泛读、标注和维护报告文档 .docx and b/doc/石兆羲-开源软件泛读、标注和维护报告文档 .docx differ diff --git a/src/Notes-master1/.gradle/8.0/checksums/checksums.lock b/src/Notes-master1/.gradle/8.0/checksums/checksums.lock deleted file mode 100644 index 5d8cd07..0000000 Binary files a/src/Notes-master1/.gradle/8.0/checksums/checksums.lock and /dev/null differ diff --git a/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin b/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin deleted file mode 100644 index 4096bd4..0000000 Binary files a/src/Notes-master1/.gradle/8.0/checksums/md5-checksums.bin and /dev/null differ diff --git a/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin b/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin deleted file mode 100644 index e3ce94e..0000000 Binary files a/src/Notes-master1/.gradle/8.0/checksums/sha1-checksums.bin and /dev/null differ diff --git a/src/Notes-master1/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock b/src/Notes-master1/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index d3a5ce6..0000000 Binary files a/src/Notes-master1/.gradle/8.0/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/src/Notes-master1/.gradle/8.0/dependencies-accessors/gc.properties b/src/Notes-master1/.gradle/8.0/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin deleted file mode 100644 index 569ffad..0000000 Binary files a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.bin and /dev/null differ diff --git a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock deleted file mode 100644 index 8791ee1..0000000 Binary files a/src/Notes-master1/.gradle/8.0/executionHistory/executionHistory.lock and /dev/null differ diff --git a/src/Notes-master1/.gradle/8.0/fileChanges/last-build.bin b/src/Notes-master1/.gradle/8.0/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/src/Notes-master1/.gradle/8.0/fileChanges/last-build.bin and /dev/null differ diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin deleted file mode 100644 index ee55588..0000000 Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.bin and /dev/null differ diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock deleted file mode 100644 index a04fab9..0000000 Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/fileHashes.lock and /dev/null differ diff --git a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin deleted file mode 100644 index 6bfdea5..0000000 Binary files a/src/Notes-master1/.gradle/8.0/fileHashes/resourceHashesCache.bin and /dev/null differ diff --git a/src/Notes-master1/.gradle/8.0/gc.properties b/src/Notes-master1/.gradle/8.0/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index b32516a..0000000 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties b/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index b22809e..0000000 --- a/src/Notes-master1/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Sun Nov 19 23:35:33 CST 2023 -gradle.version=8.0 diff --git a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin b/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 7a67d3d..0000000 Binary files a/src/Notes-master1/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/src/Notes-master1/.gradle/file-system.probe b/src/Notes-master1/.gradle/file-system.probe deleted file mode 100644 index 5ef2a0c..0000000 Binary files a/src/Notes-master1/.gradle/file-system.probe and /dev/null differ diff --git a/src/Notes-master1/.gradle/vcs-1/gc.properties b/src/Notes-master1/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/src/Notes-master1/.idea/.gitignore b/src/Notes-master1/.idea/.gitignore deleted file mode 100644 index 359bb53..0000000 --- a/src/Notes-master1/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# 默认忽略的文件 -/shelf/ -/workspace.xml diff --git a/src/Notes-master1/.idea/compiler.xml b/src/Notes-master1/.idea/compiler.xml deleted file mode 100644 index b589d56..0000000 --- a/src/Notes-master1/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/.idea/gradle.xml b/src/Notes-master1/.idea/gradle.xml deleted file mode 100644 index ae388c2..0000000 --- a/src/Notes-master1/.idea/gradle.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/.idea/jarRepositories.xml b/src/Notes-master1/.idea/jarRepositories.xml deleted file mode 100644 index a5f05cd..0000000 --- a/src/Notes-master1/.idea/jarRepositories.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/.idea/misc.xml b/src/Notes-master1/.idea/misc.xml deleted file mode 100644 index 22fd288..0000000 --- a/src/Notes-master1/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/.idea/vcs.xml b/src/Notes-master1/.idea/vcs.xml deleted file mode 100644 index 5a0857d..0000000 --- a/src/Notes-master1/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build.gradle b/src/Notes-master1/app/build.gradle deleted file mode 100644 index 23b5789..0000000 --- a/src/Notes-master1/app/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -apply plugin: 'com.android.application' - -android { - namespace "net.micode.notes" - compileSdkVersion 33 - buildToolsVersion "34.0.0" - - defaultConfig { - applicationId "net.micode.notes" - minSdkVersion 14 - targetSdkVersion 14 - useLibrary 'org.apache.http.legacy' - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } -} diff --git a/src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json deleted file mode 100644 index 9e26dfe..0000000 --- a/src/Notes-master1/app/build/intermediates/annotation_processor_list/debug/annotationProcessors.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk deleted file mode 100644 index a4e03f5..0000000 Binary files a/src/Notes-master1/app/build/intermediates/apk/debug/app-debug.apk and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json deleted file mode 100644 index b2231b9..0000000 --- a/src/Notes-master1/app/build/intermediates/apk/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "APK", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "app-debug.apk" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt b/src/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt deleted file mode 100644 index 46dacc6..0000000 --- a/src/Notes-master1/app/build/intermediates/apk_ide_redirect_file/debug/redirect.txt +++ /dev/null @@ -1,2 +0,0 @@ -#- File Locator - -listingFile=../../apk/debug/output-metadata.json diff --git a/src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties b/src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties deleted file mode 100644 index 379c8cd..0000000 --- a/src/Notes-master1/app/build/intermediates/app_metadata/debug/app-metadata.properties +++ /dev/null @@ -1,2 +0,0 @@ -appMetadataVersion=1.1 -androidGradlePluginVersion=8.1.3 diff --git a/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json deleted file mode 100644 index 714f651..0000000 --- a/src/Notes-master1/app/build/intermediates/compatible_screen_manifest/debug/output-metadata.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "COMPATIBLE_SCREEN_MANIFEST", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [] -} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar deleted file mode 100644 index b894c6e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_0/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_1/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_2/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_3/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_4/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_4/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_4/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_5/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_5/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_5/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_6/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_6/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_6/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_7/graph.bin b/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_7/graph.bin deleted file mode 100644 index 601f245..0000000 Binary files a/src/Notes-master1/app/build/intermediates/desugar_graph/debug/out/currentProject/jar_54143eeb0ea1a5cb11cabce248cb9602bc9bff6f0457d8f480658f8e704f3947_bucket_7/graph.bin and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex deleted file mode 100644 index e7abfa2..0000000 Binary files a/src/Notes-master1/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out deleted file mode 100644 index 5c2c286..0000000 Binary files a/src/Notes-master1/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out b/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out deleted file mode 100644 index 301160a..0000000 --- a/src/Notes-master1/app/build/intermediates/dex_number_of_buckets_file/debug/out +++ /dev/null @@ -1 +0,0 @@ -8 \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state b/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state deleted file mode 100644 index 1c983fc..0000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties deleted file mode 100644 index 64f0fe8..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ /dev/null @@ -1,96 +0,0 @@ -#Mon Nov 20 00:20:01 CST 2023 -net.micode.notes.app-main-6\:/color/primary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat -net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat -net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_color_btn_mask.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/call_record.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_call_record.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/clock.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_clock.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_delete.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_dropdown_icon.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_blue.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_green.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_red.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_blue.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_green.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_red.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_white.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_title_yellow.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_white.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/edit_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_edit_yellow.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_large.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_large.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_normal.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_size_selector_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_small.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_small.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/font_super.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_font_super.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/icon_app.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_icon_app.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_background.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_blue_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_blue_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_folder.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_folder.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_footer_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_green_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_red_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_white_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_down.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_middle.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_single.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_list_yellow_up.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/menu_delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_delete.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/menu_move.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_menu_move.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/new_note_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_normal.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/new_note_pressed.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_new_note_pressed.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_note_edit_color_selector_panel.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/notification.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_notification.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/search_result.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_search_result.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/selected.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_selected.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/title_alert.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_alert.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_title_bar_bg.9.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_blue.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_green.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_red.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_white.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_2x_yellow.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_blue.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_green.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_red.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_white.png.flat -net.micode.notes.app-main-6\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_widget_4x_yellow.png.flat -net.micode.notes.app-main-6\:/drawable/new_note.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\drawable_new_note.xml.flat -net.micode.notes.app-main-6\:/layout/account_dialog_title.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_account_dialog_title.xml.flat -net.micode.notes.app-main-6\:/layout/add_account_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_add_account_text.xml.flat -net.micode.notes.app-main-6\:/layout/datetime_picker.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_datetime_picker.xml.flat -net.micode.notes.app-main-6\:/layout/dialog_edit_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_dialog_edit_text.xml.flat -net.micode.notes.app-main-6\:/layout/folder_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_folder_list_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit.xml.flat -net.micode.notes.app-main-6\:/layout/note_edit_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_edit_list_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_item.xml.flat -net.micode.notes.app-main-6\:/layout/note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list.xml.flat -net.micode.notes.app-main-6\:/layout/note_list_dropdown_menu.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_dropdown_menu.xml.flat -net.micode.notes.app-main-6\:/layout/note_list_footer.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_note_list_footer.xml.flat -net.micode.notes.app-main-6\:/layout/settings_header.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_settings_header.xml.flat -net.micode.notes.app-main-6\:/layout/widget_2x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_2x.xml.flat -net.micode.notes.app-main-6\:/layout/widget_4x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\layout_widget_4x.xml.flat -net.micode.notes.app-main-6\:/menu/call_note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_note_edit.xml.flat -net.micode.notes.app-main-6\:/menu/call_record_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_call_record_folder.xml.flat -net.micode.notes.app-main-6\:/menu/note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_edit.xml.flat -net.micode.notes.app-main-6\:/menu/note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list.xml.flat -net.micode.notes.app-main-6\:/menu/note_list_dropdown.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_dropdown.xml.flat -net.micode.notes.app-main-6\:/menu/note_list_options.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_note_list_options.xml.flat -net.micode.notes.app-main-6\:/menu/sub_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\menu_sub_folder.xml.flat -net.micode.notes.app-main-6\:/raw-zh-rCN/introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw-zh-rCN_introduction.flat -net.micode.notes.app-main-6\:/raw/introduction=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\raw_introduction.flat -net.micode.notes.app-main-6\:/xml/preferences.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_preferences.xml.flat -net.micode.notes.app-main-6\:/xml/searchable.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_searchable.xml.flat -net.micode.notes.app-main-6\:/xml/widget_2x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_2x_info.xml.flat -net.micode.notes.app-main-6\:/xml/widget_4x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\merged_res\\debug\\xml_widget_4x_info.xml.flat diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml deleted file mode 100644 index d65e0cc..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 邮件 - - - %1$s 条符合“%2$s”的搜索结果 - - 确认删除文件夹及所包含的便签吗？ - 确认要删除该条便签吗? - 确认要删除所选的 %d 条便签吗? - 删除 - 便签 - 便签2x2 - 便签4x4 - 删除 - 通话便签 - 取消 - 设置 - 成功删除提醒 - 不能为空便签设置闹钟提醒 - 不能将空便签发送到桌面 - 要查看的便签不存在 - 导出文本时发生错误，请检查SD卡 - SD卡被占用，不能操作 - 同步已取消 - 同步失败，发生内部错误 - 同步失败，请检查网络和帐号设置 - 导出失败 - 文件夹 %1$s 已存在，请重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已将文本文件(%1$s)输出至SD卡(%2$s)目录 - 已将所选 %1$d 条便签移到 %2$s 文件夹 - 请输入名称 - 已添加到桌面 - 提醒我 - 新建文件夹 - 删除 - 取消全选 - 导出文本 - 修改文件夹名称 - 刪除文件夹 - 查看文件夹 - 大 - 正常 - 文字大小 - 小 - 超大 - 进入清单模式 - 移动到文件夹 - 上一级文件夹 - 退出清单模式 - 删除提醒 - 搜索 - 全选 - 没有选中项，操作无效 - 选中了 %d 项 - 发送到桌面 - 设置 - 分享 - 同步 - 取消同步 - 选择文件夹 - 已过期 - 发送邮件 - 打开地图 - 呼叫电话 - 浏览网页 - 查看 - 知道了 - 新建便签 - ... - 与google task同步便签记录 - 同步账号 - 添加账号 - 新建便签背景颜色随机 - 取消同步 - 立即同步 - 当前帐号 %1$s - 如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复 - 请选择google帐号，便签将与该帐号的google task内容同步。 - 同步便签 - 上次同步于 %1$s - 取消 - 更换账号 - 删除账号 - 设置 - 正在同步中，不能修改同步帐号 - 同步帐号已设置为%1$s - 便签 - 搜索便签 - 正在搜索便签 - 便签中的文字 - 创建提醒 - 导出成功 - 与%1$s同步成功 - 正在获取服务器便签列表... - 登录%1$s... - 正在同步本地便签... - 同步已取消 - 同步失败 - 同步成功 - 同步便签... - 没有关联内容，点击新建便签。 - 访客模式下，便签内容不可见 - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml deleted file mode 100644 index 226b5bc..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 短信 - 郵件 - - - %1$s 條符合”%2$s“的搜尋結果 - - 確認刪除檔夾及所包含的便簽嗎？ - 确认要删除該條便籤嗎? - 确认要刪除所選的 %d 條便籤嗎? - 刪除 - 便簽 - 便簽2x2 - 便簽4x4 - 刪除 - 通話便籤 - 取消 - 設置 - 成功刪除提醒 - 不能爲空便籤設置鬧鐘提醒 - 不能將空便籤發送到桌面 - 要查看的便籤不存在 - 導出TXT時發生錯誤，請檢查SD卡 - SD卡被佔用，不能操作 - 同步已取消 - 同步失敗，發生內部錯誤 - 同步失敗，請檢查網絡和帳號設置 - 導出失敗 - 文件夾 %1$s 已存在，請重新命名 - yyyyMMdd - MM月dd日 kk:mm - 已將文本文件(%1$s)導出至SD(%2$s)目錄 - 已將所選 %1$d 便籤移到 %2$s 文件夾 - 請輸入名稱 - 已添加到桌面 - 提醒我 - 新建文件夾 - 刪除 - 取消全選 - 導出文本 - 修改文件夾名稱 - 刪除文件夾 - 查看文件夾 - 大 - 正常 - 文字大小 - 小 - 超大 - 進入清單模式 - 移動到文件夾 - 上一級文件夾 - 退出清單模式 - 刪除提醒 - 搜尋 - 全選 - 沒有選中項，操作無效 - 選中了 %d 項 - 發送到桌面 - 設置 - 分享 - 同步 - 取消同步 - 選擇文件夾 - 已過期 - 發送郵件 - 打開地圖 - 呼叫電話 - 浏覽網頁 - 查看 - 知道了 - 新建便簽 - ... - 与google task同步便簽記錄 - 同步賬號 - 添加賬號 - 新建便籤背景顏色隨機 - 取消同步 - 立即同步 - 當前帳號 %1$s - 如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復 - 請選擇google帳號，便簽將與該帳號的google task內容同步。 - 同步便簽 - 上次同步于 %1$s - 取消 - 更換賬號 - 刪除賬號 - 設置 - 正在同步中，不能修改同步帳號 - 同步帳號已設置為%1$s - 便籤 - 搜索便籤 - 正在搜索便籤 - 便籤中的文字 - 創建提醒 - 導出成功 - 與%1$s同步成功 - 正在獲取服務器便籤列表... - 登陸%1$s... - 正在同步本地便籤... - 同步已取消 - 同步失敗 - 同步成功 - 同步便簽... - 沒有關聯內容，點擊新建便簽。 - 訪客模式下，便籤內容不可見 - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml deleted file mode 100644 index e49b0c3..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml +++ /dev/null @@ -1,169 +0,0 @@ - - - - -%s - --%s - --%s - --%s - - - Messaging - Email - - #335b5b5b - 26sp - 20sp - 17sp - 14sp - 33sp - - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - Confirm to delete folder and its notes? - Confirm to delete this note? - Confirm to delete the selected %d notes? - Delete selected notes - Notes - Notes 2x2 - Notes 4x4 - Delete - Call notes - cancel - set - Delete reminder successfully - Sorry, can not set clock on empty note - Sorry, can not send and empty note to home - The note is not exist - Export failed, please check SD card - SD card busy, not available now - Sync is canceled - Sync failed, internal error occurs - Sync failed, please check network and account settings - Export fail - notes_%s.txt - /MIUI/notes/ - The folder %1$s exist, please rename - yyyyMMdd - MMMd kk:mm - Export text file (%1$s) to SD (%2$s) directory - (%d) - Have moved selected %1$d notes to %2$s folder - Input name - Note added to home - Remind me - New Folder - Delete - Deselect all - Export text - Change folder name - Delete folder - View folder - Large - Medium - Font size - Small - Super - Enter check list - Move to folder - Parent folder - Leave check list - Delete reminder - Search - Select all - Nothing selected, the operation is invalid - %d selected - Send to home - Settings - Share - Sync - Cancel syncing - Select folder - Expired - Send email - Open map - Call - Browse web - Take a look - Got it - Add note - ... - Sync notes with google task - Sync account - Add account - New note background color random - Cancel syncing - Sync immediately - Current account %1$s - All sync related information will be deleted, which may result in duplicated items sometime - Please select a google account. Local notes will be synced with google task. - Sync notes - Last sync time %1$s - yyyy-MM-dd hh:mm:ss - Cancel - Change sync account - Remove sync account - Settings - Cannot change the account because sync is in progress - %1$s has been set as the sync account - Notes - Search notes - Searching Notes - Text in your notes - Set reminder - Export successful - Sync is successful with account %1$s - Getting remote note list... - Logging into %1$s... - Synchronize local notes with Google Task... - Sync is canceled - Sync is failed - Sync is successful - Syncing notes... - No associated note found, click to create associated note. - Privacy mode，can not see note content - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml deleted file mode 100644 index fe12ad3..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - -%s - --%s - --%s - --%s - - Messaging - Email - #335b5b5b33sp26sp20sp17sp14spNotesNotes 2x2Notes 4x4No associated note found, click to create associated note.Privacy mode，can not see note content...Add noteDelete reminder successfullySet reminderExpiredyyyyMMddMMMd kk:mmGot itTake a lookCallSend emailBrowse webOpen map/MIUI/notes/notes_%s.txt(%d)New FolderExport textSyncCancel syncingSettingsSearchDeleteMove to folder%d selectedNothing selected, the operation is invalidSelect allDeselect allFont sizeSmallMediumLargeSuperEnter check listLeave check listView folderDelete folderChange folder nameThe folder %1$s exist, please renameShareSend to homeRemind meDelete reminderSelect folderParent folderNote added to homeConfirm to delete folder and its notes?Delete selected notesConfirm to delete the selected %d notes?Confirm to delete this note?Have moved selected %1$d notes to %2$s folderSD card busy, not available nowExport failed, please check SD cardThe note is not existSorry, can not set clock on empty noteSorry, can not send and empty note to homeExport successfulExport failExport text file (%1$s) to SD (%2$s) directorySyncing notes...Sync is successfulSync is failedSync is canceledSync is successful with account %1$sSync failed, please check network and account settingsSync failed, internal error occursSync is canceledLogging into %1$s...Getting remote note list...Synchronize local notes with Google Task...SettingsSync accountSync notes with google taskLast sync time %1$syyyy-MM-dd hh:mm:ssAdd accountChange sync accountRemove sync accountCancelSync immediatelyCancel syncingCurrent account %1$sAll sync related information will be deleted, which may result in duplicated items sometimeSync notesPlease select a google account. Local notes will be synced with google task.Cannot change the account because sync is in progress%1$s has been set as the sync accountNew note background color randomDeleteCall notesInput nameSearching NotesSearch notesText in your notesNotessetcancel - %1$s result for \"%2$s\" - - %1$s results for \"%2$s\" - - 短信 - 邮件 - 便签便签2x2便签4x4没有关联内容，点击新建便签。访客模式下，便签内容不可见...新建便签成功删除提醒创建提醒已过期yyyyMMddMM月dd日 kk:mm知道了查看呼叫电话发送邮件浏览网页打开地图新建文件夹导出文本同步取消同步设置搜索删除移动到文件夹选中了 %d 项没有选中项，操作无效全选取消全选文字大小小正常大超大进入清单模式退出清单模式查看文件夹刪除文件夹修改文件夹名称文件夹 %1$s 已存在，请重新命名分享发送到桌面提醒我删除提醒选择文件夹上一级文件夹已添加到桌面删除确认要删除所选的 %d 条便签吗?确认要删除该条便签吗?确认删除文件夹及所包含的便签吗？已将所选 %1$d 条便签移到 %2$s 文件夹SD卡被占用，不能操作导出文本时发生错误，请检查SD卡要查看的便签不存在不能为空便签设置闹钟提醒不能将空便签发送到桌面导出成功导出失败已将文本文件(%1$s)输出至SD卡(%2$s)目录同步便签...同步成功同步失败同步已取消与%1$s同步成功同步失败，请检查网络和帐号设置同步失败，发生内部错误同步已取消登录%1$s...正在获取服务器便签列表...正在同步本地便签...设置同步账号与google task同步便签记录上次同步于 %1$s添加账号更换账号删除账号取消立即同步取消同步当前帐号 %1$s如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复同步便签请选择google帐号，便签将与该帐号的google task内容同步。正在同步中，不能修改同步帐号同步帐号已设置为%1$s新建便签背景颜色随机删除通话便签请输入名称正在搜索便签搜索便签便签中的文字便签设置取消 - %1$s 条符合“%2$s”的搜索结果 - - 短信 - 郵件 - 便簽便簽2x2便簽4x4沒有關聯內容，點擊新建便簽。訪客模式下，便籤內容不可見...新建便簽成功刪除提醒創建提醒已過期yyyyMMddMM月dd日 kk:mm知道了查看呼叫電話發送郵件浏覽網頁打開地圖已將所選 %1$d 便籤移到 %2$s 文件夾新建文件夾導出文本同步取消同步設置搜尋刪除移動到文件夾選中了 %d 項沒有選中項，操作無效全選取消全選文字大小小正常大超大進入清單模式退出清單模式查看文件夾刪除文件夾修改文件夾名稱文件夾 %1$s 已存在，請重新命名分享發送到桌面提醒我刪除提醒選擇文件夾上一級文件夾已添加到桌面刪除确认要刪除所選的 %d 條便籤嗎?确认要删除該條便籤嗎?確認刪除檔夾及所包含的便簽嗎？SD卡被佔用，不能操作導出TXT時發生錯誤，請檢查SD卡要查看的便籤不存在不能爲空便籤設置鬧鐘提醒不能將空便籤發送到桌面導出成功導出失敗已將文本文件(%1$s)導出至SD(%2$s)目錄同步便簽...同步成功同步失敗同步已取消與%1$s同步成功同步失敗，請檢查網絡和帳號設置同步失敗，發生內部錯誤同步已取消登陸%1$s...正在獲取服務器便籤列表...正在同步本地便籤...設置同步賬號与google task同步便簽記錄上次同步于 %1$s添加賬號更換賬號刪除賬號取消立即同步取消同步當前帳號 %1$s如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復同步便簽請選擇google帳號，便簽將與該帳號的google task內容同步。正在同步中，不能修改同步帳號同步帳號已設置為%1$s新建便籤背景顏色隨機刪除通話便籤請輸入名稱正在搜索便籤搜索便籤便籤中的文字便籤設置取消 - %1$s 條符合”%2$s“的搜尋結果 - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties deleted file mode 100644 index 545a505..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ /dev/null @@ -1,96 +0,0 @@ -#Mon Nov 20 00:18:20 CST 2023 -net.micode.notes.app-main-5\:/color/primary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\primary_text_dark.xml -net.micode.notes.app-main-5\:/color/secondary_text_dark.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\color\\secondary_text_dark.xml -net.micode.notes.app-main-5\:/drawable-hdpi/bg_btn_set_color.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_btn_set_color.png -net.micode.notes.app-main-5\:/drawable-hdpi/bg_color_btn_mask.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\bg_color_btn_mask.png -net.micode.notes.app-main-5\:/drawable-hdpi/call_record.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\call_record.png -net.micode.notes.app-main-5\:/drawable-hdpi/clock.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\clock.png -net.micode.notes.app-main-5\:/drawable-hdpi/delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\delete.png -net.micode.notes.app-main-5\:/drawable-hdpi/dropdown_icon.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\dropdown_icon.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_blue.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_green.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_red.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_blue.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_blue.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_green.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_green.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_red.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_red.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_white.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_title_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_title_yellow.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_white.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_white.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/edit_yellow.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\edit_yellow.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_large.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_large.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_normal.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_size_selector_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_size_selector_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_small.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_small.png -net.micode.notes.app-main-5\:/drawable-hdpi/font_super.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\font_super.png -net.micode.notes.app-main-5\:/drawable-hdpi/icon_app.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\icon_app.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_background.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_background.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_blue_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_blue_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_folder.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_folder.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_footer_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_footer_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_green_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_green_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_red_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_red_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_white_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_white_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_down.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_down.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_middle.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_middle.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_single.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_single.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/list_yellow_up.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\list_yellow_up.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_delete.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_delete.png -net.micode.notes.app-main-5\:/drawable-hdpi/menu_move.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\menu_move.png -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_normal.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_normal.png -net.micode.notes.app-main-5\:/drawable-hdpi/new_note_pressed.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\new_note_pressed.png -net.micode.notes.app-main-5\:/drawable-hdpi/note_edit_color_selector_panel.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\note_edit_color_selector_panel.png -net.micode.notes.app-main-5\:/drawable-hdpi/notification.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\notification.png -net.micode.notes.app-main-5\:/drawable-hdpi/search_result.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\search_result.png -net.micode.notes.app-main-5\:/drawable-hdpi/selected.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\selected.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_alert.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_alert.png -net.micode.notes.app-main-5\:/drawable-hdpi/title_bar_bg.9.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\title_bar_bg.9.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_blue.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_green.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_red.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_white.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_2x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_2x_yellow.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_blue.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_blue.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_green.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_green.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_red.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_red.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_white.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_white.png -net.micode.notes.app-main-5\:/drawable-hdpi/widget_4x_yellow.png=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable-hdpi-v4\\widget_4x_yellow.png -net.micode.notes.app-main-5\:/drawable/new_note.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\new_note.xml -net.micode.notes.app-main-5\:/layout/account_dialog_title.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\account_dialog_title.xml -net.micode.notes.app-main-5\:/layout/add_account_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\add_account_text.xml -net.micode.notes.app-main-5\:/layout/datetime_picker.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\datetime_picker.xml -net.micode.notes.app-main-5\:/layout/dialog_edit_text.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\dialog_edit_text.xml -net.micode.notes.app-main-5\:/layout/folder_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\folder_list_item.xml -net.micode.notes.app-main-5\:/layout/note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit.xml -net.micode.notes.app-main-5\:/layout/note_edit_list_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_edit_list_item.xml -net.micode.notes.app-main-5\:/layout/note_item.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_item.xml -net.micode.notes.app-main-5\:/layout/note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list.xml -net.micode.notes.app-main-5\:/layout/note_list_dropdown_menu.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_dropdown_menu.xml -net.micode.notes.app-main-5\:/layout/note_list_footer.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\note_list_footer.xml -net.micode.notes.app-main-5\:/layout/settings_header.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\settings_header.xml -net.micode.notes.app-main-5\:/layout/widget_2x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_2x.xml -net.micode.notes.app-main-5\:/layout/widget_4x.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\layout\\widget_4x.xml -net.micode.notes.app-main-5\:/menu/call_note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_note_edit.xml -net.micode.notes.app-main-5\:/menu/call_record_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\call_record_folder.xml -net.micode.notes.app-main-5\:/menu/note_edit.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_edit.xml -net.micode.notes.app-main-5\:/menu/note_list.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list.xml -net.micode.notes.app-main-5\:/menu/note_list_dropdown.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_dropdown.xml -net.micode.notes.app-main-5\:/menu/note_list_options.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\note_list_options.xml -net.micode.notes.app-main-5\:/menu/sub_folder.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\menu\\sub_folder.xml -net.micode.notes.app-main-5\:/raw-zh-rCN/introduction=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw-zh-rCN\\introduction -net.micode.notes.app-main-5\:/raw/introduction=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\raw\\introduction -net.micode.notes.app-main-5\:/xml/preferences.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\preferences.xml -net.micode.notes.app-main-5\:/xml/searchable.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\searchable.xml -net.micode.notes.app-main-5\:/xml/widget_2x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_2x_info.xml -net.micode.notes.app-main-5\:/xml/widget_4x_info.xml=D\:\\Notes-master1\\app\\build\\intermediates\\packaged_res\\debug\\xml\\widget_4x_info.xml diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml deleted file mode 100644 index 60eb5bd..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml deleted file mode 100644 index c6ae0a3..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml b/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml deleted file mode 100644 index 8b924a7..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/mergeDebugShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt deleted file mode 100644 index 51ec75d..0000000 --- a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt +++ /dev/null @@ -1,4 +0,0 @@ -#Mon Nov 20 10:13:51 CST 2023 -base.0=D\:\\Notes-master1\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex -path.0=classes.dex -renamed.0=classes.dex diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources deleted file mode 100644 index 7c0f13d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 b/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 deleted file mode 100644 index 945a7c5..0000000 Binary files a/src/Notes-master1/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0 and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class deleted file mode 100644 index a7948fd..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class deleted file mode 100644 index 42394b7..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class deleted file mode 100644 index 569dbdc..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataColumns.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class deleted file mode 100644 index 76ef96e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class deleted file mode 100644 index 36c8d49..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$NoteColumns.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class deleted file mode 100644 index 42461a2..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class deleted file mode 100644 index 413745e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class deleted file mode 100644 index 64fe9eb..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper$TABLE.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class deleted file mode 100644 index 0b075b4..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class deleted file mode 100644 index 1d3de0e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class deleted file mode 100644 index 20ff3f7..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class deleted file mode 100644 index 5236c5e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class deleted file mode 100644 index 099f3ba..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class deleted file mode 100644 index 2783ae3..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class deleted file mode 100644 index 5aaf1d4..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class deleted file mode 100644 index 359609e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/TaskList.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class deleted file mode 100644 index 1a059ce..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/ActionFailureException.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class deleted file mode 100644 index 75665c2..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/exception/NetworkFailureException.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class deleted file mode 100644 index 6f45159..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$1.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class deleted file mode 100644 index f73069c..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class deleted file mode 100644 index b99539f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskASyncTask.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class deleted file mode 100644 index 7be3b8a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskClient.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class deleted file mode 100644 index ac1834c..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskManager.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class deleted file mode 100644 index f246eb8..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService$1.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class deleted file mode 100644 index 18da491..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/remote/GTaskSyncService.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class deleted file mode 100644 index c40e945..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note$NoteData.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class deleted file mode 100644 index d2041cc..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/Note.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class deleted file mode 100644 index 15f1f77..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class deleted file mode 100644 index df71afc..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/model/WorkingNote.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class deleted file mode 100644 index 63e7f9c..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils$TextExport.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class deleted file mode 100644 index 6a86737..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/BackupUtils.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class deleted file mode 100644 index 6af3200..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/DataUtils.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class deleted file mode 100644 index d320e3e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/GTaskStringUtils.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class deleted file mode 100644 index 84e57a4..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteBgResources.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class deleted file mode 100644 index 8805a06..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$NoteItemBgResources.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class deleted file mode 100644 index 7f2eb75..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$TextAppearanceResources.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class deleted file mode 100644 index b4ec3ba..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser$WidgetBgResources.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class deleted file mode 100644 index f2e1b62..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/tool/ResourceParser.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class deleted file mode 100644 index 98353eb..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmAlertActivity.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class deleted file mode 100644 index a1d202d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmInitReceiver.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class deleted file mode 100644 index a41b775..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/AlarmReceiver.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class deleted file mode 100644 index 029286f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$1.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class deleted file mode 100644 index e65c35c..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$2.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class deleted file mode 100644 index de51bad..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$3.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class deleted file mode 100644 index d04cbe7..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$4.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class deleted file mode 100644 index 255a4e6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class deleted file mode 100644 index 400d289..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePicker.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class deleted file mode 100644 index 415e755..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$1.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class deleted file mode 100644 index 70481dd..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class deleted file mode 100644 index 71e5215..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DateTimePickerDialog.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class deleted file mode 100644 index ddd74fd..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu$1.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class deleted file mode 100644 index 54e7df6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/DropdownMenu.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class deleted file mode 100644 index fad3442..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter$FolderListItem.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class deleted file mode 100644 index 023f716..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/FoldersListAdapter.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class deleted file mode 100644 index 062716f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$1.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class deleted file mode 100644 index 14c20ca..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$2.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class deleted file mode 100644 index 247e76f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$3.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class deleted file mode 100644 index 8e1f0bf..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class deleted file mode 100644 index 70bd279..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditActivity.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class deleted file mode 100644 index 2040186..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$1.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class deleted file mode 100644 index 9874f47..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class deleted file mode 100644 index 3a19d3b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteEditText.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class deleted file mode 100644 index 771aa91..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NoteItemData.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class deleted file mode 100644 index f1ba220..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$1.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class deleted file mode 100644 index 76c0c9d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$2.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class deleted file mode 100644 index 0fd6977..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$3.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class deleted file mode 100644 index 0468652..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$4.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class deleted file mode 100644 index 54fa572..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$5.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class deleted file mode 100644 index 062ecb5..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$6.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class deleted file mode 100644 index c217873..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$7.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class deleted file mode 100644 index d3dbb60..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$8.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class deleted file mode 100644 index 8f0a21b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$9.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class deleted file mode 100644 index 127437f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class deleted file mode 100644 index 2edab7b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ListEditState.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class deleted file mode 100644 index 3981f16..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$1.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class deleted file mode 100644 index 99e161f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback$2.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class deleted file mode 100644 index f249e33..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$ModeCallback.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class deleted file mode 100644 index 81f06d3..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class deleted file mode 100644 index 3d4e8b1..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class deleted file mode 100644 index 83dc6c8..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListActivity.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class deleted file mode 100644 index 2bdb58b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class deleted file mode 100644 index 5e432e9..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListAdapter.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class deleted file mode 100644 index 4596834..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesListItem.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class deleted file mode 100644 index 362fa05..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$1.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class deleted file mode 100644 index 8523228..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$2.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class deleted file mode 100644 index d91bc85..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$3.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class deleted file mode 100644 index 99c7a64..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$4.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class deleted file mode 100644 index 17e4d3b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$5.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class deleted file mode 100644 index 7b80036..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$6.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class deleted file mode 100644 index d9abeb9..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$7.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class deleted file mode 100644 index 39e534a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$8.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class deleted file mode 100644 index eb938cf..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class deleted file mode 100644 index 0937be2..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/ui/NotesPreferenceActivity.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class deleted file mode 100644 index a00281f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class deleted file mode 100644 index 043e410..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_2x.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class b/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class deleted file mode 100644 index ee3fd40..0000000 Binary files a/src/Notes-master1/app/build/intermediates/javac/debug/classes/net/micode/notes/widget/NoteWidgetProvider_4x.class and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt b/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt deleted file mode 100644 index 5bec0cd..0000000 --- a/src/Notes-master1/app/build/intermediates/local_only_symbol_list/debug/R-def.txt +++ /dev/null @@ -1,285 +0,0 @@ -R_DEF: Internal format may change without notice -local -array format_for_exported_note -array menu_share_ways -color primary_text_dark -color secondary_text_dark -color user_query_highlight -dimen text_font_size_large -dimen text_font_size_medium -dimen text_font_size_normal -dimen text_font_size_small -dimen text_font_size_super -drawable bg_btn_set_color -drawable bg_color_btn_mask -drawable call_record -drawable clock -drawable delete -drawable dropdown_icon -drawable edit_blue -drawable edit_green -drawable edit_red -drawable edit_title_blue -drawable edit_title_green -drawable edit_title_red -drawable edit_title_white -drawable edit_title_yellow -drawable edit_white -drawable edit_yellow -drawable font_large -drawable font_normal -drawable font_size_selector_bg -drawable font_small -drawable font_super -drawable icon_app -drawable list_background -drawable list_blue_down -drawable list_blue_middle -drawable list_blue_single -drawable list_blue_up -drawable list_folder -drawable list_footer_bg -drawable list_green_down -drawable list_green_middle -drawable list_green_single -drawable list_green_up -drawable list_red_down -drawable list_red_middle -drawable list_red_single -drawable list_red_up -drawable list_white_down -drawable list_white_middle -drawable list_white_single -drawable list_white_up -drawable list_yellow_down -drawable list_yellow_middle -drawable list_yellow_single -drawable list_yellow_up -drawable menu_delete -drawable menu_move -drawable new_note -drawable new_note_normal -drawable new_note_pressed -drawable note_edit_color_selector_panel -drawable notification -drawable search_result -drawable selected -drawable title_alert -drawable title_bar_bg -drawable widget_2x_blue -drawable widget_2x_green -drawable widget_2x_red -drawable widget_2x_white -drawable widget_2x_yellow -drawable widget_4x_blue -drawable widget_4x_green -drawable widget_4x_red -drawable widget_4x_white -drawable widget_4x_yellow -id account_dialog_subtitle -id account_dialog_title -id action_select_all -id amPm -id btn_new_note -id btn_set_bg_color -id cb_edit_item -id date -id delete -id et_edit_text -id et_foler_name -id font_size_selector -id hour -id iv_alert_icon -id iv_bg_blue -id iv_bg_blue_select -id iv_bg_green -id iv_bg_green_select -id iv_bg_red -id iv_bg_red_select -id iv_bg_white -id iv_bg_white_select -id iv_bg_yellow -id iv_bg_yellow_select -id iv_large_select -id iv_medium_select -id iv_small_select -id iv_super_select -id ll_font_large -id ll_font_normal -id ll_font_small -id ll_font_super -id menu_alert -id menu_delete -id menu_delete_remind -id menu_export_text -id menu_font_size -id menu_list_mode -id menu_new_folder -id menu_new_note -id menu_search -id menu_send_to_desktop -id menu_setting -id menu_share -id menu_sync -id minute -id move -id navigation_bar -id note_bg_color_selector -id note_edit_list -id note_edit_view -id note_item -id note_title -id notes_list -id prefenerece_sync_status_textview -id preference_sync_button -id selection_menu -id sv_note_edit -id tv_alert_date -id tv_folder_name -id tv_modified_date -id tv_name -id tv_time -id tv_title -id tv_title_bar -id widget_bg_image -id widget_text -layout account_dialog_title -layout add_account_text -layout datetime_picker -layout dialog_edit_text -layout folder_list_item -layout note_edit -layout note_edit_list_item -layout note_item -layout note_list -layout note_list_dropdown_menu -layout note_list_footer -layout settings_header -layout widget_2x -layout widget_4x -menu call_note_edit -menu call_record_folder -menu note_edit -menu note_list -menu note_list_dropdown -menu note_list_options -menu sub_folder -plurals search_results_title -raw introduction -string alert_message_delete_folder -string alert_message_delete_note -string alert_message_delete_notes -string alert_title_delete -string app_name -string app_widget2x2 -string app_widget4x4 -string button_delete -string call_record_folder_name -string datetime_dialog_cancel -string datetime_dialog_ok -string delete_remind_time_message -string error_note_empty_for_clock -string error_note_empty_for_send_to_desktop -string error_note_not_exist -string error_sdcard_export -string error_sdcard_unmounted -string error_sync_cancelled -string error_sync_internal -string error_sync_network -string failed_sdcard_export -string file_name_txt_format -string file_path -string folder_exist -string format_date_ymd -string format_datetime_mdhm -string format_exported_file_location -string format_folder_files_count -string format_move_notes_to_folder -string hint_foler_name -string info_note_enter_desktop -string menu_alert -string menu_create_folder -string menu_delete -string menu_deselect_all -string menu_export_text -string menu_folder_change_name -string menu_folder_delete -string menu_folder_view -string menu_font_large -string menu_font_normal -string menu_font_size -string menu_font_small -string menu_font_super -string menu_list_mode -string menu_move -string menu_move_parent_folder -string menu_normal_mode -string menu_remove_remind -string menu_search -string menu_select_all -string menu_select_none -string menu_select_title -string menu_send_to_desktop -string menu_setting -string menu_share -string menu_sync -string menu_sync_cancel -string menu_title_select_folder -string note_alert_expired -string note_link_email -string note_link_other -string note_link_tel -string note_link_web -string notealert_enter -string notealert_ok -string notelist_menu_new -string notelist_string_info -string preferences_account_summary -string preferences_account_title -string preferences_add_account -string preferences_bg_random_appear_title -string preferences_button_sync_cancel -string preferences_button_sync_immediately -string preferences_dialog_change_account_title -string preferences_dialog_change_account_warn_msg -string preferences_dialog_select_account_tips -string preferences_dialog_select_account_title -string preferences_last_sync_time -string preferences_last_sync_time_format -string preferences_menu_cancel -string preferences_menu_change_account -string preferences_menu_remove_account -string preferences_title -string preferences_toast_cannot_change_account -string preferences_toast_success_set_accout -string search -string search_hint -string search_label -string search_setting_description -string set_remind_time_message -string success_sdcard_export -string success_sync_account -string sync_progress_init_list -string sync_progress_login -string sync_progress_syncing -string ticker_cancel -string ticker_fail -string ticker_success -string ticker_syncing -string widget_havenot_content -string widget_under_visit_mode -style HighlightTextAppearancePrimary -style HighlightTextAppearanceSecondary -style NoteActionBarStyle -style NoteTheme -style TextAppearanceLarge -style TextAppearanceMedium -style TextAppearanceNormal -style TextAppearancePrimaryItem -style TextAppearanceSecondaryItem -style TextAppearanceSuper -style TextAppearanceUnderMenuIcon -xml preferences -xml searchable -xml widget_2x_info -xml widget_4x_info diff --git a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt deleted file mode 100644 index b81f957..0000000 --- a/src/Notes-master1/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt +++ /dev/null @@ -1,273 +0,0 @@ -1 -2 -17 -21 -22 D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -23 android:minSdkVersion="14" -23-->D:\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 -24 android:targetSdkVersion="14" /> -25 -26 -26-->D:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 -26-->D:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 -27 -27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 -27-->D:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 -28 -28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 -28-->D:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 -29 -29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 -29-->D:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 -30 -30-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 -30-->D:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 -31 -31-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 -31-->D:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 -32 -32-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 -32-->D:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 -33 -33-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 -33-->D:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 -34 -34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 -34-->D:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 -35 -36 D:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 -37 android:debuggable="true" -38 android:extractNativeLibs="true" -39 android:icon="@drawable/icon_app" -39-->D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 -40 android:label="@string/app_name" -40-->D:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 -41 android:testOnly="true" > -42 D:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 -43 android:name="net.micode.notes.ui.NotesListActivity" -43-->D:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 -44 android:configChanges="keyboardHidden|orientation|screenSize" -44-->D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 -45 android:label="@string/app_name" -45-->D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 -46 android:launchMode="singleTop" -46-->D:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 -47 android:theme="@style/NoteTheme" -47-->D:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 -48 android:uiOptions="splitActionBarWhenNarrow" -48-->D:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 -49 android:windowSoftInputMode="adjustPan" > -49-->D:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 -50 -50-->D:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 -51 -51-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 -51-->D:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 -52 -53 -53-->D:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 -53-->D:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 -54 -55 -56 D:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 -57 android:name="net.micode.notes.ui.NoteEditActivity" -57-->D:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 -58 android:configChanges="keyboardHidden|orientation|screenSize" -58-->D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 -59 android:launchMode="singleTop" -59-->D:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 -60 android:theme="@style/NoteTheme" > -60-->D:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 -61 -61-->D:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 -62 -62-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 -62-->D:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 -63 -64 -64-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -64-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 -65 -66 -66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -66-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -67 -67-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -67-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -68 -69 -69-->D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 -70 -70-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 -70-->D:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 -71 -72 -72-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -72-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 -73 -74 -74-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -74-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -75 -75-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 -75-->D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -76 -77 -77-->D:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 -78 -78-->D:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 -78-->D:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 -79 -80 -80-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 -80-->D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 -81 -82 -83 D:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 -84 android:name="android.app.searchable" -84-->D:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 -85 android:resource="@xml/searchable" /> -85-->D:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 -86 -87 -88 D:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 -89 android:name="net.micode.notes.data.NotesProvider" -89-->D:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 -90 android:authorities="micode_notes" -90-->D:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 -91 android:multiprocess="true" /> -91-->D:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 -92 -93 D:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 -94 android:name="net.micode.notes.widget.NoteWidgetProvider_2x" -94-->D:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 -95 android:label="@string/app_widget2x2" > -95-->D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 -96 -96-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 -97 -97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -97-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 -98 -98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -98-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 -99 -99-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -99-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 -100 -101 -102 D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 -103 android:name="android.appwidget.provider" -103-->D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 -104 android:resource="@xml/widget_2x_info" /> -104-->D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 -105 -106 D:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 -107 android:name="net.micode.notes.widget.NoteWidgetProvider_4x" -107-->D:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 -108 android:label="@string/app_widget4x4" > -108-->D:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 -109 -109-->D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 -110 -110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 -110-->D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 -111 -111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 -111-->D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 -112 -112-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 -112-->D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 -113 -114 -115 D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 -116 android:name="android.appwidget.provider" -116-->D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 -117 android:resource="@xml/widget_4x_info" /> -117-->D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 -118 -119 -119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 -119-->D:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 -120 -120-->D:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 -121 -121-->D:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 -121-->D:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 -122 -123 -124 D:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 -125 android:name="net.micode.notes.ui.AlarmReceiver" -125-->D:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 -126 android:process=":remote" > -126-->D:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 -127 -128 -129 D:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 -130 android:name="net.micode.notes.ui.AlarmAlertActivity" -130-->D:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 -131 android:label="@string/app_name" -131-->D:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 -132 android:launchMode="singleInstance" -132-->D:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 -133 android:theme="@android:style/Theme.Holo.Wallpaper.NoTitleBar" > -133-->D:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 -134 -135 D:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 -136 android:name="net.micode.notes.ui.NotesPreferenceActivity" -136-->D:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 -137 android:label="@string/preferences_title" -137-->D:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 -138 android:launchMode="singleTop" -138-->D:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 -139 android:theme="@android:style/Theme.Holo.Light" > -139-->D:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 -140 -141 -142 D:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 -143 android:name="net.micode.notes.gtask.remote.GTaskSyncService" -143-->D:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 -144 android:exported="false" > -144-->D:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 -145 -146 -147 D:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 -148 android:name="android.app.default_searchable" -148-->D:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 -149 android:value=".ui.NoteEditActivity" /> -149-->D:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 -150 -151 -152 diff --git a/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar b/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar deleted file mode 100644 index 15cb0ec..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_java_res/debug/base.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml deleted file mode 100644 index 9e8d8ca..0000000 --- a/src/Notes-master1/app/build/intermediates/merged_manifest/debug/AndroidManifest.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json deleted file mode 100644 index a56d03a..0000000 --- a/src/Notes-master1/app/build/intermediates/merged_manifests/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "MERGED_MANIFESTS", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "AndroidManifest.xml" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat deleted file mode 100644 index e5df6da..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_primary_text_dark.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat deleted file mode 100644 index 8cc05db..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/color_secondary_text_dark.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat deleted file mode 100644 index 2eda191..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_btn_set_color.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat deleted file mode 100644 index 59c2358..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_bg_color_btn_mask.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat deleted file mode 100644 index 89fb25d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_call_record.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat deleted file mode 100644 index 40e03de..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_clock.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat deleted file mode 100644 index 809ce24..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_delete.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat deleted file mode 100644 index f80e058..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_dropdown_icon.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat deleted file mode 100644 index be22aa0..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_blue.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat deleted file mode 100644 index 2a07d4f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_green.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat deleted file mode 100644 index b71467d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_red.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat deleted file mode 100644 index 9cf62b3..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_blue.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat deleted file mode 100644 index f77ea7d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_green.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat deleted file mode 100644 index 4b9e264..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_red.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat deleted file mode 100644 index cbb044c..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_white.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat deleted file mode 100644 index 14d4feb..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_title_yellow.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat deleted file mode 100644 index 9226aa6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_white.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat deleted file mode 100644 index d49f07e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_edit_yellow.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat deleted file mode 100644 index b33f03f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_large.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat deleted file mode 100644 index d631a65..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_normal.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat deleted file mode 100644 index 0400aeb..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_size_selector_bg.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat deleted file mode 100644 index f6a97f6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_small.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat deleted file mode 100644 index 28656cb..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_font_super.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat deleted file mode 100644 index ca8a144..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_icon_app.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat deleted file mode 100644 index 2a028e8..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_background.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat deleted file mode 100644 index ca41f40..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat deleted file mode 100644 index 7302f30..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat deleted file mode 100644 index 02a4f77..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat deleted file mode 100644 index 4382694..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_blue_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat deleted file mode 100644 index b4e71dc..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_folder.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat deleted file mode 100644 index b230b8f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_footer_bg.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat deleted file mode 100644 index 633e0e7..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat deleted file mode 100644 index d432a14..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat deleted file mode 100644 index 5a72f21..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat deleted file mode 100644 index 3e628af..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_green_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat deleted file mode 100644 index a4b4193..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat deleted file mode 100644 index 7ae0f98..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat deleted file mode 100644 index 6cbb18b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat deleted file mode 100644 index a4a6692..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_red_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat deleted file mode 100644 index 9623c13..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat deleted file mode 100644 index 404ea2c..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat deleted file mode 100644 index 4bb304b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat deleted file mode 100644 index 449a2d8..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_white_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat deleted file mode 100644 index 74c5445..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_down.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat deleted file mode 100644 index 99bbe37..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_middle.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat deleted file mode 100644 index cfab562..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_single.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat deleted file mode 100644 index afdf9b0..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_list_yellow_up.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat deleted file mode 100644 index a53a14d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_delete.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat deleted file mode 100644 index d0312eb..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_menu_move.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat deleted file mode 100644 index 01ef2da..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_normal.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat deleted file mode 100644 index ca5c107..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_new_note_pressed.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat deleted file mode 100644 index 23eb0dc..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_note_edit_color_selector_panel.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat deleted file mode 100644 index a138233..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_notification.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat deleted file mode 100644 index 3b4516a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_search_result.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat deleted file mode 100644 index 465926e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_selected.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat deleted file mode 100644 index ed8e6a9..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_alert.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat deleted file mode 100644 index fb37689..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_title_bar_bg.9.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat deleted file mode 100644 index adfba04..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_blue.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat deleted file mode 100644 index 8b13b97..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_green.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat deleted file mode 100644 index 896fb83..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_red.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat deleted file mode 100644 index 2c0cce3..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_white.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat deleted file mode 100644 index 973eb75..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_2x_yellow.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat deleted file mode 100644 index c521cf6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_blue.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat deleted file mode 100644 index dd55472..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_green.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat deleted file mode 100644 index 2912b97..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_red.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat deleted file mode 100644 index 90b6f06..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_white.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat deleted file mode 100644 index 6556925..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable-hdpi_widget_4x_yellow.png.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat deleted file mode 100644 index eec4deb..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/drawable_new_note.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat deleted file mode 100644 index 1bbe3ab..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_account_dialog_title.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat deleted file mode 100644 index 305e7a6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_add_account_text.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat deleted file mode 100644 index 61742b5..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_datetime_picker.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat deleted file mode 100644 index 78701a1..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_dialog_edit_text.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat deleted file mode 100644 index 7b3fb68..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_folder_list_item.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat deleted file mode 100644 index 6c97e3d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat deleted file mode 100644 index 006b151..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_edit_list_item.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat deleted file mode 100644 index 1c3342f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_item.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat deleted file mode 100644 index 8f48256..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat deleted file mode 100644 index 749f04b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_dropdown_menu.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat deleted file mode 100644 index 98f56f4..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_note_list_footer.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat deleted file mode 100644 index 9caf2e6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_settings_header.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat deleted file mode 100644 index a74989a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_2x.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat deleted file mode 100644 index 94470b7..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/layout_widget_4x.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat deleted file mode 100644 index 7b10945..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_note_edit.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat deleted file mode 100644 index 5cbb9e9..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_call_record_folder.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat deleted file mode 100644 index c025a60..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_edit.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat deleted file mode 100644 index 4316da7..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat deleted file mode 100644 index 7d74a65..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_dropdown.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat deleted file mode 100644 index 9210c15..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_note_list_options.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat deleted file mode 100644 index ad66757..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/menu_sub_folder.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat deleted file mode 100644 index 68b46ae..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat deleted file mode 100644 index 02a9e4e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/raw_introduction.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat deleted file mode 100644 index 4e7bd33..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rCN_values-zh-rCN.arsc.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat deleted file mode 100644 index 0e5932b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values-zh-rTW_values-zh-rTW.arsc.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat deleted file mode 100644 index 40e69d2..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/values_values.arsc.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat deleted file mode 100644 index 752f47f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_preferences.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat deleted file mode 100644 index 625e86f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_searchable.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat deleted file mode 100644 index ad294be..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_2x_info.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat b/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat deleted file mode 100644 index 4d8a2a5..0000000 Binary files a/src/Notes-master1/app/build/intermediates/merged_res/debug/xml_widget_4x_info.xml.flat and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json deleted file mode 100644 index aac8885..0000000 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json +++ /dev/null @@ -1,186 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rCN_values-zh-rCN.arsc.flat", - "map": [ - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-4:/values_values.arsc.flat", - "map": [ - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - } - ] - }, - { - "outputFile": "net.micode.notes.app-merged_res-4:/values-zh-rTW_values-zh-rTW.arsc.flat", - "map": [ - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json deleted file mode 100644 index 2372a1f..0000000 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rCN/values-zh-rCN.xml", - "map": [ - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rCN\\strings.xml", - "from": { - "startLines": "121,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6532,3495,3429,3356,3306,827,867,915,6083,6128,6478,6428,1199,3861,3929,3802,3737,3674,4592,4532,4469,4061,2877,1369,1422,4115,3568,6185,3247,3034,1798,2079,2325,1851,2817,2764,2713,2518,2470,2376,2424,2564,2611,2122,3188,2661,3077,2036,2278,2222,2167,2979,1992,2937,1901,1942,3129,1318,1623,1719,1576,1672,1529,1484,1148,1095,4967,4908,5108,6009,5419,5350,5483,5561,5744,5671,5042,5295,5165,5230,4859,5848,5931,6390,6283,6235,6328,1261,4006,4410,4705,4647,4772,4362,4317,4269,4218,963,1029", - "endLines": "123,71,70,69,68,19,20,21,112,113,120,119,26,77,78,76,75,74,90,89,88,80,60,29,30,81,72,114,67,63,38,44,49,39,59,58,57,53,52,50,51,54,55,45,66,56,64,43,48,47,46,62,42,61,40,41,65,28,34,36,33,35,32,31,25,24,97,96,99,111,104,103,105,106,108,107,98,102,100,101,95,109,110,118,116,115,117,27,79,87,92,91,93,86,85,84,83,22,23", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6704,3563,3490,3424,3351,862,910,958,6123,6180,6527,6473,1256,3924,4001,3856,3797,3732,4642,4587,4527,4110,2932,1417,1479,4195,3644,6230,3301,3072,1846,2117,2371,1896,2872,2812,2759,2559,2513,2419,2465,2606,2656,2162,3242,2708,3124,2074,2320,2273,2217,3029,2031,2974,1937,1987,3183,1364,1667,1763,1618,1714,1571,1524,1194,1143,5037,4962,5160,6078,5478,5414,5556,5666,5843,5739,5103,5345,5225,5290,4903,5926,6004,6423,6323,6278,6385,1313,4056,4464,4767,4700,4829,4405,4357,4312,4264,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,457,523,596,646,686,734,782,827,884,938,988,1050,1118,1195,1254,1319,1382,1437,1497,1560,1614,1674,1727,1789,1874,1955,2005,2064,2107,2160,2203,2254,2304,2364,2417,2468,2514,2562,2610,2656,2703,2753,2798,2857,2909,2961,3004,3051,3107,3162,3217,3261,3303,3344,3394,3453,3504,3553,3602,3649,3696,3743,3788,3839,3892,3967,4026,4083,4157,4221,4290,4368,4478,4582,4655,4721,4776,4841,4906,4955,5038,5116,5154,5199,5247,5309,5366,5421,5480,5547,5605,5667,5715,5760,5808,5859,5925", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,72,65,72,49,39,47,47,44,56,53,49,61,67,76,58,64,62,54,59,62,53,59,52,61,84,80,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,452,518,591,641,681,729,777,822,879,933,983,1045,1113,1190,1249,1314,1377,1432,1492,1555,1609,1669,1722,1784,1869,1950,2000,2059,2102,2155,2198,2249,2299,2359,2412,2463,2509,2557,2605,2651,2698,2748,2793,2852,2904,2956,2999,3046,3102,3157,3212,3256,3298,3339,3389,3448,3499,3548,3597,3644,3691,3738,3783,3834,3887,3962,4021,4078,4152,4216,4285,4363,4473,4577,4650,4716,4771,4836,4901,4950,5033,5111,5149,5194,5242,5304,5361,5416,5475,5542,5600,5662,5710,5755,5803,5854,5920,5986" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json deleted file mode 100644 index 5a163ed..0000000 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values-zh-rTW/values-zh-rTW.xml", - "map": [ - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\strings.xml", - "from": { - "startLines": "122,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "6507,3575,3509,3436,3386,827,867,915,6057,6102,6453,6403,1199,3835,3903,3776,3710,3647,4565,4505,4442,4035,2957,1369,1422,4089,1768,6159,3327,3114,1878,2159,2405,1931,2897,2844,2793,2598,2550,2456,2504,2644,2691,2202,3268,2741,3157,2116,2358,2302,2247,3059,2072,3017,1981,2022,3209,1318,1623,1719,1576,1672,1529,1484,1148,1095,4940,4881,5081,5982,5392,5323,5456,5534,5717,5644,5015,5268,5138,5203,4832,5821,5904,6365,6258,6210,6303,1261,3980,4383,4678,4620,4745,4335,4290,4242,4191,963,1029", - "endLines": "124,72,71,70,69,19,20,21,112,113,121,120,26,76,77,75,74,73,89,88,87,79,61,29,30,80,37,114,68,64,39,45,50,40,60,59,58,54,53,51,52,55,56,46,67,57,65,44,49,48,47,63,43,62,41,42,66,28,34,36,33,35,32,31,25,24,96,95,98,110,103,102,104,105,107,106,97,101,99,100,94,108,109,119,117,116,118,27,78,86,91,90,92,85,84,83,82,22,23", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "6679,3642,3570,3504,3431,862,910,958,6097,6154,6502,6448,1256,3898,3975,3830,3771,3705,4615,4560,4500,4084,3012,1417,1479,4168,1843,6204,3381,3152,1926,2197,2451,1976,2952,2892,2839,2639,2593,2499,2545,2686,2736,2242,3322,2788,3204,2154,2400,2353,2297,3109,2111,3054,2017,2067,3263,1364,1667,1763,1618,1714,1571,1524,1194,1143,5010,4935,5133,6051,5451,5387,5529,5639,5816,5712,5076,5318,5198,5263,4876,5899,5977,6398,6298,6253,6360,1313,4030,4437,4740,4673,4802,4378,4330,4285,4237,1024,1090" - }, - "to": { - "startLines": "6,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "215,384,456,522,595,645,685,733,781,826,883,937,987,1049,1117,1194,1253,1319,1382,1437,1497,1560,1614,1674,1727,1789,1873,1953,2003,2062,2105,2158,2201,2252,2302,2362,2415,2466,2512,2560,2608,2654,2701,2751,2796,2855,2907,2959,3002,3049,3105,3160,3215,3259,3301,3342,3392,3451,3502,3551,3600,3647,3694,3741,3786,3837,3890,3965,4024,4081,4155,4219,4288,4366,4476,4580,4653,4719,4774,4839,4904,4953,5036,5114,5152,5197,5245,5307,5364,5419,5478,5545,5603,5665,5713,5758,5806,5857,5923", - "endLines": "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106", - "endColumns": "14,71,65,72,49,39,47,47,44,56,53,49,61,67,76,58,65,62,54,59,62,53,59,52,61,83,79,49,58,42,52,42,50,49,59,52,50,45,47,47,45,46,49,44,58,51,51,42,46,55,54,54,43,41,40,49,58,50,48,48,46,46,46,44,50,52,74,58,56,73,63,68,77,109,103,72,65,54,64,64,48,82,77,37,44,47,61,56,54,58,66,57,61,47,44,47,50,65,65", - "endOffsets": "379,451,517,590,640,680,728,776,821,878,932,982,1044,1112,1189,1248,1314,1377,1432,1492,1555,1609,1669,1722,1784,1868,1948,1998,2057,2100,2153,2196,2247,2297,2357,2410,2461,2507,2555,2603,2649,2696,2746,2791,2850,2902,2954,2997,3044,3100,3155,3210,3254,3296,3337,3387,3446,3497,3546,3595,3642,3689,3736,3781,3832,3885,3960,4019,4076,4150,4214,4283,4361,4471,4575,4648,4714,4769,4834,4899,4948,5031,5109,5147,5192,5240,5302,5359,5414,5473,5540,5598,5660,5708,5753,5801,5852,5918,5984" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values-zh-rTW\\arrays.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endLines": "21", - "endColumns": "19", - "endOffsets": "817" - }, - "to": { - "startLines": "2", - "startColumns": "4", - "startOffsets": "105", - "endLines": "5", - "endColumns": "19", - "endOffsets": "210" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json deleted file mode 100644 index 6628b8c..0000000 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "logs": [ - { - "outputFile": "net.micode.notes.app-mergeDebugResources-2:/values/values.xml", - "map": [ - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\dimens.xml", - "from": { - "startLines": "19,20,21,22,18", - "startColumns": "4,4,4,4,4", - "startOffsets": "764,816,869,922,712", - "endColumns": "51,52,52,51,51", - "endOffsets": "811,864,917,969,759" - }, - "to": { - "startLines": "13,14,15,16,17", - "startColumns": "4,4,4,4,4", - "startOffsets": "477,529,582,635,687", - "endColumns": "51,52,52,51,51", - "endOffsets": "524,577,630,682,734" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\styles.xml", - "from": { - "startLines": "50,55,64,60,22,26,30,35,40,18,45", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "2062,2267,2640,2479,895,1078,1263,1449,1653,712,1860", - "endLines": "53,58,67,62,25,29,33,38,43,21,48", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "2261,2473,2843,2634,1073,1258,1443,1647,1854,890,2056" - }, - "to": { - "startLines": "125,129,133,137,140,144,148,152,156,160,164", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8124,8328,8539,8746,8906,9089,9274,9459,9662,9868,10051", - "endLines": "128,132,136,139,143,147,151,155,159,163,167", - "endColumns": "12,12,12,12,12,12,12,12,12,12,12", - "endOffsets": "8323,8534,8741,8901,9084,9269,9454,9657,9863,10046,10247" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\colors.xml", - "from": { - "startLines": "18", - "startColumns": "4", - "startOffsets": "712", - "endColumns": "56", - "endOffsets": "764" - }, - "to": { - "startLines": "12", - "startColumns": "4", - "startOffsets": "420", - "endColumns": "56", - "endOffsets": "472" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\strings.xml", - "from": { - "startLines": "128,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "8008,3898,4159,4063,3994,827,870,922,7506,7555,7950,7899,1282,4613,4707,4542,4458,4375,5574,5491,5389,4883,2004,1953,3397,1486,1539,4944,2097,4242,7618,3827,3582,2156,2471,2772,2214,3326,3265,3208,2986,2934,2831,2884,3036,3086,2518,3761,3146,3631,2424,2717,2629,2571,3520,2374,3475,2271,2314,3694,1431,1750,1858,1703,1805,1647,1599,1227,1174,6030,5963,6271,7409,6635,6554,6709,6798,7040,6961,6114,6189,6495,6335,6415,5908,7184,7306,7858,7731,7674,7784,1366,4815,5303,5709,5640,5789,5244,5189,5127,5067,974,1084", - "endLines": "132,72,75,74,73,19,20,21,118,119,127,126,26,81,82,80,79,78,94,93,92,84,39,38,64,29,30,85,41,76,120,71,67,42,48,53,43,63,62,61,57,56,54,55,58,59,49,70,60,68,47,52,51,50,66,46,65,44,45,69,28,34,36,33,35,32,31,25,24,101,100,104,116,109,108,110,111,113,112,102,103,107,105,106,99,114,115,125,123,122,124,27,83,91,96,95,97,90,89,88,87,22,23", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "8412,3989,4237,4154,4058,865,917,969,7550,7613,8003,7945,1361,4702,4810,4608,4537,4453,5635,5569,5486,4939,2061,1999,3470,1534,1594,5044,2151,4339,7668,3893,3626,2209,2513,2826,2266,3392,3321,3260,3031,2981,2879,2929,3081,3141,2566,3822,3203,3689,2466,2767,2712,2624,3577,2419,3515,2309,2369,3756,1481,1800,1906,1745,1853,1698,1642,1277,1222,6109,6025,6330,7500,6704,6630,6793,6956,7179,7035,6184,6266,6549,6410,6490,5958,7301,7404,7894,7779,7726,7853,1426,4878,5384,5784,5704,5878,5298,5239,5184,5122,1079,1169" - }, - "to": { - "startLines": "18,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "startColumns": "4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4", - "startOffsets": "739,1092,1188,1271,1367,1436,1479,1531,1583,1632,1695,1753,1804,1888,1982,2090,2161,2245,2328,2394,2477,2579,2640,2702,2753,2831,2884,2944,3049,3108,3210,3265,3336,3385,3443,3490,3549,3606,3677,3738,3795,3845,3897,3950,4000,4050,4110,4163,4229,4291,4354,4401,4456,4544,4602,4664,4714,4759,4802,4862,4929,4984,5039,5092,5139,5192,5248,5296,5351,5404,5488,5555,5619,5715,5789,5870,5959,6122,6266,6345,6420,6502,6561,6641,6721,6776,6898,7001,7042,7095,7152,7226,7291,7359,7445,7525,7594,7688,7747,7802,7864,7924,8034", - "endLines": "22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124", - "endColumns": "14,95,82,95,68,42,51,51,48,62,57,50,83,93,107,70,83,82,65,82,101,60,61,50,77,52,59,104,58,101,54,70,48,57,46,58,56,70,60,56,49,51,52,49,49,59,52,65,61,62,46,54,87,57,61,49,44,42,59,66,54,54,52,46,52,55,47,54,52,83,66,63,95,73,80,88,162,143,78,74,81,58,79,79,54,121,102,40,52,56,73,64,67,85,79,68,93,58,54,61,59,109,89", - "endOffsets": "1087,1183,1266,1362,1431,1474,1526,1578,1627,1690,1748,1799,1883,1977,2085,2156,2240,2323,2389,2472,2574,2635,2697,2748,2826,2879,2939,3044,3103,3205,3260,3331,3380,3438,3485,3544,3601,3672,3733,3790,3840,3892,3945,3995,4045,4105,4158,4224,4286,4349,4396,4451,4539,4597,4659,4709,4754,4797,4857,4924,4979,5034,5087,5134,5187,5243,5291,5346,5399,5483,5550,5614,5710,5784,5865,5954,6117,6261,6340,6415,6497,6556,6636,6716,6771,6893,6996,7037,7090,7147,7221,7286,7354,7440,7520,7589,7683,7742,7797,7859,7919,8029,8119" - } - }, - { - "source": "D:\\Notes-master1\\app\\src\\main\\res\\values\\arrays.xml", - "from": { - "startLines": "19,26", - "startColumns": "4,4", - "startOffsets": "739,1047", - "endLines": "24,29", - "endColumns": "19,19", - "endOffsets": "1041,1162" - }, - "to": { - "startLines": "2,8", - "startColumns": "4,4", - "startOffsets": "105,300", - "endLines": "7,11", - "endColumns": "19,19", - "endOffsets": "295,415" - } - } - ] - } - ] -} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json b/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json deleted file mode 100644 index 2603807..0000000 --- a/src/Notes-master1/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json +++ /dev/null @@ -1,382 +0,0 @@ -[ - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_middle.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_normal.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_normal.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_single.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_green.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_green.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_search_result.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/search_result.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_dropdown_menu.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_list_dropdown_menu.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_super.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_super.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_blue.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_blue.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/menu_sub_folder.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/sub_folder.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_yellow.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_yellow.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_pressed.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_pressed.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/color_secondary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-6:/color/secondary_text_dark.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_dropdown_icon.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/dropdown_icon.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_middle.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/color_primary_text_dark.xml.flat", - "source": "net.micode.notes.app-main-6:/color/primary_text_dark.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_single.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_delete.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/delete.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_middle.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_new_note_normal.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/new_note_normal.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_dialog_edit_text.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/dialog_edit_text.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_background.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_background.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_edit.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_down.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_edit_list_item.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_edit_list_item.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_size_selector_bg.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_size_selector_bg.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_bar_bg.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_bar_bg.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_up.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_yellow.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_yellow.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_footer_bg.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_footer_bg.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_down.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_folder_list_item.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/folder_list_item.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_small.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_small.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_green.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_green.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_color_btn_mask.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_color_btn_mask.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_down.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_up.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_red_single.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_red_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_green.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_green.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_note_edit_color_selector_panel.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/note_edit_color_selector_panel.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_yellow_up.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_yellow_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_clock.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/clock.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_white.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_white.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_list.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_list.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_red.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_red.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_dropdown.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/note_list_dropdown.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_item.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_item.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/xml_searchable.xml.flat", - "source": "net.micode.notes.app-main-6:/xml/searchable.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_icon_app.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/icon_app.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_move.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_move.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_bg_btn_set_color.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/bg_btn_set_color.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_down.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_note_list_footer.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/note_list_footer.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_green.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_green.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/menu_note_edit.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/note_edit.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_middle.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/raw-zh-rCN_introduction.flat", - "source": "net.micode.notes.app-main-6:/raw-zh-rCN/introduction" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_blue.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_blue.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_add_account_text.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/add_account_text.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_title_alert.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/title_alert.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_notification.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/notification.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/menu_note_list.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/note_list.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_single.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_white.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_white.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/menu_note_list_options.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/note_list_options.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_white.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_white.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_4x_red.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_4x_red.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/xml_widget_2x_info.xml.flat", - "source": "net.micode.notes.app-main-6:/xml/widget_2x_info.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_white.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_white.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_widget_2x.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/widget_2x.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/menu_call_record_folder.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/call_record_folder.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_font_large.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/font_large.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/menu_call_note_edit.xml.flat", - "source": "net.micode.notes.app-main-6:/menu/call_note_edit.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_blue.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_blue.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_yellow.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_yellow.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_up.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_call_record.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/call_record.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/xml_widget_4x_info.xml.flat", - "source": "net.micode.notes.app-main-6:/xml/widget_4x_info.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_blue_down.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_blue_down.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_menu_delete.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/menu_delete.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_red.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_red.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/xml_preferences.xml.flat", - "source": "net.micode.notes.app-main-6:/xml/preferences.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_selected.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/selected.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_yellow.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_yellow.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_up.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_up.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_datetime_picker.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/datetime_picker.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/raw_introduction.flat", - "source": "net.micode.notes.app-main-6:/raw/introduction" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_settings_header.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/settings_header.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_edit_title_blue.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/edit_title_blue.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_widget_4x.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/widget_4x.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_green_middle.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_green_middle.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable_new_note.xml.flat", - "source": "net.micode.notes.app-main-6:/drawable/new_note.xml" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_widget_2x_red.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/widget_2x_red.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_white_single.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_white_single.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/drawable-hdpi_list_folder.9.png.flat", - "source": "net.micode.notes.app-main-6:/drawable-hdpi/list_folder.9.png" - }, - { - "merged": "net.micode.notes.app-merged_res-4:/layout_account_dialog_title.xml.flat", - "source": "net.micode.notes.app-main-6:/layout/account_dialog_title.xml" - } -] \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/navigation_json/debug/navigation.json b/src/Notes-master1/app/build/intermediates/navigation_json/debug/navigation.json deleted file mode 100644 index 0637a08..0000000 --- a/src/Notes-master1/app/build/intermediates/navigation_json/debug/navigation.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json b/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json deleted file mode 100644 index eea66e3..0000000 --- a/src/Notes-master1/app/build/intermediates/packaged_manifests/debug/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "PACKAGED_MANIFESTS", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "AndroidManifest.xml" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json deleted file mode 100644 index 1eefece..0000000 --- a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/output-metadata.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "PROCESSED_RES", - "kind": "Directory" - }, - "applicationId": "net.micode.notes", - "variantName": "debug", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "versionCode": 1, - "versionName": "0.1", - "outputFile": "resources-debug.ap_" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ b/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ deleted file mode 100644 index 85057c6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar deleted file mode 100644 index 606d631..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/6fb608442905b936dce52f16a181c025151faf92e41d064ee3771f89d763e519_5.jar and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex deleted file mode 100644 index 68fa48e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex deleted file mode 100644 index a961bc4..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex deleted file mode 100644 index 1c0dee7..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataColumns.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex deleted file mode 100644 index 720f42c..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex deleted file mode 100644 index 3e6ef4e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$NoteColumns.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex deleted file mode 100644 index 37e4878..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex deleted file mode 100644 index 1baae91..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex deleted file mode 100644 index 00400e4..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex deleted file mode 100644 index d9a2ab4..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex deleted file mode 100644 index f06b011..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex deleted file mode 100644 index a55abb8..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex deleted file mode 100644 index e43108d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex deleted file mode 100644 index ba7e3d2..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex deleted file mode 100644 index 66f590a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex deleted file mode 100644 index 137bd02..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex deleted file mode 100644 index 82a15e2..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/TaskList.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex deleted file mode 100644 index ff466b5..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/ActionFailureException.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex deleted file mode 100644 index c3c8e6a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/exception/NetworkFailureException.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex deleted file mode 100644 index ade6a4a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex deleted file mode 100644 index 9db738a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$OnCompleteListener.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex deleted file mode 100644 index 369292a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex deleted file mode 100644 index 0e75b17..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskClient.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex deleted file mode 100644 index 2972d40..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex deleted file mode 100644 index e65e5b6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService$1.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex deleted file mode 100644 index cc8addf..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskSyncService.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex deleted file mode 100644 index bff9419..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note$NoteData.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex deleted file mode 100644 index 00800a0..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex deleted file mode 100644 index 4cc87c9..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote$NoteSettingChangedListener.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex deleted file mode 100644 index 158951c..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex deleted file mode 100644 index 8d54430..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex deleted file mode 100644 index 81fbd05..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex deleted file mode 100644 index 0dd0265..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex deleted file mode 100644 index fc4e994..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/GTaskStringUtils.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex deleted file mode 100644 index 8766a36..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteBgResources.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex deleted file mode 100644 index bd1b45f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$NoteItemBgResources.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex deleted file mode 100644 index 813c29b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$TextAppearanceResources.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex deleted file mode 100644 index e8db59a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser$WidgetBgResources.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex deleted file mode 100644 index 61a84ce..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex deleted file mode 100644 index fe16853..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex deleted file mode 100644 index f641273..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmInitReceiver.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex deleted file mode 100644 index 9278ab0..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmReceiver.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex deleted file mode 100644 index eed3350..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$1.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex deleted file mode 100644 index 88dead1..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$2.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex deleted file mode 100644 index afad0e0..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$3.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex deleted file mode 100644 index 01e1c18..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$4.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex deleted file mode 100644 index 0df2655..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker$OnDateTimeChangedListener.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex deleted file mode 100644 index e1205dd..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex deleted file mode 100644 index 2c10036..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$1.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex deleted file mode 100644 index d9419a5..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog$OnDateTimeSetListener.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex deleted file mode 100644 index 5bba515..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePickerDialog.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex deleted file mode 100644 index 49a8b16..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu$1.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex deleted file mode 100644 index 92250f2..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DropdownMenu.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex deleted file mode 100644 index 1f9408f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex deleted file mode 100644 index cce08c4..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex deleted file mode 100644 index 8dd885e..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex deleted file mode 100644 index 15180b4..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex deleted file mode 100644 index 38f5d82..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex deleted file mode 100644 index 3a9b0bf..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex deleted file mode 100644 index a91b293..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex deleted file mode 100644 index 5915330..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$1.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex deleted file mode 100644 index 1323e64..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText$OnTextViewChangeListener.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex deleted file mode 100644 index 70d2682..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex deleted file mode 100644 index bc0b0bf..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteItemData.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex deleted file mode 100644 index e02309b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex deleted file mode 100644 index 79c670f..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex deleted file mode 100644 index ad34861..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex deleted file mode 100644 index b1c6ee6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex deleted file mode 100644 index b419ff2..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex deleted file mode 100644 index 8e51dd7..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex deleted file mode 100644 index 1519f8d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex deleted file mode 100644 index 18faaca..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex deleted file mode 100644 index 79b3edd..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex deleted file mode 100644 index 2b33a92..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex deleted file mode 100644 index 259bcf7..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex deleted file mode 100644 index 5be9167..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex deleted file mode 100644 index a062b8d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex deleted file mode 100644 index 39f896b..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex deleted file mode 100644 index dff3aea..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex deleted file mode 100644 index 39389fd..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex deleted file mode 100644 index d6d04d7..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex deleted file mode 100644 index a0cf8e6..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter$AppWidgetAttribute.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex deleted file mode 100644 index 68f5579..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex deleted file mode 100644 index 46c593d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex deleted file mode 100644 index 14d6a26..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex deleted file mode 100644 index 99e75dd..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$2.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex deleted file mode 100644 index 80233e5..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$3.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex deleted file mode 100644 index 5919360..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex deleted file mode 100644 index a5a02af..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$5.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex deleted file mode 100644 index 194cc49..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$6.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex deleted file mode 100644 index 4861014..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$7.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex deleted file mode 100644 index 5e41302..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$8.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex deleted file mode 100644 index 8f2b93d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex deleted file mode 100644 index 685b35d..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex deleted file mode 100644 index a300134..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex deleted file mode 100644 index a2738ca..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex b/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex deleted file mode 100644 index 10f6948..0000000 Binary files a/src/Notes-master1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex and /dev/null differ diff --git a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt b/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt deleted file mode 100644 index 00d6e91..0000000 --- a/src/Notes-master1/app/build/intermediates/runtime_symbol_list/debug/R.txt +++ /dev/null @@ -1,283 +0,0 @@ -int array format_for_exported_note 0x7f010000 -int array menu_share_ways 0x7f010001 -int color primary_text_dark 0x7f020000 -int color secondary_text_dark 0x7f020001 -int color user_query_highlight 0x7f020002 -int dimen text_font_size_large 0x7f030000 -int dimen text_font_size_medium 0x7f030001 -int dimen text_font_size_normal 0x7f030002 -int dimen text_font_size_small 0x7f030003 -int dimen text_font_size_super 0x7f030004 -int drawable bg_btn_set_color 0x7f040000 -int drawable bg_color_btn_mask 0x7f040001 -int drawable call_record 0x7f040002 -int drawable clock 0x7f040003 -int drawable delete 0x7f040004 -int drawable dropdown_icon 0x7f040005 -int drawable edit_blue 0x7f040006 -int drawable edit_green 0x7f040007 -int drawable edit_red 0x7f040008 -int drawable edit_title_blue 0x7f040009 -int drawable edit_title_green 0x7f04000a -int drawable edit_title_red 0x7f04000b -int drawable edit_title_white 0x7f04000c -int drawable edit_title_yellow 0x7f04000d -int drawable edit_white 0x7f04000e -int drawable edit_yellow 0x7f04000f -int drawable font_large 0x7f040010 -int drawable font_normal 0x7f040011 -int drawable font_size_selector_bg 0x7f040012 -int drawable font_small 0x7f040013 -int drawable font_super 0x7f040014 -int drawable icon_app 0x7f040015 -int drawable list_background 0x7f040016 -int drawable list_blue_down 0x7f040017 -int drawable list_blue_middle 0x7f040018 -int drawable list_blue_single 0x7f040019 -int drawable list_blue_up 0x7f04001a -int drawable list_folder 0x7f04001b -int drawable list_footer_bg 0x7f04001c -int drawable list_green_down 0x7f04001d -int drawable list_green_middle 0x7f04001e -int drawable list_green_single 0x7f04001f -int drawable list_green_up 0x7f040020 -int drawable list_red_down 0x7f040021 -int drawable list_red_middle 0x7f040022 -int drawable list_red_single 0x7f040023 -int drawable list_red_up 0x7f040024 -int drawable list_white_down 0x7f040025 -int drawable list_white_middle 0x7f040026 -int drawable list_white_single 0x7f040027 -int drawable list_white_up 0x7f040028 -int drawable list_yellow_down 0x7f040029 -int drawable list_yellow_middle 0x7f04002a -int drawable list_yellow_single 0x7f04002b -int drawable list_yellow_up 0x7f04002c -int drawable menu_delete 0x7f04002d -int drawable menu_move 0x7f04002e -int drawable new_note 0x7f04002f -int drawable new_note_normal 0x7f040030 -int drawable new_note_pressed 0x7f040031 -int drawable note_edit_color_selector_panel 0x7f040032 -int drawable notification 0x7f040033 -int drawable search_result 0x7f040034 -int drawable selected 0x7f040035 -int drawable title_alert 0x7f040036 -int drawable title_bar_bg 0x7f040037 -int drawable widget_2x_blue 0x7f040038 -int drawable widget_2x_green 0x7f040039 -int drawable widget_2x_red 0x7f04003a -int drawable widget_2x_white 0x7f04003b -int drawable widget_2x_yellow 0x7f04003c -int drawable widget_4x_blue 0x7f04003d -int drawable widget_4x_green 0x7f04003e -int drawable widget_4x_red 0x7f04003f -int drawable widget_4x_white 0x7f040040 -int drawable widget_4x_yellow 0x7f040041 -int id account_dialog_subtitle 0x7f050000 -int id account_dialog_title 0x7f050001 -int id action_select_all 0x7f050002 -int id amPm 0x7f050003 -int id btn_new_note 0x7f050004 -int id btn_set_bg_color 0x7f050005 -int id cb_edit_item 0x7f050006 -int id date 0x7f050007 -int id delete 0x7f050008 -int id et_edit_text 0x7f050009 -int id et_foler_name 0x7f05000a -int id font_size_selector 0x7f05000b -int id hour 0x7f05000c -int id iv_alert_icon 0x7f05000d -int id iv_bg_blue 0x7f05000e -int id iv_bg_blue_select 0x7f05000f -int id iv_bg_green 0x7f050010 -int id iv_bg_green_select 0x7f050011 -int id iv_bg_red 0x7f050012 -int id iv_bg_red_select 0x7f050013 -int id iv_bg_white 0x7f050014 -int id iv_bg_white_select 0x7f050015 -int id iv_bg_yellow 0x7f050016 -int id iv_bg_yellow_select 0x7f050017 -int id iv_large_select 0x7f050018 -int id iv_medium_select 0x7f050019 -int id iv_small_select 0x7f05001a -int id iv_super_select 0x7f05001b -int id ll_font_large 0x7f05001c -int id ll_font_normal 0x7f05001d -int id ll_font_small 0x7f05001e -int id ll_font_super 0x7f05001f -int id menu_alert 0x7f050020 -int id menu_delete 0x7f050021 -int id menu_delete_remind 0x7f050022 -int id menu_export_text 0x7f050023 -int id menu_font_size 0x7f050024 -int id menu_list_mode 0x7f050025 -int id menu_new_folder 0x7f050026 -int id menu_new_note 0x7f050027 -int id menu_search 0x7f050028 -int id menu_send_to_desktop 0x7f050029 -int id menu_setting 0x7f05002a -int id menu_share 0x7f05002b -int id menu_sync 0x7f05002c -int id minute 0x7f05002d -int id move 0x7f05002e -int id navigation_bar 0x7f05002f -int id note_bg_color_selector 0x7f050030 -int id note_edit_list 0x7f050031 -int id note_edit_view 0x7f050032 -int id note_item 0x7f050033 -int id note_title 0x7f050034 -int id notes_list 0x7f050035 -int id prefenerece_sync_status_textview 0x7f050036 -int id preference_sync_button 0x7f050037 -int id selection_menu 0x7f050038 -int id sv_note_edit 0x7f050039 -int id tv_alert_date 0x7f05003a -int id tv_folder_name 0x7f05003b -int id tv_modified_date 0x7f05003c -int id tv_name 0x7f05003d -int id tv_time 0x7f05003e -int id tv_title 0x7f05003f -int id tv_title_bar 0x7f050040 -int id widget_bg_image 0x7f050041 -int id widget_text 0x7f050042 -int layout account_dialog_title 0x7f060000 -int layout add_account_text 0x7f060001 -int layout datetime_picker 0x7f060002 -int layout dialog_edit_text 0x7f060003 -int layout folder_list_item 0x7f060004 -int layout note_edit 0x7f060005 -int layout note_edit_list_item 0x7f060006 -int layout note_item 0x7f060007 -int layout note_list 0x7f060008 -int layout note_list_dropdown_menu 0x7f060009 -int layout note_list_footer 0x7f06000a -int layout settings_header 0x7f06000b -int layout widget_2x 0x7f06000c -int layout widget_4x 0x7f06000d -int menu call_note_edit 0x7f070000 -int menu call_record_folder 0x7f070001 -int menu note_edit 0x7f070002 -int menu note_list 0x7f070003 -int menu note_list_dropdown 0x7f070004 -int menu note_list_options 0x7f070005 -int menu sub_folder 0x7f070006 -int plurals search_results_title 0x7f080000 -int raw introduction 0x7f090000 -int string alert_message_delete_folder 0x7f0a0000 -int string alert_message_delete_note 0x7f0a0001 -int string alert_message_delete_notes 0x7f0a0002 -int string alert_title_delete 0x7f0a0003 -int string app_name 0x7f0a0004 -int string app_widget2x2 0x7f0a0005 -int string app_widget4x4 0x7f0a0006 -int string button_delete 0x7f0a0007 -int string call_record_folder_name 0x7f0a0008 -int string datetime_dialog_cancel 0x7f0a0009 -int string datetime_dialog_ok 0x7f0a000a -int string delete_remind_time_message 0x7f0a000b -int string error_note_empty_for_clock 0x7f0a000c -int string error_note_empty_for_send_to_desktop 0x7f0a000d -int string error_note_not_exist 0x7f0a000e -int string error_sdcard_export 0x7f0a000f -int string error_sdcard_unmounted 0x7f0a0010 -int string error_sync_cancelled 0x7f0a0011 -int string error_sync_internal 0x7f0a0012 -int string error_sync_network 0x7f0a0013 -int string failed_sdcard_export 0x7f0a0014 -int string file_name_txt_format 0x7f0a0015 -int string file_path 0x7f0a0016 -int string folder_exist 0x7f0a0017 -int string format_date_ymd 0x7f0a0018 -int string format_datetime_mdhm 0x7f0a0019 -int string format_exported_file_location 0x7f0a001a -int string format_folder_files_count 0x7f0a001b -int string format_move_notes_to_folder 0x7f0a001c -int string hint_foler_name 0x7f0a001d -int string info_note_enter_desktop 0x7f0a001e -int string menu_alert 0x7f0a001f -int string menu_create_folder 0x7f0a0020 -int string menu_delete 0x7f0a0021 -int string menu_deselect_all 0x7f0a0022 -int string menu_export_text 0x7f0a0023 -int string menu_folder_change_name 0x7f0a0024 -int string menu_folder_delete 0x7f0a0025 -int string menu_folder_view 0x7f0a0026 -int string menu_font_large 0x7f0a0027 -int string menu_font_normal 0x7f0a0028 -int string menu_font_size 0x7f0a0029 -int string menu_font_small 0x7f0a002a -int string menu_font_super 0x7f0a002b -int string menu_list_mode 0x7f0a002c -int string menu_move 0x7f0a002d -int string menu_move_parent_folder 0x7f0a002e -int string menu_normal_mode 0x7f0a002f -int string menu_remove_remind 0x7f0a0030 -int string menu_search 0x7f0a0031 -int string menu_select_all 0x7f0a0032 -int string menu_select_none 0x7f0a0033 -int string menu_select_title 0x7f0a0034 -int string menu_send_to_desktop 0x7f0a0035 -int string menu_setting 0x7f0a0036 -int string menu_share 0x7f0a0037 -int string menu_sync 0x7f0a0038 -int string menu_sync_cancel 0x7f0a0039 -int string menu_title_select_folder 0x7f0a003a -int string note_alert_expired 0x7f0a003b -int string note_link_email 0x7f0a003c -int string note_link_other 0x7f0a003d -int string note_link_tel 0x7f0a003e -int string note_link_web 0x7f0a003f -int string notealert_enter 0x7f0a0040 -int string notealert_ok 0x7f0a0041 -int string notelist_menu_new 0x7f0a0042 -int string notelist_string_info 0x7f0a0043 -int string preferences_account_summary 0x7f0a0044 -int string preferences_account_title 0x7f0a0045 -int string preferences_add_account 0x7f0a0046 -int string preferences_bg_random_appear_title 0x7f0a0047 -int string preferences_button_sync_cancel 0x7f0a0048 -int string preferences_button_sync_immediately 0x7f0a0049 -int string preferences_dialog_change_account_title 0x7f0a004a -int string preferences_dialog_change_account_warn_msg 0x7f0a004b -int string preferences_dialog_select_account_tips 0x7f0a004c -int string preferences_dialog_select_account_title 0x7f0a004d -int string preferences_last_sync_time 0x7f0a004e -int string preferences_last_sync_time_format 0x7f0a004f -int string preferences_menu_cancel 0x7f0a0050 -int string preferences_menu_change_account 0x7f0a0051 -int string preferences_menu_remove_account 0x7f0a0052 -int string preferences_title 0x7f0a0053 -int string preferences_toast_cannot_change_account 0x7f0a0054 -int string preferences_toast_success_set_accout 0x7f0a0055 -int string search 0x7f0a0056 -int string search_hint 0x7f0a0057 -int string search_label 0x7f0a0058 -int string search_setting_description 0x7f0a0059 -int string set_remind_time_message 0x7f0a005a -int string success_sdcard_export 0x7f0a005b -int string success_sync_account 0x7f0a005c -int string sync_progress_init_list 0x7f0a005d -int string sync_progress_login 0x7f0a005e -int string sync_progress_syncing 0x7f0a005f -int string ticker_cancel 0x7f0a0060 -int string ticker_fail 0x7f0a0061 -int string ticker_success 0x7f0a0062 -int string ticker_syncing 0x7f0a0063 -int string widget_havenot_content 0x7f0a0064 -int string widget_under_visit_mode 0x7f0a0065 -int style HighlightTextAppearancePrimary 0x7f0b0000 -int style HighlightTextAppearanceSecondary 0x7f0b0001 -int style NoteActionBarStyle 0x7f0b0002 -int style NoteTheme 0x7f0b0003 -int style TextAppearanceLarge 0x7f0b0004 -int style TextAppearanceMedium 0x7f0b0005 -int style TextAppearanceNormal 0x7f0b0006 -int style TextAppearancePrimaryItem 0x7f0b0007 -int style TextAppearanceSecondaryItem 0x7f0b0008 -int style TextAppearanceSuper 0x7f0b0009 -int style TextAppearanceUnderMenuIcon 0x7f0b000a -int xml preferences 0x7f0c0000 -int xml searchable 0x7f0c0001 -int xml widget_2x_info 0x7f0c0002 -int xml widget_4x_info 0x7f0c0003 diff --git a/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json b/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json deleted file mode 100644 index 51f6368..0000000 --- a/src/Notes-master1/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json +++ /dev/null @@ -1 +0,0 @@ -{"enableV1Signing":false,"enableV2Signing":true,"enableV3Signing":false,"enableV4Signing":false} \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt b/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt deleted file mode 100644 index 534c9fd..0000000 --- a/src/Notes-master1/app/build/intermediates/source_set_path_map/debug/file-map.txt +++ /dev/null @@ -1,7 +0,0 @@ -net.micode.notes.app-pngs-0 D:\Notes-master1\app\build\generated\res\pngs\debug -net.micode.notes.app-resValues-1 D:\Notes-master1\app\build\generated\res\resValues\debug -net.micode.notes.app-packageDebugResources-2 D:\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir -net.micode.notes.app-packageDebugResources-3 D:\Notes-master1\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir -net.micode.notes.app-merged_res-4 D:\Notes-master1\app\build\intermediates\merged_res\debug -net.micode.notes.app-debug-5 D:\Notes-master1\app\src\debug\res -net.micode.notes.app-main-6 D:\Notes-master1\app\src\main\res diff --git a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt b/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt deleted file mode 100644 index c78041f..0000000 --- a/src/Notes-master1/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt +++ /dev/null @@ -1,283 +0,0 @@ -net.micode.notes:xml/searchable = 0x7f0c0001 -net.micode.notes:xml/preferences = 0x7f0c0000 -net.micode.notes:style/TextAppearanceUnderMenuIcon = 0x7f0b000a -net.micode.notes:style/TextAppearanceSuper = 0x7f0b0009 -net.micode.notes:xml/widget_2x_info = 0x7f0c0002 -net.micode.notes:style/TextAppearancePrimaryItem = 0x7f0b0007 -net.micode.notes:style/TextAppearanceMedium = 0x7f0b0005 -net.micode.notes:style/HighlightTextAppearanceSecondary = 0x7f0b0001 -net.micode.notes:string/widget_under_visit_mode = 0x7f0a0065 -net.micode.notes:string/sync_progress_login = 0x7f0a005e -net.micode.notes:string/success_sync_account = 0x7f0a005c -net.micode.notes:string/search_setting_description = 0x7f0a0059 -net.micode.notes:string/search_hint = 0x7f0a0057 -net.micode.notes:string/search = 0x7f0a0056 -net.micode.notes:string/preferences_toast_success_set_accout = 0x7f0a0055 -net.micode.notes:string/preferences_title = 0x7f0a0053 -net.micode.notes:string/preferences_menu_change_account = 0x7f0a0051 -net.micode.notes:string/preferences_last_sync_time = 0x7f0a004e -net.micode.notes:string/preferences_dialog_change_account_title = 0x7f0a004a -net.micode.notes:string/preferences_bg_random_appear_title = 0x7f0a0047 -net.micode.notes:string/preferences_add_account = 0x7f0a0046 -net.micode.notes:string/preferences_account_title = 0x7f0a0045 -net.micode.notes:xml/widget_4x_info = 0x7f0c0003 -net.micode.notes:string/set_remind_time_message = 0x7f0a005a -net.micode.notes:string/notealert_enter = 0x7f0a0040 -net.micode.notes:string/note_link_web = 0x7f0a003f -net.micode.notes:string/note_link_tel = 0x7f0a003e -net.micode.notes:string/note_link_other = 0x7f0a003d -net.micode.notes:string/preferences_dialog_change_account_warn_msg = 0x7f0a004b -net.micode.notes:string/note_link_email = 0x7f0a003c -net.micode.notes:string/note_alert_expired = 0x7f0a003b -net.micode.notes:string/menu_sync_cancel = 0x7f0a0039 -net.micode.notes:string/menu_sync = 0x7f0a0038 -net.micode.notes:string/menu_share = 0x7f0a0037 -net.micode.notes:string/menu_setting = 0x7f0a0036 -net.micode.notes:string/menu_send_to_desktop = 0x7f0a0035 -net.micode.notes:string/menu_select_title = 0x7f0a0034 -net.micode.notes:style/TextAppearanceLarge = 0x7f0b0004 -net.micode.notes:string/menu_select_all = 0x7f0a0032 -net.micode.notes:string/menu_search = 0x7f0a0031 -net.micode.notes:string/menu_normal_mode = 0x7f0a002f -net.micode.notes:string/menu_font_size = 0x7f0a0029 -net.micode.notes:string/menu_font_small = 0x7f0a002a -net.micode.notes:string/menu_font_normal = 0x7f0a0028 -net.micode.notes:string/menu_remove_remind = 0x7f0a0030 -net.micode.notes:string/menu_font_large = 0x7f0a0027 -net.micode.notes:string/menu_folder_change_name = 0x7f0a0024 -net.micode.notes:string/menu_export_text = 0x7f0a0023 -net.micode.notes:string/menu_deselect_all = 0x7f0a0022 -net.micode.notes:string/menu_create_folder = 0x7f0a0020 -net.micode.notes:string/info_note_enter_desktop = 0x7f0a001e -net.micode.notes:string/success_sdcard_export = 0x7f0a005b -net.micode.notes:string/format_move_notes_to_folder = 0x7f0a001c -net.micode.notes:string/preferences_account_summary = 0x7f0a0044 -net.micode.notes:string/format_date_ymd = 0x7f0a0018 -net.micode.notes:string/file_name_txt_format = 0x7f0a0015 -net.micode.notes:id/note_edit_list = 0x7f050031 -net.micode.notes:drawable/new_note = 0x7f04002f -net.micode.notes:string/folder_exist = 0x7f0a0017 -net.micode.notes:string/menu_select_none = 0x7f0a0033 -net.micode.notes:string/failed_sdcard_export = 0x7f0a0014 -net.micode.notes:string/ticker_cancel = 0x7f0a0060 -net.micode.notes:drawable/list_red_single = 0x7f040023 -net.micode.notes:layout/note_list_dropdown_menu = 0x7f060009 -net.micode.notes:string/error_sync_cancelled = 0x7f0a0011 -net.micode.notes:string/error_sdcard_unmounted = 0x7f0a0010 -net.micode.notes:style/TextAppearanceSecondaryItem = 0x7f0b0008 -net.micode.notes:drawable/widget_4x_green = 0x7f04003e -net.micode.notes:string/error_sdcard_export = 0x7f0a000f -net.micode.notes:string/notealert_ok = 0x7f0a0041 -net.micode.notes:string/menu_move_parent_folder = 0x7f0a002e -net.micode.notes:id/tv_title = 0x7f05003f -net.micode.notes:string/error_note_empty_for_clock = 0x7f0a000c -net.micode.notes:string/delete_remind_time_message = 0x7f0a000b -net.micode.notes:style/TextAppearanceNormal = 0x7f0b0006 -net.micode.notes:string/preferences_menu_remove_account = 0x7f0a0052 -net.micode.notes:string/button_delete = 0x7f0a0007 -net.micode.notes:string/ticker_fail = 0x7f0a0061 -net.micode.notes:string/search_label = 0x7f0a0058 -net.micode.notes:string/preferences_dialog_select_account_tips = 0x7f0a004c -net.micode.notes:string/app_widget2x2 = 0x7f0a0005 -net.micode.notes:string/app_name = 0x7f0a0004 -net.micode.notes:string/menu_title_select_folder = 0x7f0a003a -net.micode.notes:drawable/list_red_down = 0x7f040021 -net.micode.notes:id/menu_delete = 0x7f050021 -net.micode.notes:string/hint_foler_name = 0x7f0a001d -net.micode.notes:string/widget_havenot_content = 0x7f0a0064 -net.micode.notes:string/alert_title_delete = 0x7f0a0003 -net.micode.notes:string/alert_message_delete_note = 0x7f0a0001 -net.micode.notes:string/format_datetime_mdhm = 0x7f0a0019 -net.micode.notes:string/alert_message_delete_folder = 0x7f0a0000 -net.micode.notes:string/datetime_dialog_cancel = 0x7f0a0009 -net.micode.notes:layout/note_item = 0x7f060007 -net.micode.notes:menu/sub_folder = 0x7f070006 -net.micode.notes:menu/note_list = 0x7f070003 -net.micode.notes:string/ticker_syncing = 0x7f0a0063 -net.micode.notes:drawable/menu_move = 0x7f04002e -net.micode.notes:id/menu_search = 0x7f050028 -net.micode.notes:string/datetime_dialog_ok = 0x7f0a000a -net.micode.notes:raw/introduction = 0x7f090000 -net.micode.notes:menu/call_record_folder = 0x7f070001 -net.micode.notes:string/preferences_last_sync_time_format = 0x7f0a004f -net.micode.notes:menu/call_note_edit = 0x7f070000 -net.micode.notes:drawable/list_red_middle = 0x7f040022 -net.micode.notes:layout/widget_2x = 0x7f06000c -net.micode.notes:layout/widget_4x = 0x7f06000d -net.micode.notes:drawable/icon_app = 0x7f040015 -net.micode.notes:layout/note_list = 0x7f060008 -net.micode.notes:layout/note_edit = 0x7f060005 -net.micode.notes:drawable/list_background = 0x7f040016 -net.micode.notes:string/alert_message_delete_notes = 0x7f0a0002 -net.micode.notes:drawable/widget_2x_blue = 0x7f040038 -net.micode.notes:layout/folder_list_item = 0x7f060004 -net.micode.notes:string/sync_progress_init_list = 0x7f0a005d -net.micode.notes:id/btn_new_note = 0x7f050004 -net.micode.notes:layout/add_account_text = 0x7f060001 -net.micode.notes:id/widget_text = 0x7f050042 -net.micode.notes:id/widget_bg_image = 0x7f050041 -net.micode.notes:string/menu_folder_delete = 0x7f0a0025 -net.micode.notes:id/tv_name = 0x7f05003d -net.micode.notes:id/account_dialog_title = 0x7f050001 -net.micode.notes:id/tv_folder_name = 0x7f05003b -net.micode.notes:id/tv_alert_date = 0x7f05003a -net.micode.notes:color/primary_text_dark = 0x7f020000 -net.micode.notes:id/tv_time = 0x7f05003e -net.micode.notes:id/selection_menu = 0x7f050038 -net.micode.notes:id/preference_sync_button = 0x7f050037 -net.micode.notes:string/error_sync_network = 0x7f0a0013 -net.micode.notes:id/notes_list = 0x7f050035 -net.micode.notes:id/note_title = 0x7f050034 -net.micode.notes:string/format_exported_file_location = 0x7f0a001a -net.micode.notes:id/note_bg_color_selector = 0x7f050030 -net.micode.notes:id/navigation_bar = 0x7f05002f -net.micode.notes:id/move = 0x7f05002e -net.micode.notes:id/menu_sync = 0x7f05002c -net.micode.notes:id/menu_share = 0x7f05002b -net.micode.notes:string/format_folder_files_count = 0x7f0a001b -net.micode.notes:string/menu_move = 0x7f0a002d -net.micode.notes:id/date = 0x7f050007 -net.micode.notes:id/note_item = 0x7f050033 -net.micode.notes:id/menu_setting = 0x7f05002a -net.micode.notes:id/menu_send_to_desktop = 0x7f050029 -net.micode.notes:style/HighlightTextAppearancePrimary = 0x7f0b0000 -net.micode.notes:drawable/font_size_selector_bg = 0x7f040012 -net.micode.notes:id/note_edit_view = 0x7f050032 -net.micode.notes:id/menu_list_mode = 0x7f050025 -net.micode.notes:string/preferences_dialog_select_account_title = 0x7f0a004d -net.micode.notes:id/menu_font_size = 0x7f050024 -net.micode.notes:string/preferences_button_sync_cancel = 0x7f0a0048 -net.micode.notes:id/menu_alert = 0x7f050020 -net.micode.notes:dimen/text_font_size_large = 0x7f030000 -net.micode.notes:id/ll_font_super = 0x7f05001f -net.micode.notes:id/ll_font_small = 0x7f05001e -net.micode.notes:string/error_note_not_exist = 0x7f0a000e -net.micode.notes:string/error_note_empty_for_send_to_desktop = 0x7f0a000d -net.micode.notes:id/minute = 0x7f05002d -net.micode.notes:id/ll_font_normal = 0x7f05001d -net.micode.notes:id/ll_font_large = 0x7f05001c -net.micode.notes:string/preferences_button_sync_immediately = 0x7f0a0049 -net.micode.notes:id/iv_super_select = 0x7f05001b -net.micode.notes:string/ticker_success = 0x7f0a0062 -net.micode.notes:id/iv_medium_select = 0x7f050019 -net.micode.notes:id/iv_large_select = 0x7f050018 -net.micode.notes:id/iv_bg_yellow_select = 0x7f050017 -net.micode.notes:drawable/bg_btn_set_color = 0x7f040000 -net.micode.notes:id/iv_bg_yellow = 0x7f050016 -net.micode.notes:drawable/bg_color_btn_mask = 0x7f040001 -net.micode.notes:drawable/list_yellow_up = 0x7f04002c -net.micode.notes:id/iv_bg_white = 0x7f050014 -net.micode.notes:menu/note_edit = 0x7f070002 -net.micode.notes:drawable/list_white_down = 0x7f040025 -net.micode.notes:drawable/list_white_up = 0x7f040028 -net.micode.notes:id/iv_bg_green = 0x7f050010 -net.micode.notes:drawable/delete = 0x7f040004 -net.micode.notes:id/iv_bg_blue = 0x7f05000e -net.micode.notes:drawable/list_green_single = 0x7f04001f -net.micode.notes:id/iv_alert_icon = 0x7f05000d -net.micode.notes:drawable/list_yellow_single = 0x7f04002b -net.micode.notes:id/cb_edit_item = 0x7f050006 -net.micode.notes:drawable/font_super = 0x7f040014 -net.micode.notes:drawable/edit_title_blue = 0x7f040009 -net.micode.notes:color/user_query_highlight = 0x7f020002 -net.micode.notes:id/font_size_selector = 0x7f05000b -net.micode.notes:string/preferences_toast_cannot_change_account = 0x7f0a0054 -net.micode.notes:id/et_edit_text = 0x7f050009 -net.micode.notes:drawable/widget_2x_yellow = 0x7f04003c -net.micode.notes:id/amPm = 0x7f050003 -net.micode.notes:id/account_dialog_subtitle = 0x7f050000 -net.micode.notes:id/menu_new_note = 0x7f050027 -net.micode.notes:id/iv_bg_green_select = 0x7f050011 -net.micode.notes:drawable/widget_2x_red = 0x7f04003a -net.micode.notes:drawable/widget_4x_yellow = 0x7f040041 -net.micode.notes:drawable/clock = 0x7f040003 -net.micode.notes:drawable/font_small = 0x7f040013 -net.micode.notes:id/btn_set_bg_color = 0x7f050005 -net.micode.notes:array/menu_share_ways = 0x7f010001 -net.micode.notes:style/NoteTheme = 0x7f0b0003 -net.micode.notes:drawable/notification = 0x7f040033 -net.micode.notes:id/iv_bg_blue_select = 0x7f05000f -net.micode.notes:drawable/widget_4x_blue = 0x7f04003d -net.micode.notes:drawable/edit_title_white = 0x7f04000c -net.micode.notes:string/menu_delete = 0x7f0a0021 -net.micode.notes:drawable/list_footer_bg = 0x7f04001c -net.micode.notes:drawable/edit_red = 0x7f040008 -net.micode.notes:string/preferences_menu_cancel = 0x7f0a0050 -net.micode.notes:drawable/widget_2x_white = 0x7f04003b -net.micode.notes:drawable/font_large = 0x7f040010 -net.micode.notes:string/file_path = 0x7f0a0016 -net.micode.notes:string/menu_alert = 0x7f0a001f -net.micode.notes:drawable/title_alert = 0x7f040036 -net.micode.notes:drawable/list_green_down = 0x7f04001d -net.micode.notes:string/error_sync_internal = 0x7f0a0012 -net.micode.notes:drawable/search_result = 0x7f040034 -net.micode.notes:string/app_widget4x4 = 0x7f0a0006 -net.micode.notes:drawable/title_bar_bg = 0x7f040037 -net.micode.notes:drawable/selected = 0x7f040035 -net.micode.notes:plurals/search_results_title = 0x7f080000 -net.micode.notes:drawable/edit_title_green = 0x7f04000a -net.micode.notes:drawable/new_note_normal = 0x7f040030 -net.micode.notes:drawable/edit_white = 0x7f04000e -net.micode.notes:drawable/widget_2x_green = 0x7f040039 -net.micode.notes:id/iv_bg_red = 0x7f050012 -net.micode.notes:drawable/list_white_single = 0x7f040027 -net.micode.notes:id/delete = 0x7f050008 -net.micode.notes:layout/note_edit_list_item = 0x7f060006 -net.micode.notes:string/call_record_folder_name = 0x7f0a0008 -net.micode.notes:drawable/list_green_up = 0x7f040020 -net.micode.notes:id/prefenerece_sync_status_textview = 0x7f050036 -net.micode.notes:id/et_foler_name = 0x7f05000a -net.micode.notes:id/menu_delete_remind = 0x7f050022 -net.micode.notes:drawable/note_edit_color_selector_panel = 0x7f040032 -net.micode.notes:id/menu_export_text = 0x7f050023 -net.micode.notes:id/hour = 0x7f05000c -net.micode.notes:string/menu_folder_view = 0x7f0a0026 -net.micode.notes:drawable/dropdown_icon = 0x7f040005 -net.micode.notes:string/notelist_string_info = 0x7f0a0043 -net.micode.notes:drawable/list_blue_single = 0x7f040019 -net.micode.notes:drawable/list_white_middle = 0x7f040026 -net.micode.notes:id/tv_title_bar = 0x7f050040 -net.micode.notes:drawable/edit_title_red = 0x7f04000b -net.micode.notes:dimen/text_font_size_normal = 0x7f030002 -net.micode.notes:layout/dialog_edit_text = 0x7f060003 -net.micode.notes:color/secondary_text_dark = 0x7f020001 -net.micode.notes:drawable/list_folder = 0x7f04001b -net.micode.notes:drawable/list_green_middle = 0x7f04001e -net.micode.notes:string/sync_progress_syncing = 0x7f0a005f -net.micode.notes:drawable/font_normal = 0x7f040011 -net.micode.notes:drawable/list_blue_up = 0x7f04001a -net.micode.notes:id/iv_small_select = 0x7f05001a -net.micode.notes:drawable/list_blue_down = 0x7f040017 -net.micode.notes:drawable/edit_yellow = 0x7f04000f -net.micode.notes:drawable/list_yellow_down = 0x7f040029 -net.micode.notes:dimen/text_font_size_super = 0x7f030004 -net.micode.notes:drawable/edit_blue = 0x7f040006 -net.micode.notes:array/format_for_exported_note = 0x7f010000 -net.micode.notes:string/menu_list_mode = 0x7f0a002c -net.micode.notes:drawable/list_yellow_middle = 0x7f04002a -net.micode.notes:drawable/list_blue_middle = 0x7f040018 -net.micode.notes:dimen/text_font_size_medium = 0x7f030001 -net.micode.notes:drawable/new_note_pressed = 0x7f040031 -net.micode.notes:id/menu_new_folder = 0x7f050026 -net.micode.notes:id/sv_note_edit = 0x7f050039 -net.micode.notes:drawable/call_record = 0x7f040002 -net.micode.notes:drawable/edit_green = 0x7f040007 -net.micode.notes:id/action_select_all = 0x7f050002 -net.micode.notes:id/tv_modified_date = 0x7f05003c -net.micode.notes:id/iv_bg_white_select = 0x7f050015 -net.micode.notes:drawable/edit_title_yellow = 0x7f04000d -net.micode.notes:layout/note_list_footer = 0x7f06000a -net.micode.notes:string/menu_font_super = 0x7f0a002b -net.micode.notes:drawable/widget_4x_red = 0x7f04003f -net.micode.notes:layout/account_dialog_title = 0x7f060000 -net.micode.notes:string/notelist_menu_new = 0x7f0a0042 -net.micode.notes:drawable/menu_delete = 0x7f04002d -net.micode.notes:id/iv_bg_red_select = 0x7f050013 -net.micode.notes:menu/note_list_dropdown = 0x7f070004 -net.micode.notes:drawable/list_red_up = 0x7f040024 -net.micode.notes:layout/settings_header = 0x7f06000b -net.micode.notes:style/NoteActionBarStyle = 0x7f0b0002 -net.micode.notes:dimen/text_font_size_small = 0x7f030003 -net.micode.notes:layout/datetime_picker = 0x7f060002 -net.micode.notes:menu/note_list_options = 0x7f070005 -net.micode.notes:drawable/widget_4x_white = 0x7f040040 diff --git a/src/Notes-master1/app/build/intermediates/variant_model/debug/variant_model.json b/src/Notes-master1/app/build/intermediates/variant_model/debug/variant_model.json deleted file mode 100644 index fbfb74a..0000000 Binary files a/src/Notes-master1/app/build/intermediates/variant_model/debug/variant_model.json and /dev/null differ diff --git a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt b/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt deleted file mode 100644 index 3837fe7..0000000 --- a/src/Notes-master1/app/build/outputs/logs/manifest-merger-debug-report.txt +++ /dev/null @@ -1,227 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 -INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:1-150:12 - package - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:19:5-31 - INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml - android:versionName - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:21:5-30 - INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml - xmlns:android - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:18:11-69 - android:versionCode - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:20:5-28 - INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml -uses-sdk -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 -INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:5-44 - android:targetSdkVersion - INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml - android:minSdkVersion - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:23:15-41 - INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:25:5-81 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:25:22-78 -uses-permission#com.android.launcher.permission.INSTALL_SHORTCUT -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:26:5-88 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:26:22-85 -uses-permission#android.permission.INTERNET -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:27:5-67 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:27:22-64 -uses-permission#android.permission.READ_CONTACTS -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:28:5-72 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:28:22-69 -uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:29:5-74 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:29:22-71 -uses-permission#android.permission.AUTHENTICATE_ACCOUNTS -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:30:5-80 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:30:22-77 -uses-permission#android.permission.GET_ACCOUNTS -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:31:5-71 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:31:22-68 -uses-permission#android.permission.USE_CREDENTIALS -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:32:5-74 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:32:22-71 -uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:33:5-81 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:33:22-78 -application -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 -INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml:35:5-149:19 - android:extractNativeLibs - INJECTED from D:\Notes-master1\app\src\main\AndroidManifest.xml - android:label - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:37:9-41 - android:icon - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:36:9-42 -activity#net.micode.notes.ui.NotesListActivity -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:38:9-51:20 - android:label - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:41:13-45 - android:launchMode - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:42:13-43 - android:windowSoftInputMode - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:45:13-52 - android:uiOptions - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:44:13-57 - android:configChanges - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:40:13-74 - android:theme - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:43:13-45 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:39:13-49 -intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:47:13-50:29 -action#android.intent.action.MAIN -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:48:17-69 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:48:25-66 -category#android.intent.category.LAUNCHER -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:49:17-77 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:49:27-74 -activity#net.micode.notes.ui.NoteEditActivity -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:53:9-81:20 - android:launchMode - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:56:13-43 - android:configChanges - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:55:13-74 - android:theme - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:57:13-45 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:54:13-48 -intent-filter#action:name:android.intent.action.VIEW+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:59:13-64:29 -action#android.intent.action.VIEW -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:60:17-69 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:60:25-66 -category#android.intent.category.DEFAULT -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:61:17-76 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:61:27-73 -data -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:62:17-78 - android:mimeType - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:62:23-75 -intent-filter#action:name:android.intent.action.INSERT_OR_EDIT+category:name:android.intent.category.DEFAULT+data:mimeType:vnd.android.cursor.item/call_note+data:mimeType:vnd.android.cursor.item/text_note -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:66:13-71:29 -action#android.intent.action.INSERT_OR_EDIT -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:67:17-79 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:67:25-76 -intent-filter#action:name:android.intent.action.SEARCH+category:name:android.intent.category.DEFAULT -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:73:13-76:29 -action#android.intent.action.SEARCH -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:74:17-71 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:74:25-68 -meta-data#android.app.searchable -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:78:13-80:54 - android:resource - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:80:17-51 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:79:17-54 -provider#net.micode.notes.data.NotesProvider -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:83:9-86:43 - android:authorities - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:85:13-47 - android:multiprocess - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:86:13-40 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:84:13-63 -receiver#net.micode.notes.widget.NoteWidgetProvider_2x -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:88:9-100:20 - android:label - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:90:13-50 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:89:13-57 -intent-filter#action:name:android.appwidget.action.APPWIDGET_DELETED+action:name:android.appwidget.action.APPWIDGET_UPDATE+action:name:android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:91:13-95:29 -action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:92:17-84 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:92:25-81 -action#android.appwidget.action.APPWIDGET_DELETED -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:93:17-85 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:93:25-82 -action#android.intent.action.PRIVACY_MODE_CHANGED -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:94:17-85 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:94:25-82 -meta-data#android.appwidget.provider -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:97:13-99:58 - android:resource - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:99:17-55 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:98:17-58 -receiver#net.micode.notes.widget.NoteWidgetProvider_4x -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:101:9-114:20 - android:label - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:103:13-50 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:102:13-57 -receiver#net.micode.notes.ui.AlarmInitReceiver -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:116:9-120:20 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:116:19-55 -intent-filter#action:name:android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:117:13-119:29 -action#android.intent.action.BOOT_COMPLETED -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:118:17-79 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:118:25-76 -receiver#net.micode.notes.ui.AlarmReceiver -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:122:9-125:20 - android:process - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:124:13-38 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:123:13-61 -activity#net.micode.notes.ui.AlarmAlertActivity -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:127:9-132:20 - android:label - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:129:13-45 - android:launchMode - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:130:13-48 - android:theme - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:131:13-75 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:128:13-50 -activity#net.micode.notes.ui.NotesPreferenceActivity -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:134:9-139:20 - android:label - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:136:13-54 - android:launchMode - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:137:13-43 - android:theme - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:138:13-60 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:135:13-71 -service#net.micode.notes.gtask.remote.GTaskSyncService -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:141:9-144:19 - android:exported - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:143:13-37 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:142:13-74 -meta-data#android.app.default_searchable -ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:146:9-148:52 - android:value - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:148:13-49 - android:name - ADDED from D:\Notes-master1\app\src\main\AndroidManifest.xml:147:13-58 diff --git a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin deleted file mode 100644 index 8d33388..0000000 Binary files a/src/Notes-master1/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and /dev/null differ diff --git a/src/Notes-master1/app/src/main/res/raw-zh-rCN/introduction b/src/Notes-master1/app/src/main/res/raw-zh-rCN/introduction deleted file mode 100644 index 7188359..0000000 --- a/src/Notes-master1/app/src/main/res/raw-zh-rCN/introduction +++ /dev/null @@ -1,7 +0,0 @@ -欢迎使用MIUI便签！ - - 无论从软件中直接添加，还是从桌面拖出widget，MIUI便签能让你快速建立和保存便签； - - 除了调整文字大小、便签背景、文件夹等基础功能外，你会发现MIUI便签也提供了清单模式、便签提醒、软件加密、导出到SD卡、同步google task的高级功能，让你的生活记录更加美好和安全； - - 来分享你的使用体验吧：http://www.miui.com/index.php diff --git a/src/Notes-master1/app/src/main/res/raw/introduction b/src/Notes-master1/app/src/main/res/raw/introduction deleted file mode 100644 index 269cf7b..0000000 --- a/src/Notes-master1/app/src/main/res/raw/introduction +++ /dev/null @@ -1 +0,0 @@ -Welcome to use MIUI notes! \ No newline at end of file diff --git a/src/Notes-master1/build.gradle b/src/Notes-master1/build.gradle deleted file mode 100644 index cf79c32..0000000 --- a/src/Notes-master1/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - maven { - url 'https://dl.google.com/android/maven2' - } - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:8.1.3' - } -} - -allprojects { - repositories { - google() - jcenter() - } -} diff --git a/src/Notes-master1/gradle/wrapper/gradle-wrapper.jar b/src/Notes-master1/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index e708b1c..0000000 Binary files a/src/Notes-master1/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/src/Notes-master1/gradle/wrapper/gradle-wrapper.properties b/src/Notes-master1/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index fe1cb71..0000000 --- a/src/Notes-master1/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -#Sun Nov 19 23:35:27 CST 2023 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/src/Notes-master1/gradlew b/src/Notes-master1/gradlew deleted file mode 100644 index 4f906e0..0000000 --- a/src/Notes-master1/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/src/Notes-master1/gradlew.bat b/src/Notes-master1/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/src/Notes-master1/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/src/Notes-master1/import-summary.txt b/src/Notes-master1/import-summary.txt deleted file mode 100644 index f2e6428..0000000 --- a/src/Notes-master1/import-summary.txt +++ /dev/null @@ -1,36 +0,0 @@ -ECLIPSE ANDROID PROJECT IMPORT SUMMARY -====================================== - -Ignored Files: --------------- -The following files were *not* copied into the new Gradle project; you -should evaluate whether these are still needed in your project and if -so manually move them: - -* .gitignore -* NOTICE -* README - -Moved Files: ------------- -Android Gradle projects use a different directory structure than ADT -Eclipse projects. Here's how the projects were restructured: - -* AndroidManifest.xml => app\src\main\AndroidManifest.xml -* res\ => app\src\main\res\ -* src\ => app\src\main\java\ - -Next Steps: ------------ -You can now build the project. The Gradle project needs network -connectivity to download dependencies. - -Bugs: ------ -If for some reason your project does not build, and you determine that -it is due to a bug or limitation of the Eclipse to Gradle importer, -please file a bug at http://b.android.com with category -Component-Tools. - -(This import summary is for your information only, and can be deleted -after import once you are satisfied with the results.) diff --git a/src/Notes-master1/local.properties b/src/Notes-master1/local.properties deleted file mode 100644 index b0fa4e5..0000000 --- a/src/Notes-master1/local.properties +++ /dev/null @@ -1,7 +0,0 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# -#Sun Nov 19 23:35:27 CST 2023 -sdk.dir=D\:\\SDK diff --git a/src/Notes-master1/settings.gradle b/src/Notes-master1/settings.gradle deleted file mode 100644 index e7b4def..0000000 --- a/src/Notes-master1/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/src/Notes-master1/app/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 88% rename from src/Notes-master1/app/src/main/AndroidManifest.xml rename to src/main/AndroidManifest.xml index e5c7d47..7c5273f 100644 --- a/src/Notes-master1/app/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -32,6 +32,8 @@ + + @@ -42,7 +44,8 @@ android:launchMode="singleTop" android:theme="@style/NoteTheme" android:uiOptions="splitActionBarWhenNarrow" - android:windowSoftInputMode="adjustPan" > + android:windowSoftInputMode="adjustPan" + android:exported="true"> @@ -54,15 +57,17 @@ android:name=".ui.NoteEditActivity" android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleTop" - android:theme="@style/NoteTheme" > + android:theme="@style/NoteTheme" + android:exported="true"> - - + + + @@ -87,7 +92,8 @@ + android:label="@string/app_widget2x2" + android:exported="false"> @@ -100,7 +106,8 @@ + android:label="@string/app_widget4x4" + android:exported="false"> @@ -110,10 +117,11 @@ + android:resource="@xml/widget_4x_info" + android:exported="false"/> - + diff --git a/src/main/assets/front/BERNHC.TTF b/src/main/assets/front/BERNHC.TTF new file mode 100644 index 0000000..bb9b711 Binary files /dev/null and b/src/main/assets/front/BERNHC.TTF differ diff --git a/src/main/assets/front/LCALLIG.TTF b/src/main/assets/front/LCALLIG.TTF new file mode 100644 index 0000000..d7a0eb8 Binary files /dev/null and b/src/main/assets/front/LCALLIG.TTF differ diff --git a/src/main/assets/front/仿宋.TTF b/src/main/assets/front/仿宋.TTF new file mode 100644 index 0000000..16eb427 Binary files /dev/null and b/src/main/assets/front/仿宋.TTF differ diff --git a/src/main/assets/front/楷体.TTF b/src/main/assets/front/楷体.TTF new file mode 100644 index 0000000..ece2ac2 Binary files /dev/null and b/src/main/assets/front/楷体.TTF differ diff --git a/src/main/assets/front/行楷.TTF b/src/main/assets/front/行楷.TTF new file mode 100644 index 0000000..53439a2 Binary files /dev/null and b/src/main/assets/front/行楷.TTF differ diff --git a/src/main/assets/front/隶书.TTF b/src/main/assets/front/隶书.TTF new file mode 100644 index 0000000..67a3d4a Binary files /dev/null and b/src/main/assets/front/隶书.TTF differ diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java b/src/main/java/net/micode/notes/data/Contact.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/data/Contact.java rename to src/main/java/net/micode/notes/data/Contact.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java b/src/main/java/net/micode/notes/data/Notes.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/data/Notes.java rename to src/main/java/net/micode/notes/data/Notes.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java b/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java rename to src/main/java/net/micode/notes/data/NotesDatabaseHelper.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java b/src/main/java/net/micode/notes/data/NotesProvider.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/data/NotesProvider.java rename to src/main/java/net/micode/notes/data/NotesProvider.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java b/src/main/java/net/micode/notes/gtask/data/MetaData.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/MetaData.java rename to src/main/java/net/micode/notes/gtask/data/MetaData.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java b/src/main/java/net/micode/notes/gtask/data/Node.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Node.java rename to src/main/java/net/micode/notes/gtask/data/Node.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java b/src/main/java/net/micode/notes/gtask/data/SqlData.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlData.java rename to src/main/java/net/micode/notes/gtask/data/SqlData.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java b/src/main/java/net/micode/notes/gtask/data/SqlNote.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java rename to src/main/java/net/micode/notes/gtask/data/SqlNote.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java b/src/main/java/net/micode/notes/gtask/data/Task.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/Task.java rename to src/main/java/net/micode/notes/gtask/data/Task.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java b/src/main/java/net/micode/notes/gtask/data/TaskList.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/data/TaskList.java rename to src/main/java/net/micode/notes/gtask/data/TaskList.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java b/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java rename to src/main/java/net/micode/notes/gtask/exception/ActionFailureException.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java b/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java rename to src/main/java/net/micode/notes/gtask/exception/NetworkFailureException.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java similarity index 97% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java index 56c8e5e..f50ba1b 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java +++ b/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java @@ -77,10 +77,11 @@ public class GTaskASyncTask extends AsyncTask { pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext, NotesListActivity.class), 0); } -// notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, + // notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content, // pendingIntent); notification.contentIntent = pendingIntent; mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification); + } @Override diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java b/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskClient.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskClient.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java b/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskManager.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskManager.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java b/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java rename to src/main/java/net/micode/notes/gtask/remote/GTaskSyncService.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java b/src/main/java/net/micode/notes/model/Note.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/model/Note.java rename to src/main/java/net/micode/notes/model/Note.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java b/src/main/java/net/micode/notes/model/WorkingNote.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/model/WorkingNote.java rename to src/main/java/net/micode/notes/model/WorkingNote.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java b/src/main/java/net/micode/notes/tool/BackupUtils.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/tool/BackupUtils.java rename to src/main/java/net/micode/notes/tool/BackupUtils.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java b/src/main/java/net/micode/notes/tool/DataUtils.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/tool/DataUtils.java rename to src/main/java/net/micode/notes/tool/DataUtils.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java b/src/main/java/net/micode/notes/tool/GTaskStringUtils.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java rename to src/main/java/net/micode/notes/tool/GTaskStringUtils.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java b/src/main/java/net/micode/notes/tool/ResourceParser.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/tool/ResourceParser.java rename to src/main/java/net/micode/notes/tool/ResourceParser.java diff --git a/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java b/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java new file mode 100644 index 0000000..cd14c0c --- /dev/null +++ b/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java @@ -0,0 +1,209 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * + * @ProjectName: $MiNotes$ + * @Package: $ui$ + * @ClassName: $AlarmAlertActivity.java$ + * @Description: 该类主要构建了一个闹铃提醒页面，以及用户不同选择的解决方案 + * @Author: 石兆羲 + * @CreateDate: $2023/12/21$ + */ + +package net.micode.notes.ui; + +import android.app.Activity; +import android.app.AlertDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.content.DialogInterface.OnClickListener; +import android.content.DialogInterface.OnDismissListener; +import android.content.Intent; +import android.media.AudioManager; +import android.media.MediaPlayer; +import android.media.RingtoneManager; +import android.net.Uri; +import android.os.Bundle; +import android.os.PowerManager; +import android.provider.Settings; +import android.view.Window; +import android.view.WindowManager; + +import net.micode.notes.R; +import net.micode.notes.data.Notes; +import net.micode.notes.tool.DataUtils; + +import java.io.IOException; + + +public class AlarmAlertActivity extends Activity implements OnClickListener, OnDismissListener { + private long mNoteId; //文本在数据库中存储的ID号 + private String mSnippet; //闹钟提示时出现的文本内容 + private static final int SNIPPET_PREW_MAX_LEN = 60; + MediaPlayer mPlayer; + + @Override + protected void onCreate(Bundle savedInstanceState) { + //该部分的功能是：手机锁屏后，如果到了闹钟提示时间就点亮屏幕 + super.onCreate(savedInstanceState); + //Bundle类型的数据与Map类型的数据相似，都是以key-value的形式存储数据的 + //saveInstanceState方法是用来保存Activity的状态的 + //能从onCreate的参数savedInsanceState中获得状态数据 + requestWindowFeature(Window.FEATURE_NO_TITLE); //界面显示“无标题“ + + final Window win = getWindow(); + win.addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED); + + if (!isScreenOn()) { + win.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON + //保持窗口点亮 + | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON + //点亮窗口 + | WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON + //允许在点亮窗口时锁屏 + | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR); + } + + Intent intent = getIntent(); + + try { + mNoteId = Long.valueOf(intent.getData().getPathSegments().get(1)); + mSnippet = DataUtils.getSnippetById(this.getContentResolver(), mNoteId); + //根据ID从数据库中获取标签内容，其中getContentResolver（）是实现数据共享，实例存储。 + mSnippet = mSnippet.length() > SNIPPET_PREW_MAX_LEN ? mSnippet.substring(0, + SNIPPET_PREW_MAX_LEN) + getResources().getString(R.string.notelist_string_info) + : mSnippet; + //判断标签片段是否达到符合长度 + + } catch (IllegalArgumentException e) { + e.printStackTrace(); + return; + } + //上述代码代码区如果有错误，就会返回所写异常的处理。 + mPlayer = new MediaPlayer(); + if (DataUtils.visibleInNoteDatabase(getContentResolver(), mNoteId, Notes.TYPE_NOTE)) { + showActionDialog(); + //弹出对话框 + playAlarmSound(); + //播放闹钟提示音 + } else { + finish(); + //结束闹钟操作 + } + } + + private boolean isScreenOn() { + //该部分功能是：判断屏幕是否锁屏，调用系统函数判断，返回值一个布尔类型值 + PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); + return pm.isScreenOn(); + } + + private void playAlarmSound() { + //播放闹钟提示音 + Uri url = RingtoneManager.getActualDefaultRingtoneUri(this, RingtoneManager.TYPE_ALARM); + //调用系统的铃声管理URI，得到闹钟提示音 + int silentModeStreams = Settings.System.getInt(getContentResolver(), + Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0); + + if ((silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0) { + //判断系统静音状态，如果静音则闹钟不响，否则响铃 + mPlayer.setAudioStreamType(silentModeStreams); + } else { + mPlayer.setAudioStreamType(AudioManager.STREAM_ALARM); + } + try { + mPlayer.setDataSource(this, url); + //该方法设置了多媒体数据来源，由前文的uri管理决定，该方法没有返回值 + mPlayer.prepare(); + //准备同步 + mPlayer.setLooping(true); + //设置是否循环播放铃声 + mPlayer.start(); + //播放铃声 + } catch (IllegalArgumentException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (SecurityException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + //e.printStackTrace()函数功能是抛出异常， 还将显示出更深的调用信息 + //System.out.println(e)，这个方法打印出异常，并且输出在哪里出现的异常 + } catch (IllegalStateException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + private void showActionDialog() { + //该部分主要构建了一个响铃后的对话框，让用户决定是否关闭闹钟 + AlertDialog.Builder dialog = new AlertDialog.Builder(this); + //AlertDialog的构造方法全部是Protected的 + //所以不能直接通过new一个AlertDialog来创建出一个AlertDialog。 + //要创建一个AlertDialog，就要用到AlertDialog.Builder中的create()方法 + //如这里的dialog就是新建了一个AlertDialog + dialog.setTitle(R.string.app_name); + //设置对话框标题 + dialog.setMessage(mSnippet); + //设置对话框内容 + dialog.setPositiveButton(R.string.notealert_ok, this); + //在对话框中设置“yes”按钮 + if (isScreenOn()) { + dialog.setNegativeButton(R.string.notealert_enter, this); + }//在对话框设置“No”按钮 + dialog.show().setOnDismissListener(this); + } + + public void onClick(DialogInterface dialog, int which) { + switch (which) { + //用which来选择点击后的操作 + case DialogInterface.BUTTON_NEGATIVE: + //如果点击了“No”按钮，就取消操作 + Intent intent = new Intent(this, NoteEditActivity.class); + //类间数据传输 + intent.setAction(Intent.ACTION_VIEW); + //设置动作属性 + intent.putExtra(Intent.EXTRA_UID, mNoteId); + //实现key-value对，EXTRA_UID为key；mNoteId为键 + startActivity(intent); + //开始执行动作 + break; + default: + //确定操作 + break; + } + } + + public void onDismiss(DialogInterface dialog) { + //用户选择忽略闹钟的操作 + stopAlarmSound(); + //停止响铃 + finish(); + } + + private void stopAlarmSound() { + //用户选择停止响铃 + if (mPlayer != null) { + mPlayer.stop(); + //停止播放 + mPlayer.release(); + //释放多媒体对象MediaPlayer + mPlayer = null; + } + } +} diff --git a/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java b/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java new file mode 100644 index 0000000..b1a9529 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java @@ -0,0 +1,88 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * + * @ProjectName: $MiNotes$ + * @Package: $ui$ + * @ClassName: $AlarmInitReciver.java$ + * @Description: 该类主要功能是根据数据库里的闹钟时间创建一个闹钟机制 + * @Author: 石兆羲 + * @CreateDate: $2023/12/23$ + */ + +package net.micode.notes.ui; + +import android.app.AlarmManager; +import android.app.PendingIntent; +import android.content.BroadcastReceiver; +import android.content.ContentUris; +import android.content.Context; +import android.content.Intent; +import android.database.Cursor; + +import net.micode.notes.data.Notes; +import net.micode.notes.data.Notes.NoteColumns; + + +public class AlarmInitReceiver extends BroadcastReceiver { + + private static final String [] PROJECTION = new String [] { + NoteColumns.ID, + NoteColumns.ALERTED_DATE + }; + //对数据库的操作，作用是调用ID和设定的闹钟时间 + private static final int COLUMN_ID = 0; + private static final int COLUMN_ALERTED_DATE = 1; + + @Override + public void onReceive(Context context, Intent intent) { + long currentDate = System.currentTimeMillis(); + //System.currentTimeMillis()函数的作用是产生一个当前的毫秒 + //毫秒数是自1970年1月1日0时起的毫秒数 + Cursor c = context.getContentResolver().query(Notes.CONTENT_NOTE_URI, + //Cursor在这里的作用是通过查找数据库中的标签内容，找到和当前系统时间相等的标签 + //通过 context.getContentResolver() 获取当前应用程序的 ContentResolver 对象 + //使用 query() 方法对系统中的 Notes 数据库进行查询操作。 + //其中，Notes.CONTENT_NOTE_URI 是一个常量，表示 Notes 数据库中的笔记表对应的 Uri 地址。 + PROJECTION,//字符串数组，包含查询结果的列名 + NoteColumns.ALERTED_DATE + ">? AND " + NoteColumns.TYPE + "=" + Notes.TYPE_NOTE, + //这里定义了两个查询条件： + //笔记的提醒日期晚于某个特定时间； + //笔记的类型为 Notes.TYPE_NOTE + new String[] { String.valueOf(currentDate) }, + //将long变量currentDate转化为字符串 + null); + + if (c != null) { + if (c.moveToFirst()) { + do { + long alertDate = c.getLong(COLUMN_ALERTED_DATE); + Intent sender = new Intent(context, AlarmReceiver.class); + //Intent用于在不同组件之间传递消息、启动服务、启动活动等。 + sender.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, c.getLong(COLUMN_ID))); + PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0, sender, 0); + //PendingIntent通常用于在未来的某个时间点执行某项操作，比如在特定的时刻启动一个 Activity、发送一个广播或者启动一个服务。 + AlarmManager alermManager = (AlarmManager) context + .getSystemService(Context.ALARM_SERVICE); + alermManager.set(AlarmManager.RTC_WAKEUP, alertDate, pendingIntent); + //AlarmManager用于在指定的时间点触发某个操作。它可以用来实现定时任务、闹钟提醒、周期性任务等功能。 + //通过网上查找资料发现，对于闹钟机制的启动，通常需要上面的几个步骤，如新建Intent、PendingIntent以及AlarmManager等 + } while (c.moveToNext()); + } + c.close(); + } + } +} diff --git a/src/main/java/net/micode/notes/ui/AlarmReceiver.java b/src/main/java/net/micode/notes/ui/AlarmReceiver.java new file mode 100644 index 0000000..d58a500 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/AlarmReceiver.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * + * @ProjectName: $MiNotes$ + * @Package: $ui$ + * @ClassName: $AlarmReciver.java$ + * @Description: 该类主要功能启动、实现闹钟功能 + * @Author: 石兆羲 + * @CreateDate: $2023/12/25$ + */ +package net.micode.notes.ui; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; + +public class AlarmReceiver extends BroadcastReceiver { + @Override + public void onReceive(Context context, Intent intent) { + intent.setClass(context, AlarmAlertActivity.class); + //启动AlarmAlertActivity + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + //activity要存在于activity的栈中，而非activity的途径启动activity时必然不存在一个activity的栈 + //所以要新起一个栈装入启动的activity + context.startActivity(intent); + } +} diff --git a/src/main/java/net/micode/notes/ui/DateTimePicker.java b/src/main/java/net/micode/notes/ui/DateTimePicker.java new file mode 100644 index 0000000..5977568 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/DateTimePicker.java @@ -0,0 +1,533 @@ +/* + * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/** + * + * @ProjectName: $MiNotes$ + * @Package: $ui$ + * @ClassName: $DateTimePicker.java$ + * @Description: 该类主要功能是实现设置闹钟过程中涉及时间变化部分的具体操作 + * @Author: 石兆羲 + * @CreateDate: $2023/12/25$ + */ +package net.micode.notes.ui; + +import java.text.DateFormatSymbols; +import java.util.Calendar; + +import net.micode.notes.R; + + +import android.content.Context; +import android.text.format.DateFormat; +import android.view.View; +import android.widget.FrameLayout; +import android.widget.NumberPicker; + +public class DateTimePicker extends FrameLayout { + //FrameLayout是布局模板之一 + //所有的子元素全部在屏幕的右上方 + private static final boolean DEFAULT_ENABLE_STATE = true; + + private static final int HOURS_IN_HALF_DAY = 12; + private static final int HOURS_IN_ALL_DAY = 24; + private static final int DAYS_IN_ALL_WEEK = 7; + private static final int DATE_SPINNER_MIN_VAL = 0; + private static final int DATE_SPINNER_MAX_VAL = DAYS_IN_ALL_WEEK - 1; + private static final int HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW = 0; + private static final int HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW = 23; + private static final int HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW = 1; + private static final int HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW = 12; + private static final int MINUT_SPINNER_MIN_VAL = 0; + private static final int MINUT_SPINNER_MAX_VAL = 59; + private static final int AMPM_SPINNER_MIN_VAL = 0; + private static final int AMPM_SPINNER_MAX_VAL = 1; + //以上语句的作用都是用于初始化控件 + private final NumberPicker mDateSpinner; + private final NumberPicker mHourSpinner; + private final NumberPicker mMinuteSpinner; + private final NumberPicker mAmPmSpinner; + //NumberPicker是数字选择器，定义上述四个变量用于表示设置闹钟时需要选择的变量（时、分、秒、日期等） + private Calendar mDate; + //定义了Calendar类型的变量mDate，用于操作时间 + private String[] mDateDisplayValues = new String[DAYS_IN_ALL_WEEK]; + + private boolean mIsAm; + + private boolean mIs24HourView; + + private boolean mIsEnabled = DEFAULT_ENABLE_STATE; + + private boolean mInitialising; + + private OnDateTimeChangedListener mOnDateTimeChangedListener; + + private NumberPicker.OnValueChangeListener mOnDateChangedListener = new NumberPicker.OnValueChangeListener() { + @Override + public void onValueChange(NumberPicker picker, int oldVal, int newVal) { + mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal); + updateDateControl(); + //OnValueChangeListener，这是时间改变监听器，这里主要是对日期的监听 + //将现在日期的值传递给mDate；updateDateControl是同步操作 + + onDateTimeChanged(); + //这段代码是一个事件回调方法 onValueChange 的实现。它是在 NumberPicker 控件的值发生改变时被调用的。 + //在这个方法中，首先根据新旧值的差异，使用 mDate.add(Calendar.DAY_OF_YEAR, newVal - oldVal) 方法来更新 mDate 对应的 Calendar 对象，即将日期增加或减少相应的天数。 + //接下来，调用 updateDateControl() 方法来更新与日期相关的控件，更新显示日期的文本或者刷新界面等操作。 + //最后，调用 onDateTimeChanged() 方法来处理日期时间的变化。 + } + }; + + private NumberPicker.OnValueChangeListener mOnHourChangedListener = new NumberPicker.OnValueChangeListener() { + //这里是对 小时（Hour） 的监听 + @Override + public void onValueChange(NumberPicker picker, int oldVal, int newVal) { + boolean isDateChanged = false; + Calendar cal = Calendar.getInstance(); + //声明一个Calendar的变量cal，便于后续的操作 + if (!mIs24HourView) { + if (!mIsAm && oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY) { + cal.setTimeInMillis(mDate.getTimeInMillis()); + cal.add(Calendar.DAY_OF_YEAR, 1); + isDateChanged = true; + //这段代码是对于12小时制时，当从晚上的 11 点切换到早上的 12 点时，会将日期向后推一天。 + } else if (mIsAm && oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { + cal.setTimeInMillis(mDate.getTimeInMillis()); + cal.add(Calendar.DAY_OF_YEAR, -1); + isDateChanged = true; + } + //这段代码和之前的类似，但是是当从早上的 12 点切换到晚上的 11 点时，会将日期向前推一天。 + if (oldVal == HOURS_IN_HALF_DAY - 1 && newVal == HOURS_IN_HALF_DAY || + oldVal == HOURS_IN_HALF_DAY && newVal == HOURS_IN_HALF_DAY - 1) { + mIsAm = !mIsAm; + updateAmPmControl(); + //当在凌晨 11 点和中午 12 点之间进行切换时，会切换上午和下午的状态，并更新相关的显示控件。 + } + } else { + if (oldVal == HOURS_IN_ALL_DAY - 1 && newVal == 0) { + cal.setTimeInMillis(mDate.getTimeInMillis()); + cal.add(Calendar.DAY_OF_YEAR, 1); + isDateChanged = true; + //当从一天的最后一小时切换到第二天的第一小时时，会将日期向后推一天。 + } else if (oldVal == 0 && newVal == HOURS_IN_ALL_DAY - 1) { + cal.setTimeInMillis(mDate.getTimeInMillis()); + cal.add(Calendar.DAY_OF_YEAR, -1); + isDateChanged = true; + //当从第二天的第一小时切换到一天的最后一小时时，会将日期向前推一天。 + } + + } + int newHour = mHourSpinner.getValue() % HOURS_IN_HALF_DAY + (mIsAm ? 0 : HOURS_IN_HALF_DAY); + //通过数字选择器对newHour的赋值 + mDate.set(Calendar.HOUR_OF_DAY, newHour); + //通过set函数将新的Hour值传给mDate + onDateTimeChanged(); + if (isDateChanged) { + setCurrentYear(cal.get(Calendar.YEAR)); + setCurrentMonth(cal.get(Calendar.MONTH)); + setCurrentDay(cal.get(Calendar.DAY_OF_MONTH)); + }//这段代码是在日期发生变化时，将新的日期设置为当前的年月日。 + } + }; + + private NumberPicker.OnValueChangeListener mOnMinuteChangedListener = new NumberPicker.OnValueChangeListener() { + @Override + //对分钟（Minute）改变的监听 + public void onValueChange(NumberPicker picker, int oldVal, int newVal) { + int minValue = mMinuteSpinner.getMinValue(); + int maxValue = mMinuteSpinner.getMaxValue(); + //获取分钟数字选择器中的最大值和最小值 + int offset = 0; + //设置offset，作为小时改变的一个记录数据 + if (oldVal == maxValue && newVal == minValue) { + offset += 1; + //如果原值为59，新值为0，则offset加1 + } else if (oldVal == minValue && newVal == maxValue) { + offset -= 1; + //如果原值为0，新值为59，则offset减1 + + } + if (offset != 0) { + //如果 offset 不等于 0，表示需要进行偏移操作。接下来的代码会根据偏移值更新日期和小时的值。 + mDate.add(Calendar.HOUR_OF_DAY, offset);//偏移日期，将小时增加或减少。 + mHourSpinner.setValue(getCurrentHour());//小时的选择器设置为当前的小时值。 + updateDateControl();//更新日期相关的显示控件。 + int newHour = getCurrentHourOfDay(); + if (newHour >= HOURS_IN_HALF_DAY) { + mIsAm = false; + updateAmPmControl(); + } else { + mIsAm = true; + updateAmPmControl(); + }//根据 newHour 的值判断是否超过半天。若超过半天，则将 mIsAm 设置为 false，否则设置为 true。 + //然后调用 updateAmPmControl() 更新上午/下午的显示控件。 + } + mDate.set(Calendar.MINUTE, newVal);//将选择器中的分钟值设置为 newVal，即新选择的分钟值。 + onDateTimeChanged(); + } + }; + + private NumberPicker.OnValueChangeListener mOnAmPmChangedListener = new NumberPicker.OnValueChangeListener() { + //对AM和PM的监听 + @Override + public void onValueChange(NumberPicker picker, int oldVal, int newVal) {//是在上午/下午选择器的值发生变化时的处理逻辑。 + mIsAm = !mIsAm; + if (mIsAm) {//如果 mIsAm 是 true，表示用户选择了上午。前调12小时 + mDate.add(Calendar.HOUR_OF_DAY, -HOURS_IN_HALF_DAY); + } else {//如果 mIsAm 是 false，表示用户选择了下午。后调12小时 + mDate.add(Calendar.HOUR_OF_DAY, HOURS_IN_HALF_DAY); + } + updateAmPmControl();//更新上/下午显示控件 + onDateTimeChanged(); + + } + }; + + public interface OnDateTimeChangedListener { + //用来监听日期选择器的变化。 + void onDateTimeChanged(DateTimePicker view, int year, int month, + int dayOfMonth, int hourOfDay, int minute); + /*view：表示触发事件的日期时间选择器。 + year：表示选择的年份。 + month：表示选择的月份，范围是 0-11（0 表示一月）。 + dayOfMonth：表示选择的日期。 + hourOfDay：表示选择的小时数，范围是 0-23。 + minute：表示选择的分钟数，范围是 0-59。*/ + } + + public DateTimePicker(Context context) { + this(context, System.currentTimeMillis()); + //通过对数据库的访问，获取当前的系统时间 + } + + public DateTimePicker(Context context, long date) { + this(context, date, DateFormat.is24HourFormat(context)); + }//上面函数的得到的是一个天文数字（1970至今的秒数），需要DateFormat将其变得有意义 + + public DateTimePicker(Context context, long date, boolean is24HourView) { + super(context); + //获取系统时间 + mDate = Calendar.getInstance(); + mInitialising = true; + mIsAm = getCurrentHourOfDay() >= HOURS_IN_HALF_DAY; + inflate(context, R.layout.datetime_picker, this); + //如果当前Activity里用到别的layout，比如对话框layout + //还要设置这个layout上的其他组件的内容，就必须用inflate()方法先将对话框的layout找出来 + //然后再用findViewById()找到它上面的其它组件 + mDateSpinner = (NumberPicker) findViewById(R.id.date); + mDateSpinner.setMinValue(DATE_SPINNER_MIN_VAL); + mDateSpinner.setMaxValue(DATE_SPINNER_MAX_VAL); + mDateSpinner.setOnValueChangedListener(mOnDateChangedListener); + + mHourSpinner = (NumberPicker) findViewById(R.id.hour); + mHourSpinner.setOnValueChangedListener(mOnHourChangedListener); + mMinuteSpinner = (NumberPicker) findViewById(R.id.minute); + mMinuteSpinner.setMinValue(MINUT_SPINNER_MIN_VAL); + mMinuteSpinner.setMaxValue(MINUT_SPINNER_MAX_VAL); + mMinuteSpinner.setOnLongPressUpdateInterval(100); + mMinuteSpinner.setOnValueChangedListener(mOnMinuteChangedListener); + + String[] stringsForAmPm = new DateFormatSymbols().getAmPmStrings(); + mAmPmSpinner = (NumberPicker) findViewById(R.id.amPm); + mAmPmSpinner.setMinValue(AMPM_SPINNER_MIN_VAL); + mAmPmSpinner.setMaxValue(AMPM_SPINNER_MAX_VAL); + mAmPmSpinner.setDisplayedValues(stringsForAmPm); + mAmPmSpinner.setOnValueChangedListener(mOnAmPmChangedListener); + //可以看到原有的注释，意思是初始化日期时间选择器中的三个数字选择器和一个上午/下午选择器。 + // update controls to initial state + updateDateControl(); + updateHourControl(); + updateAmPmControl(); + + set24HourView(is24HourView); + //设置当前时间 + // set to current time + setCurrentDate(date); + + setEnabled(isEnabled()); + //设置内容描述（目的是提高访问性） + // set the content descriptions + mInitialising = false; + } + + @Override + public void setEnabled(boolean enabled) { + if (mIsEnabled == enabled) { + return; + } + super.setEnabled(enabled); + mDateSpinner.setEnabled(enabled); + mMinuteSpinner.setEnabled(enabled); + mHourSpinner.setEnabled(enabled); + mAmPmSpinner.setEnabled(enabled); + mIsEnabled = enabled; + }//这段代码定义了一个名为 setEnabled() 的方法，用于启用或禁用日期时间选择器。 + + @Override + public boolean isEnabled() { + return mIsEnabled; + } + + /** + * Get the current date in millis + * + * @return the current date in millis + */ + public long getCurrentDateInTimeMillis() { + return mDate.getTimeInMillis(); + }//得到当前秒数 + + /** + * Set the current date + * + * @param date The current date in millis + */ + public void setCurrentDate(long date) { + Calendar cal = Calendar.getInstance(); + cal.setTimeInMillis(date); + setCurrentDate(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), + cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE)); + }//设置当前时间，参数date + + /** + * Set the current date + * + * @param year The current year + * @param month The current month + * @param dayOfMonth The current dayOfMonth + * @param hourOfDay The current hourOfDay + * @param minute The current minute + */ + public void setCurrentDate(int year, int month, + int dayOfMonth, int hourOfDay, int minute) { + setCurrentYear(year); + setCurrentMonth(month); + setCurrentDay(dayOfMonth); + setCurrentHour(hourOfDay); + setCurrentMinute(minute); + }//设置当前时间 + + /** + * Get current year + * + * @return The current year + */ + public int getCurrentYear() { + return mDate.get(Calendar.YEAR); + } + + /** + * Set current year + * + * @param year The current year + */ + public void setCurrentYear(int year) { + if (!mInitialising && year == getCurrentYear()) { + return; + } + mDate.set(Calendar.YEAR, year); + updateDateControl(); + onDateTimeChanged(); + } + + /** + * Get current month in the year + * + * @return The current month in the year + */ + public int getCurrentMonth() { + return mDate.get(Calendar.MONTH); + } + + /** + * Set current month in the year + * + * @param month The month in the year + */ + public void setCurrentMonth(int month) { + if (!mInitialising && month == getCurrentMonth()) { + return; + } + mDate.set(Calendar.MONTH, month); + updateDateControl(); + onDateTimeChanged(); + } + + /** + * Get current day of the month + * + * @return The day of the month + */ + public int getCurrentDay() { + return mDate.get(Calendar.DAY_OF_MONTH); + } + + /** + * Set current day of the month + * + * @param dayOfMonth The day of the month + */ + public void setCurrentDay(int dayOfMonth) { + if (!mInitialising && dayOfMonth == getCurrentDay()) { + return; + } + mDate.set(Calendar.DAY_OF_MONTH, dayOfMonth); + updateDateControl(); + onDateTimeChanged(); + } +//上述一大段代码实现的功能是得到year、month、day等值 + /** + * Get current hour in 24 hour mode, in the range (0~23) + * @return The current hour in 24 hour mode + */ + public int getCurrentHourOfDay() { + return mDate.get(Calendar.HOUR_OF_DAY); + } + + private int getCurrentHour() { + if (mIs24HourView){ + return getCurrentHourOfDay(); + } else { + int hour = getCurrentHourOfDay(); + if (hour > HOURS_IN_HALF_DAY) { + return hour - HOURS_IN_HALF_DAY; + } else { + return hour == 0 ? HOURS_IN_HALF_DAY : hour; + } + } + } + + /** + * Set current hour in 24 hour mode, in the range (0~23) + * + * @param hourOfDay + */ + public void setCurrentHour(int hourOfDay) { + if (!mInitialising && hourOfDay == getCurrentHourOfDay()) { + return; + } + mDate.set(Calendar.HOUR_OF_DAY, hourOfDay); + if (!mIs24HourView) { + if (hourOfDay >= HOURS_IN_HALF_DAY) { + mIsAm = false; + if (hourOfDay > HOURS_IN_HALF_DAY) { + hourOfDay -= HOURS_IN_HALF_DAY; + } + } else { + mIsAm = true; + if (hourOfDay == 0) { + hourOfDay = HOURS_IN_HALF_DAY; + } + } + updateAmPmControl(); + } + mHourSpinner.setValue(hourOfDay); + onDateTimeChanged(); + } + + /** + * Get currentMinute + * + * @return The Current Minute + */ + public int getCurrentMinute() { + return mDate.get(Calendar.MINUTE); + } + + /** + * Set current minute + */ + public void setCurrentMinute(int minute) { + if (!mInitialising && minute == getCurrentMinute()) { + return; + } + mMinuteSpinner.setValue(minute); + mDate.set(Calendar.MINUTE, minute); + onDateTimeChanged(); + } + + /** + * @return true if this is in 24 hour view else false. + */ + public boolean is24HourView () { + return mIs24HourView; + } + + /** + * Set whether in 24 hour or AM/PM mode. + * + * @param is24HourView True for 24 hour mode. False for AM/PM mode. + */ + public void set24HourView(boolean is24HourView) { + if (mIs24HourView == is24HourView) { + return; + } + mIs24HourView = is24HourView; + mAmPmSpinner.setVisibility(is24HourView ? View.GONE : View.VISIBLE); + int hour = getCurrentHourOfDay(); + updateHourControl(); + setCurrentHour(hour); + updateAmPmControl(); + } + + private void updateDateControl() { + Calendar cal = Calendar.getInstance(); + cal.setTimeInMillis(mDate.getTimeInMillis()); + cal.add(Calendar.DAY_OF_YEAR, -DAYS_IN_ALL_WEEK / 2 - 1); + mDateSpinner.setDisplayedValues(null); + for (int i = 0; i < DAYS_IN_ALL_WEEK; ++i) { + cal.add(Calendar.DAY_OF_YEAR, 1); + mDateDisplayValues[i] = (String) DateFormat.format("MM.dd EEEE", cal); + } + mDateSpinner.setDisplayedValues(mDateDisplayValues); + mDateSpinner.setValue(DAYS_IN_ALL_WEEK / 2); + mDateSpinner.invalidate(); + }//一个关于星期几的算法 + + private void updateAmPmControl() { + if (mIs24HourView) { + mAmPmSpinner.setVisibility(View.GONE); + } else { + int index = mIsAm ? Calendar.AM : Calendar.PM; + mAmPmSpinner.setValue(index); + mAmPmSpinner.setVisibility(View.VISIBLE); + } + }//判断上午下午的算法 + + private void updateHourControl() { + if (mIs24HourView) { + mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_24_HOUR_VIEW); + mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_24_HOUR_VIEW); + } else { + mHourSpinner.setMinValue(HOUR_SPINNER_MIN_VAL_12_HOUR_VIEW); + mHourSpinner.setMaxValue(HOUR_SPINNER_MAX_VAL_12_HOUR_VIEW); + }//小时的算法 + } + + /** + * Set the callback that indicates the 'Set' button has been pressed. + * @param callback the callback, if null will do nothing + */ + public void setOnDateTimeChangedListener(OnDateTimeChangedListener callback) { + mOnDateTimeChangedListener = callback; + } + + private void onDateTimeChanged() { + if (mOnDateTimeChangedListener != null) { + mOnDateTimeChangedListener.onDateTimeChanged(this, getCurrentYear(), + getCurrentMonth(), getCurrentDay(), getCurrentHourOfDay(), getCurrentMinute()); + } + } +} diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java b/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java rename to src/main/java/net/micode/notes/ui/DateTimePickerDialog.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java b/src/main/java/net/micode/notes/ui/DropdownMenu.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/DropdownMenu.java rename to src/main/java/net/micode/notes/ui/DropdownMenu.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java b/src/main/java/net/micode/notes/ui/FoldersListAdapter.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java rename to src/main/java/net/micode/notes/ui/FoldersListAdapter.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java similarity index 85% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java rename to src/main/java/net/micode/notes/ui/NoteEditActivity.java index 6a7c530..f03c586 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/main/java/net/micode/notes/ui/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; @@ -51,6 +52,19 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; +import android.graphics.Typeface; +import android.speech.tts.TextToSpeech; +import android.speech.tts.TextToSpeech.OnInitListener; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; + + + + + import net.micode.notes.R; import net.micode.notes.data.Notes; @@ -62,16 +76,23 @@ import net.micode.notes.tool.ResourceParser; import net.micode.notes.tool.ResourceParser.TextAppearanceResources; import net.micode.notes.ui.DateTimePickerDialog.OnDateTimeSetListener; import net.micode.notes.ui.NoteEditText.OnTextViewChangeListener; +import net.micode.notes.ui.translate_demo.BaiduTranslateService; +import net.micode.notes.ui.translate_demo.MD5Utils; +import net.micode.notes.ui.translate_demo.RespondBean; import net.micode.notes.widget.NoteWidgetProvider_2x; import net.micode.notes.widget.NoteWidgetProvider_4x; import java.util.HashMap; import java.util.HashSet; +import java.util.Locale; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; + +/*translate*/ + public class NoteEditActivity extends Activity implements OnClickListener, NoteSettingChangedListener, OnTextViewChangeListener { private class HeadViewHolder { @@ -85,6 +106,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private static final Map sBgSelectorBtnsMap = new HashMap(); + static { sBgSelectorBtnsMap.put(R.id.iv_bg_yellow, ResourceParser.YELLOW); sBgSelectorBtnsMap.put(R.id.iv_bg_red, ResourceParser.RED); @@ -94,6 +116,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private static final Map sBgSelectorSelectionMap = new HashMap(); + static { sBgSelectorSelectionMap.put(ResourceParser.YELLOW, R.id.iv_bg_yellow_select); sBgSelectorSelectionMap.put(ResourceParser.RED, R.id.iv_bg_red_select); @@ -103,6 +126,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private static final Map sFontSizeBtnsMap = new HashMap(); + static { sFontSizeBtnsMap.put(R.id.ll_font_large, ResourceParser.TEXT_LARGE); sFontSizeBtnsMap.put(R.id.ll_font_small, ResourceParser.TEXT_SMALL); @@ -111,6 +135,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private static final Map sFontSelectorSelectionMap = new HashMap(); + static { sFontSelectorSelectionMap.put(ResourceParser.TEXT_LARGE, R.id.iv_large_select); sFontSelectorSelectionMap.put(ResourceParser.TEXT_SMALL, R.id.iv_small_select); @@ -149,6 +174,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, private String mUserQuery; private Pattern mPattern; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -214,7 +240,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, getWindow().setSoftInputMode( WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); - } else if(TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { + } else if (TextUtils.equals(Intent.ACTION_INSERT_OR_EDIT, intent.getAction())) { // New note long folderId = intent.getLongExtra(Notes.INTENT_EXTRA_FOLDER_ID, 0); int widgetId = intent.getIntExtra(Notes.INTENT_EXTRA_WIDGET_ID, @@ -309,7 +335,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, } else { mNoteHeaderHolder.tvAlertDate.setVisibility(View.GONE); mNoteHeaderHolder.ivAlertIcon.setVisibility(View.GONE); - }; + } + ; } @Override @@ -350,7 +377,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, } private boolean inRangeOfView(View view, MotionEvent ev) { - int []location = new int[2]; + int[] location = new int[2]; view.getLocationOnScreen(location); int x = location[0]; int y = location[1]; @@ -358,12 +385,29 @@ public class NoteEditActivity extends Activity implements OnClickListener, || ev.getX() > (x + view.getWidth()) || ev.getY() < y || ev.getY() > (y + view.getHeight())) { - return false; - } + return false; + } return true; } + private void texttoSpeech() { + mTTS.speak(mNoteEditor.getText().toString(), TextToSpeech.QUEUE_FLUSH, null, null); + } + + private TextToSpeech mTTS; + private void initResources() { + mTTS = new TextToSpeech(this, new OnInitListener() { + @Override + public void onInit(int status) { + if (status == TextToSpeech.SUCCESS) { + mTTS.setLanguage(Locale.CHINESE); + mTTS.setPitch(0.8f); + mTTS.setSpeechRate(0.8f); + } + + } + }); mHeadViewPanel = findViewById(R.id.note_title); mNoteHeaderHolder = new HeadViewHolder(); mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); @@ -383,7 +427,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, for (int id : sFontSizeBtnsMap.keySet()) { View view = findViewById(id); view.setOnClickListener(this); - }; + } + ; mSharedPrefs = PreferenceManager.getDefaultSharedPreferences(this); mFontSizeId = mSharedPrefs.getInt(PREFERENCE_FONT_SIZE, ResourceParser.BG_DEFAULT_FONT_SIZE); /** @@ -391,16 +436,17 @@ public class NoteEditActivity extends Activity implements OnClickListener, * The id may larger than the length of resources, in this case, * return the {@link ResourceParser#BG_DEFAULT_FONT_SIZE} */ - if(mFontSizeId >= TextAppearanceResources.getResourcesSize()) { + if (mFontSizeId >= TextAppearanceResources.getResourcesSize()) { mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE; } mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); } + @Override protected void onPause() { super.onPause(); - if(saveNote()) { + if (saveNote()) { Log.d(TAG, "Note data was saved with length:" + mWorkingNote.getContent().length()); } clearSettingState(); @@ -417,20 +463,51 @@ public class NoteEditActivity extends Activity implements OnClickListener, return; } - intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[] { - mWorkingNote.getWidgetId() + intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, new int[]{ + mWorkingNote.getWidgetId() }); sendBroadcast(intent); setResult(RESULT_OK, intent); } + public void showSingleAlterDioglog() { + final String[] items = {"楷体", "行楷", "仿宋", "隶书", "LCALLIG", "BERNHC"}; + AlertDialog.Builder alterBuilder = new AlertDialog.Builder(this); + alterBuilder.setTitle("选择字体"); + alterBuilder.setSingleChoiceItems(items, 0, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + if (i == 0) { + Typeface typeface0 = Typeface.createFromAsset(getAssets(), "front/楷体.TTF"); + mNoteEditor.setTypeface(typeface0); + } else if (i == 1) { + Typeface typeface1 = Typeface.createFromAsset(getAssets(), "front/行楷.TTF"); + mNoteEditor.setTypeface(typeface1); + } else if (i == 2) { + Typeface typeface2 = Typeface.createFromAsset(getAssets(), "front/仿宋.TTF"); + mNoteEditor.setTypeface(typeface2); + } else if (i == 3) { + Typeface typeface3 = Typeface.createFromAsset(getAssets(), "front/隶书.TTF"); + mNoteEditor.setTypeface(typeface3); + } else if (i == 4) { + Typeface typeface4 = Typeface.createFromAsset(getAssets(), "front/LCALLIG.TTF"); + mNoteEditor.setTypeface(typeface4); + } else if (i == 5) { + Typeface typeface5 = Typeface.createFromAsset(getAssets(), "front/BERNHC.TTF"); + mNoteEditor.setTypeface(typeface5); + } + } + }); + alterBuilder.show(); + } + public void onClick(View v) { 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.VISIBLE); } else if (sBgSelectorBtnsMap.containsKey(id)) { findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility( View.GONE); @@ -454,7 +531,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, @Override public void onBackPressed() { - if(clearSettingState()) { + if (clearSettingState()) { return; } @@ -507,36 +584,56 @@ public class NoteEditActivity extends Activity implements OnClickListener, @Override public boolean onOptionsItemSelected(MenuItem item) { - int itemId = item.getItemId(); - if (itemId == R.id.menu_delete) { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_note)); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - deleteCurrentNote(); - finish(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - } else if (itemId == R.id.menu_font_size) { - mFontSizeSelector.setVisibility(View.VISIBLE); - findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); - } else if (itemId == R.id.menu_list_mode) { - mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? - TextNote.MODE_CHECK_LIST : 0); - } else if (itemId == R.id.menu_share) { - getWorkingText(); - sendTo(this, mWorkingNote.getContent()); - } else if (itemId == R.id.menu_send_to_desktop) { - sendToDesktop(); - } else if (itemId == R.id.menu_alert) { - setReminder(); - } else if (itemId == R.id.menu_delete_remind) { - mWorkingNote.setAlertDate(0, false); + switch (item.getItemId()) { + case R.id.menu_new_note: + createNewNote(); + break; + case R.id.menu_delete: + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(getString(R.string.alert_title_delete)); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setMessage(getString(R.string.alert_message_delete_note)); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + deleteCurrentNote(); + finish(); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); + break; + case R.id.menu_font_size: + mFontSizeSelector.setVisibility(View.VISIBLE); + findViewById(sFontSelectorSelectionMap.get(mFontSizeId)).setVisibility(View.VISIBLE); + break; + case R.id.menu_list_mode: + mWorkingNote.setCheckListMode(mWorkingNote.getCheckListMode() == 0 ? + TextNote.MODE_CHECK_LIST : 0); + break; + case R.id.menu_voice_mix: + Log.d("voice mix", "in"); + texttoSpeech(); + break; + case R.id.menu_share: + getWorkingText(); + sendTo(this, mWorkingNote.getContent()); + break; + case R.id.menu_send_to_desktop: + sendToDesktop(); + break; + case R.id.menu_alert: + setReminder(); + break; + case R.id.menu_delete_remind: + mWorkingNote.setAlertDate(0, false); + break; + default: + break; + case R.id.menu_font_select: + showSingleAlterDioglog(); + break; + } return true; } @@ -545,7 +642,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, DateTimePickerDialog d = new DateTimePickerDialog(this, System.currentTimeMillis()); d.setOnDateTimeSetListener(new OnDateTimeSetListener() { public void OnDateTimeSet(AlertDialog dialog, long date) { - mWorkingNote.setAlertDate(date , true); + mWorkingNote.setAlertDate(date, true); } }); d.show(); @@ -614,7 +711,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0); AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE)); showAlertHeader(); - if(!set) { + if (!set) { alarmManager.cancel(pendingIntent); } else { alarmManager.set(AlarmManager.RTC_WAKEUP, date, pendingIntent); @@ -647,7 +744,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, mEditTextList.removeViewAt(index); NoteEditText edit = null; - if(index == 0) { + if (index == 0) { edit = (NoteEditText) mEditTextList.getChildAt(0).findViewById( R.id.et_edit_text); } else { @@ -664,7 +761,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, /** * Should not happen, check for debug */ - if(index > mEditTextList.getChildCount()) { + if (index > mEditTextList.getChildCount()) { Log.e(TAG, "Index out of mEditTextList boundrary, should not happen"); } @@ -684,7 +781,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, String[] items = text.split("\n"); int index = 0; for (String item : items) { - if(!TextUtils.isEmpty(item)) { + if (!TextUtils.isEmpty(item)) { mEditTextList.addView(getListItem(item, index)); index++; } @@ -749,7 +846,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, Log.e(TAG, "Wrong index, should not happen"); return; } - if(hasText) { + if (hasText) { mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.VISIBLE); } else { mEditTextList.getChildAt(index).findViewById(R.id.cb_edit_item).setVisibility(View.GONE); @@ -858,4 +955,4 @@ public class NoteEditActivity extends Activity implements OnClickListener, private void showToast(int resId, int duration) { Toast.makeText(this, resId, duration).show(); } -} +} \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java b/src/main/java/net/micode/notes/ui/NoteEditText.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteEditText.java rename to src/main/java/net/micode/notes/ui/NoteEditText.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java b/src/main/java/net/micode/notes/ui/NoteItemData.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NoteItemData.java rename to src/main/java/net/micode/notes/ui/NoteItemData.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java similarity index 83% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java rename to src/main/java/net/micode/notes/ui/NotesListActivity.java index 6db3761..98d6d86 100644 --- a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -79,6 +79,8 @@ import java.io.InputStreamReader; import java.util.HashSet; public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { + /*首页背景切换*/ + private int mode = -1; private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; private static final int FOLDER_LIST_QUERY_TOKEN = 1; @@ -122,7 +124,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private static final String TAG = "NotesListActivity"; public static final int NOTES_LISTVIEW_SCROLL_RATE = 30; - + public static int secret_mode = 0; private NoteItemData mFocusNoteDataItem; private static final String NORMAL_SELECTION = NoteColumns.PARENT_ID + "=?"; @@ -139,6 +141,7 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.note_list); + getWindow().setBackgroundDrawableResource(R.drawable.fish); initResources(); /** @@ -319,26 +322,28 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt return true; } - int itemId = item.getItemId(); - if (itemId == R.id.delete) { - AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); - builder.setTitle(getString(R.string.alert_title_delete)); - builder.setIcon(android.R.drawable.ic_dialog_alert); - builder.setMessage(getString(R.string.alert_message_delete_notes, - mNotesListAdapter.getSelectedCount())); - builder.setPositiveButton(android.R.string.ok, - new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - batchDelete(); - } - }); - builder.setNegativeButton(android.R.string.cancel, null); - builder.show(); - } else if (itemId == R.id.move) { - startQueryDestinationFolders(); - } else { - return false; + switch (item.getItemId()) { + case R.id.delete: + AlertDialog.Builder builder = new AlertDialog.Builder(NotesListActivity.this); + builder.setTitle(getString(R.string.alert_title_delete)); + builder.setIcon(android.R.drawable.ic_dialog_alert); + builder.setMessage(getString(R.string.alert_message_delete_notes, + mNotesListAdapter.getSelectedCount())); + builder.setPositiveButton(android.R.string.ok, + new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + batchDelete(); + } + }); + builder.setNegativeButton(android.R.string.cancel, null); + builder.show(); + break; + case R.id.move: + startQueryDestinationFolders(); + break; + default: + return false; } return true; } @@ -409,10 +414,35 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt private void startAsyncNotesListQuery() { String selection = (mCurrentFolderId == Notes.ID_ROOT_FOLDER) ? ROOT_FOLDER_SELECTION : NORMAL_SELECTION; - mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, - Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[] { - String.valueOf(mCurrentFolderId) - }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + if(secret_mode == 0) { + mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, + Notes.CONTENT_NOTE_URI, NoteItemData.PROJECTION, selection, new String[]{ + String.valueOf(mCurrentFolderId) + }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + } + else{ + String str1 = "666"; + String [] PROJECTION = new String [] { //定义一个新的PROJECTION数组，只换掉SNIPPET + NoteColumns.ID, + NoteColumns.ALERTED_DATE, + NoteColumns.BG_COLOR_ID, + NoteColumns.CREATED_DATE, + NoteColumns.HAS_ATTACHMENT, + NoteColumns.MODIFIED_DATE, + NoteColumns.NOTES_COUNT, + NoteColumns.PARENT_ID, +// NoteColumns.SNIPPET, + str1, + NoteColumns.TYPE, + NoteColumns.WIDGET_ID, + NoteColumns.WIDGET_TYPE, + }; + mBackgroundQueryHandler.startQuery(FOLDER_NOTE_LIST_QUERY_TOKEN, null, + Notes.CONTENT_NOTE_URI, PROJECTION, selection, new String[]{ + String.valueOf(mCurrentFolderId) + }, NoteColumns.TYPE + " DESC," + NoteColumns.MODIFIED_DATE + " DESC"); + + } } private final class BackgroundQueryHandler extends AsyncQueryHandler { @@ -556,8 +586,12 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } public void onClick(View v) { - if (v.getId() == R.id.btn_new_note) { - createNewNote(); + switch (v.getId()) { + case R.id.btn_new_note: + createNewNote(); + break; + default: + break; } } @@ -769,32 +803,107 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt } else { Log.e(TAG, "Wrong state:" + mState); } + + if (mode == 1) { + menu.findItem(R.id.menu_fish).setVisible(false); + } else if (mode == 0){ + menu.findItem(R.id.menu_flower).setVisible(false); + } + if(secret_mode == 1) + menu.findItem(R.id.menu_secret).setVisible(false); + else + menu.findItem(R.id.menu_quit_secret).setVisible(false); return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { - int itemId = item.getItemId(); - if (itemId == R.id.menu_new_folder) { - showCreateOrModifyFolderDialog(true); - } else if (itemId == R.id.menu_export_text) { - exportNoteToText(); - } else if (itemId == R.id.menu_sync) { - if (isSyncMode()) { - if (TextUtils.equals(item.getTitle(), getString(R.string.menu_sync))) { - GTaskSyncService.startSync(this); + switch (item.getItemId()) { + case R.id.menu_secret: { //进入私密模式 + secret_mode = 1; + AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); + dialog.setTitle("重要提醒"); + dialog.setMessage("您确认进入私密模式吗？"); + dialog.setCancelable(false); + dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + startAsyncNotesListQuery(); + Toast.makeText(NotesListActivity.this,"您已进入私密模式",Toast.LENGTH_SHORT).show(); + } + }); + dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which){} + }); + dialog.show(); + startAsyncNotesListQuery(); + Toast.makeText(this,"您已进入私密模式",Toast.LENGTH_SHORT).show(); + break; + } + case R.id.menu_quit_secret:{ //退出私密模式 + secret_mode = 0; + AlertDialog.Builder dialog = new AlertDialog.Builder(NotesListActivity.this); + dialog.setTitle("重要提醒"); + dialog.setMessage("您确认退出私密模式吗？"); + dialog.setCancelable(false); + dialog.setPositiveButton("确认", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + startAsyncNotesListQuery(); + Toast.makeText(NotesListActivity.this,"您已退出私密模式",Toast.LENGTH_SHORT).show(); + } + }); + dialog.setNegativeButton("取消", new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which){} + }); + dialog.show(); + break; + } + case R.id.menu_fish: { + mode = 1; + getWindow().setBackgroundDrawableResource(R.drawable.fish); + break; + } + case R.id.menu_flower: { + mode = 0; + getWindow().setBackgroundDrawableResource(R.drawable.flower); + break; + } + case R.id.menu_new_folder: { + showCreateOrModifyFolderDialog(true); + break; + } + case R.id.menu_export_text: { + exportNoteToText(); + break; + } + 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 { - GTaskSyncService.cancelSync(this); + startPreferenceActivity(); } - } else { + break; + } + case R.id.menu_setting: { startPreferenceActivity(); + break; + } + case R.id.menu_new_note: { + createNewNote(); + break; } - } else if (itemId == R.id.menu_setting) { - startPreferenceActivity(); - } else if (itemId == R.id.menu_new_note) { - createNewNote(); - } else if (itemId == R.id.menu_search) { - onSearchRequested(); + case R.id.menu_search: + onSearchRequested(); + break; + default: + break; } return true; } diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java b/src/main/java/net/micode/notes/ui/NotesListAdapter.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListAdapter.java rename to src/main/java/net/micode/notes/ui/NotesListAdapter.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java b/src/main/java/net/micode/notes/ui/NotesListItem.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesListItem.java rename to src/main/java/net/micode/notes/ui/NotesListItem.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java b/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java rename to src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java diff --git a/src/main/java/net/micode/notes/ui/translate_demo/BaiduTranslateService.java b/src/main/java/net/micode/notes/ui/translate_demo/BaiduTranslateService.java new file mode 100644 index 0000000..f3facc7 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/translate_demo/BaiduTranslateService.java @@ -0,0 +1,23 @@ +package net.micode.notes.ui.translate_demo; +import retrofit2.Call; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; +import retrofit2.http.POST; +//源URL https://fanyi-api.baidu.com/api/trans/vip/translate +//参数如下 +// String q 英文单词/中文 +// String from 原始语种 zh中文/eh英文 +// String to 目标语种 zh中文/eh英文 +// String from zh中文/eh英文 +// String appid 你的appid +// String salt 随机数（整形转字符串） +// String sign 签名 32位字母小写MD5编码的 appid+q+salt+密钥 +public interface BaiduTranslateService { + //翻译接口 + //表示提交表单数据，@Field注解键名 + //适用于数据量少的情况 + @POST("translate") + @FormUrlEncoded + Call translate(@Field("q") String q, @Field("from") String from, @Field("to") String to, @Field("appid") String appid, @Field("salt") String salt, + @Field("sign") String sign); +} \ No newline at end of file diff --git a/src/main/java/net/micode/notes/ui/translate_demo/MD5Utils.java b/src/main/java/net/micode/notes/ui/translate_demo/MD5Utils.java new file mode 100644 index 0000000..6bb5829 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/translate_demo/MD5Utils.java @@ -0,0 +1,34 @@ +package net.micode.notes.ui.translate_demo; +import java.security.MessageDigest; + +/** + * 加密解密工具类(对字符串加密) MD5加密 + */ +public class MD5Utils { + + /** + * MD5加密算法使用 对字符串加密 + * + * @param info 参数为需要加密的String + * @return 返回加密后的String + */ + public static String getMD5Code(String info) { + try { + MessageDigest md5 = MessageDigest.getInstance("MD5"); + md5.update(info.getBytes("utf-8"));//设置编码格式 + byte[] encryption = md5.digest(); + StringBuffer stringBuffer = new StringBuffer(); + for (int i = 0; i < encryption.length; i++) { + if (Integer.toHexString(0xff & encryption[i]).length() == 1) { + stringBuffer.append("0").append(Integer.toHexString(0xff & encryption[i])); + } else { + stringBuffer.append(Integer.toHexString(0xff & encryption[i])); + } + } + return stringBuffer.toString(); + } catch (Exception e) { + return "MD5加密异常"; + } + } + +} \ No newline at end of file diff --git a/src/main/java/net/micode/notes/ui/translate_demo/RespondBean.java b/src/main/java/net/micode/notes/ui/translate_demo/RespondBean.java new file mode 100644 index 0000000..8496216 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/translate_demo/RespondBean.java @@ -0,0 +1,65 @@ +package net.micode.notes.ui.translate_demo; +import java.util.List; + +public class RespondBean { + + /** + * from : zh + * to : en + * trans_result : [{"src":"你好","dst":"Hello"}] + */ + + private String from; + private String to; + private List trans_result; + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + + public String getTo() { + return to; + } + + public void setTo(String to) { + this.to = to; + } + + public List getTrans_result() { + return trans_result; + } + + public void setTrans_result(List trans_result) { + this.trans_result = trans_result; + } + + public static class TransResultBean { + /** + * src : 你好 + * dst : Hello + */ + + private String src; + private String dst; + + public String getSrc() { + return src; + } + + public void setSrc(String src) { + this.src = src; + } + + public String getDst() { + return dst; + } + + public void setDst(String dst) { + this.dst = dst; + } + } +} \ No newline at end of file diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java diff --git a/src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java b/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java similarity index 100% rename from src/Notes-master1/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java rename to src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml b/src/main/res/color/primary_text_dark.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/color/primary_text_dark.xml rename to src/main/res/color/primary_text_dark.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml b/src/main/res/color/secondary_text_dark.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/color/secondary_text_dark.xml rename to src/main/res/color/secondary_text_dark.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_btn_set_color.png b/src/main/res/drawable-hdpi/bg_btn_set_color.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_btn_set_color.png rename to src/main/res/drawable-hdpi/bg_btn_set_color.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_color_btn_mask.png b/src/main/res/drawable-hdpi/bg_color_btn_mask.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/bg_color_btn_mask.png rename to src/main/res/drawable-hdpi/bg_color_btn_mask.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/call_record.png b/src/main/res/drawable-hdpi/call_record.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/call_record.png rename to src/main/res/drawable-hdpi/call_record.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/clock.png b/src/main/res/drawable-hdpi/clock.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/clock.png rename to src/main/res/drawable-hdpi/clock.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/delete.png b/src/main/res/drawable-hdpi/delete.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/delete.png rename to src/main/res/drawable-hdpi/delete.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/dropdown_icon.9.png b/src/main/res/drawable-hdpi/dropdown_icon.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/dropdown_icon.9.png rename to src/main/res/drawable-hdpi/dropdown_icon.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_blue.9.png b/src/main/res/drawable-hdpi/edit_blue.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_blue.9.png rename to src/main/res/drawable-hdpi/edit_blue.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_green.9.png b/src/main/res/drawable-hdpi/edit_green.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_green.9.png rename to src/main/res/drawable-hdpi/edit_green.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_red.9.png b/src/main/res/drawable-hdpi/edit_red.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_red.9.png rename to src/main/res/drawable-hdpi/edit_red.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_blue.9.png b/src/main/res/drawable-hdpi/edit_title_blue.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_blue.9.png rename to src/main/res/drawable-hdpi/edit_title_blue.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_green.9.png b/src/main/res/drawable-hdpi/edit_title_green.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_green.9.png rename to src/main/res/drawable-hdpi/edit_title_green.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_red.9.png b/src/main/res/drawable-hdpi/edit_title_red.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_red.9.png rename to src/main/res/drawable-hdpi/edit_title_red.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_white.9.png b/src/main/res/drawable-hdpi/edit_title_white.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_white.9.png rename to src/main/res/drawable-hdpi/edit_title_white.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_yellow.9.png b/src/main/res/drawable-hdpi/edit_title_yellow.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_title_yellow.9.png rename to src/main/res/drawable-hdpi/edit_title_yellow.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_white.9.png b/src/main/res/drawable-hdpi/edit_white.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_white.9.png rename to src/main/res/drawable-hdpi/edit_white.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_yellow.9.png b/src/main/res/drawable-hdpi/edit_yellow.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/edit_yellow.9.png rename to src/main/res/drawable-hdpi/edit_yellow.9.png diff --git a/src/main/res/drawable-hdpi/fish.png b/src/main/res/drawable-hdpi/fish.png new file mode 100644 index 0000000..08cb702 Binary files /dev/null and b/src/main/res/drawable-hdpi/fish.png differ diff --git a/src/main/res/drawable-hdpi/flower.png b/src/main/res/drawable-hdpi/flower.png new file mode 100644 index 0000000..b90f384 Binary files /dev/null and b/src/main/res/drawable-hdpi/flower.png differ diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_large.png b/src/main/res/drawable-hdpi/font_large.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_large.png rename to src/main/res/drawable-hdpi/font_large.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_normal.png b/src/main/res/drawable-hdpi/font_normal.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_normal.png rename to src/main/res/drawable-hdpi/font_normal.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_size_selector_bg.9.png b/src/main/res/drawable-hdpi/font_size_selector_bg.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_size_selector_bg.9.png rename to src/main/res/drawable-hdpi/font_size_selector_bg.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_small.png b/src/main/res/drawable-hdpi/font_small.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_small.png rename to src/main/res/drawable-hdpi/font_small.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_super.png b/src/main/res/drawable-hdpi/font_super.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/font_super.png rename to src/main/res/drawable-hdpi/font_super.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/icon_app.png b/src/main/res/drawable-hdpi/icon_app.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/icon_app.png rename to src/main/res/drawable-hdpi/icon_app.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_background.png b/src/main/res/drawable-hdpi/list_background.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_background.png rename to src/main/res/drawable-hdpi/list_background.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_down.9.png b/src/main/res/drawable-hdpi/list_blue_down.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_down.9.png rename to src/main/res/drawable-hdpi/list_blue_down.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_middle.9.png b/src/main/res/drawable-hdpi/list_blue_middle.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_middle.9.png rename to src/main/res/drawable-hdpi/list_blue_middle.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_single.9.png b/src/main/res/drawable-hdpi/list_blue_single.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_single.9.png rename to src/main/res/drawable-hdpi/list_blue_single.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_up.9.png b/src/main/res/drawable-hdpi/list_blue_up.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_blue_up.9.png rename to src/main/res/drawable-hdpi/list_blue_up.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_folder.9.png b/src/main/res/drawable-hdpi/list_folder.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_folder.9.png rename to src/main/res/drawable-hdpi/list_folder.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_footer_bg.9.png b/src/main/res/drawable-hdpi/list_footer_bg.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_footer_bg.9.png rename to src/main/res/drawable-hdpi/list_footer_bg.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_down.9.png b/src/main/res/drawable-hdpi/list_green_down.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_down.9.png rename to src/main/res/drawable-hdpi/list_green_down.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_middle.9.png b/src/main/res/drawable-hdpi/list_green_middle.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_middle.9.png rename to src/main/res/drawable-hdpi/list_green_middle.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_single.9.png b/src/main/res/drawable-hdpi/list_green_single.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_single.9.png rename to src/main/res/drawable-hdpi/list_green_single.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_up.9.png b/src/main/res/drawable-hdpi/list_green_up.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_green_up.9.png rename to src/main/res/drawable-hdpi/list_green_up.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_down.9.png b/src/main/res/drawable-hdpi/list_red_down.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_down.9.png rename to src/main/res/drawable-hdpi/list_red_down.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_middle.9.png b/src/main/res/drawable-hdpi/list_red_middle.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_middle.9.png rename to src/main/res/drawable-hdpi/list_red_middle.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_single.9.png b/src/main/res/drawable-hdpi/list_red_single.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_single.9.png rename to src/main/res/drawable-hdpi/list_red_single.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_up.9.png b/src/main/res/drawable-hdpi/list_red_up.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_red_up.9.png rename to src/main/res/drawable-hdpi/list_red_up.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_down.9.png b/src/main/res/drawable-hdpi/list_white_down.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_down.9.png rename to src/main/res/drawable-hdpi/list_white_down.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_middle.9.png b/src/main/res/drawable-hdpi/list_white_middle.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_middle.9.png rename to src/main/res/drawable-hdpi/list_white_middle.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_single.9.png b/src/main/res/drawable-hdpi/list_white_single.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_single.9.png rename to src/main/res/drawable-hdpi/list_white_single.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_up.9.png b/src/main/res/drawable-hdpi/list_white_up.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_white_up.9.png rename to src/main/res/drawable-hdpi/list_white_up.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_down.9.png b/src/main/res/drawable-hdpi/list_yellow_down.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_down.9.png rename to src/main/res/drawable-hdpi/list_yellow_down.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_middle.9.png b/src/main/res/drawable-hdpi/list_yellow_middle.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_middle.9.png rename to src/main/res/drawable-hdpi/list_yellow_middle.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_single.9.png b/src/main/res/drawable-hdpi/list_yellow_single.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_single.9.png rename to src/main/res/drawable-hdpi/list_yellow_single.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_up.9.png b/src/main/res/drawable-hdpi/list_yellow_up.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/list_yellow_up.9.png rename to src/main/res/drawable-hdpi/list_yellow_up.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_delete.png b/src/main/res/drawable-hdpi/menu_delete.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_delete.png rename to src/main/res/drawable-hdpi/menu_delete.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_move.png b/src/main/res/drawable-hdpi/menu_move.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/menu_move.png rename to src/main/res/drawable-hdpi/menu_move.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_normal.png b/src/main/res/drawable-hdpi/new_note_normal.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_normal.png rename to src/main/res/drawable-hdpi/new_note_normal.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_pressed.png b/src/main/res/drawable-hdpi/new_note_pressed.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/new_note_pressed.png rename to src/main/res/drawable-hdpi/new_note_pressed.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/note_edit_color_selector_panel.png b/src/main/res/drawable-hdpi/note_edit_color_selector_panel.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/note_edit_color_selector_panel.png rename to src/main/res/drawable-hdpi/note_edit_color_selector_panel.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/notification.png b/src/main/res/drawable-hdpi/notification.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/notification.png rename to src/main/res/drawable-hdpi/notification.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/search_result.png b/src/main/res/drawable-hdpi/search_result.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/search_result.png rename to src/main/res/drawable-hdpi/search_result.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/selected.png b/src/main/res/drawable-hdpi/selected.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/selected.png rename to src/main/res/drawable-hdpi/selected.png diff --git a/src/main/res/drawable-hdpi/settings.png b/src/main/res/drawable-hdpi/settings.png new file mode 100644 index 0000000..6d4df75 Binary files /dev/null and b/src/main/res/drawable-hdpi/settings.png differ diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_alert.png b/src/main/res/drawable-hdpi/title_alert.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_alert.png rename to src/main/res/drawable-hdpi/title_alert.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_bar_bg.9.png b/src/main/res/drawable-hdpi/title_bar_bg.9.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/title_bar_bg.9.png rename to src/main/res/drawable-hdpi/title_bar_bg.9.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_blue.png b/src/main/res/drawable-hdpi/widget_2x_blue.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_blue.png rename to src/main/res/drawable-hdpi/widget_2x_blue.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_green.png b/src/main/res/drawable-hdpi/widget_2x_green.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_green.png rename to src/main/res/drawable-hdpi/widget_2x_green.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_red.png b/src/main/res/drawable-hdpi/widget_2x_red.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_red.png rename to src/main/res/drawable-hdpi/widget_2x_red.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_white.png b/src/main/res/drawable-hdpi/widget_2x_white.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_white.png rename to src/main/res/drawable-hdpi/widget_2x_white.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_yellow.png b/src/main/res/drawable-hdpi/widget_2x_yellow.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_2x_yellow.png rename to src/main/res/drawable-hdpi/widget_2x_yellow.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_blue.png b/src/main/res/drawable-hdpi/widget_4x_blue.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_blue.png rename to src/main/res/drawable-hdpi/widget_4x_blue.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_green.png b/src/main/res/drawable-hdpi/widget_4x_green.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_green.png rename to src/main/res/drawable-hdpi/widget_4x_green.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_red.png b/src/main/res/drawable-hdpi/widget_4x_red.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_red.png rename to src/main/res/drawable-hdpi/widget_4x_red.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_white.png b/src/main/res/drawable-hdpi/widget_4x_white.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_white.png rename to src/main/res/drawable-hdpi/widget_4x_white.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_yellow.png b/src/main/res/drawable-hdpi/widget_4x_yellow.png similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable-hdpi-v4/widget_4x_yellow.png rename to src/main/res/drawable-hdpi/widget_4x_yellow.png diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable/new_note.xml b/src/main/res/drawable/new_note.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/drawable/new_note.xml rename to src/main/res/drawable/new_note.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml b/src/main/res/layout/account_dialog_title.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/account_dialog_title.xml rename to src/main/res/layout/account_dialog_title.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml b/src/main/res/layout/add_account_text.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/add_account_text.xml rename to src/main/res/layout/add_account_text.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml b/src/main/res/layout/datetime_picker.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/datetime_picker.xml rename to src/main/res/layout/datetime_picker.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml b/src/main/res/layout/dialog_edit_text.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/dialog_edit_text.xml rename to src/main/res/layout/dialog_edit_text.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml b/src/main/res/layout/folder_list_item.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/folder_list_item.xml rename to src/main/res/layout/folder_list_item.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml b/src/main/res/layout/note_edit.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml rename to src/main/res/layout/note_edit.xml index 10b2aa7..6a1976f 100644 --- a/src/Notes-master1/app/build/intermediates/packaged_res/debug/layout/note_edit.xml +++ b/src/main/res/layout/note_edit.xml @@ -35,9 +35,9 @@ android:id="@+id/tv_modified_date" android:layout_width="0dip" android:layout_height="wrap_content" - android:layout_weight="1" android:layout_gravity="left|center_vertical" android:layout_marginRight="8dip" + android:layout_weight="1" android:textAppearance="@style/TextAppearanceSecondaryItem" /> + android:layout_height="fill_parent"> + + + + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml b/src/main/res/menu/note_list.xml similarity index 76% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml rename to src/main/res/menu/note_list.xml index 42ea736..6c7b52c 100644 --- a/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list.xml +++ b/src/main/res/menu/note_list.xml @@ -36,4 +36,19 @@ + + + + + + + diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml b/src/main/res/menu/note_list_dropdown.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_dropdown.xml rename to src/main/res/menu/note_list_dropdown.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_options.xml b/src/main/res/menu/note_list_options.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/note_list_options.xml rename to src/main/res/menu/note_list_options.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml b/src/main/res/menu/sub_folder.xml similarity index 80% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml rename to src/main/res/menu/sub_folder.xml index b00de26..41fe907 100644 --- a/src/Notes-master1/app/build/intermediates/packaged_res/debug/menu/sub_folder.xml +++ b/src/main/res/menu/sub_folder.xml @@ -21,4 +21,11 @@ + + + \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/raw-zh-rCN/introduction b/src/main/res/raw-zh-rCN/introduction similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/raw-zh-rCN/introduction rename to src/main/res/raw-zh-rCN/introduction diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/raw/introduction b/src/main/res/raw/introduction similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/raw/introduction rename to src/main/res/raw/introduction diff --git a/src/Notes-master1/app/src/main/res/values-zh-rCN/arrays.xml b/src/main/res/values-zh-rCN/arrays.xml similarity index 100% rename from src/Notes-master1/app/src/main/res/values-zh-rCN/arrays.xml rename to src/main/res/values-zh-rCN/arrays.xml diff --git a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml similarity index 98% rename from src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml rename to src/main/res/values-zh-rCN/strings.xml index 09f75ed..211a881 100644 --- a/src/Notes-master1/app/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -119,6 +119,8 @@ 便签 设置 取消 + 私密模式 + 退出私密模式 %1$s 条符合“%2$s”的搜索结果 diff --git a/src/Notes-master1/app/src/main/res/values-zh-rTW/arrays.xml b/src/main/res/values-zh-rTW/arrays.xml similarity index 100% rename from src/Notes-master1/app/src/main/res/values-zh-rTW/arrays.xml rename to src/main/res/values-zh-rTW/arrays.xml diff --git a/src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from src/Notes-master1/app/src/main/res/values-zh-rTW/strings.xml rename to src/main/res/values-zh-rTW/strings.xml diff --git a/src/Notes-master1/app/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml similarity index 100% rename from src/Notes-master1/app/src/main/res/values/arrays.xml rename to src/main/res/values/arrays.xml diff --git a/src/Notes-master1/app/src/main/res/values/colors.xml b/src/main/res/values/colors.xml similarity index 100% rename from src/Notes-master1/app/src/main/res/values/colors.xml rename to src/main/res/values/colors.xml diff --git a/src/Notes-master1/app/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml similarity index 100% rename from src/Notes-master1/app/src/main/res/values/dimens.xml rename to src/main/res/values/dimens.xml diff --git a/src/Notes-master1/app/src/main/res/values/strings.xml b/src/main/res/values/strings.xml similarity index 96% rename from src/Notes-master1/app/src/main/res/values/strings.xml rename to src/main/res/values/strings.xml index 55df868..bec6625 100644 --- a/src/Notes-master1/app/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -38,6 +38,12 @@ /MIUI/notes/ notes_%s.txt + + 背景1：锦鲤 + 背景2：荷花 + 选择字体 + secret model + quit secret model (%d) New Folder diff --git a/src/Notes-master1/app/src/main/res/values/styles.xml b/src/main/res/values/styles.xml similarity index 95% rename from src/Notes-master1/app/src/main/res/values/styles.xml rename to src/main/res/values/styles.xml index d750e65..318860d 100644 --- a/src/Notes-master1/app/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -63,7 +63,7 @@ \ No newline at end of file diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/preferences.xml b/src/main/res/xml/preferences.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/preferences.xml rename to src/main/res/xml/preferences.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/searchable.xml b/src/main/res/xml/searchable.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/searchable.xml rename to src/main/res/xml/searchable.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_2x_info.xml b/src/main/res/xml/widget_2x_info.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_2x_info.xml rename to src/main/res/xml/widget_2x_info.xml diff --git a/src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_4x_info.xml b/src/main/res/xml/widget_4x_info.xml similarity index 100% rename from src/Notes-master1/app/build/intermediates/packaged_res/debug/xml/widget_4x_info.xml rename to src/main/res/xml/widget_4x_info.xml diff --git a/src/widget-provider.txt b/src/widget-provider.txt deleted file mode 100644 index 81ed6ae..0000000 --- a/src/widget-provider.txt +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -/* - * 版权所有 (c) 2010-2011，MiCode 开源社区（www.micode.net） - * - * 根据 Apache 许可证 2.0 版本（"许可证"）获得许可； - * 除非符合许可证，否则您不得使用此文件。 - * 您可以在以下网址获取许可证的副本 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 除非适用法律要求或书面同意，否则根据许可证分发的软件 - * 是基于"按原样"的基础分发的，不提供任何形式的担保或条件， - * 无论是明示的还是暗示的。请参阅许可证以获取特定的语言权限 - * 和限制。 - */ -package net.micode.notes.widget; -import android.app.PendingIntent; -import android.appwidget.AppWidgetManager; -import android.appwidget.AppWidgetProvider; -import android.content.ContentValues; -import android.content.Context; -import android.content.Intent; -import android.database.Cursor; -import android.util.Log; -import android.widget.RemoteViews; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.data.Notes.NoteColumns; -import net.micode.notes.tool.ResourceParser; -import net.micode.notes.ui.NoteEditActivity; -import net.micode.notes.ui.NotesListActivity; - -// 这个类是 NoteWidgetProvider 的一个抽象基类。它扩展了 AppWidgetProvider。 -public abstract class NoteWidgetProvider extends AppWidgetProvider { - // 用于从内容提供程序查询笔记信息的投影。 - public static final String [] PROJECTION = new String [] { - NoteColumns.ID, - NoteColumns.BG_COLOR_ID, - NoteColumns.SNIPPET - }; - - // 代表查询结果中的列的常量。 - public static final int COLUMN_ID = 0; - public static final int COLUMN_BG_COLOR_ID = 1; - public static final int COLUMN_SNIPPET = 2; - - private static final String TAG = "NoteWidgetProvider"; - - // 当小部件实例被删除时调用此方法。 - @Override - public void onDeleted(Context context, int[] appWidgetIds) { - ContentValues values = new ContentValues(); - values.put(NoteColumns.WIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID); - // 更新内容提供程序以解除小部件与笔记的关联。 - for (int i = 0; i < appWidgetIds.length; i++) { - context.getContentResolver().update(Notes.CONTENT_NOTE_URI, - values, - NoteColumns.WIDGET_ID + "=?", - new String[] { String.valueOf(appWidgetIds[i])}); - } - } - // 此方法检索与小部件关联的笔记的信息。 - private Cursor getNoteWidgetInfo(Context context, int widgetId) { - return context.getContentResolver().query(Notes.CONTENT_NOTE_URI, - PROJECTION, - NoteColumns.WIDGET_ID + "=? AND " + NoteColumns.PARENT_ID + "<>?", - new String[] { String.valueOf(widgetId), String.valueOf(Notes.ID_TRASH_FOLER) }, - null); - } - // 此方法用于更新与小部件关联的小部件实例。 - protected void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - update(context, appWidgetManager, appWidgetIds, false); - } - // 此方法用于更新带有启用隐私模式选项的小部件实例。 - private void update(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, - boolean privacyMode) { - for (int i = 0; i < appWidgetIds.length; i++) { - if (appWidgetIds[i] != AppWidgetManager.INVALID_APPWIDGET_ID) { - int bgId = ResourceParser.getDefaultBgId(context); - String snippet = ""; - Intent intent = new Intent(context, NoteEditActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP); - intent.putExtra(Notes.INTENT_EXTRA_WIDGET_ID, appWidgetIds[i]); - intent.putExtra(Notes.INTENT_EXTRA_WIDGET_TYPE, getWidgetType()); - - Cursor c = getNoteWidgetInfo(context, appWidgetIds[i]); - if (c != null && c.moveToFirst()) { - if (c.getCount() > 1) { - Log.e(TAG, "Multiple message with same widget id:" + appWidgetIds[i]); - c.close(); - return; - } - snippet = c.getString(COLUMN_SNIPPET); - bgId = c.getInt(COLUMN_BG_COLOR_ID); - intent.putExtra(Intent.EXTRA_UID, c.getLong(COLUMN_ID)); - intent.setAction(Intent.ACTION_VIEW); - } else { - snippet = context.getResources().getString(R.string.widget_havenot_content); - intent.setAction(Intent.ACTION_INSERT_OR_EDIT); - } - - if (c != null) { - c.close(); - } - // 为小部件创建 RemoteViews 并设置其属性。 - RemoteViews rv = new RemoteViews(context.getPackageName(), getLayoutId()); - rv.setImageViewResource(R.id.widget_bg_image, getBgResourceId(bgId)); - intent.putExtra(Notes.INTENT_EXTRA_BACKGROUND_ID, bgId); - /** - * Generate the pending intent to start host for the widget - */ - // 生成启动小部件点击时相应活动的待定意图。 - PendingIntent pendingIntent = null; - if (privacyMode) { - // 为隐私模式设置文本。 - rv.setTextViewText(R.id.widget_text, - context.getString(R.string.widget_under_visit_mode)); - // 创建一个待定意图，以在隐私模式下启动 NotesListActivity。 - pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], new Intent( - context, NotesListActivity.class), PendingIntent.FLAG_UPDATE_CURRENT); - } else { - // 使用笔记片段设置文本。 - rv.setTextViewText(R.id.widget_text, snippet); - // 创建一个待定意图，以启动 NoteEditActivity 以编辑笔记。 - pendingIntent = PendingIntent.getActivity(context, appWidgetIds[i], intent, - PendingIntent.FLAG_UPDATE_CURRENT); - } - // 设置小部件文本的点击行为。 - rv.setOnClickPendingIntent(R.id.widget_text, pendingIntent); - // 更新小部件实例。 - appWidgetManager.updateAppWidget(appWidgetIds[i], rv); - } - } - } - // 抽象方法，根据背景 ID 获取背景图片资源的资源 ID。 - protected abstract int getBgResourceId(int bgId); - // 抽象方法，获取小部件的布局 ID。 - protected abstract int getLayoutId(); - // 抽象方法，获取小部件的类型。 - protected abstract int getWidgetType(); -} diff --git a/src/widget-provider_2X.txt b/src/widget-provider_2X.txt deleted file mode 100644 index 1f2c6a8..0000000 --- a/src/widget-provider_2X.txt +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * 版权所有 (c) 2010-2011，MiCode 开源社区（www.micode.net） - * - * 根据 Apache 许可证 2.0 版本（"许可证"）获得许可； - * 除非符合许可证，否则您不得使用此文件。 - * 您可以在以下网址获取许可证的副本 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 除非适用法律要求或书面同意，否则根据许可证分发的软件 - * 是基于"按原样"的基础分发的，不提供任何形式的担保或条件， - * 无论是明示的还是暗示的。请参阅许可证以获取特定的语言权限 - * 和限制。 - */ -package net.micode.notes.widget; - -import android.appwidget.AppWidgetManager; -import android.content.Context; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.tool.ResourceParser; - -// NoteWidgetProvider_2x 是 NoteWidgetProvider 的子类，用于处理 2x 小部件。 - -public class NoteWidgetProvider_2x extends NoteWidgetProvider { - // 当小部件需要更新时调用此方法。 - @Override - public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - super.update(context, appWidgetManager, appWidgetIds); - } - // 获取 2x 小部件的布局 ID。 - @Override - protected int getLayoutId() { - return R.layout.widget_2x; - } - // 根据背景 ID 获取 2x 小部件背景图片资源的资源 ID。 - @Override - protected int getBgResourceId(int bgId) { - return ResourceParser.WidgetBgResources.getWidget2xBgResource(bgId); - } - // 获取小部件的类型，这里表示 2x 小部件。 - @Override - protected int getWidgetType() { - return Notes.TYPE_WIDGET_2X; - } -} -//NoteWidgetProvider_2x 类继承自 NoteWidgetProvider，它是处理 2x 小部件的具体实现。 -//onUpdate 方法在小部件需要更新时被调用，它调用了基类的 update 方法来执行小部件的更新。 -//getLayoutId 方法返回 2x 小部件的布局资源 ID。 -//getBgResourceId 方法根据给定的背景 ID 获取 2x 小部件背景图片资源的资源 ID。 -//getWidgetType 方法返回小部件的类型，这里表示 2x 小部件。 \ No newline at end of file diff --git a/src/widget-provider_4X.txt b/src/widget-provider_4X.txt deleted file mode 100644 index c132928..0000000 --- a/src/widget-provider_4X.txt +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (c) 2010-2011, The MiCode Open Source Community (www.micode.net) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* - * 版权所有 (c) 2010-2011，MiCode 开源社区（www.micode.net） - * - * 根据 Apache 许可证 2.0 版本（"许可证"）获得许可； - * 除非符合许可证，否则您不得使用此文件。 - * 您可以在以下网址获取许可证的副本 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 除非适用法律要求或书面同意，否则根据许可证分发的软件 - * 是基于"按原样"的基础分发的，不提供任何形式的担保或条件， - * 无论是明示的还是暗示的。请参阅许可证以获取特定的语言权限 - * 和限制。 - */ -package net.micode.notes.widget; - -import android.appwidget.AppWidgetManager; -import android.content.Context; - -import net.micode.notes.R; -import net.micode.notes.data.Notes; -import net.micode.notes.tool.ResourceParser; - -// NoteWidgetProvider_4x 是 NoteWidgetProvider 的子类，用于处理 4x 小部件。 -public class NoteWidgetProvider_4x extends NoteWidgetProvider { - - // 当小部件需要更新时调用此方法。 - @Override - public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) { - // 调用基类的 update 方法以更新小部件。 - super.update(context, appWidgetManager, appWidgetIds); - } - - // 获取 4x 小部件的布局 ID。 - protected int getLayoutId() { - return R.layout.widget_4x; - } - - // 根据背景 ID 获取 4x 小部件背景图片资源的资源 ID。 - @Override - protected int getBgResourceId(int bgId) { - return ResourceParser.WidgetBgResources.getWidget4xBgResource(bgId); - } - - // 获取小部件的类型，这里表示 4x 小部件。 - @Override - protected int getWidgetType() { - return Notes.TYPE_WIDGET_4X; - } -} - //NoteWidgetProvider_4x 类继承自 NoteWidgetProvider，它是处理 4x 小部件的具体实现。 - //onUpdate 方法在小部件需要更新时被调用，它调用了基类的 update 方法来执行小部件的更新。 - //getLayoutId 方法返回 4x 小部件的布局资源 ID。 - //getBgResourceId 方法根据给定的背景 ID 获取 4x 小部件背景图片资源的资源 ID。 - //getWidgetType 方法返回小部件的类型，这里表示 4x 小部件。 \ No newline at end of file