fenix
/
Simple-Notes
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removing Stetho and Upgrade to Pro button

This commit is contained in:
tibbi 2018-11-07 11:23:54 +01:00
parent f12ad22230
commit 435272c8b3
5 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/build.gradle
View File

@ -42,7 +42,6 @@ android {
dependencies {
implementation 'com.simplemobiletools:commons:5.3.13'
implementation 'com.facebook.stetho:stetho:1.5.0'
}
Properties props = new Properties()

5
app/src/main/kotlin/com/simplemobiletools/notes/App.kt
View File

@ -1,16 +1,11 @@
package com.simplemobiletools.notes
import android.app.Application
import com.facebook.stetho.Stetho
import com.simplemobiletools.commons.extensions.checkUseEnglish
class App : Application() {
override fun onCreate() {
super.onCreate()
if (BuildConfig.DEBUG) {
Stetho.initializeWithDefaults(this)
}
checkUseEnglish()
}
}

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

@ -13,10 +13,8 @@ import android.view.MenuItem
import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog
import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.dialogs.UpgradeToProDialog
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.LICENSE_RTL
import com.simplemobiletools.commons.helpers.LICENSE_STETHO
import com.simplemobiletools.commons.helpers.PERMISSION_READ_STORAGE
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
import com.simplemobiletools.commons.models.FAQItem
@ -89,11 +87,6 @@ class MainActivity : SimpleActivity() {
wasInit = true
checkAppOnSDCard()
if (!config.wasInitialUpgradeToProShown) {
UpgradeToProDialog(this)
config.wasInitialUpgradeToProShown = true
}
}
override fun onResume() {
@ -313,7 +306,7 @@ class MainActivity : SimpleActivity() {
}
private fun launchAbout() {
val licenses = LICENSE_STETHO or LICENSE_RTL
val licenses = LICENSE_RTL
val faqItems = arrayListOf(
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),

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

@ -3,7 +3,9 @@ package com.simplemobiletools.notes.activities
import android.content.Intent
import android.os.Bundle
import com.simplemobiletools.commons.dialogs.RadioGroupDialog
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getAdjustedPrimaryColor
import com.simplemobiletools.commons.extensions.updateTextColors
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
import com.simplemobiletools.commons.helpers.isOreoPlus
import com.simplemobiletools.commons.models.RadioItem
@ -24,7 +26,6 @@ class SettingsActivity : SimpleActivity() {
override fun onResume() {
super.onResume()
setupUpgradeToPro()
setupCustomizeColors()
setupUseEnglish()
setupAutosaveNotes()
@ -51,13 +52,6 @@ class SettingsActivity : SimpleActivity() {
}
}
private fun setupUpgradeToPro() {
settings_upgrade_to_pro_holder.beGoneIf(isAProApp())
settings_upgrade_to_pro_holder.setOnClickListener {
launchUpgradeToProIntent()
}
}
private fun setupCustomizeColors() {
settings_customize_colors_holder.setOnClickListener {
startCustomizationActivity()

22
app/src/main/res/layout/activity_settings.xml
View File

@ -12,28 +12,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/settings_upgrade_to_pro_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_upgrade_to_pro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/upgrade_to_pro"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_customize_colors_holder"
android:layout_width="match_parent"