From f42e69388e1158a778e57b439f19ebd46b430454 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Mon, 16 Dec 2019 21:13:10 +0100 Subject: [PATCH] Clean --- .../loki/redesign/DisplayNameActivity.kt | 16 ++---------- .../loki/redesign/LandingActivity.kt | 16 ++---------- .../loki/redesign/RegisterActivity.kt | 25 ++++++++----------- .../loki/redesign/RestoreActivity.kt | 24 ++++++++---------- .../redesign/utilities/ActivityUtilities.kt | 21 ++++++++++++++++ 5 files changed, 46 insertions(+), 56 deletions(-) create mode 100644 src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt diff --git a/src/org/thoughtcrime/securesms/loki/redesign/DisplayNameActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/DisplayNameActivity.kt index 77e1c29b40..01724b652b 100644 --- a/src/org/thoughtcrime/securesms/loki/redesign/DisplayNameActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/redesign/DisplayNameActivity.kt @@ -1,28 +1,16 @@ package org.thoughtcrime.securesms.loki.redesign import android.os.Bundle -import android.support.v7.app.ActionBar -import android.view.Gravity -import android.widget.ImageView -import android.widget.RelativeLayout import kotlinx.android.synthetic.main.activity_display_name_v2.* import network.loki.messenger.R import org.thoughtcrime.securesms.BaseActionBarActivity +import org.thoughtcrime.securesms.loki.redesign.utilities.setUpActionBarSessionLogo class DisplayNameActivity : BaseActionBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - supportActionBar!!.setDisplayShowHomeEnabled(false) - supportActionBar!!.setDisplayShowTitleEnabled(false) - val logoImageView = ImageView(this) - logoImageView.setImageResource(R.drawable.session_logo) - val logoImageViewContainer = RelativeLayout(this) - logoImageViewContainer.addView(logoImageView) - logoImageViewContainer.gravity = Gravity.CENTER - val logoImageViewContainerLayoutParams = ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.WRAP_CONTENT) - supportActionBar!!.setCustomView(logoImageViewContainer, logoImageViewContainerLayoutParams) - supportActionBar!!.setDisplayShowCustomEnabled(true) + setUpActionBarSessionLogo() setContentView(R.layout.activity_display_name_v2) } diff --git a/src/org/thoughtcrime/securesms/loki/redesign/LandingActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/LandingActivity.kt index 61ae4e7e85..134e0da872 100644 --- a/src/org/thoughtcrime/securesms/loki/redesign/LandingActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/redesign/LandingActivity.kt @@ -2,29 +2,17 @@ package org.thoughtcrime.securesms.loki.redesign import android.content.Intent import android.os.Bundle -import android.support.v7.app.ActionBar -import android.view.Gravity -import android.widget.ImageView -import android.widget.RelativeLayout import kotlinx.android.synthetic.main.activity_landing.* import network.loki.messenger.R import org.thoughtcrime.securesms.BaseActionBarActivity +import org.thoughtcrime.securesms.loki.redesign.utilities.setUpActionBarSessionLogo class LandingActivity : BaseActionBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_landing) - supportActionBar!!.setDisplayShowHomeEnabled(false) - supportActionBar!!.setDisplayShowTitleEnabled(false) - val logoImageView = ImageView(this) - logoImageView.setImageResource(R.drawable.session_logo) - val logoImageViewContainer = RelativeLayout(this) - logoImageViewContainer.addView(logoImageView) - logoImageViewContainer.gravity = Gravity.CENTER - val logoImageViewContainerLayoutParams = ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.WRAP_CONTENT) - supportActionBar!!.setCustomView(logoImageViewContainer, logoImageViewContainerLayoutParams) - supportActionBar!!.setDisplayShowCustomEnabled(true) + setUpActionBarSessionLogo() fakeChatView.startAnimating() registerButton.setOnClickListener { register() } restoreButton.setOnClickListener { restore() } diff --git a/src/org/thoughtcrime/securesms/loki/redesign/RegisterActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/RegisterActivity.kt index 9786c0b593..c1a5242205 100644 --- a/src/org/thoughtcrime/securesms/loki/redesign/RegisterActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/redesign/RegisterActivity.kt @@ -1,31 +1,28 @@ package org.thoughtcrime.securesms.loki.redesign import android.content.Intent +import android.graphics.Typeface import android.os.Bundle -import android.support.v7.app.ActionBar -import android.view.Gravity -import android.widget.ImageView -import android.widget.RelativeLayout +import android.text.Spannable +import android.text.SpannableStringBuilder +import android.text.style.StyleSpan import kotlinx.android.synthetic.main.activity_register.* import network.loki.messenger.R import org.thoughtcrime.securesms.BaseActionBarActivity +import org.thoughtcrime.securesms.loki.redesign.utilities.setUpActionBarSessionLogo + class RegisterActivity : BaseActionBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_register) - supportActionBar!!.setDisplayShowHomeEnabled(false) - supportActionBar!!.setDisplayShowTitleEnabled(false) - val logoImageView = ImageView(this) - logoImageView.setImageResource(R.drawable.session_logo) - val logoImageViewContainer = RelativeLayout(this) - logoImageViewContainer.addView(logoImageView) - logoImageViewContainer.gravity = Gravity.CENTER - val logoImageViewContainerLayoutParams = ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.WRAP_CONTENT) - supportActionBar!!.setCustomView(logoImageViewContainer, logoImageViewContainerLayoutParams) - supportActionBar!!.setDisplayShowCustomEnabled(true) + setUpActionBarSessionLogo() registerButton.setOnClickListener { register() } + val termsExplanation = SpannableStringBuilder("By using this service, you agree to our Terms and Conditions and Privacy Statement") + termsExplanation.setSpan(StyleSpan(Typeface.BOLD), 40, 60, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + termsExplanation.setSpan(StyleSpan(Typeface.BOLD), 65, 82, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + legalButton.text = termsExplanation } private fun register() { diff --git a/src/org/thoughtcrime/securesms/loki/redesign/RestoreActivity.kt b/src/org/thoughtcrime/securesms/loki/redesign/RestoreActivity.kt index a86bcc1c57..78e551996d 100644 --- a/src/org/thoughtcrime/securesms/loki/redesign/RestoreActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/redesign/RestoreActivity.kt @@ -1,29 +1,25 @@ package org.thoughtcrime.securesms.loki.redesign +import android.graphics.Typeface import android.os.Bundle -import android.support.v7.app.ActionBar -import android.view.Gravity -import android.widget.ImageView -import android.widget.RelativeLayout +import android.text.Spannable +import android.text.SpannableStringBuilder +import android.text.style.StyleSpan import kotlinx.android.synthetic.main.activity_restore.* import network.loki.messenger.R import org.thoughtcrime.securesms.BaseActionBarActivity +import org.thoughtcrime.securesms.loki.redesign.utilities.setUpActionBarSessionLogo class RestoreActivity : BaseActionBarActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - supportActionBar!!.setDisplayShowHomeEnabled(false) - supportActionBar!!.setDisplayShowTitleEnabled(false) - val logoImageView = ImageView(this) - logoImageView.setImageResource(R.drawable.session_logo) - val logoImageViewContainer = RelativeLayout(this) - logoImageViewContainer.addView(logoImageView) - logoImageViewContainer.gravity = Gravity.CENTER - val logoImageViewContainerLayoutParams = ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.WRAP_CONTENT) - supportActionBar!!.setCustomView(logoImageViewContainer, logoImageViewContainerLayoutParams) - supportActionBar!!.setDisplayShowCustomEnabled(true) + setUpActionBarSessionLogo() setContentView(R.layout.activity_restore) + val termsExplanation = SpannableStringBuilder("By using this service, you agree to our Terms and Conditions and Privacy Statement") + termsExplanation.setSpan(StyleSpan(Typeface.BOLD), 40, 60, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + termsExplanation.setSpan(StyleSpan(Typeface.BOLD), 65, 82, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE) + legalButton.text = termsExplanation } override fun onResume() { diff --git a/src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt b/src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt new file mode 100644 index 0000000000..d112684e0f --- /dev/null +++ b/src/org/thoughtcrime/securesms/loki/redesign/utilities/ActivityUtilities.kt @@ -0,0 +1,21 @@ +package org.thoughtcrime.securesms.loki.redesign.utilities + +import android.support.v7.app.ActionBar +import android.support.v7.app.AppCompatActivity +import android.view.Gravity +import android.widget.ImageView +import android.widget.RelativeLayout +import network.loki.messenger.R + +fun AppCompatActivity.setUpActionBarSessionLogo() { + supportActionBar!!.setDisplayShowHomeEnabled(false) + supportActionBar!!.setDisplayShowTitleEnabled(false) + val logoImageView = ImageView(this) + logoImageView.setImageResource(R.drawable.session_logo) + val logoImageViewContainer = RelativeLayout(this) + logoImageViewContainer.addView(logoImageView) + logoImageViewContainer.gravity = Gravity.CENTER + val logoImageViewContainerLayoutParams = ActionBar.LayoutParams(ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.WRAP_CONTENT) + supportActionBar!!.setCustomView(logoImageViewContainer, logoImageViewContainerLayoutParams) + supportActionBar!!.setDisplayShowCustomEnabled(true) +} \ No newline at end of file