From bd43fc59477421261dda7444f582780022119590 Mon Sep 17 00:00:00 2001 From: Florens Douwes Date: Fri, 21 Mar 2014 00:29:09 +0100 Subject: [PATCH] Added floating labels to replyfragment. --- Chan/assets/html/licences.html | 21 ++ Chan/res/anim/slide_from_bottom.xml | 12 + Chan/res/anim/slide_to_bottom.xml | 12 + Chan/res/layout/floatlabel_edittext.xml | 20 ++ Chan/res/layout/reply_view.xml | 300 ++++++++++-------- Chan/res/values/attrs.xml | 12 + Chan/res/values/colors.xml | 4 + .../floatlabel/FloatLabelEditText.java | 233 ++++++++++++++ .../org/floens/chan/adapter/PostAdapter.java | 2 +- .../floens/chan/fragment/ReplyFragment.java | 25 +- Chan/src/org/floens/chan/loader/Loader.java | 5 +- .../floens/chan/manager/ThreadManager.java | 2 +- 12 files changed, 495 insertions(+), 153 deletions(-) create mode 100644 Chan/res/anim/slide_from_bottom.xml create mode 100644 Chan/res/anim/slide_to_bottom.xml create mode 100644 Chan/res/layout/floatlabel_edittext.xml create mode 100644 Chan/res/values/colors.xml create mode 100644 Chan/src/com/micromobs/android/floatlabel/FloatLabelEditText.java diff --git a/Chan/assets/html/licences.html b/Chan/assets/html/licences.html index f06cf4bc..8e83ea1e 100644 --- a/Chan/assets/html/licences.html +++ b/Chan/assets/html/licences.html @@ -74,6 +74,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
+ +

AndroidFloatLabel from Weddingparty

+ https://github.com/weddingparty/AndroidFloatLabel +
+        
+Copyright (C) 2014 AndroidFloatLabel team
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+        
+    
+
diff --git a/Chan/res/anim/slide_from_bottom.xml b/Chan/res/anim/slide_from_bottom.xml new file mode 100644 index 00000000..552753ac --- /dev/null +++ b/Chan/res/anim/slide_from_bottom.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/Chan/res/anim/slide_to_bottom.xml b/Chan/res/anim/slide_to_bottom.xml new file mode 100644 index 00000000..48d25795 --- /dev/null +++ b/Chan/res/anim/slide_to_bottom.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/Chan/res/layout/floatlabel_edittext.xml b/Chan/res/layout/floatlabel_edittext.xml new file mode 100644 index 00000000..d40a8722 --- /dev/null +++ b/Chan/res/layout/floatlabel_edittext.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/Chan/res/layout/reply_view.xml b/Chan/res/layout/reply_view.xml index 7e25d37b..82eb1d56 100644 --- a/Chan/res/layout/reply_view.xml +++ b/Chan/res/layout/reply_view.xml @@ -1,149 +1,177 @@ - + android:showDividers="middle" > - - - - - - - - - - - - - - -