refine: purchase dialog

Author: Hamza417

app/src/main/java/app/simple/inure/dialogs/app/FullVersion.kt

@@ -1,27 +1,32 @@
 package app.simple.inure.dialogs.app
 
 import android.content.DialogInterface
+import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentManager
 import app.simple.inure.R
 import app.simple.inure.decorations.ripple.DynamicRippleTextView
+import app.simple.inure.dialogs.app.Purchase.Companion.showPurchaseDialog
 import app.simple.inure.extensions.fragments.ScopedBottomSheetFragment
 import app.simple.inure.interfaces.fragments.WarningCallbacks
+import app.simple.inure.preferences.TrialPreferences
 import app.simple.inure.ui.panels.Trial
 
 class FullVersion : ScopedBottomSheetFragment() {
 
-    private lateinit var showMe: DynamicRippleTextView
+    private lateinit var trialInfo: DynamicRippleTextView
+    private lateinit var purchase: DynamicRippleTextView
     private lateinit var close: DynamicRippleTextView
     private var warningCallbacks: WarningCallbacks? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val view = inflater.inflate(R.layout.dialog_full_version, container, false)
 
-        showMe = view.findViewById(R.id.purchase)
+        trialInfo = view.findViewById(R.id.trial_info)
+        purchase = view.findViewById(R.id.purchase)
         close = view.findViewById(R.id.close)
 
         return view
@@ -31,9 +36,13 @@ class FullVersion : ScopedBottomSheetFragment() {
         super.onViewCreated(view, savedInstanceState)
         startPostponedEnterTransition()
 
-        showMe.setOnClickListener {
+        trialInfo.setOnClickListener {
             dismiss()
-            openFragmentSlide(Trial.newInstance(), "trial")
+            openFragmentSlide(Trial.newInstance(), Trial.TAG)
+        }
+
+        purchase.setOnClickListener {
+            parentFragmentManager.showPurchaseDialog()
         }
 
         close.setOnClickListener {
@@ -55,6 +64,19 @@ class FullVersion : ScopedBottomSheetFragment() {
         }
     }
 
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
+        super.onSharedPreferenceChanged(sharedPreferences, key)
+        when (key) {
+            TrialPreferences.HAS_LICENSE_KEY -> {
+                if (TrialPreferences.isAppFullVersionEnabled()) {
+                    requireActivity().runOnUiThread {
+                        dismiss()
+                    }
+                }
+            }
+        }
+    }
+
     companion object {
         fun newInstance(): FullVersion {
             val args = Bundle()

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

@@ -27,18 +27,34 @@
             android:layout_marginTop="5dp"
             android:text="@string/one_time_purchase"
             android:textSize="@dimen/info_text_tiny"
+            app:appFontStyle="regular"
+            app:textColorStyle="tertiary" />
+
+        <app.simple.inure.decorations.ripple.DynamicRippleTextView
+            android:id="@+id/trial_info"
+            android:drawablePadding="5dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:layout_gravity="end"
+            android:layout_marginTop="@dimen/dialog_padding"
+            android:padding="@dimen/button_padding"
+            android:text="@string/trial_info"
+            android:textSize="@dimen/info_text_small"
             app:appFontStyle="bold"
-            app:textColorStyle="primary" />
+            app:drawableEndCompat="@drawable/ic_arrow_right_16dp"
+            app:drawableTintStyle="accent"
+            app:textColorStyle="secondary" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
-            android:layout_marginTop="@dimen/dialog_padding"
+            android:layout_marginTop="@dimen/popup_padding"
             android:animateLayoutChanges="true"
             android:orientation="horizontal">
 
-            <View
+            <Space
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
@@ -60,11 +76,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end|center_vertical"
-                android:layout_marginStart="10dp"
+                android:layout_marginStart="@dimen/popup_item_gap_length"
                 android:drawablePadding="@dimen/popup_padding"
                 android:gravity="center"
                 android:padding="@dimen/dialog_padding"
-                android:text="@string/upgrade"
+                android:text="@string/purchase"
                 android:textSize="@dimen/info_text_small"
                 app:appFontStyle="bold"
                 app:drawableEndCompat="@drawable/ic_open_in_new_tiny"

app/src/main/res/values/strings.xml

@@ -781,6 +781,5 @@
     <string name="desc_disable_animations">Disable app animations completely.</string>
     <string name="add_vote_desc">Tap the button to add your vote.</string>
     <string name="relevance">Relevance</string>
-    <string name="upgrade">Upgrade</string>
     <string name="one_time_purchase">One-time purchase. Lifetime access.</string>
 </resources>