Skip to content
This repository was archived by the owner on Nov 18, 2024. It is now read-only.

Commit ab4e956

Browse files
JizzuJizzu
committed
Merge dev branch
2 parents 3ef361a + d2a8ade commit ab4e956

57 files changed

Lines changed: 3045 additions & 426 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.idea/assetWizardSettings.xml‎

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎.idea/codeStyles/Project.xml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎.idea/encodings.xml‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
66
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
7+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
78

89
<application
910
android:name=".ui.App"

‎app/src/main/java/apps/jizzu/simpletodo/service/widget/ViewFactory.kt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,57 +32,57 @@ class ViewFactory internal constructor(private val mContext: Context) : RemoteVi
3232

3333
override fun getViewAt(position: Int): RemoteViews {
3434
val remoteViews = RemoteViews(mContext.packageName, R.layout.widget_task_item)
35-
remoteViews.setTextViewText(R.id.item_title, mWidgetData[position].title)
35+
remoteViews.setTextViewText(R.id.tvItemTitle, mWidgetData[position].title)
3636

3737
if (!mWidgetData[position].note.isEmpty()) {
38-
remoteViews.setViewVisibility(R.id.item_note_icon, View.VISIBLE)
39-
} else remoteViews.setViewVisibility(R.id.item_note_icon, View.GONE)
38+
remoteViews.setViewVisibility(R.id.ivItemNoteIcon, View.VISIBLE)
39+
} else remoteViews.setViewVisibility(R.id.ivItemNoteIcon, View.GONE)
4040

4141

4242
if (mWidgetData[position].date != 0L) {
4343
remoteViews.apply {
44-
setViewPadding(R.id.item_title, 0, 0, 0, 0)
45-
setViewVisibility(R.id.item_date, View.VISIBLE)
44+
setViewPadding(R.id.tvItemTitle, 0, 0, 0, 0)
45+
setViewVisibility(R.id.tvItemDate, View.VISIBLE)
4646
}
4747

4848
when {
4949
// Today
5050
DateUtils.isToday(mWidgetData[position].date) -> {
5151
remoteViews.apply {
52-
setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.blue))
53-
setTextViewText(R.id.item_date, mContext.getString(R.string.reminder_today, DateAndTimeFormatter.getTime(mWidgetData[position].date)))
52+
setTextColor(R.id.tvItemDate, ContextCompat.getColor(mContext, R.color.blue))
53+
setTextViewText(R.id.tvItemDate, mContext.getString(R.string.reminder_today, DateAndTimeFormatter.getTime(mWidgetData[position].date)))
5454
}
5555
}
5656

5757
// Yesterday
5858
DateUtils.isToday(mWidgetData[position].date + DateUtils.DAY_IN_MILLIS) -> {
5959
remoteViews.apply {
60-
setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.red))
61-
setTextViewText(R.id.item_date, mContext.getString(R.string.reminder_yesterday, DateAndTimeFormatter.getTime(mWidgetData[position].date)))
60+
setTextColor(R.id.tvItemDate, ContextCompat.getColor(mContext, R.color.red))
61+
setTextViewText(R.id.tvItemDate, mContext.getString(R.string.reminder_yesterday, DateAndTimeFormatter.getTime(mWidgetData[position].date)))
6262
}
6363
}
6464

6565
// Tomorrow
6666
DateUtils.isToday(mWidgetData[position].date - DateUtils.DAY_IN_MILLIS) -> {
6767
remoteViews.apply {
68-
setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.blue))
69-
setTextViewText(R.id.item_date, mContext.getString(R.string.reminder_tomorrow, DateAndTimeFormatter.getTime(mWidgetData[position].date)))
68+
setTextColor(R.id.tvItemDate, ContextCompat.getColor(mContext, R.color.blue))
69+
setTextViewText(R.id.tvItemDate, mContext.getString(R.string.reminder_tomorrow, DateAndTimeFormatter.getTime(mWidgetData[position].date)))
7070
}
7171
}
7272

7373
// Far past
7474
mWidgetData[position].date < Calendar.getInstance().timeInMillis -> {
7575
remoteViews.apply {
76-
setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.red))
77-
setTextViewText(R.id.item_date, DateAndTimeFormatter.getFullDate(mWidgetData[position].date))
76+
setTextColor(R.id.tvItemDate, ContextCompat.getColor(mContext, R.color.red))
77+
setTextViewText(R.id.tvItemDate, DateAndTimeFormatter.getFullDate(mWidgetData[position].date))
7878
}
7979
}
8080

8181
// Far future
8282
else -> {
8383
remoteViews.apply {
84-
setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.blue))
85-
setTextViewText(R.id.item_date, mContext.getString(R.string.date_format_at, DateAndTimeFormatter.getFullDate(mWidgetData[position].date), DateAndTimeFormatter.getTime(mWidgetData[position].date)))
84+
setTextColor(R.id.tvItemDate, ContextCompat.getColor(mContext, R.color.blue))
85+
setTextViewText(R.id.tvItemDate, mContext.getString(R.string.date_format_at, DateAndTimeFormatter.getFullDate(mWidgetData[position].date), DateAndTimeFormatter.getTime(mWidgetData[position].date)))
8686
}
8787
}
8888
}
@@ -93,13 +93,13 @@ class ViewFactory internal constructor(private val mContext: Context) : RemoteVi
9393
val height = displayMetrics.heightPixels
9494
Log.d(TAG, "width = $width, height = $height")
9595

96-
remoteViews.setViewVisibility(R.id.item_date, View.GONE)
96+
remoteViews.setViewVisibility(R.id.tvItemDate, View.GONE)
9797
if (width >= 1080 || height >= 1776) {
98-
remoteViews.setViewPadding(R.id.item_title, 0, 27, 0, 27)
98+
remoteViews.setViewPadding(R.id.tvItemTitle, 0, 27, 0, 27)
9999
} else if (width >= 720 || height >= 1184) {
100-
remoteViews.setViewPadding(R.id.item_title, 0, 20, 0, 20)
100+
remoteViews.setViewPadding(R.id.tvItemTitle, 0, 20, 0, 20)
101101
} else if (width >= 480 || height >= 800) {
102-
remoteViews.setViewPadding(R.id.item_title, 0, 15, 0, 15)
102+
remoteViews.setViewPadding(R.id.tvItemTitle, 0, 15, 0, 15)
103103
}
104104
}
105105

@@ -113,7 +113,7 @@ class ViewFactory internal constructor(private val mContext: Context) : RemoteVi
113113
if (mWidgetData[position].date != 0L) {
114114
fillInIntent.putExtra(WidgetProvider.ITEM_DATE, mWidgetData[position].date)
115115
}
116-
remoteViews.setOnClickFillInIntent(R.id.item, fillInIntent)
116+
remoteViews.setOnClickFillInIntent(R.id.rvWidgetItem, fillInIntent)
117117

118118
return remoteViews
119119
}

‎app/src/main/java/apps/jizzu/simpletodo/service/widget/WidgetProvider.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ class WidgetProvider : AppWidgetProvider() {
2424
adapter.data = Uri.parse(adapter.toUri(Intent.URI_INTENT_SCHEME))
2525

2626
val widget = RemoteViews(context.packageName, R.layout.widget_list)
27-
widget.setRemoteAdapter(R.id.widgetList, adapter)
28-
widget.setOnClickPendingIntent(R.id.toolbarTitle, onTitleClickPendingIntent)
27+
widget.setRemoteAdapter(R.id.lvWidgetTasksList, adapter)
28+
widget.setOnClickPendingIntent(R.id.tvWidgetTitle, onTitleClickPendingIntent)
2929

3030
val onTaskClickPendingIntent = PendingIntent.getBroadcast(context, 0, Intent(context, WidgetProvider::class.java), 0)
31-
widget.setPendingIntentTemplate(R.id.widgetList, onTaskClickPendingIntent)
31+
widget.setPendingIntentTemplate(R.id.lvWidgetTasksList, onTaskClickPendingIntent)
3232

33-
appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.widgetList)
33+
appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.lvWidgetTasksList)
3434
appWidgetManager.updateAppWidget(appWidgetId, widget)
3535
}
3636
super.onUpdate(context, appWidgetManager, appWidgetIds)

‎app/src/main/java/apps/jizzu/simpletodo/ui/dialogs/CreateBackupDialogFragment.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ class CreateBackupDialogFragment : BaseDialogFragment() {
2525
}
2626

2727
private fun initDialog() {
28-
dialogMessage.setText(R.string.backup_create_dialog_message)
29-
buttonConfirm.setText(R.string.backup_create_dialog_button)
30-
buttonConfirm.setOnClickListener { createBackup() }
31-
buttonCancel.setOnClickListener { dismiss() }
28+
tvDialogMessage.setText(R.string.backup_create_dialog_message)
29+
tvConfirm.setText(R.string.backup_create_dialog_button)
30+
tvConfirm.setOnClickListener { createBackup() }
31+
tvCancel.setOnClickListener { dismiss() }
3232
}
3333

3434
private fun createBackup() {

‎app/src/main/java/apps/jizzu/simpletodo/ui/dialogs/DeleteTaskDialogFragment.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class DeleteTaskDialogFragment(val task: Task) : BaseDialogFragment() {
2626
}
2727

2828
private fun initDialog() {
29-
dialogMessage.setText(R.string.dialog_message)
30-
buttonConfirm.setText(R.string.action_delete)
31-
buttonConfirm.setOnClickListener {
29+
tvDialogMessage.setText(R.string.dialog_message)
30+
tvConfirm.setText(R.string.action_delete)
31+
tvConfirm.setOnClickListener {
3232
mViewModel.deleteTask(task)
3333
if (task.date != 0L) {
3434
val alarmHelper = AlarmHelper.getInstance()
@@ -37,7 +37,7 @@ class DeleteTaskDialogFragment(val task: Task) : BaseDialogFragment() {
3737
}
3838
activity?.finish()
3939
}
40-
buttonCancel.setOnClickListener { dismiss() }
40+
tvCancel.setOnClickListener { dismiss() }
4141
}
4242

4343
private fun createViewModel(application: Application) = ViewModelProviders.of(this).get(DeleteTaskViewModel(application)::class.java)

‎app/src/main/java/apps/jizzu/simpletodo/ui/dialogs/RateThisAppDialogFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ class RateThisAppDialogFragment : BaseDialogFragment() {
2424
private fun initButtons() {
2525
val preferenceHelper = PreferenceHelper.getInstance()
2626

27-
buttonRate.setOnClickListener {
27+
tvRate.setOnClickListener {
2828
preferenceHelper.putBoolean(PreferenceHelper.IS_NEED_TO_SHOW_RATE_DIALOG_LATER, false)
2929
rateThisApp()
3030
dismiss()
3131
}
32-
buttonNo.setOnClickListener {
32+
tvNeverShow.setOnClickListener {
3333
preferenceHelper.putBoolean(PreferenceHelper.IS_NEED_TO_SHOW_RATE_DIALOG_LATER, false)
3434
dismiss()
3535
}
36-
buttonLater.setOnClickListener {
36+
tvShowLater.setOnClickListener {
3737
preferenceHelper.putInt(PreferenceHelper.LAUNCHES_COUNTER, 0)
3838
dismiss()
3939
}

0 commit comments

Comments
 (0)