diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/drawable/baseline_map_24.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/drawable/outline_database_24.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/drawable/rounded_bar_chart_24.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 51 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_log.xml | 14 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_main.xml | 14 | ||||
| -rw-r--r-- | app/src/main/res/layout/fragment_map.xml | 14 | ||||
| -rw-r--r-- | app/src/main/res/menu/nav_menu.xml | 15 | ||||
| -rw-r--r-- | app/src/main/res/values-night/styles.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values-night/themes.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/values/colors.xml | 6 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/themes.xml | 18 |
14 files changed, 95 insertions, 65 deletions
diff --git a/app/src/main/res/drawable/baseline_map_24.xml b/app/src/main/res/drawable/baseline_map_24.xml new file mode 100644 index 0000000..58f2947 --- /dev/null +++ b/app/src/main/res/drawable/baseline_map_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/> + +</vector> diff --git a/app/src/main/res/drawable/outline_database_24.xml b/app/src/main/res/drawable/outline_database_24.xml new file mode 100644 index 0000000..651d3b6 --- /dev/null +++ b/app/src/main/res/drawable/outline_database_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M480,840Q329,840 224.5,793.5Q120,747 120,680L120,280Q120,214 225.5,167Q331,120 480,120Q629,120 734.5,167Q840,214 840,280L840,680Q840,747 735.5,793.5Q631,840 480,840ZM480,361Q569,361 659,335.5Q749,310 760,281Q749,252 659.5,226Q570,200 480,200Q389,200 301.5,225.5Q214,251 200,281Q214,311 301.5,336Q389,361 480,361ZM480,560Q522,560 561,556Q600,552 635.5,544.5Q671,537 702.5,526Q734,515 760,501L760,381Q734,395 702.5,406Q671,417 635.5,424.5Q600,432 561,436Q522,440 480,440Q438,440 398,436Q358,432 322.5,424.5Q287,417 256,406Q225,395 200,381L200,501Q225,515 256,526Q287,537 322.5,544.5Q358,552 398,556Q438,560 480,560ZM480,760Q526,760 573.5,753Q621,746 661,734.5Q701,723 728,708.5Q755,694 760,679L760,581Q734,595 702.5,606Q671,617 635.5,624.5Q600,632 561,636Q522,640 480,640Q438,640 398,636Q358,632 322.5,624.5Q287,617 256,606Q225,595 200,581L200,680Q205,695 231.5,709Q258,723 298,734.5Q338,746 386,753Q434,760 480,760Z"/> + +</vector> diff --git a/app/src/main/res/drawable/rounded_bar_chart_24.xml b/app/src/main/res/drawable/rounded_bar_chart_24.xml new file mode 100644 index 0000000..146a07d --- /dev/null +++ b/app/src/main/res/drawable/rounded_bar_chart_24.xml @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp"> + + <path android:fillColor="@android:color/white" android:pathData="M680,800Q663,800 651.5,788.5Q640,777 640,760L640,560Q640,543 651.5,531.5Q663,520 680,520L760,520Q777,520 788.5,531.5Q800,543 800,560L800,760Q800,777 788.5,788.5Q777,800 760,800L680,800ZM440,800Q423,800 411.5,788.5Q400,777 400,760L400,200Q400,183 411.5,171.5Q423,160 440,160L520,160Q537,160 548.5,171.5Q560,183 560,200L560,760Q560,777 548.5,788.5Q537,800 520,800L440,800ZM200,800Q183,800 171.5,788.5Q160,777 160,760L160,400Q160,383 171.5,371.5Q183,360 200,360L280,360Q297,360 308.5,371.5Q320,383 320,400L320,760Q320,777 308.5,788.5Q297,800 280,800L200,800Z"/> + +</vector> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 76aa1e4..c78970c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,42 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.constraintlayout.widget.ConstraintLayout - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/main" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:fitsSystemWindows="true" tools:context=".MainActivity"> - <LinearLayout - android:layout_width="0dp" + <FrameLayout + android:id="@+id/container" + android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + android:layout_above="@+id/bottomNav" > - <TextView - android:id="@+id/haederCell" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Cell Info" - android:textSize="20sp" /> + </FrameLayout> - <ScrollView - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <LinearLayout - android:id="@+id/cellsList" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> - </ScrollView> - <org.osmdroid.views.MapView android:id="@+id/map" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> - </LinearLayout> - -</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file + <com.google.android.material.bottomnavigation.BottomNavigationView + android:id="@+id/bottomNav" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:scrollIndicators="left" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:menu="@menu/nav_menu" /> +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_log.xml b/app/src/main/res/layout/fragment_log.xml new file mode 100644 index 0000000..8df01f3 --- /dev/null +++ b/app/src/main/res/layout/fragment_log.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".LogFragment"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="LOG" /> + +</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml new file mode 100644 index 0000000..366cbbe --- /dev/null +++ b/app/src/main/res/layout/fragment_main.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".MainFragment"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="@string/hello_blank_fragment" /> + +</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_map.xml b/app/src/main/res/layout/fragment_map.xml new file mode 100644 index 0000000..3ebc6c4 --- /dev/null +++ b/app/src/main/res/layout/fragment_map.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:context=".MapFragment"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="MAP" /> + +</FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/menu/nav_menu.xml b/app/src/main/res/menu/nav_menu.xml new file mode 100644 index 0000000..5c42815 --- /dev/null +++ b/app/src/main/res/menu/nav_menu.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/main" + android:icon="@drawable/rounded_bar_chart_24" + android:title="Main" /> + <item + android:id="@+id/log" + android:icon="@drawable/outline_database_24" + android:title="Logs" /> + <item + android:id="@+id/map" + android:icon="@drawable/baseline_map_24" + android:title="Map" /> +</menu>
\ No newline at end of file diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index 04e74eb..e5f8fdc 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -1,6 +1,2 @@ <resources> - <style name="Widget.Theme.Netmon.MyView" parent=""> - <item name="android:background">@color/gray_600</item> - <item name="exampleColor">@color/light_blue_600</item> - </style> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 9b38736..17a54dd 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,5 +1,2 @@ <resources xmlns:tools="http://schemas.android.com/tools"> - <style name="Base.Theme.Netmon" parent="Theme.Material3.DayNight.NoActionBar"> - <item name="android:windowBackground">#FF000000</item> - </style> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e2337bb..55344e5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,9 +1,3 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="black">#FF000000</color> - <color name="white">#FFFFFFFF</color> - <color name="light_blue_400">#FF29B6F6</color> - <color name="light_blue_600">#FF039BE5</color> - <color name="gray_400">#FFBDBDBD</color> - <color name="gray_600">#FF757575</color> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2c29dfa..723086d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,4 +3,6 @@ <string name="title_activity_main2">MainActivity2</string> <string name="tab_text_1">Tab 1</string> <string name="tab_text_2">Tab 2</string> + <!-- TODO: Remove or change this placeholder text --> + <string name="hello_blank_fragment">Hello blank fragment</string> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5ed5dd0..e5f8fdc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,6 +1,2 @@ <resources> - <style name="Widget.Theme.Netmon.MyView" parent=""> - <item name="android:background">@color/gray_400</item> - <item name="exampleColor">@color/light_blue_400</item> - </style> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 8c1e2ef..d292522 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,18 +1,4 @@ -<resources xmlns:tools="http://schemas.android.com/tools"> - <!-- Base application theme. --> - <style name="Base.Theme.Netmon" parent="Theme.Material3.DayNight.NoActionBar"> - <!-- Customize your light theme here. --> - <!-- <item name="colorPrimary">@color/my_light_primary</item> --> +<resources> + <style name="Base.Theme.Netmon" parent="Theme.Material3.DayNight"> </style> - - <style name="Theme.Netmon" parent="Base.Theme.Netmon" /> - - <style name="Theme.Netmon.NoActionBar"> - <item name="windowActionBar">false</item> - <item name="windowNoTitle">true</item> - </style> - - <style name="Theme.Netmon.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> - - <style name="Theme.Netmon.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> </resources>
\ No newline at end of file |