Skip to content

Commit de224f9

Browse files
authored
refactor(settings): remove color customization lock and add thank you button (#207)
1 parent 7e103a2 commit de224f9

4 files changed

Lines changed: 4 additions & 26 deletions

File tree

app/src/gplay/res/values/bools.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@
22
<resources>
33
<bool name="show_donate_in_about">false</bool>
44
<bool name="hide_google_relations">false</bool>
5-
<bool name="hide_all_external_links">false</bool>
65
<bool name="pretend_thank_you_installed">true</bool>
76
</resources>

app/src/main/kotlin/org/fossify/voicerecorder/activities/SettingsActivity.kt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ import org.fossify.commons.extensions.beGoneIf
1111
import org.fossify.commons.extensions.beVisible
1212
import org.fossify.commons.extensions.beVisibleIf
1313
import org.fossify.commons.extensions.formatSize
14-
import org.fossify.commons.extensions.getCustomizeColorsString
1514
import org.fossify.commons.extensions.getProperPrimaryColor
1615
import org.fossify.commons.extensions.humanizePath
1716
import org.fossify.commons.extensions.isOrWasThankYouInstalled
18-
import org.fossify.commons.extensions.launchPurchaseThankYouIntent
1917
import org.fossify.commons.extensions.toast
2018
import org.fossify.commons.extensions.updateTextColors
2119
import org.fossify.commons.helpers.IS_CUSTOMIZING_COLORS
@@ -70,7 +68,6 @@ class SettingsActivity : SimpleActivity() {
7068
super.onResume()
7169
setupToolbar(binding.settingsToolbar, NavigationIcon.Arrow)
7270

73-
setupPurchaseThankYou()
7471
setupCustomizeColors()
7572
setupCustomizeWidgetColors()
7673
setupUseEnglish()
@@ -96,17 +93,9 @@ class SettingsActivity : SimpleActivity() {
9693
}
9794
}
9895

99-
private fun setupPurchaseThankYou() {
100-
binding.settingsPurchaseThankYouHolder.beGoneIf(isOrWasThankYouInstalled())
101-
binding.settingsPurchaseThankYouHolder.setOnClickListener {
102-
launchPurchaseThankYouIntent()
103-
}
104-
}
105-
10696
private fun setupCustomizeColors() {
107-
binding.settingsColorCustomizationLabel.text = getCustomizeColorsString()
10897
binding.settingsColorCustomizationHolder.setOnClickListener {
109-
handleCustomizeColorsClick()
98+
startCustomizationActivity()
11099
}
111100
}
112101

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,20 +80,10 @@
8080
android:layout_height="wrap_content"
8181
android:text="@string/general_settings" />
8282

83-
<RelativeLayout
83+
<org.fossify.commons.views.PurchaseThankYouItem
8484
android:id="@+id/settings_purchase_thank_you_holder"
85-
style="@style/SettingsHolderTextViewOneLinerStyle"
8685
android:layout_width="match_parent"
87-
android:layout_height="wrap_content">
88-
89-
<org.fossify.commons.views.MyTextView
90-
android:id="@+id/settings_purchase_thank_you"
91-
style="@style/SettingsTextLabelStyle"
92-
android:layout_width="wrap_content"
93-
android:layout_height="wrap_content"
94-
android:text="@string/purchase_simple_thank_you" />
95-
96-
</RelativeLayout>
86+
android:layout_height="wrap_content"/>
9787

9888
<RelativeLayout
9989
android:id="@+id/settings_use_english_holder"

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ androidx-swiperefreshlayout = "1.1.0"
1414
eventbus = "3.3.1"
1515
#Fossify
1616
#noinspection GradleDependency
17-
commons = "4.4.2"
17+
commons = "5.0.0"
1818
#AudioRecordView
1919
audiorecordview = "1.0.5"
2020
#TAndroidLame

0 commit comments

Comments
 (0)