diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt index 54879e5a..de20676b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt @@ -13,16 +13,17 @@ import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.value import com.simplemobiletools.commons.helpers.LICENSE_AMBILWARNA import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN +import com.simplemobiletools.commons.helpers.LICENSE_RTL import com.simplemobiletools.commons.helpers.LICENSE_STETHO import com.simplemobiletools.notes.BuildConfig import com.simplemobiletools.notes.R -import com.simplemobiletools.notes.helpers.TYPE_NOTE import com.simplemobiletools.notes.adapters.NotesPagerAdapter import com.simplemobiletools.notes.databases.DBHelper import com.simplemobiletools.notes.dialogs.NewNoteDialog import com.simplemobiletools.notes.dialogs.OpenNoteDialog import com.simplemobiletools.notes.dialogs.RenameNoteDialog import com.simplemobiletools.notes.extensions.getTextSize +import com.simplemobiletools.notes.helpers.TYPE_NOTE import com.simplemobiletools.notes.models.Note import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.fragment_note.* @@ -129,7 +130,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener { } private fun launchAbout() { - startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_AMBILWARNA or LICENSE_STETHO, BuildConfig.VERSION_NAME) + startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_AMBILWARNA or LICENSE_STETHO or LICENSE_RTL, BuildConfig.VERSION_NAME) } private fun displayDeleteNotePrompt() { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/views/MyViewPager.kt b/app/src/main/kotlin/com/simplemobiletools/notes/views/MyViewPager.kt deleted file mode 100644 index d783728b..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/notes/views/MyViewPager.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.simplemobiletools.notes.views - -import android.content.Context -import android.support.v4.view.ViewPager -import android.util.AttributeSet -import android.view.MotionEvent - -// we are creating a custom viewpager just to fix "pointerIndex out of range" exception at onInterceptTouchEvent -class MyViewPager : ViewPager { - - constructor(context: Context) : super(context) { - } - - constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { - } - - override fun onInterceptTouchEvent(ev: MotionEvent): Boolean { - try { - return super.onInterceptTouchEvent(ev) - } catch (ex: IllegalArgumentException) { - ex.printStackTrace() - } - - return false - } - - override fun onTouchEvent(ev: MotionEvent): Boolean { - try { - return super.onTouchEvent(ev) - } catch (ex: IllegalArgumentException) { - ex.printStackTrace() - } - - return false - } -} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 41a5e10e..18e180bb 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<com.simplemobiletools.notes.views.MyViewPager +<com.simplemobiletools.commons.views.MyViewPager xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/view_pager" android:layout_width="match_parent" @@ -12,4 +12,4 @@ android:layout_gravity="top" android:paddingLeft="@dimen/activity_margin" android:paddingRight="@dimen/activity_margin"/> -</com.simplemobiletools.notes.views.MyViewPager> +</com.simplemobiletools.commons.views.MyViewPager>