diff options
Diffstat (limited to 'platform_tools/android/apps/skar_java/src/main/res')
7 files changed, 38 insertions, 35 deletions
diff --git a/platform_tools/android/apps/skar_java/src/main/res/drawable-xxhdpi/clear.png b/platform_tools/android/apps/skar_java/src/main/res/drawable-xxhdpi/clear.png Binary files differnew file mode 100755 index 0000000000..b3e45df41d --- /dev/null +++ b/platform_tools/android/apps/skar_java/src/main/res/drawable-xxhdpi/clear.png diff --git a/platform_tools/android/apps/skar_java/src/main/res/drawable-xxhdpi/splash.png b/platform_tools/android/apps/skar_java/src/main/res/drawable-xxhdpi/splash.png Binary files differnew file mode 100644 index 0000000000..240b464115 --- /dev/null +++ b/platform_tools/android/apps/skar_java/src/main/res/drawable-xxhdpi/splash.png diff --git a/platform_tools/android/apps/skar_java/src/main/res/layout/activity_main.xml b/platform_tools/android/apps/skar_java/src/main/res/layout/activity_main.xml index a642a815ef..b6a1c7030d 100644 --- a/platform_tools/android/apps/skar_java/src/main/res/layout/activity_main.xml +++ b/platform_tools/android/apps/skar_java/src/main/res/layout/activity_main.xml @@ -43,12 +43,15 @@ android:id="@+id/gl_surfaceview" android:layout_width="match_parent" android:layout_height="match_parent" /> + <android.support.design.widget.BottomNavigationView android:id="@+id/palette" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" app:menu="@menu/platte_bar" + app:itemIconTint="@android:color/black" + app:itemTextColor="@android:color/black" style="@style/BottomNavigation" /> </FrameLayout> diff --git a/platform_tools/android/apps/skar_java/src/main/res/menu/main_menu.xml b/platform_tools/android/apps/skar_java/src/main/res/menu/main_menu.xml index 3b96c92651..4e75bc47c7 100644 --- a/platform_tools/android/apps/skar_java/src/main/res/menu/main_menu.xml +++ b/platform_tools/android/apps/skar_java/src/main/res/menu/main_menu.xml @@ -17,44 +17,33 @@ --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <group - android:id="@+id/menu_top"> - <item - android:id="@+id/reset_paint" - android:title="Reset Finger Painting"/> - </group> - <group - android:id="@+id/menu_middle" + <group android:id="@+id/menu_painting" android:checkableBehavior="single"> <item android:id="@+id/smooth_paint" - android:title="Smooth Painting" /> - <item - android:id="@+id/rough_paint" - android:title="Rough Painting" /> + android:checkable="true" + android:checked="true" + android:title="@string/menu_painting_smooth" /> </group> - - <group - android:id="@+id/menu_bottom" - android:checkableBehavior="single"> - + <group android:id="@+id/menu_drawables"> <item android:id="@+id/draw_circle" - android:title="Circle" > + android:checked="true" + android:checkable="true" + android:title="@string/menu_drawable_circle" > </item> <item android:id="@+id/draw_rect" - android:title="Rect" > + android:title="@string/menu_drawable_rect" > </item> <item - android:id="@+id/draw_animation" - android:title="Animation" > + android:id="@+id/draw_text" + android:title="@string/menu_drawable_text" > </item> <item - android:id="@+id/draw_text" - android:title="Text" > + android:id="@+id/draw_animation" + android:title="@string/menu_drawable_animation" > </item> </group> - </menu>
\ No newline at end of file diff --git a/platform_tools/android/apps/skar_java/src/main/res/menu/platte_bar.xml b/platform_tools/android/apps/skar_java/src/main/res/menu/platte_bar.xml index 0e28cae592..b20ab1ea60 100644 --- a/platform_tools/android/apps/skar_java/src/main/res/menu/platte_bar.xml +++ b/platform_tools/android/apps/skar_java/src/main/res/menu/platte_bar.xml @@ -19,11 +19,17 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/palette_red" - android:title="Red" /> + android:icon="@drawable/splash" + android:iconTint="@android:color/holo_red_dark" + android:title="@string/palette_red" /> <item android:id="@+id/palette_green" - android:title="Green" /> + android:icon="@drawable/splash" + android:iconTint="@android:color/holo_green_dark" + android:title="@string/palette_green" /> <item android:id="@+id/palette_reset" - android:title="Reset" /> + android:icon="@drawable/clear" + android:iconTint="@android:color/black" + android:title="@string/palette_reset" /> </menu>
\ No newline at end of file diff --git a/platform_tools/android/apps/skar_java/src/main/res/values/strings.xml b/platform_tools/android/apps/skar_java/src/main/res/values/strings.xml index 4a74851e91..8d636f17fe 100644 --- a/platform_tools/android/apps/skar_java/src/main/res/values/strings.xml +++ b/platform_tools/android/apps/skar_java/src/main/res/values/strings.xml @@ -18,4 +18,16 @@ <resources> <string name="app_name">Hello CanvasAR</string> + + <!-- Palette Strings --> + <string name="palette_red">Red</string> + <string name="palette_green">Green</string> + <string name="palette_reset">Reset Painting</string> + + <!-- Main Menu Strings --> + <string name="menu_painting_smooth">Smooth Painting</string> + <string name="menu_drawable_circle">Circle</string> + <string name="menu_drawable_rect">Rect</string> + <string name="menu_drawable_text">Text</string> + <string name="menu_drawable_animation">Animation</string> </resources> diff --git a/platform_tools/android/apps/skar_java/src/main/res/values/styles.xml b/platform_tools/android/apps/skar_java/src/main/res/values/styles.xml index 12b2281b57..ced245f41f 100644 --- a/platform_tools/android/apps/skar_java/src/main/res/values/styles.xml +++ b/platform_tools/android/apps/skar_java/src/main/res/values/styles.xml @@ -33,15 +33,8 @@ <!-- All customizations that are NOT specific to a particular API-level can go here. --> </style> - <style name="QText" parent="Widget.Design.BottomNavigationView"> - <item name="android:textSize">20sp</item> - <item name="android:textColor">@android:color/holo_red_dark</item> - <item name="android:textStyle">bold</item> - <item name="android:typeface">sans</item> - </style> - <style name="BottomNavigation" parent="Widget.Design.BottomNavigationView"> - <item name="itemBackground">@android:color/darker_gray</item> + <item name="itemBackground">@android:color/white</item> </style> </resources> |
