TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-31 01:26:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Launch stickers.

Browse Source
This commit is contained in:
Greyson Parrelli
2019-12-13 01:23:32 -05:00
parent 4173efbe5a
commit b9bd3f2b4c
25 changed files with 434 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/drawable/ic_sticker_splash_24.xml Normal file
View File

@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@color/core_grey_55"
android:pathData="M8.75,21.982c-0.021,0 -0.041,0 -0.062,0A7.326,7.326 0,0 1,5.072 21.2,5.55 5.55,0 0,1 2.8,18.928c-0.522,-0.977 -0.8,-1.947 -0.8,-4.62L2,9.692c0,-2.673 0.278,-3.643 0.8,-4.62A5.55,5.55 0,0 1,5.072 2.8c0.977,-0.522 1.947,-0.8 4.62,-0.8h4.616c2.673,0 3.643,0.278 4.62,0.8A5.55,5.55 0,0 1,21.2 5.072c0.522,0.977 0.8,1.947 0.8,4.62v2.257c0,0.1 -0.026,0.2 -0.036,0.3L17.191,12.249c-2.8,0 -3.872,0.3 -4.975,0.89a6.172,6.172 0,0 0,-2.575 2.575c-0.591,1.1 -0.891,2.177 -0.891,4.977ZM17.191,13.75c-2.719,0 -3.513,0.309 -4.268,0.712a4.7,4.7 0,0 0,-1.96 1.961c-0.4,0.755 -0.713,1.549 -0.713,4.269v0.9c0.078,-0.044 0.158,-0.083 0.232,-0.134L20.734,14.4a2.971,2.971 0,0 0,0.644 -0.647Z"/>
</vector>

86
res/layout/experience_upgrade_stickers_fragment.xml Normal file
View File

@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?android:windowBackground">
<com.airbnb.lottie.LottieAnimationView
android:id="@+id/stickers_experience_animation"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="13dp"
android:layout_marginBottom="20dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/stickers_experience_title"
app:lottie_rawRes="@raw/lottie_stickers_splash"/>
<TextView
android:id="@+id/stickers_experience_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="7dp"
style="@style/Signal.Text.Headline"
android:fontFamily="sans-serif-medium"
android:text="@string/ExperienceUpgradeActivity_introducing_stickers"
android:gravity="center"
app:layout_constraintBottom_toTopOf="@id/stickers_experience_subtitle"
app:layout_constraintStart_toStartOf="@id/stickers_experience_start_margin"
app:layout_constraintEnd_toEndOf="@id/stickers_experience_end_margin"/>
<TextView
android:id="@+id/stickers_experience_subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginBottom="7dp"
style="@style/Signal.Text.Body"
android:text="@string/ExperienceUpgradeActivity_why_use_words_when_you_can_use_stickers_tap_this_icon"
android:gravity="center"
app:layout_constraintBottom_toTopOf="@id/stickers_experience_icon"
app:layout_constraintStart_toStartOf="@id/stickers_experience_start_margin"
app:layout_constraintEnd_toEndOf="@id/stickers_experience_end_margin"/>
<ImageView
android:id="@+id/stickers_experience_icon"
android:layout_width="34dp"
android:layout_height="34dp"
android:layout_marginBottom="32dp"
app:srcCompat="@drawable/ic_sticker_splash_24"
app:layout_constraintBottom_toTopOf="@id/stickers_experience_go_button"
app:layout_constraintStart_toStartOf="@id/stickers_experience_start_margin"
app:layout_constraintEnd_toEndOf="@id/stickers_experience_end_margin"/>
<com.dd.CircularProgressButton
android:id="@+id/stickers_experience_go_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="32dp"
android:background="@color/signal_primary"
android:textColor="@color/white"
android:elevation="4dp"
app:cpb_colorIndicator="@color/white"
app:cpb_colorProgress="@color/textsecure_primary"
app:cpb_cornerRadius="4dp"
app:cpb_selectorIdle="@drawable/progress_button_state"
app:cpb_textIdle="@string/ExperienceUpgradeActivity_lets_go"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/stickers_experience_start_margin"
app:layout_constraintEnd_toEndOf="@id/stickers_experience_end_margin"/>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/stickers_experience_start_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_begin="16dp" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/stickers_experience_end_margin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_end="16dp" />
</androidx.constraintlayout.widget.ConstraintLayout>

2
res/layout/sticker_preview_activity.xml
View File

@@ -69,7 +69,7 @@
android:id="@+id/sticker_install_share_button_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:tint="@color/core_grey_90"
android:tint="?sticker_management_action_button_color"
android:visibility="gone"
app:srcCompat="@drawable/ic_forward_outline_24"
app:layout_constraintTop_toTopOf="@id/sticker_install_share_button"

1
res/raw/lottie_stickers_splash.json Normal file
View File

File diff suppressed because one or more lines are too long

5
res/values/strings.xml
View File

@@ -391,6 +391,11 @@
<string name="ExperienceUpgradeActivity_you_can_disable_or_enable_this_feature_link_previews">You can disable or enable this feature anytime in your Signal settings (Privacy &gt; Send link previews).</string>
<string name="ExperienceUpgradeActivity_got_it">Got it</string>
<string name="ExperienceUpgradeActivity_introducing_stickers">Introducing stickers</string>
<string name="ExperienceUpgradeActivity_why_use_words_when_you_can_use_stickers">Why use words when you can use stickers?</string>
<string name="ExperienceUpgradeActivity_why_use_words_when_you_can_use_stickers_tap_this_icon">Why use words when you can use stickers? Tap this icon on your keyboard:</string>
<string name="ExperienceUpgradeActivity_lets_go">Let\'s go</string>
<!-- GcmBroadcastReceiver -->
<string name="GcmBroadcastReceiver_retrieving_a_message">Retrieving a message…</string>