Skip to content

Commit 9d357bb

Browse files
authored
refactor(settings): remove color customization lock and add thank you button (#145)
1 parent 3464513 commit 9d357bb

3 files changed

Lines changed: 4 additions & 23 deletions

File tree

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

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class SettingsActivity : SimpleActivity() {
4141
super.onResume()
4242
setupToolbar(binding.settingsToolbar, NavigationIcon.Arrow)
4343

44-
setupPurchaseThankYou()
4544
setupCustomizeColors()
4645
setupUseEnglish()
4746
setupLanguage()
@@ -86,17 +85,9 @@ class SettingsActivity : SimpleActivity() {
8685
}
8786
}
8887

89-
private fun setupPurchaseThankYou() {
90-
binding.settingsPurchaseThankYouHolder.beGoneIf(isOrWasThankYouInstalled())
91-
binding.settingsPurchaseThankYouHolder.setOnClickListener {
92-
launchPurchaseThankYouIntent()
93-
}
94-
}
95-
9688
private fun setupCustomizeColors() {
97-
binding.settingsCustomizeColorsLabel.text = getCustomizeColorsString()
9889
binding.settingsColorCustomizationHolder.setOnClickListener {
99-
handleCustomizeColorsClick()
90+
startCustomizationActivity()
10091
}
10192
}
10293

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,10 @@
7070
android:layout_height="wrap_content"
7171
android:orientation="vertical">
7272

73-
<RelativeLayout
73+
<org.fossify.commons.views.PurchaseThankYouItem
7474
android:id="@+id/settings_purchase_thank_you_holder"
75-
style="@style/SettingsHolderTextViewOneLinerStyle"
7675
android:layout_width="match_parent"
77-
android:layout_height="wrap_content">
78-
79-
<org.fossify.commons.views.MyTextView
80-
android:id="@+id/settings_purchase_thank_you"
81-
style="@style/SettingsTextLabelStyle"
82-
android:layout_width="wrap_content"
83-
android:layout_height="wrap_content"
84-
android:text="@string/purchase_simple_thank_you" />
85-
86-
</RelativeLayout>
76+
android:layout_height="wrap_content"/>
8777

8878
<RelativeLayout
8979
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
@@ -11,7 +11,7 @@ androidx-window = "1.4.0"
1111
androidx-camera = "1.4.2"
1212
androidx-ktx = "2.8.6"
1313
#Fossify
14-
commons = "4.4.2"
14+
commons = "5.0.0"
1515
#Gradle
1616
gradlePlugins-agp = "8.11.1"
1717
#build

0 commit comments

Comments
 (0)