Some more sliding pane layout fixes

Signed-off-by: Daniele Ricci <[email protected]>
kontalk · Sep 7, 2015 · 435a6fa · 435a6fa
1 parent 4fcaa2d
commit 435a6fa
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/app/src/main/java/org/kontalk/ui/ConversationsActivity.java b/app/src/main/java/org/kontalk/ui/ConversationsActivity.java
@@ -100,7 +100,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         supportRequestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setContentView(R.layout.conversation_screen);
+        setContentView(R.layout.conversations_screen);
 
         mFragment = (ConversationListFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.fragment_conversation_list);
@@ -146,7 +146,7 @@ public void onPanelSlide(View panel, float slideOffset) {
 
         mSlidingPanel = (SlidingPaneLayout) findViewById(R.id.slider_pane);
         mSlidingPanel.setPanelSlideListener(slidingListener);
-        mSlidingPanel.setParallaxDistance(200);
+        mSlidingPanel.setParallaxDistance(getResources().getDimensionPixelSize(R.dimen.slidepane_parallax));
 
         // initial menu
         if (!mSlidingPanel.isSlideable()) {

diff --git a/...c/main/res/layout/conversation_screen.xml → .../main/res/layout/conversations_screen.xml b/...c/main/res/layout/conversation_screen.xml → .../main/res/layout/conversations_screen.xml
@@ -16,12 +16,14 @@
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 
-<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" android:layout_height="match_parent"
+<android.support.v4.widget.SlidingPaneLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:id="@+id/slider_pane">
 
     <include layout="@layout/contacts_list_screen"/>
 
     <include layout="@layout/conversation_list_screen"/>
 
-</android.support.v4.widget.SlidingPaneLayout>
+</android.support.v4.widget.SlidingPaneLayout>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -12,4 +12,6 @@
     <dimen name="emoji_textview_size">22sp</dimen>
     <dimen name="emoji_edittext_size">22sp</dimen>
     <dimen name="emoji_listitem_size">18sp</dimen>
+
+    <dimen name="slidepane_parallax">200dp</dimen>
 </resources>