diff --git a/app/build.gradle b/app/build.gradle index 18567cd5..b6d1ec0a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,7 +51,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.15.9' + implementation 'com.simplemobiletools:commons:5.16.12' kapt 'androidx.room:room-compiler:2.1.0' implementation 'androidx.room:room-runtime:2.1.0' diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt index 9e871663..91732663 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt @@ -341,7 +341,8 @@ class MainActivity : SimpleActivity() { FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons), FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons), FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons), - FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons) + FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons), + FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons) ) startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt index cb503fff..45c8e25f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SplashActivity.kt @@ -5,8 +5,6 @@ import com.simplemobiletools.commons.activities.BaseSplashActivity import com.simplemobiletools.notes.pro.helpers.OPEN_NOTE_ID class SplashActivity : BaseSplashActivity() { - override fun getAppPackageName() = packageName - override fun initActivity() { if (intent.extras?.containsKey(OPEN_NOTE_ID) == true) { Intent(this, MainActivity::class.java).apply { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt index f1b2d4a2..1e388843 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/ChecklistAdapter.kt @@ -73,8 +73,8 @@ class ChecklistAdapter(activity: BaseSimpleActivity, var items: ArrayList<Checkl private fun initDrawables() { val res = activity.resources - crossDrawable = res.getColoredDrawableWithColor(R.drawable.ic_cross_big, res.getColor(R.color.theme_dark_red_primary_color)) - checkDrawable = res.getColoredDrawableWithColor(R.drawable.ic_check_big, res.getColor(R.color.md_green_700)) + crossDrawable = res.getColoredDrawableWithColor(R.drawable.ic_cross_vector, res.getColor(R.color.theme_dark_red_primary_color)) + checkDrawable = res.getColoredDrawableWithColor(R.drawable.ic_check_vector, res.getColor(R.color.md_green_700)) } private fun renameChecklistItem() { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt index 9ed9d662..8a48be9f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt @@ -57,7 +57,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener { } private fun setupFragment() { - val plusIcon = resources.getColoredDrawableWithColor(R.drawable.ic_plus, if (context!!.isBlackAndWhiteTheme()) Color.BLACK else Color.WHITE) + val plusIcon = resources.getColoredDrawableWithColor(R.drawable.ic_plus_vector, if (context!!.isBlackAndWhiteTheme()) Color.BLACK else Color.WHITE) view.apply { checklist_fab.apply { setImageDrawable(plusIcon) diff --git a/app/src/main/res/layout/fragment_checklist.xml b/app/src/main/res/layout/fragment_checklist.xml index 5ecc6896..113f2724 100644 --- a/app/src/main/res/layout/fragment_checklist.xml +++ b/app/src/main/res/layout/fragment_checklist.xml @@ -52,6 +52,6 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|end" android:layout_margin="@dimen/activity_margin" - android:src="@drawable/ic_plus"/> + android:src="@drawable/ic_plus_vector"/> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/item_checklist.xml b/app/src/main/res/layout/item_checklist.xml index 995a2817..d399497a 100644 --- a/app/src/main/res/layout/item_checklist.xml +++ b/app/src/main/res/layout/item_checklist.xml @@ -30,6 +30,6 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:padding="@dimen/normal_margin" - android:src="@drawable/ic_cross_big"/> + android:src="@drawable/ic_cross_vector"/> </RelativeLayout> diff --git a/app/src/main/res/layout/open_note_item.xml b/app/src/main/res/layout/open_note_item.xml index 79264092..f7063db4 100644 --- a/app/src/main/res/layout/open_note_item.xml +++ b/app/src/main/res/layout/open_note_item.xml @@ -17,10 +17,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_marginEnd="@dimen/small_margin" - android:layout_marginRight="@dimen/small_margin" android:padding="@dimen/small_margin" - android:src="@drawable/ic_attach_file"/> + android:src="@drawable/ic_attach_file_vector"/> </RelativeLayout> diff --git a/app/src/main/res/menu/cab_checklist.xml b/app/src/main/res/menu/cab_checklist.xml index de3ff06a..846ca634 100644 --- a/app/src/main/res/menu/cab_checklist.xml +++ b/app/src/main/res/menu/cab_checklist.xml @@ -8,7 +8,7 @@ app:showAsAction="ifRoom"/> <item android:id="@+id/cab_delete" - android:icon="@drawable/ic_delete" + android:icon="@drawable/ic_delete_vector" android:title="@string/delete" app:showAsAction="ifRoom"/> </menu> diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml index 5966a6cd..fe032a88 100644 --- a/app/src/main/res/menu/menu.xml +++ b/app/src/main/res/menu/menu.xml @@ -3,27 +3,27 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/save_note" - android:icon="@drawable/ic_save" + android:icon="@drawable/ic_save_vector" android:title="@string/save" app:showAsAction="ifRoom"/> <item android:id="@+id/undo" - android:icon="@drawable/ic_undo" + android:icon="@drawable/ic_undo_vector" android:title="@string/undo" app:showAsAction="ifRoom"/> <item android:id="@+id/redo" - android:icon="@drawable/ic_redo" + android:icon="@drawable/ic_redo_vector" android:title="@string/redo" app:showAsAction="ifRoom"/> <item android:id="@+id/open_note" - android:icon="@drawable/ic_open" + android:icon="@drawable/ic_folder_open_vector" android:title="@string/open_note" app:showAsAction="ifRoom"/> <item android:id="@+id/new_note" - android:icon="@drawable/ic_plus" + android:icon="@drawable/ic_plus_vector" android:title="@string/new_note" app:showAsAction="ifRoom"/> <item @@ -33,7 +33,7 @@ app:showAsAction="ifRoom"/> <item android:id="@+id/share" - android:icon="@drawable/ic_share" + android:icon="@drawable/ic_share_vector" android:title="@string/share" app:showAsAction="ifRoom"/> <item @@ -54,7 +54,7 @@ app:showAsAction="never"/> <item android:id="@+id/delete_note" - android:icon="@drawable/ic_delete" + android:icon="@drawable/ic_delete_vector" android:title="@string/delete_note" app:showAsAction="ifRoom"/> <item diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 6e0d1416..c08f8415 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <string name="package_name">com.simplemobiletools.notes.pro</string> <!-- Release notes --> <string name="release_62">Allow customizing the bottom navigation bar color</string>