Skip to content
This repository has been archived by the owner on May 8, 2019. It is now read-only.

Commit

Permalink
New URL for website
Browse files Browse the repository at this point in the history
  • Loading branch information
Javi Pacheco committed Jan 27, 2017
1 parent 4804051 commit 4c96e09
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 13 deletions.
20 changes: 18 additions & 2 deletions modules/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,31 @@
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:host="www.9cards.io" />
<data android:host="9c.io" android:pathPrefix="/shared-collection" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:host="nine.cards" />
<data android:host="www.9c.io" android:pathPrefix="/shared-collection" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:host="www.9cards.io" android:pathPrefix="/shared-collection" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" />
<data android:scheme="https" />
<data android:host="nine.cards" android:pathPrefix="/shared-collection" />
</intent-filter>
</activity>

Expand Down
4 changes: 2 additions & 2 deletions modules/app/src/main/res/values-sw400dp/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<dimen name="height_search_box">48dp</dimen>

<dimen name="wizard_height_image_content">380dp</dimen>
<dimen name="wizard_height_header_steps">340dp</dimen>
<dimen name="wizard_height_image_content">360dp</dimen>
<dimen name="wizard_height_header_steps">320dp</dimen>

</resources>
4 changes: 2 additions & 2 deletions modules/app/src/main/res/values-sw600dp/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<dimen name="height_search_box">48dp</dimen>

<dimen name="wizard_height_image_content">380dp</dimen>
<dimen name="wizard_height_header_steps">340dp</dimen>
<dimen name="wizard_height_image_content">360dp</dimen>
<dimen name="wizard_height_header_steps">320dp</dimen>

</resources>
5 changes: 3 additions & 2 deletions modules/app/src/main/res/values/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<string name="user_id_key">ninecards-user-id</string>
<string name="bluetooth_key">bluetooth-devices</string>

<string name="shared_collection_url">http://nine.cards/collections/id/%1$s</string>
<string name="shared_collection_url">http://9c.io/shared-collection/%1$s</string>

<!-- Crashlytics -->
<string name="crashlytics_enabled">${crashlytics.enabled}</string>
Expand All @@ -41,10 +41,11 @@
<string name="follow_us_google_plus">https://plus.google.com/+47deg</string>
<string name="open_source">http://github.com/47deg</string>
<string name="web_47">http://www.47deg.com</string>
<string name="web_tos">http://9c.io/tos</string>
<string name="nine_cards_github">https://github.com/47deg/nine-cards-v2/</string>

<!-- Preferences Help -->
<string name="ninecards_help">https://47deg.github.io/nine-cards-v2</string>
<string name="ninecards_help">http://www.9cards.io/</string>

<!-- Firebase -->
<string name="firebase_enabled" translatable="false">${firebase.enabled}</string>
Expand Down
4 changes: 2 additions & 2 deletions modules/app/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@

<dimen name="margin_left_subtitle">40dp</dimen>

<dimen name="wizard_height_image_content">320dp</dimen>
<dimen name="wizard_height_header_steps">300dp</dimen>
<dimen name="wizard_height_image_content">300dp</dimen>
<dimen name="wizard_height_header_steps">280dp</dimen>

<dimen name="wizard_size_checkbox_title">24dp</dimen>
<dimen name="wizard_size_checkbox_collection">38dp</dimen>
Expand Down
2 changes: 1 addition & 1 deletion modules/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

<string name="termsAndConditions">
<![CDATA[
by continuing, you accept the<br/><u>Terms of Use</u> and <u>Privacy Policy</u>.
by continuing, you accept the<br/><u>Terms of Use and Privacy Policy</u>.
]]>
</string>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class AppLinksReceiverJobs(actions: AppLinksReceiverUiActions)(
def safeExtractPath: Option[String] =
Option(uri) flatMap (u => Option(u.getPath))

val CollectionsPathRegex = "\\/collections\\/id\\/(.+)".r
val CollectionsPathRegex = "\\/shared-collection\\/(.+)".r

def openInBrowser(uri: Uri): TaskService[Unit] =
for {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ class WizardActivity
override def onClickAcceptTermsButton(): Unit =
wizardJobs.connectAccount().resolveAsync()

override def onClickVisitTermsButton(): Unit =
wizardJobs.showTermOfUseWebsite().resolveAsync()

override def onClickSelectV1DeviceButton(packages: Seq[PackagesByCategory]): Unit =
wizardJobs
.deviceSelected(packages)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ class WizardJobs(
}
}

def showTermOfUseWebsite(): TaskService[Unit] =
di.launcherExecutorProcess.launchUrl(resGetString(R.string.web_tos))

def deviceSelected(packages: Seq[PackagesByCategory]): TaskService[Unit] =
for {
_ <- di.trackEventProcess.chooseNewConfiguration()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ trait WizardUiListener {

def onClickAcceptTermsButton(): Unit

def onClickVisitTermsButton(): Unit

def onClickSelectV1DeviceButton(packages: Seq[PackagesByCategory]): Unit

def onClickSelectDeviceButton(maybeCloudId: Option[String]): Unit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,9 @@ class WizardUiActions(dom: WizardDOM, listener: WizardUiListener)(
})
})) ~
(dom.userTitle <~ tvText(Html.fromHtml(resGetString(R.string.welcome)))) ~
(dom.usersTerms <~ tvText(Html.fromHtml(resGetString(R.string.termsAndConditions)))) ~
(dom.usersTerms <~
tvText(Html.fromHtml(resGetString(R.string.termsAndConditions))) <~
On.click(Ui(listener.onClickVisitTermsButton()))) ~
(dom.stepsAction <~
diveInActionStyle <~
On.click(Ui(listener.onClickFinishWizardButton()))) ~
Expand Down

0 comments on commit 4c96e09

Please sign in to comment.