From 65d79a0cc8ea05a60819e902325dfe007c7dd345 Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Fri, 28 Aug 2020 15:13:42 +0300 Subject: [PATCH] Redesign/apple emoji icons instead of system emoji for auth flow (#745) --- .../auth/account/SetupNewAccountFragment.kt | 4 +- .../main/res/drawable/ic_clock_loading.png | Bin 0 -> 2265 bytes .../main/res/drawable/ic_congratulation.png | Bin 0 -> 3259 bytes app/src/main/res/drawable/ic_party_popper.xml | 48 ------------------ .../res/layout/fragment_congratulation.xml | 3 +- .../res/layout/fragment_setup_new_account.xml | 10 ++-- .../fragment_setup_selected_account.xml | 12 ++--- .../data/DefaultDocumentEmojiIconProvider.kt | 10 ++-- 8 files changed, 19 insertions(+), 68 deletions(-) create mode 100644 app/src/main/res/drawable/ic_clock_loading.png create mode 100644 app/src/main/res/drawable/ic_congratulation.png delete mode 100644 app/src/main/res/drawable/ic_party_popper.xml diff --git a/app/src/main/java/com/agileburo/anytype/ui/auth/account/SetupNewAccountFragment.kt b/app/src/main/java/com/agileburo/anytype/ui/auth/account/SetupNewAccountFragment.kt index 3c4f0376e7..c47a165a88 100644 --- a/app/src/main/java/com/agileburo/anytype/ui/auth/account/SetupNewAccountFragment.kt +++ b/app/src/main/java/com/agileburo/anytype/ui/auth/account/SetupNewAccountFragment.kt @@ -33,11 +33,11 @@ class SetupNewAccountFragment : NavigationFragment(R.layout.fragment_setup_new_a override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) setupNavigation() - vm.state.observe(this, this) + vm.state.observe(viewLifecycleOwner, this) } private fun setupNavigation() { - vm.observeNavigation().observe(this, navObserver) + vm.observeNavigation().observe(viewLifecycleOwner, navObserver) } override fun onChanged(state: ViewState) { diff --git a/app/src/main/res/drawable/ic_clock_loading.png b/app/src/main/res/drawable/ic_clock_loading.png new file mode 100644 index 0000000000000000000000000000000000000000..8caad6ba38a8911b21e8489996320cc41de73adf GIT binary patch literal 2265 zcmV;~2qyQ5P)F8N15VeF)Z#Wm;-r&>H z(PAr;0ro2abh(omer7VMLg7QQhhMNFofVi+9xD z_mEF1^Y!@9)!DkHmg#78Ivgyz4wa?wL)90PT^6SH22K?**00xywL_t(| zUY(eQa~nq#hs7t!vR#=ujh!ZKlLp!YF*7qWn3NC!sI(IFHHl}e>lIxrxS%Zaa-eD$GQInwd;>Ep+b zKLaZ(v!6bFYHV+57R`UZeEISt@awOC^gdDul~S;LmyxcsgBL3+pIK%%HxJ@oZ?zi2 zf+d9U_0p2Z?KY2(eBU7d-5WpHd;yXdFWBV{x6QV@yYBP70?@0`_}aMZ@OtCF%Q+Ni ziTfHGtjBmf;92*w0mnVp3?pbW71e9(f=XEZJujmB5IHY8MV zY=%VPjc-C90Q7RLSVtY8R*=DHtH!-&3W9b^76d;XMiDhTPboul)~A^$Q+kN_QqrH=?CIe!0s z+3)uc&B3wYMD%m9m`o;VTI-}-v0yM5Wr5#ZF3RZ)1OlKwd8_OFTtY>3+xn`-?5-K$z zXb15`f~hf`a~Na+!JNNbXA(WoMSFDLgI4^Ve(cy-2Em+vuAETa>lU;PA)a8EPUJ{n zjopogZsuZA{KJL^G?ju@qSFt5%+WnI6`-85R5lw6PCgvH{dUU79_$Aw${9;# zqpo0Z`t8G8-c&;L+y1_j0$izV&=o_DFMVR-7Ck(f+TRa25mYJbqFf*W$58tRT=ZaP z|0tk!Y5`{{OF1c!xTfE}{nGCF=%3oz4+H|V6;sNC2P8++$kEx>_hjs6FaWg4lr))4 zrM$^xwSuPQ7;U2lY@h*He|SiO;?QKGt>8GCK8FqIzxhBGcaQ)oI0Q&?jWLmjNJ67R z&d-PLi}(%l--Cx^Z-)luH?#o?Fth{)eWs#w>cK%?JEG6} zZ!99o8Vm@%b!{dHBNAH(O$UySqA8dS_{X*4wLuS@Rtj@4Apuv8>1dR1H^!1hnm+uW zA#+k`YOMOJI+8F*9Zd##h6CakEgsjf0CQ5Q4qH2&q;O#mf^Kr#HLTIkC5fic5N{F^~v=rhY7_h?ahC(`s?-$Vqs03?tU zZ4eNl5H_`=PRvzDube~SX8UMmb|42Ea#p~x|0A2(A#kH0&7lwo-EIfkPYhdx!(p?b ztc!bijd=x;)g~mkj)hY3sJC}~JRXnZ#Op?}pN;C6r6qX!@W&&?HxD1a))DXoWI!ra nDuu!kq2hlCfvaaA-&F7~Lf+pmT<3iS00000NkvXXu0mjfUC>yU literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_congratulation.png b/app/src/main/res/drawable/ic_congratulation.png new file mode 100644 index 0000000000000000000000000000000000000000..e28860a2f0584cdc0bee54841981c1f69716da14 GIT binary patch literal 3259 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 - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_congratulation.xml b/app/src/main/res/layout/fragment_congratulation.xml index 56c53ddfc7..6f94c7e03d 100644 --- a/app/src/main/res/layout/fragment_congratulation.xml +++ b/app/src/main/res/layout/fragment_congratulation.xml @@ -34,10 +34,11 @@ app:layout_constraintTop_toTopOf="parent"> + android:src="@drawable/ic_congratulation" /> diff --git a/app/src/main/res/layout/fragment_setup_new_account.xml b/app/src/main/res/layout/fragment_setup_new_account.xml index 96f437f760..8e5031e12b 100644 --- a/app/src/main/res/layout/fragment_setup_new_account.xml +++ b/app/src/main/res/layout/fragment_setup_new_account.xml @@ -33,14 +33,12 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - + android:src="@drawable/ic_clock_loading" /> diff --git a/app/src/main/res/layout/fragment_setup_selected_account.xml b/app/src/main/res/layout/fragment_setup_selected_account.xml index 589e5e39d1..62ef21446c 100644 --- a/app/src/main/res/layout/fragment_setup_selected_account.xml +++ b/app/src/main/res/layout/fragment_setup_selected_account.xml @@ -16,14 +16,12 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> - + android:src="@drawable/ic_clock_loading" /> diff --git a/library-emojifier/src/main/java/com/agileburo/anytype/emojifier/data/DefaultDocumentEmojiIconProvider.kt b/library-emojifier/src/main/java/com/agileburo/anytype/emojifier/data/DefaultDocumentEmojiIconProvider.kt index 68cbb68d6f..3c79e0e406 100644 --- a/library-emojifier/src/main/java/com/agileburo/anytype/emojifier/data/DefaultDocumentEmojiIconProvider.kt +++ b/library-emojifier/src/main/java/com/agileburo/anytype/emojifier/data/DefaultDocumentEmojiIconProvider.kt @@ -10,13 +10,15 @@ class DefaultDocumentEmojiIconProvider : DocumentEmojiIconProvider { "💡", "🎒", "🚀", "🤖", "📚", "🍎", "🏡", "🤝", "😍", "☕", "🔥", "💥", "✍", "⏳", "📌", - "🚩", "🦉", "📮", "📄", "🖌", + "🖍", "🦉", "📮", "📄", "🖌", "🗳", "⏰", "🔑", "🎉", "🗃", "🔖", "🧠", "👁", "🎗", "🎲", - "🧩", "🚲", "⚙", "🔶", "🌍", - "🏕", "🧳", "🌵", "🚗", "🚂", + "🏙", "🚲", "⚙", "🔶", "🌍", + "🏕", "🎡", "🌵", "🚗", "🚂", "🖼", "⭐", "🥁", "🚠", "🛫", - "🏔", "🏗", "🛠", "🔍", "🕹" + "🏔", "🏗", "🛠", "🔍", "🕹", + "🛋", "🎁", "🧮", "🏜", "🌋", + "🎇", "🍏", "💫", "🌿", "🦊" ) }