fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-03-24 04:20:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #670 from esensar/release-crash-fix

Browse Source 
Fix release build type crash and missing pager tab strip
This commit is contained in:
Tibor Kaputa 2023-08-15 16:49:52 +02:00 committed by GitHub
commit 1d6fbfeab8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/proguard-rules.pro vendored
View File

@ -25,3 +25,9 @@
public static <1> INSTANCE;
kotlinx.serialization.KSerializer serializer(...);
}
# Needed for using TypeToken with Gson
# Taken from: https://r8.googlesource.com/r8/+/refs/heads/main/compatibility-faq.md#troubleshooting-gson-gson
-keepattributes Signature
-keep class com.google.gson.reflect.TypeToken { *; }
-keep class * extends com.google.gson.reflect.TypeToken

5
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
View File

@ -27,6 +27,7 @@ import android.webkit.WebViewClient
import android.widget.ImageView
import android.widget.TextView
import android.widget.Toast
import androidx.viewpager.widget.ViewPager
import com.simplemobiletools.commons.dialogs.*
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.*
@ -80,12 +81,11 @@ class MainActivity : SimpleActivity() {
private lateinit var searchNextBtn: ImageView
private lateinit var searchClearBtn: ImageView
private lateinit var binding: ActivityMainBinding
private val binding: ActivityMainBinding by viewBinding(ActivityMainBinding::inflate)
override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true
super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
appLaunched(BuildConfig.APPLICATION_ID)
setupOptionsMenu()
@ -103,6 +103,7 @@ class MainActivity : SimpleActivity() {
binding.pagerTabStrip.setTextSize(TypedValue.COMPLEX_UNIT_PX, getPercentageFontSize())
binding.pagerTabStrip.layoutParams.height =
(binding.pagerTabStrip.height + resources.getDimension(com.simplemobiletools.commons.R.dimen.activity_margin) * 2 * (config.fontSizePercentage / 100f)).toInt()
(binding.pagerTabStrip.layoutParams as ViewPager.LayoutParams).isDecor = true
checkWhatsNewDialog()
checkIntents(intent)

3
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt
View File

@ -27,12 +27,11 @@ import kotlin.system.exitProcess
class SettingsActivity : SimpleActivity() {
private val notesFileType = "application/json"
private lateinit var binding: ActivitySettingsBinding
private val binding: ActivitySettingsBinding by viewBinding(ActivitySettingsBinding::inflate)
override fun onCreate(savedInstanceState: Bundle?) {
isMaterialActivity = true
super.onCreate(savedInstanceState)
binding = ActivitySettingsBinding.inflate(layoutInflater)
setContentView(binding.root)
updateMaterialActivityViews(binding.settingsCoordinator, binding.settingsHolder, useTransparentNavigation = true, useTopSearchMenu = false)

3
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/WidgetConfigureActivity.kt
View File

@ -41,13 +41,12 @@ class WidgetConfigureActivity : SimpleActivity() {
private var mIsCustomizingColors = false
private var mShowTitle = false
private var mNotes = listOf<Note>()
private lateinit var binding: WidgetConfigBinding
private val binding: WidgetConfigBinding by viewBinding(WidgetConfigBinding::inflate)
public override fun onCreate(savedInstanceState: Bundle?) {
useDynamicTheme = false
super.onCreate(savedInstanceState)
setResult(RESULT_CANCELED)
binding = WidgetConfigBinding.inflate(layoutInflater)
setContentView(binding.root)
initVariables()

2
app/src/main/kotlin/com/simplemobiletools/notes/pro/fragments/ChecklistFragment.kt
View File

@ -28,7 +28,7 @@ class ChecklistFragment : NoteFragment(), ChecklistItemsListener {
private var noteId = 0L
lateinit var binding: FragmentChecklistBinding
private lateinit var binding: FragmentChecklistBinding
var items = mutableListOf<ChecklistItem>()