Skip to content
Snippets Groups Projects
Commit d634b38f authored by Xavier Gibert's avatar Xavier Gibert
Browse files

icons of selected, bugfix touch zoom in special locked views

parent e3247b12
No related branches found
No related tags found
No related merge requests found
......@@ -133,7 +133,7 @@ This three.js demo is part of a collection at
// DEBUG OPTIONS
//-----------------------------------------------------------------------------------------------------------------------
var auto_rotate_sc = false;// If true, it ignores the simulator attitude and rotates the spacecraft.
var auto_rotate_sc = true;// If true, it ignores the simulator attitude and rotates the spacecraft.
//-----------------------------------------------------------------------------------------------------------------------
// PERFORMANCE VALUES (Set at initialization)
......
......@@ -2,6 +2,7 @@ function update()
{
//Views
controls.update();
switch(selected_view){
case "Earth"://Earth
camera.position = earth.position.clone().normalize().multiplyScalar(getCamDistance());
......@@ -38,7 +39,6 @@ function update()
camera.up = init_sc_up_right.clone().applyQuaternion(spacecraft.quaternion.clone().normalize());
break;
default:
controls.update();
break;
}
camera.lookAt(scene.position);
......
res/drawable-xhdpi/indicators_s.png

575 B

res/drawable-xhdpi/preferences_s.png

899 B

res/drawable-xhdpi/simulator_s.png

682 B

res/drawable-xhdpi/test_s.png

501 B

res/drawable-xhdpi/visualization_s.png

1.55 KiB

<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android1="http://schemas.android.com/apk/res/android"
android1:id="@+id/RelLayout001"
android1:id="@+id/nav_item_layout"
android1:layout_width="match_parent"
android1:layout_height="wrap_content" >
android1:layout_height="wrap_content"
android1:background="@drawable/navigation_section" >
<ImageView
android1:id="@+id/nav_item_icon"
android1:layout_width="45dp"
android1:layout_height="45dp"
android1:layout_width="30dp"
android1:layout_height="30dp"
android1:layout_alignParentLeft="true"
android1:layout_alignParentTop="true"
android1:background="@drawable/navigation_section"
android1:contentDescription="@string/dummy"
android1:scaleType="fitCenter"
android1:src="@drawable/simulator" />
......@@ -23,7 +24,7 @@
android1:layout_alignParentRight="true"
android1:layout_alignParentTop="true"
android1:layout_toRightOf="@+id/nav_item_icon"
android1:background="@drawable/navigation_section"
android1:paddingLeft="5dp"
android1:textAppearance="?android:attr/textAppearanceLarge" />
</RelativeLayout>
......@@ -26,6 +26,7 @@ import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
......@@ -140,6 +141,7 @@ public class NavigationDrawerFragment extends Fragment {
{
LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
View rowView = inflater.inflate(R.layout.nav_item, parent, false);
RelativeLayout layout = (RelativeLayout) rowView.findViewById(R.id.nav_item_layout);
TextView textView = (TextView) rowView.findViewById(R.id.nav_item_text);
ImageView iconView = (ImageView) rowView.findViewById(R.id.nav_item_icon);
String[] values = new String[]{
......@@ -152,35 +154,58 @@ public class NavigationDrawerFragment extends Fragment {
getString(R.string.title_section7),
};
textView.setText(values[position]);
switch(position){
case 0:
iconView.setImageResource(R.drawable.simulator);
break;
case 1:
iconView.setImageResource(R.drawable.visualization);
break;
case 2:
iconView.setImageResource(R.drawable.indicators);
break;
case 3:
iconView.setImageResource(R.drawable.indicators);
break;
case 4:
iconView.setImageResource(R.drawable.preferences);
break;
case 5:
iconView.setImageResource(R.drawable.preferences);
break;
case 6:
iconView.setImageResource(R.drawable.test);
break;
}
if (position == mCurrentSelectedPosition)
{
textView.setBackgroundResource(R.drawable.navigation_selector);
switch(position){
case 0:
iconView.setImageResource(R.drawable.simulator_s);
break;
case 1:
iconView.setImageResource(R.drawable.visualization_s);
break;
case 2:
iconView.setImageResource(R.drawable.indicators_s);
break;
case 3:
iconView.setImageResource(R.drawable.indicators_s);
break;
case 4:
iconView.setImageResource(R.drawable.preferences_s);
break;
case 5:
iconView.setImageResource(R.drawable.preferences_s);
break;
case 6:
iconView.setImageResource(R.drawable.test_s);
break;
}
layout.setBackgroundResource(R.drawable.navigation_selector);
}else{
textView.setBackgroundResource(R.drawable.navigation_section);
switch(position){
case 0:
iconView.setImageResource(R.drawable.simulator);
break;
case 1:
iconView.setImageResource(R.drawable.visualization);
break;
case 2:
iconView.setImageResource(R.drawable.indicators);
break;
case 3:
iconView.setImageResource(R.drawable.indicators);
break;
case 4:
iconView.setImageResource(R.drawable.preferences);
break;
case 5:
iconView.setImageResource(R.drawable.preferences);
break;
case 6:
iconView.setImageResource(R.drawable.test);
break;
}
layout.setBackgroundResource(R.drawable.navigation_section);
}
return rowView;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment