mirror of
https://github.com/etesync/android
synced 2025-06-27 18:32:37 +00:00
Signup page: add a notice about the pricing.
This commit is contained in:
parent
b5355b47e3
commit
fd94ea51f5
@ -25,10 +25,12 @@ public class Constants {
|
|||||||
NOTIFICATION_PERMISSIONS = 20;
|
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 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 contactUri = webUri.buildUpon().appendEncodedPath("about/#contact").build();
|
||||||
public static final Uri registrationUrl = webUri.buildUpon().appendEncodedPath("accounts/signup/").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 reportIssueUri = Uri.parse("https://github.com/etesync/android/issues");
|
||||||
public static final Uri feedbackUri = reportIssueUri;
|
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 dashboard = webUri.buildUpon().appendEncodedPath("dashboard/").build();
|
||||||
public static final Uri faqUri = webUri.buildUpon().appendEncodedPath("faq/").build();
|
public static final Uri faqUri = webUri.buildUpon().appendEncodedPath("faq/").build();
|
||||||
public static final Uri helpUri = webUri.buildUpon().appendEncodedPath("user-guide/android/").build();
|
public static final Uri helpUri = webUri.buildUpon().appendEncodedPath("user-guide/android/").build();
|
||||||
|
@ -198,10 +198,15 @@ class WebViewActivity : BaseActivity() {
|
|||||||
Constants.dashboard,
|
Constants.dashboard,
|
||||||
Constants.webUri.buildUpon().appendEncodedPath("tos/").build(),
|
Constants.webUri.buildUpon().appendEncodedPath("tos/").build(),
|
||||||
Constants.webUri.buildUpon().appendEncodedPath("about/").build(),
|
Constants.webUri.buildUpon().appendEncodedPath("about/").build(),
|
||||||
|
Constants.pricing,
|
||||||
)
|
)
|
||||||
val accountsUri = Constants.webUri.buildUpon().appendEncodedPath("accounts/").build()
|
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!!)
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,6 +17,7 @@ import android.view.View
|
|||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.widget.Button
|
import android.widget.Button
|
||||||
import android.widget.CheckedTextView
|
import android.widget.CheckedTextView
|
||||||
|
import android.widget.TextView
|
||||||
import androidx.fragment.app.DialogFragment
|
import androidx.fragment.app.DialogFragment
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.commit
|
import androidx.fragment.app.commit
|
||||||
@ -32,6 +33,7 @@ import com.etebase.client.exceptions.EtebaseException
|
|||||||
import com.etesync.syncadapter.Constants
|
import com.etesync.syncadapter.Constants
|
||||||
import com.etesync.syncadapter.HttpClient
|
import com.etesync.syncadapter.HttpClient
|
||||||
import com.etesync.syncadapter.R
|
import com.etesync.syncadapter.R
|
||||||
|
import com.etesync.syncadapter.ui.WebViewActivity
|
||||||
import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder
|
import com.etesync.syncadapter.ui.setup.BaseConfigurationFinder
|
||||||
import com.etesync.syncadapter.ui.setup.CreateAccountFragment
|
import com.etesync.syncadapter.ui.setup.CreateAccountFragment
|
||||||
import com.etesync.syncadapter.ui.setup.DetectConfigurationFragment
|
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)
|
editPassword = v.findViewById(R.id.url_password)
|
||||||
showAdvanced = v.findViewById(R.id.show_advanced)
|
showAdvanced = v.findViewById(R.id.show_advanced)
|
||||||
customServer = v.findViewById(R.id.custom_server)
|
customServer = v.findViewById(R.id.custom_server)
|
||||||
|
v.findViewById<TextView>(R.id.trial_notice).setOnClickListener {
|
||||||
|
WebViewActivity.openUrl(requireContext(), Constants.pricing)
|
||||||
|
}
|
||||||
|
|
||||||
if (savedInstanceState == null) {
|
if (savedInstanceState == null) {
|
||||||
editUserName.editText?.setText(initialUsername ?: "")
|
editUserName.editText?.setText(initialUsername ?: "")
|
||||||
|
@ -29,6 +29,15 @@
|
|||||||
android:text="@string/signup_title"
|
android:text="@string/signup_title"
|
||||||
android:layout_marginBottom="14dp"/>
|
android:layout_marginBottom="14dp"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/trial_notice"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="You are signing up for a free trial. Click here for pricing information."
|
||||||
|
android:background="@color/infoColor"
|
||||||
|
android:padding="14dp"
|
||||||
|
android:layout_marginBottom="14dp"/>
|
||||||
|
|
||||||
<com.google.android.material.textfield.TextInputLayout
|
<com.google.android.material.textfield.TextInputLayout
|
||||||
android:id="@+id/user_name"
|
android:id="@+id/user_name"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
<color name="primaryTextColor">#000000</color>
|
<color name="primaryTextColor">#000000</color>
|
||||||
|
|
||||||
<color name="errorColor">#d32f2f</color>
|
<color name="errorColor">#d32f2f</color>
|
||||||
|
<color name="infoColor">#E8F4FD</color>
|
||||||
|
|
||||||
|
|
||||||
<!-- app theme -->
|
<!-- app theme -->
|
||||||
|
Loading…
Reference in New Issue
Block a user