Skip to content

Commit 05f27fd

Browse files
committed
Rekado 4.1.4
- Added: New languages from Crowdin. - Fixed: Payloads are not getting loaded on the console.
1 parent e285d90 commit 05f27fd

27 files changed

+179
-61
lines changed

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ android {
4646
}
4747

4848
buildFeatures {
49-
viewBinding = true
49+
viewBinding true
5050
}
5151

5252
}
@@ -71,7 +71,7 @@ dependencies {
7171

7272
// Google: Design
7373
implementation "com.google.android.material:material:$materialComponentsVersion"
74-
implementation "com.google.android:flexbox:$flexBoxLayoutVersion"
74+
implementation "com.google.android.flexbox:flexbox:$flexBoxLayoutVersion"
7575

7676
// Design
7777
implementation "dev.chrisbanes.insetter:insetter:$insetterVersion"

app/libs/magta.aar

-4.51 KB
Binary file not shown.

app/libs/penza.aar

-6.24 KB
Binary file not shown.

app/src/main/java/com/pavelrekun/rekado/base/BaseFragment.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.pavelrekun.rekado.base
22

33
import androidx.fragment.app.Fragment
4-
import com.pavelrekun.penza.widgets.ElevationRecyclerView
5-
import com.pavelrekun.penza.widgets.ElevationScrollView
4+
import com.pavelrekun.magta.views.ElevationRecyclerView
5+
import com.pavelrekun.magta.views.ElevationScrollView
66

77
open class BaseFragment(layoutRes: Int = 0) : Fragment(layoutRes) {
88

app/src/main/java/com/pavelrekun/rekado/containers/SecondaryContainerActivity.kt

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import com.pavelrekun.rekado.databinding.ActivityContainerSecondaryBinding
1313
import com.pavelrekun.rekado.services.dialogs.DialogsShower
1414
import com.pavelrekun.rekado.services.extensions.*
1515
import dev.chrisbanes.insetter.applyInsetter
16-
import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
1716

1817
class SecondaryContainerActivity : BaseActivity() {
1918

app/src/main/java/com/pavelrekun/rekado/screens/payload_fragment/PayloadsFragment.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,10 @@ class PayloadsFragment : BaseFragment(R.layout.fragment_payloads) {
166166
}
167167
}
168168

169-
/* @Subscribe(threadMode = ThreadMode.MAIN)
169+
@Subscribe(threadMode = ThreadMode.MAIN)
170170
fun onEvent(event: Events.UpdatePayloadsListEvent) {
171171
updateList()
172-
}*/
172+
}
173173

174174
override fun onResume() {
175175
super.onResume()
@@ -183,14 +183,14 @@ class PayloadsFragment : BaseFragment(R.layout.fragment_payloads) {
183183
}
184184
}
185185

186-
/* override fun onStart() {
186+
override fun onStart() {
187187
super.onStart()
188188
EventBus.getDefault().register(this)
189189
}
190190

191191
override fun onStop() {
192192
super.onStop()
193193
EventBus.getDefault().unregister(this)
194-
}*/
194+
}
195195

196196
}

app/src/main/java/com/pavelrekun/rekado/screens/serial_checker_activity/SerialCheckerFragment.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ import android.widget.Toast
77
import com.google.zxing.integration.android.IntentIntegrator
88
import com.pavelrekun.magta.design.getString
99
import com.pavelrekun.magta.design.isEmpty
10-
import com.pavelrekun.rekado.services.extensions.viewBinding
1110
import com.pavelrekun.rekado.R
1211
import com.pavelrekun.rekado.base.BaseFragment
1312
import com.pavelrekun.rekado.databinding.FragmentSerialCheckerBinding
1413
import com.pavelrekun.rekado.services.Constants
14+
import com.pavelrekun.rekado.services.extensions.viewBinding
1515
import com.pavelrekun.rekado.services.utils.SerialUtils
1616
import com.pavelrekun.rekado.services.utils.Utils
1717
import dev.chrisbanes.insetter.applyInsetter
18-
import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
1918

2019
class SerialCheckerFragment : BaseFragment(R.layout.fragment_serial_checker) {
2120

app/src/main/java/com/pavelrekun/rekado/screens/settings_fragment/SettingsFragment.kt

-2
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ import com.pavelrekun.rekado.services.extensions.openSettingsAppearanceThemesScr
1717
import com.pavelrekun.rekado.services.payloads.PayloadHelper
1818
import com.pavelrekun.rekado.services.utils.LoginUtils
1919
import com.pavelrekun.rekado.services.utils.PreferencesUtils
20-
import com.pavelrekun.rekado.services.utils.Utils
2120
import dev.chrisbanes.insetter.applyInsetter
22-
import dev.chrisbanes.insetter.applySystemWindowInsetsToPadding
2321

2422
class SettingsFragment : BasePreferencesFragment(R.xml.preferences, R.string.navigation_settings) {
2523

app/src/main/java/com/pavelrekun/rekado/services/Constants.kt

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ object Constants {
55
const val HELP_RCM = "https://gbatemp.net/threads/the-ultimate-list-of-mods-to-enter-rcm.502145/"
66
const val HELP_SERIAL_CHECKER = "https://gbatemp.net/threads/switch-informations-by-serial-number-read-the-first-post-before-asking-questions.481215/"
77
const val GITHUB_PROJECT_LINK = "https://github.com/MenosGrante/Rekado"
8-
const val DONATE_LINK = "https://www.buymeacoffee.com/pavelrekun"
98
const val UPDATE_CHANGELOG_LINK = "https://raw.githubusercontent.com/MenosGrante/Rekado/master/app/update-changelog.json"
109

1110
const val MIME_BINARY = "application/octet-stream"

app/src/main/java/com/pavelrekun/rekado/services/dialogs/DialogsShower.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
77
import com.pavelrekun.magta.design.getString
88
import com.pavelrekun.magta.design.isEmpty
99
import com.pavelrekun.magta.restartApp
10+
import com.pavelrekun.magta.services.constants.Links
1011
import com.pavelrekun.penza.services.helpers.SettingsDialogsHelper
1112
import com.pavelrekun.rekado.R
1213
import com.pavelrekun.rekado.base.BaseActivity
@@ -108,7 +109,7 @@ object DialogsShower {
108109
val binding = DialogDonateBinding.inflate(activity.layoutInflater)
109110
val builder = MaterialAlertDialogBuilder(activity)
110111

111-
binding.donateBuyMeCoffee.setOnClickListener { Utils.openLink(activity, Constants.DONATE_LINK) }
112+
binding.aboutPatreonButton.setOnClickListener { Utils.openLink(activity, Links.PATREON_LINK) }
112113

113114
builder.setTitle(R.string.navigation_donate)
114115

app/src/main/java/com/pavelrekun/rekado/services/usb/USBReceiver.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class USBReceiver : BaseActivity() {
5959
finishReceiver()
6060
}
6161

62-
/* @Subscribe(threadMode = ThreadMode.MAIN)
62+
@Subscribe(threadMode = ThreadMode.MAIN)
6363
fun onEvent(event: Events.PayloadSelected) {
6464
injectPayload()
6565
}
@@ -77,7 +77,7 @@ class USBReceiver : BaseActivity() {
7777
override fun onStop() {
7878
EventBus.getDefault().unregister(this)
7979
super.onStop()
80-
}*/
80+
}
8181

8282
private fun finishReceiver() {
8383
if (this::payloadChooserDialog.isInitialized && payloadChooserDialog.isShowing) {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
7+
<path
8+
android:fillColor="?attr/colorIcon"
9+
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" />
10+
11+
</vector>

app/src/main/res/layout/dialog_donate.xml

+17-14
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,25 @@
1313
android:textColor="?android:attr/textColorSecondary"
1414
android:textSize="16sp" />
1515

16-
<com.google.android.material.card.MaterialCardView
16+
<com.google.android.material.button.MaterialButton
17+
android:id="@+id/aboutPatreonButton"
18+
style="@style/Widget.MaterialComponents.Button.TextButton"
1719
android:layout_width="wrap_content"
1820
android:layout_height="wrap_content"
1921
android:layout_gravity="center_horizontal"
20-
android:layout_marginBottom="16dp"
21-
app:cardCornerRadius="6dp"
22-
app:cardElevation="2dp">
23-
24-
<ImageView
25-
android:id="@+id/donateBuyMeCoffee"
26-
android:layout_width="160dp"
27-
android:layout_height="wrap_content"
28-
android:contentDescription="@null"
29-
android:foreground="?android:attr/selectableItemBackground"
30-
android:src="@drawable/pic_donate" />
31-
32-
</com.google.android.material.card.MaterialCardView>
22+
android:layout_marginTop="8dp"
23+
android:fontFamily="@font/gilroy_medium"
24+
android:paddingStart="16dp"
25+
android:paddingTop="8dp"
26+
android:paddingEnd="16dp"
27+
android:paddingBottom="8dp"
28+
android:text="@string/donate_button"
29+
android:textColor="@color/colorWhite"
30+
android:textSize="12sp"
31+
app:backgroundTint="#FF424D"
32+
app:cornerRadius="24dp"
33+
app:icon="@drawable/ic_donate_patreon"
34+
app:iconPadding="8dp"
35+
app:iconTint="@color/colorWhite" />
3336

3437
</LinearLayout>

app/src/main/res/layout/fragment_about.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<com.pavelrekun.penza.widgets.ElevationScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<com.pavelrekun.magta.views.ElevationScrollView xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:id="@+id/aboutLayoutScroll"
55
android:layout_width="match_parent"
@@ -327,4 +327,4 @@
327327
</LinearLayout>
328328
</com.google.android.material.card.MaterialCardView>
329329
</LinearLayout>
330-
</com.pavelrekun.penza.widgets.ElevationScrollView>
330+
</com.pavelrekun.magta.views.ElevationScrollView>

app/src/main/res/layout/fragment_instructions.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<com.pavelrekun.penza.widgets.ElevationScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<com.pavelrekun.magta.views.ElevationScrollView xmlns:android="http://schemas.android.com/apk/res/android"
33
android:id="@+id/instructionsLayoutScroll"
44
android:layout_width="match_parent"
55
android:layout_height="match_parent"
@@ -166,4 +166,4 @@
166166
</com.google.android.material.card.MaterialCardView>
167167

168168
</LinearLayout>
169-
</com.pavelrekun.penza.widgets.ElevationScrollView>
169+
</com.pavelrekun.magta.views.ElevationScrollView>

app/src/main/res/layout/fragment_logs.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_height="match_parent"
66
android:orientation="vertical">
77

8-
<com.pavelrekun.penza.widgets.ElevationRecyclerView
8+
<com.pavelrekun.magta.views.ElevationRecyclerView
99
android:id="@+id/logsActionsList"
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent"

app/src/main/res/layout/fragment_serial_checker.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_height="match_parent"
66
android:orientation="vertical">
77

8-
<com.pavelrekun.penza.widgets.ElevationScrollView
8+
<com.pavelrekun.magta.views.ElevationScrollView
99
android:id="@+id/serialCheckerLayoutScroll"
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent">
@@ -152,6 +152,6 @@
152152

153153
</com.google.android.material.card.MaterialCardView>
154154
</LinearLayout>
155-
</com.pavelrekun.penza.widgets.ElevationScrollView>
155+
</com.pavelrekun.magta.views.ElevationScrollView>
156156

157157
</LinearLayout>

app/src/main/res/raw/config.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"timestamp": 1618692915,
2+
"timestamp": 1625835635,
33
"payloads":[
44
{
55
"title":"hekate.bin",
66
"downloadUrl": "https://pavelrekun.dev/payloads/hekate.bin",
7-
"version":"5.5.5"
7+
"version":"5.5.8"
88
},
99
{
1010
"title":"fusee_primary.bin",
1111
"downloadUrl": "https://pavelrekun.dev/payloads/fusee_primary.bin",
12-
"version":"0.19.1"
12+
"version":"0.19.5"
1313
},
1414
{
1515
"title":"reinx.bin",
224 Bytes
Binary file not shown.

app/src/main/res/raw/hekate.bin

-580 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)