Merge dev branch

Jizzu · May 18, 2019 · 7c7bf88 · 7c7bf88
2 parents 5cebf16 + aed4cea
commit 7c7bf88
Show file tree

Hide file tree

Showing 39 changed files with 1,331 additions and 1,209 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,6 +15,11 @@ android {
         versionCode rootProject.ext.versionCode
         versionName rootProject.ext.versionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
+    }
+
+    dataBinding {
+        enabled = true
     }
 
     buildTypes {
@@ -38,6 +43,7 @@ dependencies {
     implementation "androidx.preference:preference:$rootProject.androidxVersion"
     implementation "com.github.XunMengWinter:CircularAnim:$rootProject.circularAnimVersion"
     implementation "com.github.Daio-io:dresscode:$rootProject.dresscodeVersion"
+    implementation "com.heinrichreimersoftware:material-intro:$rootProject.materialIntroVersion"
     implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayoutVersion"
 
     // Firebase Crashlytics

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -24,28 +24,34 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.view.AddTaskActivity"
+            android:name=".ui.view.task.AddTaskActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".ui.view.EditTaskActivity"
+            android:name=".ui.view.task.EditTaskActivity"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name=".ui.view.TaskNoteActivity"
+            android:name=".ui.view.task.TaskNoteActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.view.settings.activity.SettingsActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.view.ChangelogActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.view.MainIntroActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.Intro" />
         <activity
             android:name=".ui.view.SearchActivity"
             android:screenOrientation="portrait" />
+
         <service
             android:name=".service.widget.WidgetService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
+
         <receiver
             android:name=".service.alarm.AlarmReceiver"
             android:process=":remote" />

diff --git a/app/src/main/java/apps/jizzu/simpletodo/service/widget/WidgetProvider.kt b/app/src/main/java/apps/jizzu/simpletodo/service/widget/WidgetProvider.kt
@@ -8,7 +8,7 @@ import android.content.Intent
 import android.net.Uri
 import android.widget.RemoteViews
 import apps.jizzu.simpletodo.R
-import apps.jizzu.simpletodo.ui.view.EditTaskActivity
+import apps.jizzu.simpletodo.ui.view.task.EditTaskActivity
 import apps.jizzu.simpletodo.ui.view.MainActivity
 
 class WidgetProvider : AppWidgetProvider() {

diff --git a/app/src/main/java/apps/jizzu/simpletodo/ui/view/ChangelogActivity.kt b/app/src/main/java/apps/jizzu/simpletodo/ui/view/ChangelogActivity.kt
@@ -15,7 +15,7 @@ class ChangelogActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         matchDressCode()
         setContentView(R.layout.activity_changelog)
-        initToolbar(getString(R.string.whats_new_title))
+        initToolbar(getString(R.string.whats_new_title), R.drawable.round_close_black_24)
         btnConfirm.setOnClickListener { onBackPressed() }
     }
 

diff --git a/app/src/main/java/apps/jizzu/simpletodo/ui/view/MainActivity.kt b/app/src/main/java/apps/jizzu/simpletodo/ui/view/MainActivity.kt
@@ -44,6 +44,7 @@ import apps.jizzu.simpletodo.ui.view.base.BaseActivity
 import apps.jizzu.simpletodo.ui.view.settings.activity.SettingsActivity
 import apps.jizzu.simpletodo.ui.view.settings.fragment.FragmentDateAndTime
 import apps.jizzu.simpletodo.ui.view.settings.fragment.FragmentNotifications
+import apps.jizzu.simpletodo.ui.view.task.AddTaskActivity
 import apps.jizzu.simpletodo.utils.PreferenceHelper
 import apps.jizzu.simpletodo.utils.gone
 import apps.jizzu.simpletodo.utils.toast
@@ -244,7 +245,9 @@ class MainActivity : BaseActivity() {
     }
 
     private fun showChangelogActivity() {
-        if (mPreferenceHelper.getInt(PreferenceHelper.VERSION_CODE) != BuildConfig.VERSION_CODE) {
+        if (mPreferenceHelper.getBoolean(PreferenceHelper.IS_FIRST_LAUNCH) && mPreferenceHelper.getInt(PreferenceHelper.VERSION_CODE) == 0) {
+            startActivityForResult(Intent(this, MainIntroActivity::class.java), APP_INTRO_CODE)
+        } else if (mPreferenceHelper.getInt(PreferenceHelper.VERSION_CODE) != BuildConfig.VERSION_CODE) {
             startActivity(Intent(this, ChangelogActivity::class.java))
         }
     }
@@ -479,6 +482,15 @@ class MainActivity : BaseActivity() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
 
+        if (requestCode == APP_INTRO_CODE) {
+            if (resultCode == RESULT_OK) {
+                mPreferenceHelper.putBoolean(PreferenceHelper.IS_FIRST_LAUNCH, false)
+                mPreferenceHelper.putInt(PreferenceHelper.VERSION_CODE, BuildConfig.VERSION_CODE)
+            } else {
+                finish()
+            }
+        }
+
         if (requestCode == SPEECH_INPUT_CODE && resultCode == RESULT_OK && data != null) {
             val result = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
             val task = Task().apply {
@@ -492,5 +504,6 @@ class MainActivity : BaseActivity() {
     companion object {
         var mTaskList = arrayListOf<Task>()
         private const val SPEECH_INPUT_CODE = 111
+        private const val APP_INTRO_CODE = 222
     }
 }
diff --git a/app/src/main/java/apps/jizzu/simpletodo/ui/view/MainIntroActivity.kt b/app/src/main/java/apps/jizzu/simpletodo/ui/view/MainIntroActivity.kt
@@ -0,0 +1,32 @@
+package apps.jizzu.simpletodo.ui.view
+
+import android.os.Bundle
+import apps.jizzu.simpletodo.R
+import com.heinrichreimersoftware.materialintro.app.IntroActivity
+import com.heinrichreimersoftware.materialintro.slide.SimpleSlide
+
+class MainIntroActivity : IntroActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        addIntroScreen(getString(R.string.intro_1_title), getString(R.string.intro_1_description),
+                R.drawable.illustration_intro_1)
+        addIntroScreen(getString(R.string.intro_2_title), getString(R.string.intro_2_description),
+                R.drawable.illustration_intro_2)
+        addIntroScreen(getString(R.string.intro_3_title), getString(R.string.intro_3_description),
+                R.drawable.illustration_intro_3)
+        addIntroScreen(getString(R.string.intro_4_title), getString(R.string.intro_4_description),
+                R.drawable.illustration_intro_4)
+    }
+
+    private fun addIntroScreen(title: String, description: String, drawable: Int) {
+        addSlide(SimpleSlide.Builder()
+                .title(title)
+                .description(description)
+                .image(drawable)
+                .background(R.color.white)
+                .backgroundDark(R.color.white)
+                .layout(R.layout.activity_main_intro)
+                .build())
+    }
+}
diff --git a/app/src/main/java/apps/jizzu/simpletodo/ui/view/SearchActivity.kt b/app/src/main/java/apps/jizzu/simpletodo/ui/view/SearchActivity.kt
@@ -6,6 +6,7 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
@@ -35,7 +36,7 @@ class SearchActivity : BaseActivity(), SearchView.OnQueryTextListener {
         super.onCreate(savedInstanceState)
         matchDressCode()
         setContentView(R.layout.activity_search)
-        initToolbar("", R.drawable.round_arrow_back_black_24)
+        initToolbar()
 
         if (intent.getBooleanExtra("isShortcut", false)) {
             PreferenceHelper.getInstance().init(applicationContext)
@@ -66,10 +67,12 @@ class SearchActivity : BaseActivity(), SearchView.OnQueryTextListener {
         mAdapter.updateData(arrayListOf())
         llEmptyView.visible()
         if (isSearchFieldEmpty) {
-            ivEmptyIllustration.setImageResource(R.drawable.illustration_search)
+            ivEmptyIllustration.setImageDrawable(AppCompatResources.getDrawable(this,
+                    R.drawable.illustration_search))
             tvEmptyTitle.text = getString(R.string.search_view_empty_text)
         } else {
-            ivEmptyIllustration.setImageResource(R.drawable.illustration_not_found)
+            ivEmptyIllustration.setImageDrawable(AppCompatResources.getDrawable(this,
+                    R.drawable.illustration_not_found))
             tvEmptyTitle.text = getString(R.string.search_view_not_found_text)
         }
     }

diff --git a/app/src/main/java/apps/jizzu/simpletodo/ui/view/base/BaseActivity.kt b/app/src/main/java/apps/jizzu/simpletodo/ui/view/base/BaseActivity.kt
@@ -20,7 +20,7 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import apps.jizzu.simpletodo.R
 import apps.jizzu.simpletodo.data.models.Task
-import apps.jizzu.simpletodo.ui.view.EditTaskActivity
+import apps.jizzu.simpletodo.ui.view.task.EditTaskActivity
 import apps.jizzu.simpletodo.utils.toastLong
 import com.google.android.material.snackbar.Snackbar
 import daio.io.dresscode.dressCodeStyleId
@@ -33,7 +33,7 @@ abstract class BaseActivity : AppCompatActivity() {
         initStatusBar()
     }
 
-    fun initToolbar(titleText: String, drawable: Int? = R.drawable.round_close_black_24, view: Toolbar? = toolbar) {
+    fun initToolbar(titleText: String = "", drawable: Int? = R.drawable.round_arrow_back_black_24, view: Toolbar? = toolbar) {
         title = ""
         tvToolbarTitle.text = titleText
 

diff --git a/app/src/main/java/apps/jizzu/simpletodo/ui/view/base/BaseTaskActivity.kt b/app/src/main/java/apps/jizzu/simpletodo/ui/view/base/BaseTaskActivity.kt
@@ -14,7 +14,7 @@ import android.widget.EditText
 import android.widget.TimePicker
 import androidx.core.content.ContextCompat
 import apps.jizzu.simpletodo.R
-import apps.jizzu.simpletodo.ui.view.TaskNoteActivity
+import apps.jizzu.simpletodo.ui.view.task.TaskNoteActivity
 import apps.jizzu.simpletodo.utils.DateAndTimeFormatter
 import apps.jizzu.simpletodo.utils.PreferenceHelper
 import apps.jizzu.simpletodo.utils.gone

diff --git a/app/src/main/java/apps/jizzu/simpletodo/ui/view/settings/activity/SettingsActivity.kt b/app/src/main/java/apps/jizzu/simpletodo/ui/view/settings/activity/SettingsActivity.kt
@@ -22,7 +22,7 @@ class SettingsActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         matchDressCode()
         setContentView(R.layout.activity_settings)
-        initToolbar(getString(R.string.settings), R.drawable.round_arrow_back_black_24)
+        initToolbar(getString(R.string.settings))
         openSettingsFragment()
     }
 

diff --git a/app/src/main/java/apps/jizzu/simpletodo/ui/view/settings/fragment/FragmentLicenses.kt b/app/src/main/java/apps/jizzu/simpletodo/ui/view/settings/fragment/FragmentLicenses.kt
@@ -32,6 +32,7 @@ class FragmentLicenses : BaseSettingsFragment() {
         clRxJava.setOnClickListener { openUri(RX_JAVA_PAGE) }
         clRxKotlin.setOnClickListener { openUri(RX_KOTLIN_PAGE) }
         clDressCode.setOnClickListener { openUri(DRESS_CODE_PAGE) }
+        clMaterialIntro.setOnClickListener { openUri(MATERIAL_INTRO_PAGE) }
     }
 
     private fun openUri(uri: String) = startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(uri)))
@@ -42,5 +43,6 @@ class FragmentLicenses : BaseSettingsFragment() {
         private const val RX_JAVA_PAGE = "https://github.com/ReactiveX/RxJava"
         private const val RX_KOTLIN_PAGE = "https://github.com/ReactiveX/RxKotlin"
         private const val DRESS_CODE_PAGE = "https://github.com/Daio-io/dresscode"
+        private const val MATERIAL_INTRO_PAGE = "https://github.com/heinrichreimer/material-intro"
     }
 }
diff --git a/...zzu/simpletodo/ui/view/AddTaskActivity.kt → ...impletodo/ui/view/task/AddTaskActivity.kt b/...zzu/simpletodo/ui/view/AddTaskActivity.kt → ...impletodo/ui/view/task/AddTaskActivity.kt
@@ -1,4 +1,4 @@
-package apps.jizzu.simpletodo.ui.view
+package apps.jizzu.simpletodo.ui.view.task
 
 import android.os.Bundle
 import androidx.lifecycle.ViewModelProviders

diff --git a/...zu/simpletodo/ui/view/EditTaskActivity.kt → ...mpletodo/ui/view/task/EditTaskActivity.kt b/...zu/simpletodo/ui/view/EditTaskActivity.kt → ...mpletodo/ui/view/task/EditTaskActivity.kt
@@ -1,4 +1,4 @@
-package apps.jizzu.simpletodo.ui.view
+package apps.jizzu.simpletodo.ui.view.task
 
 import android.os.Bundle
 import android.view.Menu

diff --git a/...zu/simpletodo/ui/view/TaskNoteActivity.kt → ...mpletodo/ui/view/task/TaskNoteActivity.kt b/...zu/simpletodo/ui/view/TaskNoteActivity.kt → ...mpletodo/ui/view/task/TaskNoteActivity.kt
@@ -1,4 +1,4 @@
-package apps.jizzu.simpletodo.ui.view
+package apps.jizzu.simpletodo.ui.view.task
 
 import android.app.Activity
 import android.content.Intent
@@ -18,14 +18,14 @@ class TaskNoteActivity : BaseActivity() {
         super.onCreate(savedInstanceState)
         matchDressCode()
         setContentView(R.layout.activity_task_note)
-        initToolbar(getString(R.string.task_note), R.drawable.round_arrow_back_black_24)
+        initToolbar(getString(R.string.task_note), R.drawable.round_close_black_24)
         initScrollViewListener(svTaskDetails)
         restoreData()
     }
 
     private fun restoreData() {
         val note = intent.getStringExtra("note")
-        if (!note.isEmpty()) {
+        if (note.isNotEmpty()) {
             tvTaskNote.apply {
                 setText(note)
                 setSelection(note.length)

diff --git a/app/src/main/java/apps/jizzu/simpletodo/utils/PreferenceHelper.kt b/app/src/main/java/apps/jizzu/simpletodo/utils/PreferenceHelper.kt
@@ -11,9 +11,10 @@ class PreferenceHelper private constructor() {
     }
 
     fun putBoolean(key: String, value: Boolean) {
-        val editor = mPreferences.edit()
-        editor.putBoolean(key, value)
-        editor.apply()
+        mPreferences.edit().apply {
+            putBoolean(key, value)
+            apply()
+        }
     }
 
     fun getBoolean(key: String) = mPreferences.getBoolean(key, true)
@@ -37,6 +38,7 @@ class PreferenceHelper private constructor() {
         const val TIME_FORMAT_KEY = "time_format_key"
         const val LAUNCHES_COUNTER = "launches_counter"
         const val IS_NEED_TO_SHOW_RATE_DIALOG_LATER = "is_need_to_show_rate_dialog_later"
+        const val IS_FIRST_LAUNCH = "is_first_launch"
 
         private var mInstance: PreferenceHelper? = null