From 9de3f6082cea8356b41113a384f093ea10771e8f Mon Sep 17 00:00:00 2001 From: Yassine Moslah Date: Sun, 27 Oct 2019 00:28:50 +0100 Subject: [PATCH] freezing name animation fixed --- .../.idea/caches/build_file_checksums.ser | Bin 534 -> 537 bytes collapse-toolbar/.idea/codeStyles/Project.xml | 134 ++++++++++++++---- collapse-toolbar/.idea/misc.xml | 20 ++- collapse-toolbar/.idea/vcs.xml | 6 + .../src/main/res/layout/toolbar_header.xml | 20 +-- 5 files changed, 142 insertions(+), 38 deletions(-) create mode 100644 collapse-toolbar/.idea/vcs.xml diff --git a/collapse-toolbar/.idea/caches/build_file_checksums.ser b/collapse-toolbar/.idea/caches/build_file_checksums.ser index 83dbaff7056a75ec4789954e6269384596360348..2042e8599ab0689b37e661a9409b379459b89195 100644 GIT binary patch delta 73 zcmV-P0Ji^@1epYomj!MLV~W?2oQMx7FI978a&s?vVRLh7Ze^2(0X6{)lkWi*lRE(| f6HaP13b4GbNq?{%lGNn%^mG6blaB!#lh^@1_A(qn delta 71 zcmV-N0J#5|1eOGlmjz}$f}%^2oQRWY0YoQ(oyjHd?BwmQXt8?t{@==U03|O~b7gXK dFGyi>X)i8ka$#g_WiOM!0UMK70TPqH0a}wN9?Sp$ diff --git a/collapse-toolbar/.idea/codeStyles/Project.xml b/collapse-toolbar/.idea/codeStyles/Project.xml index 30aa626..ae78c11 100644 --- a/collapse-toolbar/.idea/codeStyles/Project.xml +++ b/collapse-toolbar/.idea/codeStyles/Project.xml @@ -1,29 +1,113 @@ - - - - - - - - - - + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+
+
+
\ No newline at end of file diff --git a/collapse-toolbar/.idea/misc.xml b/collapse-toolbar/.idea/misc.xml index e1fef8d..f06a551 100644 --- a/collapse-toolbar/.idea/misc.xml +++ b/collapse-toolbar/.idea/misc.xml @@ -73,27 +73,41 @@ - + diff --git a/collapse-toolbar/.idea/vcs.xml b/collapse-toolbar/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/collapse-toolbar/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/collapse-toolbar/app/src/main/res/layout/toolbar_header.xml b/collapse-toolbar/app/src/main/res/layout/toolbar_header.xml index 46e4a61..7f4c73f 100644 --- a/collapse-toolbar/app/src/main/res/layout/toolbar_header.xml +++ b/collapse-toolbar/app/src/main/res/layout/toolbar_header.xml @@ -1,11 +1,10 @@ - @@ -14,22 +13,23 @@ android:layout_width="50dp" android:layout_height="50dp" android:src="@drawable/hari_circle" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file