Pārlūkot izejas kodu

drawer; begin camera fragment

tags/0.0.5
Robin Thoni 9 gadus atpakaļ
vecāks
revīzija
6b102ea685
39 mainītis faili ar 209 papildinājumiem un 145 dzēšanām
  1. Binārs
      app/src/main/ic_camera-web.png
  2. Binārs
      app/src/main/ic_command-web.png
  3. Binārs
      app/src/main/ic_location-web.png
  4. Binārs
      app/src/main/ic_sensor-web.png
  5. 62
    60
      app/src/main/java/com/rthoni/camotion/ui/MainActivity.java
  6. 25
    0
      app/src/main/java/com/rthoni/camotion/ui/fragments/CamerasFragment.java
  7. 0
    12
      app/src/main/res/drawable-v21/ic_menu_camera.xml
  8. 0
    9
      app/src/main/res/drawable-v21/ic_menu_gallery.xml
  9. 0
    9
      app/src/main/res/drawable-v21/ic_menu_manage.xml
  10. 0
    9
      app/src/main/res/drawable-v21/ic_menu_send.xml
  11. 0
    9
      app/src/main/res/drawable-v21/ic_menu_share.xml
  12. 0
    9
      app/src/main/res/drawable-v21/ic_menu_slideshow.xml
  13. Binārs
      app/src/main/res/drawable/camera_loading.jpg
  14. 0
    8
      app/src/main/res/layout/app_bar_main.xml
  15. 96
    0
      app/src/main/res/layout/cameras_layout.xml
  16. 6
    4
      app/src/main/res/layout/content_main.xml
  17. 1
    0
      app/src/main/res/layout/nav_header_main.xml
  18. 13
    16
      app/src/main/res/menu/activity_main_drawer.xml
  19. Binārs
      app/src/main/res/mipmap-hdpi/ic_camera.png
  20. Binārs
      app/src/main/res/mipmap-hdpi/ic_command.png
  21. Binārs
      app/src/main/res/mipmap-hdpi/ic_location.png
  22. Binārs
      app/src/main/res/mipmap-hdpi/ic_sensor.png
  23. Binārs
      app/src/main/res/mipmap-mdpi/ic_camera.png
  24. Binārs
      app/src/main/res/mipmap-mdpi/ic_command.png
  25. Binārs
      app/src/main/res/mipmap-mdpi/ic_location.png
  26. Binārs
      app/src/main/res/mipmap-mdpi/ic_sensor.png
  27. Binārs
      app/src/main/res/mipmap-xhdpi/ic_camera.png
  28. Binārs
      app/src/main/res/mipmap-xhdpi/ic_command.png
  29. Binārs
      app/src/main/res/mipmap-xhdpi/ic_location.png
  30. Binārs
      app/src/main/res/mipmap-xhdpi/ic_sensor.png
  31. Binārs
      app/src/main/res/mipmap-xxhdpi/ic_camera.png
  32. Binārs
      app/src/main/res/mipmap-xxhdpi/ic_command.png
  33. Binārs
      app/src/main/res/mipmap-xxhdpi/ic_location.png
  34. Binārs
      app/src/main/res/mipmap-xxhdpi/ic_sensor.png
  35. Binārs
      app/src/main/res/mipmap-xxxhdpi/ic_camera.png
  36. Binārs
      app/src/main/res/mipmap-xxxhdpi/ic_command.png
  37. Binārs
      app/src/main/res/mipmap-xxxhdpi/ic_location.png
  38. Binārs
      app/src/main/res/mipmap-xxxhdpi/ic_sensor.png
  39. 6
    0
      app/src/main/res/values/strings.xml

Binārs
app/src/main/ic_camera-web.png Parādīt failu


Binārs
app/src/main/ic_command-web.png Parādīt failu


Binārs
app/src/main/ic_location-web.png Parādīt failu


Binārs
app/src/main/ic_sensor-web.png Parādīt failu


+ 62
- 60
app/src/main/java/com/rthoni/camotion/ui/MainActivity.java Parādīt failu

@@ -1,30 +1,34 @@
1 1
 package com.rthoni.camotion.ui;
2 2
 
3
+import android.app.Fragment;
3 4
 import android.os.Bundle;
4
-import android.support.design.widget.FloatingActionButton;
5
-import android.util.Log;
6
-import android.view.View;
5
+import android.view.SubMenu;
7 6
 import android.support.design.widget.NavigationView;
8 7
 import android.support.v4.view.GravityCompat;
9 8
 import android.support.v4.widget.DrawerLayout;
10 9
 import android.support.v7.app.ActionBarDrawerToggle;
11 10
 import android.support.v7.app.AppCompatActivity;
12 11
 import android.support.v7.widget.Toolbar;
13
-import android.view.Menu;
14 12
 import android.view.MenuItem;
13
+import android.widget.TextView;
15 14
 
16
-import com.luticate.auth.business.LuticateUsersBusiness;
17 15
 import com.luticate.auth.dbo.LuFullLoginDbo;
18
-import com.luticate.utils.business.LuPromise;
19 16
 import com.rthoni.camotion.R;
20 17
 import com.rthoni.camotion.business.CamotionBusiness;
21 18
 import com.rthoni.camotion.dbo.LocationDbo;
19
+import com.rthoni.camotion.ui.fragments.CamerasFragment;
22 20
 
23 21
 import java.util.List;
24 22
 
25 23
 public class MainActivity extends AppCompatActivity
26 24
         implements NavigationView.OnNavigationItemSelectedListener {
27 25
 
26
+    private LuFullLoginDbo _fullLoginDbo = null;
27
+    private LocationDbo _currentLocation = null;
28
+    private TextView _locationNameView;
29
+    private SubMenu _locationsMenu;
30
+    private NavigationView _navigationView;
31
+
28 32
     @Override
29 33
     protected void onCreate(Bundle savedInstanceState) {
30 34
         super.onCreate(savedInstanceState);
@@ -32,25 +36,7 @@ public class MainActivity extends AppCompatActivity
32 36
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
33 37
         setSupportActionBar(toolbar);
34 38
 
35
-        FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
36
-        fab.setOnClickListener(new View.OnClickListener() {
37
-            @Override
38
-            public void onClick(View view) {
39
-                /*LuticateUsersBusiness.loginFull(CamotionBusiness.getConfig(), "user", "test42")
40
-                        .then(new LuPromise.LuConsumer<LuFullLoginDbo>() {
41
-                            @Override
42
-                            public void execute(LuFullLoginDbo data) {
43
-                                Log.d("Login", data.toString());
44
-                            }
45
-                        }, new LuPromise.LuConsumer<LuPromise.LuPromiseError>() {
46
-                            @Override
47
-                            public void execute(LuPromise.LuPromiseError error) {
48
-                                Log.e("Login", error.toString());
49
-                            }
50
-                        });*/
51
-                //List<LocationDbo> locations = CamotionBusiness.getLocations(MainActivity.this);
52
-            }
53
-        });
39
+        _locationNameView = (TextView) findViewById(R.id.location_name_textview);
54 40
 
55 41
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
56 42
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar,
@@ -58,8 +44,51 @@ public class MainActivity extends AppCompatActivity
58 44
         drawer.setDrawerListener(toggle);
59 45
         toggle.syncState();
60 46
 
61
-        NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
62
-        navigationView.setNavigationItemSelectedListener(this);
47
+        _navigationView = (NavigationView) findViewById(R.id.nav_view);
48
+        _navigationView.setNavigationItemSelectedListener(this);
49
+        _locationsMenu = _navigationView.getMenu().findItem(R.id.location_menu).getSubMenu();
50
+
51
+        init();
52
+    }
53
+
54
+    private void init()
55
+    {
56
+        List<LocationDbo> locations = CamotionBusiness.getLocations(MainActivity.this);
57
+        _locationsMenu.clear();
58
+        if (locations.isEmpty()) {
59
+            return;
60
+        }
61
+        for (final LocationDbo location : locations) {
62
+            MenuItem item = _locationsMenu.add(location.getName());
63
+            item.setIcon(R.mipmap.ic_location);
64
+            item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
65
+                @Override
66
+                public boolean onMenuItemClick(MenuItem item) {
67
+                    setLocation(location);
68
+                    return false;
69
+                }
70
+            });
71
+        }
72
+        // Force drawer update; need a fix
73
+        MenuItem item = _navigationView.getMenu().add("test42");
74
+        _navigationView.getMenu().removeItem(item.getItemId());
75
+        setLocation(locations.get(0));
76
+    }
77
+
78
+    private void setLocation(LocationDbo location)
79
+    {
80
+        _currentLocation = location;
81
+        _locationNameView.setText(_currentLocation.getName());
82
+        showView(R.id.nav_cameras);
83
+    }
84
+
85
+    private void showView(int view)
86
+    {
87
+        Fragment fragment = null;
88
+        if (view == R.id.nav_cameras) {
89
+            fragment = new CamerasFragment();
90
+        }
91
+        getFragmentManager().beginTransaction().replace(R.id.container, fragment).commit();
63 92
     }
64 93
 
65 94
     @Override
@@ -72,44 +101,17 @@ public class MainActivity extends AppCompatActivity
72 101
         }
73 102
     }
74 103
 
75
-    @Override
76
-    public boolean onCreateOptionsMenu(Menu menu) {
77
-        // Inflate the menu; this adds items to the action bar if it is present.
78
-        getMenuInflater().inflate(R.menu.menu_main, menu);
79
-        return true;
80
-    }
81
-
82
-    @Override
83
-    public boolean onOptionsItemSelected(MenuItem item) {
84
-        // Handle action bar item clicks here. The action bar will
85
-        // automatically handle clicks on the Home/Up button, so long
86
-        // as you specify a parent activity in AndroidManifest.xml.
87
-        int id = item.getItemId();
88
-
89
-        //noinspection SimplifiableIfStatement
90
-        if (id == R.id.action_settings) {
91
-            return true;
92
-        }
93
-
94
-        return super.onOptionsItemSelected(item);
95
-    }
96
-
97 104
     @SuppressWarnings("StatementWithEmptyBody")
98 105
     @Override
99 106
     public boolean onNavigationItemSelected(MenuItem item) {
100
-        // Handle navigation view item clicks here.
101 107
         int id = item.getItemId();
102 108
 
103
-        if (id == R.id.nav_camera) {
104
-            // Handle the camera action
105
-        } else if (id == R.id.nav_gallery) {
106
-
107
-        } else if (id == R.id.nav_slideshow) {
108
-
109
-        } else if (id == R.id.nav_share) {
110
-
111
-        } else if (id == R.id.nav_send) {
112
-
109
+        if (id == R.id.nav_cameras) {
110
+            showView(id);
111
+        } else if (id == R.id.nav_sensors) {
112
+            showView(id);
113
+        } else if (id == R.id.nav_commands) {
114
+            showView(id);
113 115
         }
114 116
 
115 117
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);

+ 25
- 0
app/src/main/java/com/rthoni/camotion/ui/fragments/CamerasFragment.java Parādīt failu

@@ -0,0 +1,25 @@
1
+package com.rthoni.camotion.ui.fragments;
2
+
3
+import android.app.Fragment;
4
+import android.os.Bundle;
5
+import android.view.LayoutInflater;
6
+import android.view.View;
7
+import android.view.ViewGroup;
8
+
9
+import com.rthoni.camotion.R;
10
+
11
+/**
12
+ *
13
+ * Created by robin on 11/29/15.
14
+ */
15
+public class CamerasFragment extends Fragment {
16
+
17
+    @Override
18
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
19
+                             Bundle savedInstanceState)
20
+    {
21
+        Bundle args = getArguments();
22
+        View rootView = inflater.inflate(R.layout.cameras_layout, container, false);
23
+        return rootView;
24
+    }
25
+}

+ 0
- 12
app/src/main/res/drawable-v21/ic_menu_camera.xml Parādīt failu

@@ -1,12 +0,0 @@
1
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
-    android:width="24dp"
3
-    android:height="24dp"
4
-    android:viewportHeight="24.0"
5
-    android:viewportWidth="24.0">
6
-    <path
7
-        android:fillColor="#FF000000"
8
-        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
9
-    <path
10
-        android:fillColor="#FF000000"
11
-        android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
12
-</vector>

+ 0
- 9
app/src/main/res/drawable-v21/ic_menu_gallery.xml Parādīt failu

@@ -1,9 +0,0 @@
1
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
-    android:width="24dp"
3
-    android:height="24dp"
4
-    android:viewportHeight="24.0"
5
-    android:viewportWidth="24.0">
6
-    <path
7
-        android:fillColor="#FF000000"
8
-        android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z" />
9
-</vector>

+ 0
- 9
app/src/main/res/drawable-v21/ic_menu_manage.xml Parādīt failu

@@ -1,9 +0,0 @@
1
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
-    android:width="24dp"
3
-    android:height="24dp"
4
-    android:viewportHeight="24.0"
5
-    android:viewportWidth="24.0">
6
-    <path
7
-        android:fillColor="#FF000000"
8
-        android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z" />
9
-</vector>

+ 0
- 9
app/src/main/res/drawable-v21/ic_menu_send.xml Parādīt failu

@@ -1,9 +0,0 @@
1
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
-    android:width="24dp"
3
-    android:height="24dp"
4
-    android:viewportHeight="24.0"
5
-    android:viewportWidth="24.0">
6
-    <path
7
-        android:fillColor="#FF000000"
8
-        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
9
-</vector>

+ 0
- 9
app/src/main/res/drawable-v21/ic_menu_share.xml Parādīt failu

@@ -1,9 +0,0 @@
1
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
-    android:width="24dp"
3
-    android:height="24dp"
4
-    android:viewportHeight="24.0"
5
-    android:viewportWidth="24.0">
6
-    <path
7
-        android:fillColor="#FF000000"
8
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
9
-</vector>

+ 0
- 9
app/src/main/res/drawable-v21/ic_menu_slideshow.xml Parādīt failu

@@ -1,9 +0,0 @@
1
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
-    android:width="24dp"
3
-    android:height="24dp"
4
-    android:viewportHeight="24.0"
5
-    android:viewportWidth="24.0">
6
-    <path
7
-        android:fillColor="#FF000000"
8
-        android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z" />
9
-</vector>

Binārs
app/src/main/res/drawable/camera_loading.jpg Parādīt failu


+ 0
- 8
app/src/main/res/layout/app_bar_main.xml Parādīt failu

@@ -23,12 +23,4 @@
23 23
 
24 24
     <include layout="@layout/content_main" />
25 25
 
26
-    <android.support.design.widget.FloatingActionButton
27
-        android:id="@+id/fab"
28
-        android:layout_width="wrap_content"
29
-        android:layout_height="wrap_content"
30
-        android:layout_gravity="bottom|end"
31
-        android:layout_margin="@dimen/fab_margin"
32
-        android:src="@android:drawable/ic_dialog_email" />
33
-
34 26
 </android.support.design.widget.CoordinatorLayout>

+ 96
- 0
app/src/main/res/layout/cameras_layout.xml Parādīt failu

@@ -0,0 +1,96 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
+              android:layout_width="match_parent"
4
+              android:layout_height="match_parent"
5
+              android:orientation="vertical" >
6
+
7
+    <!-- Loading progress -->
8
+
9
+    <LinearLayout
10
+        android:id="@+id/loadStatus"
11
+        android:layout_width="wrap_content"
12
+        android:layout_height="wrap_content"
13
+        android:layout_gravity="center"
14
+        android:gravity="center_horizontal"
15
+        android:orientation="vertical"
16
+        android:visibility="gone" >
17
+
18
+        <ProgressBar
19
+            style="?android:attr/progressBarStyleLarge"
20
+            android:layout_width="wrap_content"
21
+            android:layout_height="wrap_content"
22
+            android:layout_marginBottom="8dp" />
23
+
24
+        <TextView
25
+            android:id="@+id/loading_status_message"
26
+            android:layout_width="wrap_content"
27
+            android:layout_height="wrap_content"
28
+            android:layout_marginBottom="16dp"
29
+            android:text="@string/loading"
30
+            android:textAppearance="?android:attr/textAppearanceMedium" />
31
+    </LinearLayout>
32
+
33
+    <!-- Layout -->
34
+
35
+    <ScrollView
36
+        android:id="@+id/imagesScrollView"
37
+        android:layout_width="match_parent"
38
+        android:layout_height="0dp"
39
+        android:layout_weight="0.33" >
40
+
41
+        <LinearLayout
42
+            android:id="@+id/imagesLayoutScrollView"
43
+            android:layout_width="wrap_content"
44
+            android:layout_height="match_parent"
45
+            android:orientation="vertical" >
46
+
47
+            <ImageView
48
+                android:contentDescription="42"
49
+                android:layout_width="match_parent"
50
+                android:layout_height="wrap_content"
51
+                android:layout_margin="10px"
52
+                android:adjustViewBounds="true"
53
+                android:src="@drawable/camera_loading" />
54
+
55
+            <ImageView
56
+                android:contentDescription="42"
57
+                android:layout_width="match_parent"
58
+                android:layout_height="wrap_content"
59
+                android:layout_margin="10px"
60
+                android:adjustViewBounds="true"
61
+                android:src="@drawable/camera_loading" />
62
+
63
+            <ImageView
64
+                android:contentDescription="42"
65
+                android:layout_width="match_parent"
66
+                android:layout_height="wrap_content"
67
+                android:layout_margin="10px"
68
+                android:adjustViewBounds="true"
69
+                android:src="@drawable/camera_loading" />
70
+
71
+            <ImageView
72
+                android:contentDescription="42"
73
+                android:layout_width="match_parent"
74
+                android:layout_height="wrap_content"
75
+                android:layout_margin="10px"
76
+                android:adjustViewBounds="true"
77
+                android:src="@drawable/camera_loading" />
78
+
79
+            <ImageView
80
+                android:contentDescription="42"
81
+                android:layout_width="match_parent"
82
+                android:layout_height="wrap_content"
83
+                android:layout_margin="10px"
84
+                android:adjustViewBounds="true"
85
+                android:src="@drawable/camera_loading" />
86
+
87
+            <ImageView
88
+                android:contentDescription="42"
89
+                android:layout_width="match_parent"
90
+                android:layout_height="wrap_content"
91
+                android:layout_margin="10px"
92
+                android:adjustViewBounds="true"
93
+                android:src="@drawable/camera_loading" />
94
+        </LinearLayout>
95
+    </ScrollView>
96
+</LinearLayout>

+ 6
- 4
app/src/main/res/layout/content_main.xml Parādīt failu

@@ -12,8 +12,10 @@
12 12
     tools:context=".ui.MainActivity"
13 13
     tools:showIn="@layout/app_bar_main">
14 14
 
15
-    <TextView
16
-        android:layout_width="wrap_content"
17
-        android:layout_height="wrap_content"
18
-        android:text="Hello World!" />
15
+
16
+    <FrameLayout
17
+        android:id="@+id/container"
18
+        android:layout_width="match_parent"
19
+        android:layout_height="match_parent">
20
+    </FrameLayout>
19 21
 </RelativeLayout>

+ 1
- 0
app/src/main/res/layout/nav_header_main.xml Parādīt failu

@@ -16,6 +16,7 @@
16 16
         android:layout_width="match_parent"
17 17
         android:layout_height="wrap_content"
18 18
         android:text="Location Name"
19
+        android:id="@+id/location_name_textview"
19 20
         android:textAppearance="@style/TextAppearance.AppCompat.Title" />
20 21
 
21 22
 </LinearLayout>

+ 13
- 16
app/src/main/res/menu/activity_main_drawer.xml Parādīt failu

@@ -3,29 +3,26 @@
3 3
 
4 4
     <group android:checkableBehavior="single">
5 5
         <item
6
-            android:id="@+id/nav_camera"
7
-            android:icon="@drawable/ic_menu_camera"
8
-            android:title="Cameras" />
6
+            android:id="@+id/nav_cameras"
7
+            android:icon="@mipmap/ic_camera"
8
+            android:title="@string/camera" />
9 9
         <item
10
-            android:id="@+id/nav_gallery"
11
-            android:icon="@drawable/ic_menu_gallery"
12
-            android:title="Sensors" />
10
+            android:id="@+id/nav_sensors"
11
+            android:icon="@mipmap/ic_sensor"
12
+            android:title="@string/sensors" />
13 13
         <item
14
-            android:id="@+id/nav_slideshow"
15
-            android:icon="@drawable/ic_menu_slideshow"
16
-            android:title="Cammands" />
14
+            android:id="@+id/nav_commands"
15
+            android:icon="@mipmap/ic_command"
16
+            android:title="@string/commands" />
17 17
     </group>
18 18
 
19
-    <item android:title="Locations">
19
+    <item android:title="@string/locations"
20
+        android:id="@+id/location_menu">
20 21
         <menu>
21 22
             <item
22 23
                 android:id="@+id/nav_share"
23
-                android:icon="@drawable/ic_menu_share"
24
-                android:title="Select" />
25
-            <item
26
-                android:id="@+id/nav_send"
27
-                android:icon="@drawable/ic_menu_send"
28
-                android:title="Edit" />
24
+                android:icon="@mipmap/ic_location"
25
+                android:title="@string/location_select" />
29 26
         </menu>
30 27
     </item>
31 28
 

Binārs
app/src/main/res/mipmap-hdpi/ic_camera.png Parādīt failu


Binārs
app/src/main/res/mipmap-hdpi/ic_command.png Parādīt failu


Binārs
app/src/main/res/mipmap-hdpi/ic_location.png Parādīt failu


Binārs
app/src/main/res/mipmap-hdpi/ic_sensor.png Parādīt failu


Binārs
app/src/main/res/mipmap-mdpi/ic_camera.png Parādīt failu


Binārs
app/src/main/res/mipmap-mdpi/ic_command.png Parādīt failu


Binārs
app/src/main/res/mipmap-mdpi/ic_location.png Parādīt failu


Binārs
app/src/main/res/mipmap-mdpi/ic_sensor.png Parādīt failu


Binārs
app/src/main/res/mipmap-xhdpi/ic_camera.png Parādīt failu


Binārs
app/src/main/res/mipmap-xhdpi/ic_command.png Parādīt failu


Binārs
app/src/main/res/mipmap-xhdpi/ic_location.png Parādīt failu


Binārs
app/src/main/res/mipmap-xhdpi/ic_sensor.png Parādīt failu


Binārs
app/src/main/res/mipmap-xxhdpi/ic_camera.png Parādīt failu


Binārs
app/src/main/res/mipmap-xxhdpi/ic_command.png Parādīt failu


Binārs
app/src/main/res/mipmap-xxhdpi/ic_location.png Parādīt failu


Binārs
app/src/main/res/mipmap-xxhdpi/ic_sensor.png Parādīt failu


Binārs
app/src/main/res/mipmap-xxxhdpi/ic_camera.png Parādīt failu


Binārs
app/src/main/res/mipmap-xxxhdpi/ic_command.png Parādīt failu


Binārs
app/src/main/res/mipmap-xxxhdpi/ic_location.png Parādīt failu


Binārs
app/src/main/res/mipmap-xxxhdpi/ic_sensor.png Parādīt failu


+ 6
- 0
app/src/main/res/values/strings.xml Parādīt failu

@@ -7,6 +7,8 @@
7 7
     <string name="navigation_drawer_close">Close navigation drawer</string>
8 8
 
9 9
     <string name="action_settings">Settings</string>
10
+    <string name="locations">Locations</string>
11
+    <string name="location_select">Select Location</string>
10 12
 
11 13
     <string name="add_location">Add a location</string>
12 14
     <string name="add_location_text">Fill in the following fields to add a location:</string>
@@ -24,4 +26,8 @@
24 26
 
25 27
     <string name="loading">Loading…</string>
26 28
     <string name="login_progress">Logging in…</string>
29
+
30
+    <string name="camera">Cameras</string>
31
+    <string name="sensors">Sensors</string>
32
+    <string name="commands">Commands</string>
27 33
 </resources>

Notiek ielāde…
Atcelt
Saglabāt