Browse Source

changed views order

tags/0.0.6
Robin Thoni 9 years ago
parent
commit
e073ef0a75

+ 6
- 6
app/src/main/java/com/rthoni/camotion/ui/MainActivity.java View File

156
             {
156
             {
157
                 return R.id.nav_cameras;
157
                 return R.id.nav_cameras;
158
             }
158
             }
159
-            else if (_fullLoginDbo.hasPermission("CAMOTION_SENSOR_GET"))
160
-            {
161
-                return R.id.nav_sensors;
162
-            }
163
             else if (_fullLoginDbo.hasPermission("CAMOTION_COMMAND_GET"))
159
             else if (_fullLoginDbo.hasPermission("CAMOTION_COMMAND_GET"))
164
             {
160
             {
165
                 return R.id.nav_commands;
161
                 return R.id.nav_commands;
166
             }
162
             }
163
+            else if (_fullLoginDbo.hasPermission("CAMOTION_SENSOR_GET"))
164
+            {
165
+                return R.id.nav_sensors;
166
+            }
167
         }
167
         }
168
         return -1;
168
         return -1;
169
     }
169
     }
173
         CamotionFragment fragment;
173
         CamotionFragment fragment;
174
         if (view == R.id.nav_cameras) {
174
         if (view == R.id.nav_cameras) {
175
             fragment = new CamerasFragment();
175
             fragment = new CamerasFragment();
176
-        } else if (view == R.id.nav_sensors) {
177
-            fragment = new SensorsFragment();
178
         } else if (view == R.id.nav_commands) {
176
         } else if (view == R.id.nav_commands) {
179
             fragment = new CommandsFragment();
177
             fragment = new CommandsFragment();
178
+        } else if (view == R.id.nav_sensors) {
179
+            fragment = new SensorsFragment();
180
         } /*else if (view == -1) {
180
         } /*else if (view == -1) {
181
             fragment = new DefaultFragment();
181
             fragment = new DefaultFragment();
182
         } */else {
182
         } */else {

+ 4
- 4
app/src/main/res/menu/activity_main_drawer.xml View File

6
             android:id="@+id/nav_cameras"
6
             android:id="@+id/nav_cameras"
7
             android:icon="@mipmap/ic_camera"
7
             android:icon="@mipmap/ic_camera"
8
             android:title="@string/camera" />
8
             android:title="@string/camera" />
9
-        <item
10
-            android:id="@+id/nav_sensors"
11
-            android:icon="@mipmap/ic_sensor"
12
-            android:title="@string/sensors" />
13
         <item
9
         <item
14
             android:id="@+id/nav_commands"
10
             android:id="@+id/nav_commands"
15
             android:icon="@mipmap/ic_command"
11
             android:icon="@mipmap/ic_command"
16
             android:title="@string/commands" />
12
             android:title="@string/commands" />
13
+        <item
14
+            android:id="@+id/nav_sensors"
15
+            android:icon="@mipmap/ic_sensor"
16
+            android:title="@string/sensors" />
17
     </group>
17
     </group>
18
 
18
 
19
     <item android:title="@string/locations"
19
     <item android:title="@string/locations"

Loading…
Cancel
Save