Skip to content

Reskin the demo app with new UI assets and colors #5282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Reskin the demo app with new UI assets and colors #5282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...pps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/LogsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@

import android.app.AlertDialog;
import android.content.DialogInterface;
import android.os.Build;
import android.os.Bundle;
import android.widget.ImageButton;
import android.widget.ListView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
Expand All @@ -26,6 +28,10 @@ public class LogsActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_logs);
if (Build.VERSION.SDK_INT >= 21) {
getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.status_bar));
getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.nav_bar));
}
ViewCompat.setOnApplyWindowInsetsListener(
requireViewById(R.id.main),
(v, insets) -> {
Expand Down
6 changes: 6 additions & 0 deletions ...pps/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
Expand Down Expand Up @@ -218,6 +219,11 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);

if (Build.VERSION.SDK_INT >= 21) {
getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.status_bar));
getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.nav_bar));
}

try {
Os.setenv("ADSP_LIBRARY_PATH", getApplicationInfo().nativeLibraryDir, true);
} catch (ErrnoException e) {
Expand Down
6 changes: 6 additions & 0 deletions ...android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import android.app.AlertDialog;
import android.content.DialogInterface;
import android.os.Build;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;
Expand All @@ -18,6 +19,7 @@
import android.widget.ImageButton;
import android.widget.TextView;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.Insets;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
Expand Down Expand Up @@ -49,6 +51,10 @@ public class SettingsActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_settings);
if (Build.VERSION.SDK_INT >= 21) {
getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.status_bar));
getWindow().setNavigationBarColor(ContextCompat.getColor(this, R.color.nav_bar));
}
ViewCompat.setOnApplyWindowInsetsListener(
requireViewById(R.id.main),
(v, insets) -> {
Expand Down
4 changes: 1 addition & 3 deletions examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/banner_shape.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#C60C4FC3" />
<corners android:bottomRightRadius="8dp"
android:bottomLeftRadius="8dp" />
<solid android:color="#16293D" />
</shape>
2 changes: 1 addition & 1 deletion examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/baseline_add_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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">
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">

<path android:fillColor="@android:color/white" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>

Expand Down
2 changes: 1 addition & 1 deletion ...demo-apps/android/LlamaDemo/app/src/main/res/drawable/baseline_add_photo_alternate_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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">
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">

<path android:fillColor="@android:color/white" android:pathData="M19,7v2.99s-1.99,0.01 -2,0L17,7h-3s0.01,-1.99 0,-2h3L17,2h2v3h3v2h-3zM16,11L16,8h-3L13,5L5,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2v-8h-3zM5,19l3,-4 2,3 3,-4 4,5L5,19z"/>

Expand Down
3 changes: 2 additions & 1 deletion examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/baseline_article_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF
" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">

<path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>

Expand Down
3 changes: 2 additions & 1 deletion examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/baseline_close_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +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">
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF
" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">

<path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>

Expand Down
2 changes: 1 addition & 1 deletion ...ples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/baseline_delete_forever_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<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">
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">

<path android:fillColor="@android:color/white" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>

Expand Down
2 changes: 1 addition & 1 deletion examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/baseline_restart_alt_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<vector android:height="24dp" android:tint="#000000"
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M12,5V2L8,6l4,4V7c3.31,0 6,2.69 6,6c0,2.97 -2.17,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93C20,8.58 16.42,5 12,5z"/>
Expand Down
3 changes: 2 additions & 1 deletion examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/baseline_send_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<vector android:autoMirrored="true" android:height="24dp"
android:tint="#000000" android:viewportHeight="24"
android:tint="#FFFFFF
" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
</vector>
3 changes: 2 additions & 1 deletion examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/baseline_settings_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="#000000">
android:tint="#FFFFFF
">
<path
android:fillColor="@android:color/black"
android:pathData="M387.69,860L372.46,738.15Q356.39,732.77 339.5,723.08Q322.62,713.38 309.31,702.31L196.46,750L104.16,590L201.77,516.23Q200.39,507.31 199.81,498.31Q199.23,489.31 199.23,480.38Q199.23,471.85 199.81,463.04Q200.39,454.23 201.77,443.77L104.16,370L196.46,210.77L308.92,258.08Q323.39,246.62 339.81,237.12Q356.23,227.62 372.08,221.85L387.69,100L572.31,100L587.54,222.23Q605.54,228.77 620.11,237.5Q634.69,246.23 649.54,258.08L763.54,210.77L855.84,370L756.69,444.92Q758.84,454.61 759.04,463.04Q759.23,471.46 759.23,480Q759.23,488.15 758.84,496.58Q758.46,505 756.08,515.85L854.46,590L762.15,750L649.54,701.92Q634.69,713.77 619.23,722.88Q603.77,732 587.54,737.77L572.31,860L387.69,860ZM440,800L518.62,800L533,692.85Q563.62,684.85 588.96,670.12Q614.31,655.38 637.85,632.23L737.23,674L776.62,606L689.85,540.62Q694.85,525.08 696.65,510.15Q698.46,495.23 698.46,480Q698.46,464.38 696.65,449.85Q694.85,435.31 689.85,420.15L777.38,354L738,286L637.46,328.38Q617.38,306.92 589.35,290.46Q561.31,274 532.62,267.15L520,160L440.62,160L427.38,266.77Q396.77,274 370.85,288.92Q344.92,303.85 321.38,327.38L222,286L182.62,354L269,418.38Q264,432.62 262,448Q260,463.38 260,480.38Q260,496 262,511Q264,526 268.62,540.62L182.62,606L222,674L321,632Q343.77,655.38 369.69,670.31Q395.62,685.23 427,693.23L440,800ZM480.46,600Q530.38,600 565.42,564.96Q600.46,529.92 600.46,480Q600.46,430.08 565.42,395.04Q530.38,360 480.46,360Q429.92,360 395.19,395.04Q360.46,430.08 360.46,480Q360.46,529.92 395.19,564.96Q429.92,600 480.46,600ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Z"/>
Expand Down
3 changes: 2 additions & 1 deletion examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/baseline_stop_24.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +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">
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF
" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">

<path android:fillColor="@android:color/white" android:pathData="M6,6h12v12H6z"/>

Expand Down
21 changes: 21 additions & 0 deletions examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/chat_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="412dp"
android:height="893dp"
android:viewportWidth="412"
android:viewportHeight="893">
<path
android:pathData="M0,0h412v893h-412z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="206"
android:startY="0"
android:endX="206"
android:endY="893"
android:type="linear">
<item android:offset="0.05" android:color="#FF16293D"/>
<item android:offset="0.9" android:color="#FF192E4D"/>
</gradient>
</aapt:attr>
</path>
</vector>
9 changes: 9 additions & 0 deletions examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/expand_circle_down.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="18dp"
android:viewportWidth="15"
android:viewportHeight="10">
<path
android:pathData="M15,2.373L7.5,10L0,2.373L2.375,0L7.5,5.212L12.625,0L15,2.373Z"
android:fillColor="#F4F4F4"/>
</vector>
7 changes: 2 additions & 5 deletions examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/input_text_shape.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#CFCCCC" />
<stroke
android:width="2dp"
android:color= "#F4F4F4"/>
<solid android:color="#081D2C" />
<corners android:radius="20dp"/>
<padding android:top="10dp" android:bottom="10dp" android:left="10dp" android:right="10dp"/>
<padding android:layout_marginTop="5dp" android:layout_marginBottom="5dp" android:left="10dp" android:right="10dp"/>
</shape>
3 changes: 2 additions & 1 deletion examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/outline_add_box_48.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="48dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="48dp">
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="48dp" android:tint="#ffffff
" android:viewportHeight="24" android:viewportWidth="24" android:width="48dp">

<path android:fillColor="@android:color/white" android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM19,19L5,19L5,5h14v14zM11,17h2v-4h4v-2h-4L13,7h-2v4L7,11v2h4z"/>

Expand Down
5 changes: 0 additions & 5 deletions ...mo-apps/android/LlamaDemo/app/src/main/res/drawable/outline_arrow_drop_down_circle_24.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/prompt_shape.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#D3D3D3" />
<solid android:color="#081D2C" />
<corners android:radius="4dp" />
</shape>
2 changes: 1 addition & 1 deletion examples/demo-apps/android/LlamaDemo/app/src/main/res/drawable/received_message.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#fff" />
<solid android:color="#081D2C" />
<corners android:radius="10dp" />
</shape>
40 changes: 18 additions & 22 deletions examples/demo-apps/android/LlamaDemo/app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,38 +20,32 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="10dp"
android:paddingLeft="20dp"
android:paddingTop="20dp"
android:text="Chat with Llama"
android:textColor="@android:color/white"
android:textSize="20sp"
android:textSize="16sp"
android:textStyle="bold" />

<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />

<TextView
android:id="@+id/ram_usage_live"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:fontFamily="sans-serif-black"
android:paddingLeft="5dp"
android:text="0 MB"
android:textAlignment="viewEnd"
android:textColor="#FFFFFF"
android:textSize="16sp"
android:paddingLeft="5dp"/>
android:textSize="14sp" />

<ImageButton
android:id="@+id/showLogsButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="20dp"
android:backgroundTint="@android:color/transparent"
android:src="@drawable/baseline_article_24"
/>
android:paddingTop="20dp"
android:src="@drawable/baseline_article_24" />

<ImageButton
android:id="@+id/settings"
Expand All @@ -74,7 +68,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="2"
android:background="#DCD7D7"
android:background="@drawable/chat_background"
android:divider="#fff"
android:stackFromBottom="true"
android:transcriptMode="alwaysScroll" />
Expand All @@ -83,7 +77,7 @@
android:id="@+id/mediaPreviewConstraintLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#edf0ee"
android:background="#16293D"
android:visibility="gone">

<HorizontalScrollView
Expand Down Expand Up @@ -143,7 +137,7 @@
android:id="@+id/addMoreImageButton"
android:layout_width="80dp"
android:layout_height="80dp"
android:background="#ebebeb"
android:background="#16293D"
android:padding="5dp"
android:src="@drawable/outline_add_box_48" />

Expand All @@ -169,7 +163,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#F4F4F4"
android:background="#16293D"
android:orientation="horizontal">

<ImageButton
Expand All @@ -182,15 +176,17 @@

<EditText
android:id="@+id/editTextMessage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="35dp"
android:layout_weight="2"
android:background="@drawable/input_text_shape"
android:ems="10"
android:hint="Text message"
android:ems="8"
android:inputType="text"
android:paddingHorizontal="10dp"
android:text="" />
android:text=""
android:textColor="#ffffff"
android:textColorHint="#ffffff"
android:translationY="5dp" />

<ImageButton
android:id="@+id/sendButton"
Expand All @@ -205,7 +201,7 @@
android:id="@+id/addMediaLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#E9EFEC"
android:background="#16293D"
android:orientation="vertical">

<LinearLayout
Expand Down
Loading
Loading