Rekado 2.2.1

- Improved support for Android Pie (9.0) - Added small FAQ for coreboot file - Fixed bug with null update date of coreboot filename - Fixed crash in settings
MenosGrante · Aug 7, 2018 · e4f44e0 · e4f44e0
1 parent 575c245
commit e4f44e0
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 63 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.pavelrekun.rekado"
         minSdkVersion minimumSDKVersion
         targetSdkVersion currentSDKVersion
-        versionCode 23
-        versionName "2.2"
+        versionCode 24
+        versionName "2.2.1"
 
         externalNativeBuild {
             cmake {

diff --git a/app/src/main/java/com/pavelrekun/rekado/screens/instructions_fragment/InstructionsView.kt b/app/src/main/java/com/pavelrekun/rekado/screens/instructions_fragment/InstructionsView.kt
@@ -3,6 +3,7 @@ package com.pavelrekun.rekado.screens.instructions_fragment
 import com.pavelrekun.rekado.R
 import com.pavelrekun.rekado.base.BaseActivity
 import com.pavelrekun.rekado.services.Constants
+import com.pavelrekun.rekado.services.dialogs.Dialogs
 import com.pavelrekun.rekado.services.utils.Utils
 import kotlinx.android.synthetic.main.fragment_instrutions.*
 
@@ -16,5 +17,6 @@ class InstructionsView(private val activity: BaseActivity) : InstructionsContrac
 
     override fun initClickListeners() {
         activity.instructionsRCMHelp.setOnClickListener { Utils.openLink(Constants.HELP_RCM) }
+        activity.instructionsCorebootHelp.setOnClickListener { Dialogs.showDialog(activity, R.string.lakka_coreboot_dialog_title, R.string.lakka_coreboot_dialog_description) }
     }
 }
diff --git a/app/src/main/java/com/pavelrekun/rekado/screens/lakka_fragment/LakkaView.kt b/app/src/main/java/com/pavelrekun/rekado/screens/lakka_fragment/LakkaView.kt
@@ -9,12 +9,12 @@ import com.pavelrekun.konae.Konae
 import com.pavelrekun.konae.filters.ExtensionFileFilter
 import com.pavelrekun.rekado.R
 import com.pavelrekun.rekado.base.BaseActivity
+import com.pavelrekun.rekado.services.dialogs.Dialogs
 import com.pavelrekun.rekado.services.eventbus.Events
 import com.pavelrekun.rekado.services.lakka.LakkaHelper
 import com.pavelrekun.rekado.services.logs.LogHelper
 import com.pavelrekun.rekado.services.utils.MemoryUtils
 import com.pavelrekun.rekado.services.utils.PermissionsUtils
-import com.pavelrekun.rekado.services.utils.SettingsUtils
 import kotlinx.android.synthetic.main.fragment_lakka.*
 import org.greenrobot.eventbus.EventBus
 import java.io.File
@@ -67,6 +67,8 @@ class LakkaView(private val activity: BaseActivity, private val fragment: Fragme
             activity.lakkaCorebootTitle.text = activity.getString(R.string.lakka_category_coreboot)
             activity.lakkaCorebootButton.text = activity.getString(R.string.lakka_button_add)
         }
+
+        activity.lakkaCorebootHelp.setOnClickListener { Dialogs.showDialog(activity, R.string.lakka_coreboot_dialog_title, R.string.lakka_coreboot_dialog_description) }
     }
 
     override fun initClickListeners() {
@@ -113,7 +115,6 @@ class LakkaView(private val activity: BaseActivity, private val fragment: Fragme
 
         try {
             MemoryUtils.toFile(file, LakkaHelper.FOLDER_PATH + "/coreboot.rom")
-            SettingsUtils.saveCorebootUpdateDate()
             EventBus.getDefault().post(Events.UpdateCorebootEvent())
             LogHelper.log(LogHelper.INFO, "Added coreboot file!")
         } catch (e: IOException) {

diff --git a/app/src/main/java/com/pavelrekun/rekado/screens/settings_activity/SettingsFragment.kt b/app/src/main/java/com/pavelrekun/rekado/screens/settings_activity/SettingsFragment.kt
@@ -13,6 +13,7 @@ import com.pavelrekun.rekado.base.BaseActivity
 import com.pavelrekun.rekado.services.dialogs.Dialogs
 import com.pavelrekun.rekado.services.logs.LogHelper
 import com.pavelrekun.rekado.services.payloads.PayloadHelper
+import com.pavelrekun.rekado.services.utils.MemoryUtils
 import com.pavelrekun.rekado.services.utils.PermissionsUtils
 import com.pavelrekun.rekado.services.utils.SettingsUtils
 

diff --git a/app/src/main/java/com/pavelrekun/rekado/services/dialogs/Dialogs.kt b/app/src/main/java/com/pavelrekun/rekado/services/dialogs/Dialogs.kt
@@ -1,7 +1,7 @@
 package com.pavelrekun.rekado.services.dialogs
 
-import android.app.Activity
 import android.content.Intent
+import android.support.annotation.StringRes
 import android.support.v4.app.ActivityCompat
 import android.support.v7.app.AlertDialog
 import android.view.LayoutInflater
@@ -18,6 +18,15 @@ import org.greenrobot.eventbus.EventBus
 
 object Dialogs {
 
+    fun showDialog(activity: BaseActivity, @StringRes title: Int, @StringRes description: Int) {
+        val builder = AlertDialog.Builder(activity)
+        builder.setTitle(title)
+        builder.setMessage(description)
+
+        val dialog = builder.create()
+        dialog.show()
+    }
+
     fun showInjectorSelectorDialog(activity: BaseActivity): AlertDialog {
         val builder = AlertDialog.Builder(activity)
         val view = LayoutInflater.from(activity).inflate(R.layout.dialog_injector_selector, null)

diff --git a/app/src/main/java/com/pavelrekun/rekado/services/lakka/LakkaHelper.kt b/app/src/main/java/com/pavelrekun/rekado/services/lakka/LakkaHelper.kt
@@ -1,12 +1,14 @@
 package com.pavelrekun.rekado.services.lakka
 
 import android.os.Environment
-import com.pavelrekun.rekado.services.utils.SettingsUtils
+import com.pavelrekun.rekado.services.utils.Utils
 import java.io.File
+import java.util.*
 
 object LakkaHelper {
 
     val FOLDER_PATH = "${Environment.getExternalStorageDirectory()}/Rekado/Lakka"
+    val COREBOOT_FILE_PATH = "$FOLDER_PATH/coreboot.rom"
 
     const val PAYLOAD_FILENAME = "cbfs.bin"
     const val COREBOOT_FILENAME = "coreboot.rom"
@@ -19,11 +21,11 @@ object LakkaHelper {
     }
 
     fun checkCorebootPresent(): Boolean {
-        return File("$FOLDER_PATH/coreboot.rom").exists()
+        return File(COREBOOT_FILE_PATH).exists()
     }
 
     fun getCorebootUpdateDate(): String {
-        return SettingsUtils.getCorebootUpdateDate().toString()
+        return Utils.formatDate(Date(File(COREBOOT_FILE_PATH).lastModified()))
     }
 
 }
diff --git a/app/src/main/java/com/pavelrekun/rekado/services/payloads/PayloadHelper.kt b/app/src/main/java/com/pavelrekun/rekado/services/payloads/PayloadHelper.kt
@@ -2,9 +2,7 @@ package com.pavelrekun.rekado.services.payloads
 
 import android.os.Environment
 import com.pavelrekun.rekado.data.Payload
-import com.pavelrekun.rekado.services.eventbus.Events
 import io.paperdb.Paper
-import org.greenrobot.eventbus.EventBus
 import java.io.File
 
 
@@ -17,7 +15,7 @@ object PayloadHelper {
 
     fun init() {
         val folderFile = File(FOLDER_PATH)
-        if (!folderFile.exists()) folderFile.mkdir()
+        if (!folderFile.exists()) folderFile.mkdirs()
     }
 
     fun getAll(): MutableList<Payload> {
@@ -75,8 +73,4 @@ object PayloadHelper {
     fun getChosen(): Payload {
         return Paper.book().read(CHOSEN_PAYLOAD)
     }
-
-    fun removeChosen() {
-        Paper.book().delete(CHOSEN_PAYLOAD)
-    }
 }
diff --git a/app/src/main/java/com/pavelrekun/rekado/services/utils/SettingsUtils.kt b/app/src/main/java/com/pavelrekun/rekado/services/utils/SettingsUtils.kt
@@ -1,18 +1,12 @@
 package com.pavelrekun.rekado.services.utils
 
-import android.support.v7.preference.PreferenceManager
-import com.pavelrekun.rekado.RekadoApplication
 import com.pavelrekun.rekado.services.payloads.PayloadHelper
 import io.paperdb.Paper
 
 object SettingsUtils {
 
     private const val AUTO_INJECTOR_ENABLED = "AUTO_INJECTOR_ENABLED"
     private const val AUTO_INJECTOR_PAYLOAD = "AUTO_INJECTOR_PAYLOAD"
-    private const val COREBOOT_UPDATE_DATE = "COREBOOT_UPDATE_DATE"
-
-    private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(RekadoApplication.instance.applicationContext)
-
 
     fun updateAutoInjectorEnabled(enabled: Boolean) {
         Paper.book().write(AUTO_INJECTOR_ENABLED, enabled)
@@ -30,16 +24,4 @@ object SettingsUtils {
         return Paper.book().read(AUTO_INJECTOR_PAYLOAD, PayloadHelper.BASIC_PAYLOAD_NAME)
     }
 
-    fun saveCorebootUpdateDate() {
-        sharedPreferences.edit().putString(COREBOOT_UPDATE_DATE, Utils.getCurrentDate()).apply()
-    }
-
-    fun getCorebootUpdateDate(): String? {
-        return sharedPreferences.getString(COREBOOT_UPDATE_DATE, null)
-    }
-
-    fun checkCorebootUpdateDate(): Boolean {
-        return getCorebootUpdateDate() != null
-    }
-
 }
diff --git a/app/src/main/java/com/pavelrekun/rekado/services/utils/Utils.kt b/app/src/main/java/com/pavelrekun/rekado/services/utils/Utils.kt
@@ -33,8 +33,8 @@ object Utils {
         return result.toString()
     }
 
-    fun getCurrentDate(): String {
+    fun formatDate(date: Date): String {
         val dateFormat = SimpleDateFormat("dd.MM.YYYY", Locale.getDefault())
-        return dateFormat.format(Date())
+        return dateFormat.format(date)
     }
 }
diff --git a/...ain/res/drawable/ic_instructions_help.xml → app/src/main/res/drawable/ic_help.xml b/...ain/res/drawable/ic_instructions_help.xml → app/src/main/res/drawable/ic_help.xml
@@ -5,6 +5,6 @@
     android:viewportWidth="24">
 
     <path
-        android:fillColor="@color/colorIcons"
+        android:fillColor="?attr/colorAccent"
         android:pathData="M11 18h2v-2h-2v2zm1-16C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm0-14c-2.21 0-4 1.79-4 4h2c0-1.1 0.9-2 2-2s2 0.9 2 2c0 2-3 1.75-3 5h2c0-2.25 3-2.5 3-5 0-2.21-1.79-4-4-4z" />
 </vector>
diff --git a/app/src/main/res/layout/fragment_instrutions.xml b/app/src/main/res/layout/fragment_instrutions.xml
@@ -81,14 +81,33 @@
             android:elevation="3dp"
             android:orientation="vertical">
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
-                android:fontFamily="sans-serif-medium"
-                android:text="@string/instructions_category_coreboot"
-                android:textColor="?attr/colorAccent"
-                android:textSize="16sp" />
+                android:layout_margin="16dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/instructions_category_coreboot"
+                    android:textColor="?attr/colorAccent"
+                    android:textSize="16sp" />
+
+                <ImageView
+                    android:id="@+id/instructionsCorebootHelp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_weight="0"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:contentDescription="@null"
+                    android:focusable="true"
+                    android:src="@drawable/ic_help" />
+
+            </LinearLayout>
 
             <TextView
                 android:layout_width="wrap_content"
@@ -118,7 +137,7 @@
 
                 <TextView
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:fontFamily="sans-serif-medium"
                     android:text="@string/instructions_category_rcm"
@@ -135,7 +154,7 @@
                     android:clickable="true"
                     android:contentDescription="@null"
                     android:focusable="true"
-                    android:src="@drawable/ic_instructions_help" />
+                    android:src="@drawable/ic_help" />
 
             </LinearLayout>
 

diff --git a/app/src/main/res/layout/fragment_lakka.xml b/app/src/main/res/layout/fragment_lakka.xml
@@ -57,15 +57,35 @@
             android:elevation="3dp"
             android:orientation="vertical">
 
-            <TextView
-                android:id="@+id/lakkaCorebootTitle"
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
-                android:fontFamily="sans-serif-medium"
-                android:text="@string/lakka_category_coreboot"
-                android:textColor="?attr/colorAccent"
-                android:textSize="16sp" />
+                android:layout_margin="16dp">
+
+                <TextView
+                    android:id="@+id/lakkaCorebootTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/lakka_category_coreboot"
+                    android:textColor="?attr/colorAccent"
+                    android:textSize="16sp" />
+
+                <ImageView
+                    android:id="@+id/lakkaCorebootHelp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="end"
+                    android:layout_weight="0"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:clickable="true"
+                    android:contentDescription="@null"
+                    android:focusable="true"
+                    android:src="@drawable/ic_help" />
+
+            </LinearLayout>
+
 
             <TextView
                 android:id="@+id/lakkaCorebootStatus"

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -32,6 +32,8 @@
     <string name="lakka_last_update">Обновлено: %1$s</string>
     <string name="lakka_button_add">Добавить</string>
     <string name="lakka_button_update">Обновить</string>
+    <string name="lakka_coreboot_dialog_title">Что такое \u0022Coreboot\u0022?</string>
+    <string name="lakka_coreboot_dialog_description">\u0022Coreboot\u0022 - это специальный файл, который нужен для загрузки Lakka на Nintendo Switch.</string>
 
     <!-- Strings for Settings -->
     <string name="settings_category_auto_injector">Автоинжектор</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name" translatable="false">Rekado</string>
-    <string name="app_version" translatable="false">2.2</string>
+    <string name="app_version" translatable="false">2.2.1</string>
 
     <!-- Strings for Navigation -->
     <string name="navigation_payloads">Payloads</string>
@@ -50,6 +50,8 @@
     <string name="lakka_last_update">Last update: %1$s</string>
     <string name="lakka_button_add">Add</string>
     <string name="lakka_button_update">Update</string>
+    <string name="lakka_coreboot_dialog_title">What is \u0022coreboot\u0022?</string>
+    <string name="lakka_coreboot_dialog_description">\u0022Coreboot\u0022 is special file needed to load Lakka on Nintendo Switch.</string>
 
     <!-- Strings for Settings -->
     <string name="settings_category_auto_injector">Auto injector</string>

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.60"
     }
 }
@@ -24,7 +24,7 @@ allprojects {
 }
 
 ext {
-    currentSDKVersion = 27
+    currentSDKVersion = 28
     minimumSDKVersion = 21
     kotlinVersion = '1.2.60'
     kotlinCoroutines = '0.24.0'
@@ -33,7 +33,6 @@ ext {
 
     paperVersion = '2.6'
     eventBusVersion = '3.1.1'
-    commonsIOVersion = '2.6'
     materialDialogsVersion = '0.9.6.0'
     appUpdaterVersion = '2.7'
 }
diff --git a/updater/update.xml b/updater/update.xml
@@ -1,13 +1,13 @@
 <AppUpdater>
   <update>
-    <latestVersion>2.2</latestVersion>
-    <latestVersionCode>23</latestVersionCode>
+    <latestVersion>2.2.1</latestVersion>
+    <latestVersionCode>24</latestVersionCode>
     <url>https://github.com/MenosGrante/Rekado/releases</url>
     <releaseNotes>
-- Added ability to upload own "coreboot" files and update it later
-- Added ability to support application development (donating)
-- Fixed bug with "light" task description in dark theme
-- Fixed crash in Settings, when storage permission have not been granted
+- Improved support for Android Pie (9.0)
+- Added small FAQ for coreboot file
+- Fixed bug with null update date of coreboot filename
+- Fixed crash in settings
     </releaseNotes>
   </update>
 </AppUpdater>