Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2

res/layout/profile_manager_list_item_help.xml

@@ -23,7 +23,7 @@
 			android:layout_width="50dp"
 			android:layout_height="wrap_content"
 			android:id="@+id/imageView"
-			android:src="@drawable/swipe_icon"
+			android:src="@drawable/ic_swipe_action"
 			android:layout_alignParentTop="true"
 			android:layout_alignParentLeft="true"
 			android:layout_alignParentStart="true"

res/menu/home_actions.xml → res/menu/records_overview_actions.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:id="@+id/home_action_synchronize"
+	<item android:id="@+id/records_action_synchronize"
 	      android:icon="@drawable/ic_action_refresh"
 	      android:title="Synchronize"
 	      android:showAsAction="always" />

src/de/tudarmstadt/informatik/hostage/ui2/fragment/HomeFragment.java

@@ -2,7 +2,6 @@ package de.tudarmstadt.informatik.hostage.ui2.fragment;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
 
 import android.annotation.SuppressLint;
@@ -36,7 +35,6 @@ import de.tudarmstadt.informatik.hostage.model.Profile;
 import de.tudarmstadt.informatik.hostage.sync.BluetoothSync;
 import de.tudarmstadt.informatik.hostage.ui.LogFilter;
 import de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity;
-import de.tudarmstadt.informatik.hostage.ui2.activity.ProfileEditActivity;
 import de.tudarmstadt.informatik.hostage.ui2.fragment.opengl.ThreatIndicatorGLRenderer;
 
 /**
@@ -235,8 +233,6 @@ public class HomeFragment extends Fragment {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		super.onCreateView(inflater, container, savedInstanceState);
 
-		setHasOptionsMenu(true);
-
 		final Activity activity = getActivity();
 		if (activity != null) {
 			activity.setTitle(getResources().getString(R.string.drawer_overview));
@@ -376,23 +372,6 @@ public class HomeFragment extends Fragment {
 		return mRootView;
 	}
 
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		// Inflate the menu items for use in the action bar
-		inflater.inflate(R.menu.home_actions, menu);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.home_action_synchronize:
-				getActivity().startActivity(new Intent(this.getActivity(), BluetoothSync.class));
-				return true;
-		}
-
-		return false;
-	}
-
 	@Override
 	public void onStop() {
 		super.onStop();

src/de/tudarmstadt/informatik/hostage/ui2/fragment/ProfileManagerFragment.java

@@ -2,6 +2,7 @@ package de.tudarmstadt.informatik.hostage.ui2.fragment;
 
 import android.app.Fragment;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -15,9 +16,11 @@ import com.fortysevendeg.android.swipelistview.BaseSwipeListViewListener;
 import java.util.LinkedList;
 import java.util.List;
 
+import de.tudarmstadt.informatik.hostage.Hostage;
 import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.persistence.ProfileManager;
 import de.tudarmstadt.informatik.hostage.model.Profile;
+import de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity;
 import de.tudarmstadt.informatik.hostage.ui2.activity.ProfileEditActivity;
 import de.tudarmstadt.informatik.hostage.ui2.adapter.ProfileManagerListAdapter;
 import de.tudarmstadt.informatik.hostage.ui2.swipelist.SwipeListView;
@@ -29,6 +32,8 @@ import de.tudarmstadt.informatik.hostage.ui2.swipelist.SwipeListView;
 public class ProfileManagerFragment extends Fragment {
 	private ProfileManagerListAdapter mAdapter;
 
+	private SharedPreferences mSharedPreferences;
+
 	public ProfileManagerFragment(){}
 
 	private SwipeListView list;
@@ -46,9 +51,12 @@ public class ProfileManagerFragment extends Fragment {
 		final ProfileManager pmanager = ProfileManager.getInstance();
 		pmanager.loadData();
 
+	    String sharedPreferencePath = MainActivity.getContext().getString(R.string.shared_preference_path);
+	    mSharedPreferences = MainActivity.getContext().getSharedPreferences(sharedPreferencePath, Hostage.MODE_PRIVATE);
+
         final List<Profile> strList = new LinkedList<Profile>(pmanager.getProfilesList());
 
-	    if(strList.size() > 0){
+	    if(strList.size() > 0 && !mSharedPreferences.getBoolean("dismissedProfileSwipeHelp", false)){
 		    Profile tProfile = new Profile();
 		    tProfile.mShowTooltip = true;
 
@@ -68,6 +76,8 @@ public class ProfileManagerFragment extends Fragment {
 					mAdapter.remove(profile);
 					strList.remove(profile);
 					list.dismiss(position);
+
+					mSharedPreferences.edit().putBoolean("dismissedProfileSwipeHelp", true);
 				}
 			}
 

src/de/tudarmstadt/informatik/hostage/ui2/fragment/RecordOverviewFragment.java

@@ -8,6 +8,9 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ExpandableListView;
@@ -29,6 +32,7 @@ import java.util.Random;
 import de.tudarmstadt.informatik.hostage.R;
 import de.tudarmstadt.informatik.hostage.deprecated.UglyDbHelper;
 import de.tudarmstadt.informatik.hostage.logging.Record;
+import de.tudarmstadt.informatik.hostage.sync.BluetoothSync;
 import de.tudarmstadt.informatik.hostage.ui.LogFilter;
 import de.tudarmstadt.informatik.hostage.ui.LogFilter.SortType;
 import de.tudarmstadt.informatik.hostage.ui2.activity.MainActivity;
@@ -99,6 +103,7 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
              Bundle savedInstanceState) {
 
+		setHasOptionsMenu(true);
 		getActivity().setTitle(getResources().getString(R.string.drawer_records));
 
 		dbh = new UglyDbHelper(this.getActivity().getBaseContext());
@@ -301,6 +306,24 @@ public class RecordOverviewFragment extends UpNavigatibleFragment implements Che
 
     }
 
+	@Override
+	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+		// Inflate the menu items for use in the action bar
+		inflater.inflate(R.menu.records_overview_actions, menu);
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case R.id.records_action_synchronize:
+				getActivity().startActivity(new Intent(this.getActivity(), BluetoothSync.class));
+				return true;
+		}
+
+		return false;
+	}
+
+
 	/*****************************
 	 *
 	 * 			Public API