Parcourir la source

small fix plus new colors in statistic frag

Julien Clauter il y a 10 ans
Parent
commit
e32b0f4b03

+ 12 - 3
src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordOverviewFragment.java

@@ -203,13 +203,14 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
 	 *
 	 * @param SSID the SSID
 	 */
-	public void showDetailsForSSID(String SSID) {
+	public void showDetailsForSSID(Context context,  String SSID) {
 		Log.e("RecordOverviewFragment", "Implement showDetailsForSSID!!");
         this.clearFilter();
         int ESSID_INDEX = 2;
         ArrayList<String> ssids = new ArrayList<String>();
-        this.groupingKey = this.groupingTitles().get(ESSID_INDEX);
-	}
+        this.sectionToOpen = SSID;
+        this.groupingKey = this.groupingTitles(context).get(ESSID_INDEX);
+  	}
 
 
 	/*****************************
@@ -508,6 +509,14 @@ public class RecordOverviewFragment extends Fragment implements ChecklistDialog.
     	this.filter.clear();
 	}
 
+    public ArrayList<String> groupingTitles(Context context){
+        ArrayList<String> titles = new ArrayList<String>();
+        for (String groupTitle : context.getResources().getStringArray(
+                R.array.Grouping)) {
+            titles.add(groupTitle);
+        }
+        return titles;
+    }
     public ArrayList<String> groupingTitles(){
         ArrayList<String> titles = new ArrayList<String>();
         for (String groupTitle : this.getResources().getStringArray(

+ 12 - 7
src/de/tudarmstadt/informatik/hostage/ui2/fragment/StatisticsFragment.java

@@ -962,16 +962,21 @@ public class StatisticsFragment extends Fragment implements ChecklistDialog.Chec
     }
 
     public Integer generateColorForIndex(int index){
-        int r[] = new int[]{0,0,0,1,1,1,1};
-        int g[] = new int[]{0,1,1,1,1,0,0};
-        int b[] = new int[]{1,1,0,0,1,1,0};
+        int r[] = new int[]{0,0,1,1,0,1,1};
+        int g[] = new int[]{0,1,0,0,1,1,1};
+        int b[] = new int[]{1,0,0,1,1,0,1};
 
-        int a = index % 16;
+        int a = (index / 7);
         int n = index % 7;
 
-        int R = Math.max( (r[n] * 255) - ((Math.max(0,(a ))) * 16), 0);
-        int G = Math.max( (g[n] * 255) - ((Math.max(0,(a ))) * 16), 0);
-        int B = Math.max( (b[n] * 255) - ((Math.max(0,(a ))) * 16), 0);
+        int q = Math.max(1, 2 * (a / 7));
+        int multiplier = 16 / (q);
+
+        int sub = (Math.min(((Math.max(0,(a ))) * multiplier), 16));
+
+        int R = Math.max( (r[n] * 255) - sub, 0);
+        int G = Math.max( (g[n] * 255) - sub, 0);
+        int B = Math.max( (b[n] * 255) - sub, 0);
 
         return Color.argb(255,R,G,B);
     }