Polish

AndroidManifest.xml

@@ -98,7 +98,7 @@
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_configuration"
         android:supportsRtl="true"
-        android:theme="@style/TextSecure.DarkTheme"
+        android:theme="@style/Session.DarkTheme"
         tools:replace="android:allowBackup">
 
         <meta-data

res/drawable/session_logo.xml

@@ -0,0 +1,9 @@
+<vector android:height="24dp" android:viewportHeight="448.40668"
+    android:viewportWidth="404.08533" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <group>
+        <clip-path android:pathData="M0,0L404.085,0L404.085,448.407L0,448.407Z M 0,0"/>
+        <path android:fillAlpha="1" android:fillColor="#00f782"
+            android:fillType="nonZero"
+            android:pathData="m288.607,420.376l-196.335,-0c-33.576,-0 -62.508,-25.748 -64.164,-59.281 -1.771,-35.847 26.883,-65.576 62.353,-65.576l113.072,-0c6.919,-0 12.527,-5.608 12.527,-12.525l0,-92.305L327.307,252.333C356.723,268.633 375.241,299.335 376.027,332.848 377.161,380.975 336.746,420.376 288.607,420.376m-211.829,-224.303c-29.416,-16.3 -47.933,-47.001 -48.721,-80.515 -1.132,-48.127 39.283,-87.528 87.42,-87.528L311.811,28.031c33.576,-0 62.508,25.748 64.165,59.283 1.771,35.845 -26.883,65.575 -62.352,65.575 0,-0 -81.316,0.013 -113.077,0.019 -6.915,0.001 -12.499,5.608 -12.501,12.523l-0.021,92.289zM340.891,227.816 L256.254,180.919l57.371,-0c49.877,-0 90.46,-40.579 90.46,-90.457 0,-49.877 -40.583,-90.461 -90.46,-90.461l-200.299,-0c-62.485,-0 -113.327,50.841 -113.327,113.327 0,44.567 24.216,85.664 63.195,107.265l84.636,46.896l-57.368,-0c-49.88,-0 -90.463,40.58 -90.463,90.457 0,49.877 40.583,90.461 90.463,90.461L290.758,448.407c62.488,-0 113.327,-50.84 113.327,-113.327 0,-44.567 -24.216,-85.664 -63.193,-107.264" android:strokeColor="#00000000"/>
+    </group>
+</vector>

res/layout/activity_landing.xml

@@ -49,7 +49,19 @@
         android:layout_marginLeft="@dimen/massive_spacing"
         android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/massive_spacing"
-        android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
         android:text="Continue Your Session" />
 
+    <Button
+        android:id="@+id/linkButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:gravity="center"
+        android:background="@color/transparent"
+        android:textAllCaps="false"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="Link to an existing account" />
+
 </LinearLayout>

res/layout/activity_register.xml

@@ -61,7 +61,19 @@
         android:layout_marginLeft="@dimen/massive_spacing"
         android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/massive_spacing"
-        android:layout_marginBottom="@dimen/onboarding_button_bottom_offset"
         android:text="Copy" />
 
+    <Button
+        android:id="@+id/legalButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:gravity="center"
+        android:background="@color/transparent"
+        android:textAllCaps="false"
+        android:textSize="@dimen/very_small_font_size"
+        android:textColor="@color/text"
+        android:text="By using this service, you agree to our Terms and Conditions and Privacy Statement" />
+
 </LinearLayout>

res/layout/activity_restore.xml

@@ -20,7 +20,7 @@
         android:textSize="@dimen/very_large_font_size"
         android:textStyle="bold"
         android:textColor="@color/text"
-        android:text="Restore your account using your seed" />
+        android:text="Restore your account" />
 
     <TextView
         android:layout_width="match_parent"
@@ -54,7 +54,19 @@
         android:layout_marginLeft="@dimen/massive_spacing"
         android:layout_marginTop="@dimen/medium_spacing"
         android:layout_marginRight="@dimen/massive_spacing"
-        android:layout_marginBottom="@dimen/medium_spacing"
         android:text="Continue" />
 
+    <Button
+        android:id="@+id/legalButton"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/onboarding_button_bottom_offset"
+        android:layout_marginLeft="@dimen/massive_spacing"
+        android:layout_marginRight="@dimen/massive_spacing"
+        android:gravity="center"
+        android:background="@color/transparent"
+        android:textAllCaps="false"
+        android:textSize="@dimen/very_small_font_size"
+        android:textColor="@color/text"
+        android:text="By using this service, you agree to our Terms and Conditions and Privacy Statement" />
+
 </LinearLayout>

res/values/colors.xml

@@ -4,6 +4,8 @@
     <!-- Session -->
     <color name="accent">#00F782</color>
     <color name="text">#FFFFFF</color>
+    <color name="action_bar_background">#171717</color>
+    <color name="navigation_bar_background">#121212</color>
     <color name="fake_chat_bubble_background">#3F4146</color>
     <color name="fake_chat_bubble_text">#000000</color>
     <!-- Session -->

res/values/styles.xml

@@ -2,6 +2,11 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Session -->
+    <style name="Session.DarkActionBar" parent="@style/Widget.AppCompat.ActionBar">
+        <item name="background">@color/action_bar_background</item>
+        <item name="android:background">@color/action_bar_background</item>
+    </style>
+
     <style name="MediumProminentFilledButton">
         <item name="android:background">@drawable/prominent_filled_button_medium_background</item>
         <item name="android:textAllCaps">false</item>

res/values/themes.xml

@@ -2,6 +2,15 @@
 
 <resources>
 
+    <!-- Session -->
+    <style name="Session.DarkTheme" parent="@style/Theme.AppCompat">
+        <item name="actionBarStyle">@style/Session.DarkActionBar</item>
+        <item name="colorPrimary">@color/action_bar_background</item>
+        <item name="colorPrimaryDark">@color/action_bar_background</item>
+        <item name="android:navigationBarColor">@color/navigation_bar_background</item>
+    </style>
+    <!-- Session -->
+
     <style name="TextSecure.LightNoActionBar" parent="@style/TextSecure.LightTheme">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>

src/org/thoughtcrime/securesms/loki/redesign/DisplayNameActivity.kt

@@ -1,6 +1,10 @@
 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
@@ -9,6 +13,16 @@ 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)
         setContentView(R.layout.activity_display_name_v2)
     }
 

src/org/thoughtcrime/securesms/loki/redesign/LandingActivity.kt

@@ -2,6 +2,10 @@ 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
@@ -11,6 +15,16 @@ 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)
         fakeChatView.startAnimating()
         registerButton.setOnClickListener { register() }
         restoreButton.setOnClickListener { restore() }

src/org/thoughtcrime/securesms/loki/redesign/RegisterActivity.kt

@@ -2,6 +2,10 @@ 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_register.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.BaseActionBarActivity
@@ -11,6 +15,16 @@ 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)
         registerButton.setOnClickListener { register() }
     }
 

src/org/thoughtcrime/securesms/loki/redesign/RestoreActivity.kt

@@ -1,6 +1,10 @@
 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_restore.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.BaseActionBarActivity
@@ -9,6 +13,16 @@ 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)
         setContentView(R.layout.activity_restore)
     }