Rekado 4.1.4

- Added: New languages from Crowdin. - Fixed: Payloads are not getting loaded on the console.
MenosGrante · Jul 9, 2021 · 05f27fd · 05f27fd
1 parent e285d90
commit 05f27fd
Show file tree

Hide file tree

Showing 27 changed files with 179 additions and 61 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -46,7 +46,7 @@ android {
     }
 
     buildFeatures {
-        viewBinding = true
+        viewBinding true
     }
 
 }
@@ -71,7 +71,7 @@ dependencies {
 
     // Google: Design
     implementation "com.google.android.material:material:$materialComponentsVersion"
-    implementation "com.google.android:flexbox:$flexBoxLayoutVersion"
+    implementation "com.google.android.flexbox:flexbox:$flexBoxLayoutVersion"
 
     // Design
     implementation "dev.chrisbanes.insetter:insetter:$insetterVersion"

diff --git a/app/libs/magta.aar b/app/libs/magta.aar
diff --git a/app/libs/penza.aar b/app/libs/penza.aar
diff --git a/app/src/main/java/com/pavelrekun/rekado/base/BaseFragment.kt b/app/src/main/java/com/pavelrekun/rekado/base/BaseFragment.kt
@@ -1,8 +1,8 @@
 package com.pavelrekun.rekado.base
 
 import androidx.fragment.app.Fragment
-import com.pavelrekun.penza.widgets.ElevationRecyclerView
-import com.pavelrekun.penza.widgets.ElevationScrollView
+import com.pavelrekun.magta.views.ElevationRecyclerView
+import com.pavelrekun.magta.views.ElevationScrollView
 
 open class BaseFragment(layoutRes: Int = 0) : Fragment(layoutRes) {
 

diff --git a/app/src/main/java/com/pavelrekun/rekado/containers/SecondaryContainerActivity.kt b/app/src/main/java/com/pavelrekun/rekado/containers/SecondaryContainerActivity.kt
@@ -13,7 +13,6 @@ import com.pavelrekun.rekado.databinding.ActivityContainerSecondaryBinding
 import com.pavelrekun.rekado.services.dialogs.DialogsShower
 import com.pavelrekun.rekado.services.extensions.*
 import dev.chrisbanes.insetter.applyInsetter
-import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
 
 class SecondaryContainerActivity : BaseActivity() {
 

diff --git a/app/src/main/java/com/pavelrekun/rekado/screens/payload_fragment/PayloadsFragment.kt b/app/src/main/java/com/pavelrekun/rekado/screens/payload_fragment/PayloadsFragment.kt
@@ -166,10 +166,10 @@ class PayloadsFragment : BaseFragment(R.layout.fragment_payloads) {
         }
     }
 
-/*    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEvent(event: Events.UpdatePayloadsListEvent) {
         updateList()
-    }*/
+    }
 
     override fun onResume() {
         super.onResume()
@@ -183,14 +183,14 @@ class PayloadsFragment : BaseFragment(R.layout.fragment_payloads) {
         }
     }
 
-/*    override fun onStart() {
+    override fun onStart() {
         super.onStart()
         EventBus.getDefault().register(this)
     }
 
     override fun onStop() {
         super.onStop()
         EventBus.getDefault().unregister(this)
-    }*/
+    }
 
 }
diff --git a/.../main/java/com/pavelrekun/rekado/screens/serial_checker_activity/SerialCheckerFragment.kt b/.../main/java/com/pavelrekun/rekado/screens/serial_checker_activity/SerialCheckerFragment.kt
@@ -7,15 +7,14 @@ import android.widget.Toast
 import com.google.zxing.integration.android.IntentIntegrator
 import com.pavelrekun.magta.design.getString
 import com.pavelrekun.magta.design.isEmpty
-import com.pavelrekun.rekado.services.extensions.viewBinding
 import com.pavelrekun.rekado.R
 import com.pavelrekun.rekado.base.BaseFragment
 import com.pavelrekun.rekado.databinding.FragmentSerialCheckerBinding
 import com.pavelrekun.rekado.services.Constants
+import com.pavelrekun.rekado.services.extensions.viewBinding
 import com.pavelrekun.rekado.services.utils.SerialUtils
 import com.pavelrekun.rekado.services.utils.Utils
 import dev.chrisbanes.insetter.applyInsetter
-import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
 
 class SerialCheckerFragment : BaseFragment(R.layout.fragment_serial_checker) {
 

diff --git a/app/src/main/java/com/pavelrekun/rekado/screens/settings_fragment/SettingsFragment.kt b/app/src/main/java/com/pavelrekun/rekado/screens/settings_fragment/SettingsFragment.kt
@@ -17,9 +17,7 @@ import com.pavelrekun.rekado.services.extensions.openSettingsAppearanceThemesScr
 import com.pavelrekun.rekado.services.payloads.PayloadHelper
 import com.pavelrekun.rekado.services.utils.LoginUtils
 import com.pavelrekun.rekado.services.utils.PreferencesUtils
-import com.pavelrekun.rekado.services.utils.Utils
 import dev.chrisbanes.insetter.applyInsetter
-import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
 
 class SettingsFragment : BasePreferencesFragment(R.xml.preferences, R.string.navigation_settings) {
 

diff --git a/app/src/main/java/com/pavelrekun/rekado/services/Constants.kt b/app/src/main/java/com/pavelrekun/rekado/services/Constants.kt
@@ -5,7 +5,6 @@ object Constants {
     const val HELP_RCM = "https://gbatemp.net/threads/the-ultimate-list-of-mods-to-enter-rcm.502145/"
     const val HELP_SERIAL_CHECKER = "https://gbatemp.net/threads/switch-informations-by-serial-number-read-the-first-post-before-asking-questions.481215/"
     const val GITHUB_PROJECT_LINK = "https://github.com/MenosGrante/Rekado"
-    const val DONATE_LINK = "https://www.buymeacoffee.com/pavelrekun"
     const val UPDATE_CHANGELOG_LINK = "https://raw.githubusercontent.com/MenosGrante/Rekado/master/app/update-changelog.json"
 
     const val MIME_BINARY = "application/octet-stream"

diff --git a/app/src/main/java/com/pavelrekun/rekado/services/dialogs/DialogsShower.kt b/app/src/main/java/com/pavelrekun/rekado/services/dialogs/DialogsShower.kt
@@ -7,6 +7,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.pavelrekun.magta.design.getString
 import com.pavelrekun.magta.design.isEmpty
 import com.pavelrekun.magta.restartApp
+import com.pavelrekun.magta.services.constants.Links
 import com.pavelrekun.penza.services.helpers.SettingsDialogsHelper
 import com.pavelrekun.rekado.R
 import com.pavelrekun.rekado.base.BaseActivity
@@ -108,7 +109,7 @@ object DialogsShower {
         val binding = DialogDonateBinding.inflate(activity.layoutInflater)
         val builder = MaterialAlertDialogBuilder(activity)
 
-        binding.donateBuyMeCoffee.setOnClickListener { Utils.openLink(activity, Constants.DONATE_LINK) }
+        binding.aboutPatreonButton.setOnClickListener { Utils.openLink(activity, Links.PATREON_LINK) }
 
         builder.setTitle(R.string.navigation_donate)
 

diff --git a/app/src/main/java/com/pavelrekun/rekado/services/usb/USBReceiver.kt b/app/src/main/java/com/pavelrekun/rekado/services/usb/USBReceiver.kt
@@ -59,7 +59,7 @@ class USBReceiver : BaseActivity() {
         finishReceiver()
     }
 
-/*    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEvent(event: Events.PayloadSelected) {
         injectPayload()
     }
@@ -77,7 +77,7 @@ class USBReceiver : BaseActivity() {
     override fun onStop() {
         EventBus.getDefault().unregister(this)
         super.onStop()
-    }*/
+    }
 
     private fun finishReceiver() {
         if (this::payloadChooserDialog.isInitialized && payloadChooserDialog.isShowing) {

diff --git a/app/src/main/res/drawable/ic_donate_patreon.xml b/app/src/main/res/drawable/ic_donate_patreon.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?attr/colorIcon"
+        android:pathData="M3,3C2.448,3 2,3.448 2,4L2,20C2,20.552 2.448,21 3,21L5,21C5.552,21 6,20.552 6,20L6,4C6,3.448 5.552,3 5,3L3,3zM15,3C11.141,3 8,6.141 8,10C8,13.859 11.141,17 15,17C18.859,17 22,13.859 22,10C22,6.141 18.859,3 15,3z" />
+
+</vector>
diff --git a/app/src/main/res/layout/dialog_donate.xml b/app/src/main/res/layout/dialog_donate.xml
@@ -13,22 +13,25 @@
         android:textColor="?android:attr/textColorSecondary"
         android:textSize="16sp" />
 
-    <com.google.android.material.card.MaterialCardView
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/aboutPatreonButton"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginBottom="16dp"
-        app:cardCornerRadius="6dp"
-        app:cardElevation="2dp">
-
-        <ImageView
-            android:id="@+id/donateBuyMeCoffee"
-            android:layout_width="160dp"
-            android:layout_height="wrap_content"
-            android:contentDescription="@null"
-            android:foreground="?android:attr/selectableItemBackground"
-            android:src="@drawable/pic_donate" />
-
-    </com.google.android.material.card.MaterialCardView>
+        android:layout_marginTop="8dp"
+        android:fontFamily="@font/gilroy_medium"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp"
+        android:text="@string/donate_button"
+        android:textColor="@color/colorWhite"
+        android:textSize="12sp"
+        app:backgroundTint="#FF424D"
+        app:cornerRadius="24dp"
+        app:icon="@drawable/ic_donate_patreon"
+        app:iconPadding="8dp"
+        app:iconTint="@color/colorWhite" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.pavelrekun.penza.widgets.ElevationScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.pavelrekun.magta.views.ElevationScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/aboutLayoutScroll"
     android:layout_width="match_parent"
@@ -327,4 +327,4 @@
             </LinearLayout>
         </com.google.android.material.card.MaterialCardView>
     </LinearLayout>
-</com.pavelrekun.penza.widgets.ElevationScrollView>
+</com.pavelrekun.magta.views.ElevationScrollView>
diff --git a/app/src/main/res/layout/fragment_instructions.xml b/app/src/main/res/layout/fragment_instructions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.pavelrekun.penza.widgets.ElevationScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.pavelrekun.magta.views.ElevationScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/instructionsLayoutScroll"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -166,4 +166,4 @@
         </com.google.android.material.card.MaterialCardView>
 
     </LinearLayout>
-</com.pavelrekun.penza.widgets.ElevationScrollView>
+</com.pavelrekun.magta.views.ElevationScrollView>
diff --git a/app/src/main/res/layout/fragment_logs.xml b/app/src/main/res/layout/fragment_logs.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.pavelrekun.penza.widgets.ElevationRecyclerView
+    <com.pavelrekun.magta.views.ElevationRecyclerView
         android:id="@+id/logsActionsList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/fragment_serial_checker.xml b/app/src/main/res/layout/fragment_serial_checker.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.pavelrekun.penza.widgets.ElevationScrollView
+    <com.pavelrekun.magta.views.ElevationScrollView
         android:id="@+id/serialCheckerLayoutScroll"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -152,6 +152,6 @@
 
             </com.google.android.material.card.MaterialCardView>
         </LinearLayout>
-    </com.pavelrekun.penza.widgets.ElevationScrollView>
+    </com.pavelrekun.magta.views.ElevationScrollView>
 
 </LinearLayout>
diff --git a/app/src/main/res/raw/config.json b/app/src/main/res/raw/config.json
@@ -1,15 +1,15 @@
 {
-  "timestamp": 1618692915,
+  "timestamp": 1625835635,
   "payloads":[
     {
       "title":"hekate.bin",
       "downloadUrl": "https://pavelrekun.dev/payloads/hekate.bin",
-      "version":"5.5.5"
+      "version":"5.5.8"
     },
     {
       "title":"fusee_primary.bin",
       "downloadUrl": "https://pavelrekun.dev/payloads/fusee_primary.bin",
-      "version":"0.19.1"
+      "version":"0.19.5"
     },
     {
       "title":"reinx.bin",

diff --git a/app/src/main/res/raw/fusee_primary.bin b/app/src/main/res/raw/fusee_primary.bin
diff --git a/app/src/main/res/raw/hekate.bin b/app/src/main/res/raw/hekate.bin