Browse Source

popup and statistics small layout bugs fixed

Julien Clauter 10 years ago
parent
commit
fc6c7239c9

+ 2 - 6
src/de/tudarmstadt/informatik/hostage/ui2/fragment/StatisticsFragment.java

@@ -3,7 +3,6 @@ package de.tudarmstadt.informatik.hostage.ui2.fragment;
 import android.annotation.SuppressLint;
 import android.app.Fragment;
 import android.app.FragmentManager;
-import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -39,6 +38,7 @@ import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.logging.Record;
 import de.tudarmstadt.informatik.hostage.logging.UglyDbHelper;
 import de.tudarmstadt.informatik.hostage.ui.LogFilter;
+import de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity;
 import de.tudarmstadt.informatik.hostage.ui2.adapter.StatisticListAdapter;
 import de.tudarmstadt.informatik.hostage.ui2.dialog.ChecklistDialog;
 import de.tudarmstadt.informatik.hostage.ui2.dialog.DateTimeDialogFragment;
@@ -1454,12 +1454,8 @@ public class StatisticsFragment extends Fragment implements ChecklistDialog.Chec
 
             if (sortKey != null && sortKey.length() != 0) newFragment.setGroupKey(sortKey);
 
-            FragmentTransaction transaction = fm.beginTransaction();
-            transaction.replace(R.id.content_frame, newFragment, newFragment.getTag());
-            transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
-            transaction.addToBackStack(null);
+            MainActivity.getInstance().injectFragment(newFragment, true, MainActivity.MainMenuItem.RECORDS);
 
-            transaction.commit();
         }
 
     }

+ 3 - 3
src/de/tudarmstadt/informatik/hostage/ui2/popup/AbstractPopup.java

@@ -112,12 +112,12 @@ public abstract class AbstractPopup {
 
             //int alh = (position[0] + width) - windowFrame.width();
             //if (alh < 0) alh = 0;
+            int offset = windowFrame.top;
 
             int x = position[0] + (anchorWidth / 2) - (width / 2);
-            int y = position[1] - height;
+            int y = (position[1] - height) + offset;
 
-             int offset = 15;
-            height+=offset;
+            height+=(offset/2);
 
             width = windowWidth < width ? windowWidth : width;