diff --git a/app/src/main/java/com/etesync/syncadapter/Constants.java b/app/src/main/java/com/etesync/syncadapter/Constants.java index 102aa95f..d83541a0 100644 --- a/app/src/main/java/com/etesync/syncadapter/Constants.java +++ b/app/src/main/java/com/etesync/syncadapter/Constants.java @@ -25,10 +25,12 @@ public class Constants { NOTIFICATION_PERMISSIONS = 20; public static final Uri webUri = Uri.parse((DEBUG_REMOTE_URL == null) ? "https://www.etesync.com/" : DEBUG_REMOTE_URL); + public static final Uri etebaseDashboardPrefix = Uri.parse("https://dashboard.etebase.com/user/partner/"); public static final Uri contactUri = webUri.buildUpon().appendEncodedPath("about/#contact").build(); public static final Uri registrationUrl = webUri.buildUpon().appendEncodedPath("accounts/signup/").build(); public static final Uri reportIssueUri = Uri.parse("https://github.com/etesync/android/issues"); public static final Uri feedbackUri = reportIssueUri; + public static final Uri pricing = webUri.buildUpon().appendEncodedPath("pricing/").build(); public static final Uri dashboard = webUri.buildUpon().appendEncodedPath("dashboard/").build(); public static final Uri faqUri = webUri.buildUpon().appendEncodedPath("faq/").build(); public static final Uri helpUri = webUri.buildUpon().appendEncodedPath("user-guide/android/").build(); diff --git a/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt index f56ca8af..7d8b46f2 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/WebViewActivity.kt @@ -198,10 +198,15 @@ class WebViewActivity : BaseActivity() { Constants.dashboard, Constants.webUri.buildUpon().appendEncodedPath("tos/").build(), Constants.webUri.buildUpon().appendEncodedPath("about/").build(), + Constants.pricing, ) val accountsUri = Constants.webUri.buildUpon().appendEncodedPath("accounts/").build() - return allowedUris(allowedUris, uri) || uri.host == accountsUri.host && uri.path!!.startsWith(accountsUri.path!!) + return allowedUris(allowedUris, uri) || ( + uri.host == accountsUri.host && uri.path!!.startsWith(accountsUri.path!!) + ) || ( + uri.host == Constants.etebaseDashboardPrefix.host && uri.path!!.startsWith(Constants.etebaseDashboardPrefix.path!!) + ) } } } diff --git a/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt index a7b571c0..5804731c 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/etebase/SignupFragment.kt @@ -17,6 +17,7 @@ import android.view.View import android.view.ViewGroup import android.widget.Button import android.widget.CheckedTextView +import android.widget.TextView import androidx.fragment.app.DialogFragment import androidx.fragment.app.Fragment import androidx.fragment.app.commit @@ -32,6 +33,7 @@ import com.etebase.client.exceptions.EtebaseException import com.etesync.syncadapter.Constants import com.etesync.syncadapter.HttpClient import com.etesync.syncadapter.R +import com.etesync.syncadapter.ui.WebViewActivity import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder import com.etesync.syncadapter.ui.setup.CreateAccountFragment import com.etesync.syncadapter.ui.setup.DetectConfigurationFragment @@ -62,6 +64,9 @@ class SignupFragment(private val initialUsername: String?, private val initialPa editPassword = v.findViewById(R.id.url_password) showAdvanced = v.findViewById(R.id.show_advanced) customServer = v.findViewById(R.id.custom_server) + v.findViewById(R.id.trial_notice).setOnClickListener { + WebViewActivity.openUrl(requireContext(), Constants.pricing) + } if (savedInstanceState == null) { editUserName.editText?.setText(initialUsername ?: "") diff --git a/app/src/main/res/layout/signup_fragment.xml b/app/src/main/res/layout/signup_fragment.xml index bf4e2da2..ea620aee 100644 --- a/app/src/main/res/layout/signup_fragment.xml +++ b/app/src/main/res/layout/signup_fragment.xml @@ -29,6 +29,15 @@ android:text="@string/signup_title" android:layout_marginBottom="14dp"/> + + #000000 #d32f2f + #E8F4FD