mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-26 09:27:54 +00:00
provisioning dialog rework
// FREEBIE
This commit is contained in:

committed by
Moxie Marlinspike

parent
0c32001fe4
commit
2e253fb6a8
BIN
res/drawable-hdpi/icon_dialog.png
Normal file
BIN
res/drawable-hdpi/icon_dialog.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.8 KiB |
BIN
res/drawable-mdpi/icon_dialog.png
Normal file
BIN
res/drawable-mdpi/icon_dialog.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.8 KiB |
BIN
res/drawable-xhdpi/icon_dialog.png
Normal file
BIN
res/drawable-xhdpi/icon_dialog.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 4.4 KiB |
BIN
res/drawable-xxhdpi/icon_dialog.png
Normal file
BIN
res/drawable-xxhdpi/icon_dialog.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 9.4 KiB |
@@ -1,46 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingLeft="16dp"
|
||||
android:paddingRight="16dp">
|
||||
|
||||
<LinearLayout android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_centerInParent="true">
|
||||
|
||||
<TextView android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:gravity="center"
|
||||
android:text="Add device?"
|
||||
android:id="@+id/textView"/>
|
||||
|
||||
<TextView android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:gravity="left"
|
||||
android:text="The device you scanned will receive access to all incoming and outgoing messages."/>
|
||||
|
||||
<LinearLayout android:layout_width="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button android:id="@+id/cancel_button"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Cancel"/>
|
||||
|
||||
<Button android:id="@+id/continue_button"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Continue"/>
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
@@ -239,6 +239,22 @@
|
||||
<string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Passphrases don\'t match!</string>
|
||||
<string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Incorrect old passphrase!</string>
|
||||
|
||||
<!-- DeviceProvisioningActivity -->
|
||||
<string name="DeviceProvisioning_cancel">CANCEL</string>
|
||||
<string name="DeviceProvisioning_continue">CONTINUE</string>
|
||||
<string name="DeviceProvisioning_title">Link this device?</string>
|
||||
<string name="DeviceProvisioning_content_intro">It will be able to</string>
|
||||
<string name="DeviceProvisioning_content_bullets">
|
||||
- Read all your messages
|
||||
\n- Send messages in your name
|
||||
</string>
|
||||
<string name="DeviceProvisioning_content_progress_title">Adding device...</string>
|
||||
<string name="DeviceProvisioning_content_progress_content">Adding new device...</string>
|
||||
<string name="DeviceProvisioning_content_progress_success">Device added!</string>
|
||||
<string name="DeviceProvisioning_content_progress_no_device">No device found.</string>
|
||||
<string name="DeviceProvisioning_content_progress_network_error">Network error.</string>
|
||||
<string name="DeviceProvisioning_content_progress_key_error">Invalid QR code.</string>
|
||||
|
||||
<!-- PassphrasePromptActivity -->
|
||||
<string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string>
|
||||
<string name="PassphrasePromptActivity_watermark_content_description">TextSecure icon</string>
|
||||
|
@@ -13,6 +13,15 @@
|
||||
<item name="android:windowAnimationStyle">@null</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DialogActivity" parent="Theme.AppCompat">
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
<item name="android:windowIsFloating">true</item>
|
||||
<item name="android:backgroundDimEnabled">false</item>
|
||||
</style>
|
||||
|
||||
<!-- ActionBar styles -->
|
||||
<style name="TextSecure.DarkActionBar"
|
||||
parent="@style/Widget.AppCompat.ActionBar">
|
||||
|
Reference in New Issue
Block a user