r102 - test

----------- Fix: Long number in charts Fix: EUR on top Fix: icon size Fix: Crash on list update Fix: Invalid graph and stat Fix: Some bull shit Fix: Refactoring Fix: Landscape Layout Fix: NavDrawer touch Add: PIN protection Add: Chat Add: Ability to hide pairs Add: Auto refresh when maximize or return to app. Add: Fix some crash Add: New api key Add: Amount slider on buy/sell screen Add: Current balance on buy/sell screen Add: Color warning if no enough money -----------
ZorgeR · Jan 25, 2014 · dd2c14c · dd2c14c
1 parent 41d851a
commit dd2c14c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 46 deletions.
diff --git a/BTC-e.com monitor/src/main/java/com/zlab/btcmonitor/bm_Main.java b/BTC-e.com monitor/src/main/java/com/zlab/btcmonitor/bm_Main.java
@@ -805,7 +805,7 @@ public void run() {
     public static View pagePairs(ViewGroup container, LayoutInflater inflater){
         View rootView;
 
-        if(bm_MainState.getResources().getConfiguration().orientation== Configuration.ORIENTATION_PORTRAIT){
+        if(bm_MainState.getResources().getConfiguration().orientation==Configuration.ORIENTATION_PORTRAIT){
             rootView = inflater.inflate(R.layout.pairs, container, false);
         } else {
             rootView = inflater.inflate(R.layout.pairs_landscape, container, false);
@@ -1185,49 +1185,51 @@ public void onClick(DialogInterface dialog, int which) {
         pairAskList = (ListView) rootView.findViewById(R.id.listAsk);
         pairBidsList = (ListView) rootView.findViewById(R.id.listBids);
 
-        pairAskList.setOnTouchListener(new ListView.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                int action = event.getAction();
-                switch (action) {
-                    case MotionEvent.ACTION_DOWN:
-                        // Disallow ScrollView to intercept touch events.
-                        v.getParent().requestDisallowInterceptTouchEvent(true);
-                        break;
-
-                    case MotionEvent.ACTION_UP:
-                        // Allow ScrollView to intercept touch events.
-                        v.getParent().requestDisallowInterceptTouchEvent(false);
-                        break;
+        if(bm_MainState.getResources().getConfiguration().orientation==Configuration.ORIENTATION_LANDSCAPE){
+            pairAskList.setOnTouchListener(new ListView.OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    int action = event.getAction();
+                    switch (action) {
+                        case MotionEvent.ACTION_DOWN:
+                            // Disallow ScrollView to intercept touch events.
+                            v.getParent().requestDisallowInterceptTouchEvent(true);
+                            break;
+
+                        case MotionEvent.ACTION_UP:
+                            // Allow ScrollView to intercept touch events.
+                            v.getParent().requestDisallowInterceptTouchEvent(false);
+                            break;
+                    }
+
+                    // Handle ListView touch events.
+                    v.onTouchEvent(event);
+                    return true;
                 }
+            });
 
-                // Handle ListView touch events.
-                v.onTouchEvent(event);
-                return true;
-            }
-        });
+            pairBidsList.setOnTouchListener(new ListView.OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    int action = event.getAction();
+                    switch (action) {
+                        case MotionEvent.ACTION_DOWN:
+                            // Disallow ScrollView to intercept touch events.
+                            v.getParent().requestDisallowInterceptTouchEvent(true);
+                            break;
+
+                        case MotionEvent.ACTION_UP:
+                            // Allow ScrollView to intercept touch events.
+                            v.getParent().requestDisallowInterceptTouchEvent(false);
+                            break;
+                    }
 
-        pairBidsList.setOnTouchListener(new ListView.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                int action = event.getAction();
-                switch (action) {
-                    case MotionEvent.ACTION_DOWN:
-                        // Disallow ScrollView to intercept touch events.
-                        v.getParent().requestDisallowInterceptTouchEvent(true);
-                        break;
-
-                    case MotionEvent.ACTION_UP:
-                        // Allow ScrollView to intercept touch events.
-                        v.getParent().requestDisallowInterceptTouchEvent(false);
-                        break;
+                    // Handle ListView touch events.
+                    v.onTouchEvent(event);
+                    return true;
                 }
-
-                // Handle ListView touch events.
-                v.onTouchEvent(event);
-                return true;
-            }
-        });
+            });
+        }
 
         if(pairAskElements==null){pairAskElements = (List<bm_ListElementsDepth>[]) new List[VARs.pairs_CODE.length];}
         if(pairBidsElements==null){pairBidsElements=(List<bm_ListElementsDepth>[]) new List[VARs.pairs_CODE.length];}

diff --git a/BTC-e.com monitor/src/main/res/layout/pairs.xml b/BTC-e.com monitor/src/main/res/layout/pairs.xml
@@ -95,11 +95,6 @@
             android:layout_height="match_parent"
             android:layout_below="@+id/linearLayout2" android:id="@+id/linearLayout3"
             android:layout_above="@+id/linearLayout5" android:layout_weight="1">
-        <LinearLayout
-                android:orientation="vertical"
-                android:layout_width="2px"
-                android:layout_height="fill_parent">
-        </LinearLayout>
         <ListView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

diff --git a/BTC-e.com monitor/src/main/res/layout/pairs_landscape.xml b/BTC-e.com monitor/src/main/res/layout/pairs_landscape.xml
@@ -100,7 +100,7 @@
                     >
                 <LinearLayout
                         android:orientation="vertical"
-                        android:layout_width="2px"
+                        android:layout_width="4px"
                         android:layout_height="fill_parent">
                 </LinearLayout>
                 <ListView