Merge dev branch

Author: Jizzu

.idea/caches/build_file_checksums.ser

@@ -22,7 +22,7 @@ If you have any questions — welcome to the [FAQs page](FAQs.md)!
 ## Next update changes (v1.6):
 - [x] Continue redesign (BottomAppBar, rounded dialogs)
 - [x] Add adaptive icon
-- [ ] Add dark theme
+- [x] Add dark theme
 - [x] Add shortcuts
 
 ## Download links:

.idea/misc.xml

@@ -33,10 +33,11 @@ android {
 dependencies {
     // UI
     implementation "androidx.appcompat:appcompat:$rootProject.appcompatVersion"
-    implementation "com.google.android.material:material:$rootProject.androidxVersion"
+    implementation "com.google.android.material:material:$rootProject.materialVersion"
     implementation "androidx.cardview:cardview:$rootProject.androidxVersion"
     implementation "androidx.preference:preference:$rootProject.androidxVersion"
     implementation "com.github.XunMengWinter:CircularAnim:$rootProject.circularAnimVersion"
+    implementation "com.github.Daio-io:dresscode:$rootProject.dresscodeVersion"
     implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayoutVersion"
 
     // Firebase Crashlytics

.idea/modules.xml

@@ -6,11 +6,12 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
+        android:name=".ui.App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme.Light">
         <activity
             android:name=".ui.view.MainActivity"
             android:launchMode="singleTop"
@@ -30,7 +31,7 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
         <activity
-            android:name="apps.jizzu.simpletodo.ui.view.settings.activity.SettingsActivity"
+            android:name=".ui.view.settings.activity.SettingsActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.view.ChangelogActivity"

README.md

@@ -44,7 +44,7 @@ class AlarmReceiver : BroadcastReceiver() {
             setContentTitle(context.getString(R.string.reminder_text))
             setContentText(title)
             setStyle(NotificationCompat.BigTextStyle().bigText(title))
-            color = ContextCompat.getColor(context, R.color.colorAccent)
+            color = ContextCompat.getColor(context, R.color.blue)
             setSmallIcon(R.drawable.ic_check_circle_white_24dp)
             setDefaults(Notification.DEFAULT_ALL)
             setContentIntent(pendingIntent)

app/build.gradle

@@ -44,7 +44,7 @@ class ViewFactory internal constructor(private val mContext: Context) : RemoteVi
                 // Today
                 DateUtils.isToday(mWidgetData[position].date) -> {
                     remoteViews.apply {
-                        setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.colorPrimary))
+                        setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.blue))
                         setTextViewText(R.id.item_date, mContext.getString(R.string.reminder_today, DateAndTimeFormatter.getTime(mWidgetData[position].date)))
                     }
                 }
@@ -60,7 +60,7 @@ class ViewFactory internal constructor(private val mContext: Context) : RemoteVi
                 // Tomorrow
                 DateUtils.isToday(mWidgetData[position].date - DateUtils.DAY_IN_MILLIS) -> {
                     remoteViews.apply {
-                        setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.colorPrimary))
+                        setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.blue))
                         setTextViewText(R.id.item_date, mContext.getString(R.string.reminder_tomorrow, DateAndTimeFormatter.getTime(mWidgetData[position].date)))
                     }
                 }
@@ -76,7 +76,7 @@ class ViewFactory internal constructor(private val mContext: Context) : RemoteVi
                 // Far future
                 else -> {
                     remoteViews.apply {
-                        setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.colorPrimary))
+                        setTextColor(R.id.item_date, ContextCompat.getColor(mContext, R.color.blue))
                         setTextViewText(R.id.item_date, mContext.getString(R.string.date_format_at, DateAndTimeFormatter.getFullDate(mWidgetData[position].date), DateAndTimeFormatter.getTime(mWidgetData[position].date)))
                     }
                 }

app/src/main/AndroidManifest.xml

@@ -0,0 +1,19 @@
+package apps.jizzu.simpletodo.ui
+
+import android.app.Application
+import apps.jizzu.simpletodo.R
+import daio.io.dresscode.DressCode
+import daio.io.dresscode.declareDressCode
+
+class App : Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+
+        declareDressCode(
+                DressCode("Light", R.style.AppTheme_Light),
+                DressCode("Dark", R.style.AppTheme_Dark),
+                DressCode("Black", R.style.AppTheme_Black)
+        )
+    }
+}

app/src/main/java/apps/jizzu/simpletodo/service/alarm/AlarmReceiver.kt

@@ -0,0 +1,47 @@
+package apps.jizzu.simpletodo.ui.dialogs
+
+import android.app.Application
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.lifecycle.ViewModelProviders
+import apps.jizzu.simpletodo.R
+import apps.jizzu.simpletodo.ui.dialogs.base.BaseDialogFragment
+import apps.jizzu.simpletodo.utils.toast
+import apps.jizzu.simpletodo.vm.CreateBackupViewModel
+import kotlinx.android.synthetic.main.dialog_default.*
+
+class CreateBackupDialogFragment : BaseDialogFragment() {
+    private lateinit var mViewModel: CreateBackupViewModel
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
+            inflater.inflate(R.layout.dialog_default, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        activity?.let { mViewModel = createViewModel(it.application) }
+        initDialog()
+    }
+
+    private fun initDialog() {
+        dialogMessage.setText(R.string.backup_create_dialog_message)
+        buttonConfirm.setText(R.string.backup_create_dialog_button)
+        buttonConfirm.setOnClickListener { createBackup() }
+        buttonCancel.setOnClickListener { dismiss() }
+    }
+
+    private fun createBackup() {
+        mViewModel.createBackup()
+
+        if (mViewModel.isBackupCreatedSuccessfully()) {
+            dismiss()
+            toast(getString(R.string.backup_create_message_success))
+        } else {
+            dismiss()
+            toast(getString(R.string.backup_create_message_failure))
+        }
+    }
+
+    private fun createViewModel(application: Application) = ViewModelProviders.of(this).get(CreateBackupViewModel(application)::class.java)
+}