diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0950b40..ef54462 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -23,9 +23,9 @@ <application android:name=".app.Application" android:allowBackup="true" - android:icon="@mipmap/ic_launcher" + android:icon="@mipmap/ic_murena" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher" + android:roundIcon="@mipmap/ic_murena_round" android:supportsRtl="true" android:theme="@style/AppTheme" android:networkSecurityConfig="@xml/network_security_config" diff --git a/app/src/main/ic_murena-playstore.png b/app/src/main/ic_murena-playstore.png new file mode 100644 index 0000000..e6220a6 Binary files /dev/null and b/app/src/main/ic_murena-playstore.png differ diff --git a/app/src/main/res/drawable/ic_murena_background.xml b/app/src/main/res/drawable/ic_murena_background.xml new file mode 100644 index 0000000..ca3826a --- /dev/null +++ b/app/src/main/res/drawable/ic_murena_background.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8"?> +<vector + android:height="108dp" + android:width="108dp" + android:viewportHeight="108" + android:viewportWidth="108" + xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#3DDC84" + android:pathData="M0,0h108v108h-108z"/> + <path android:fillColor="#00000000" android:pathData="M9,0L9,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,0L19,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M29,0L29,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M39,0L39,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M49,0L49,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M59,0L59,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M69,0L69,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M79,0L79,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M89,0L89,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M99,0L99,108" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,9L108,9" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,19L108,19" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,29L108,29" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,39L108,39" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,49L108,49" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,59L108,59" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,69L108,69" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,79L108,79" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,89L108,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M0,99L108,99" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,29L89,29" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,39L89,39" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,49L89,49" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,59L89,59" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,69L89,69" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M19,79L89,79" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M29,19L29,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M39,19L39,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M49,19L49,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M59,19L59,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M69,19L69,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> + <path android:fillColor="#00000000" android:pathData="M79,19L79,89" + android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/> +</vector> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_murena.xml b/app/src/main/res/mipmap-anydpi-v26/ic_murena.xml new file mode 100644 index 0000000..2cafd57 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_murena.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_murena_background"/> + <foreground android:drawable="@mipmap/ic_murena_foreground"/> +</adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_murena_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_murena_round.xml new file mode 100644 index 0000000..2cafd57 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_murena_round.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@color/ic_murena_background"/> + <foreground android:drawable="@mipmap/ic_murena_foreground"/> +</adaptive-icon> \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_murena.webp b/app/src/main/res/mipmap-hdpi/ic_murena.webp new file mode 100644 index 0000000..b543c93 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_murena.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_murena_foreground.webp b/app/src/main/res/mipmap-hdpi/ic_murena_foreground.webp new file mode 100644 index 0000000..e573a7d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_murena_foreground.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_murena_round.webp b/app/src/main/res/mipmap-hdpi/ic_murena_round.webp new file mode 100644 index 0000000..e753dec Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_murena_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_murena.webp b/app/src/main/res/mipmap-mdpi/ic_murena.webp new file mode 100644 index 0000000..fe57dc6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_murena.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_murena_foreground.webp b/app/src/main/res/mipmap-mdpi/ic_murena_foreground.webp new file mode 100644 index 0000000..0b9242c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_murena_foreground.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_murena_round.webp b/app/src/main/res/mipmap-mdpi/ic_murena_round.webp new file mode 100644 index 0000000..45318b3 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_murena_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_murena.webp b/app/src/main/res/mipmap-xhdpi/ic_murena.webp new file mode 100644 index 0000000..0d20be4 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_murena.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_murena_foreground.webp b/app/src/main/res/mipmap-xhdpi/ic_murena_foreground.webp new file mode 100644 index 0000000..0047880 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_murena_foreground.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_murena_round.webp b/app/src/main/res/mipmap-xhdpi/ic_murena_round.webp new file mode 100644 index 0000000..cbca1ea Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_murena_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_murena.webp b/app/src/main/res/mipmap-xxhdpi/ic_murena.webp new file mode 100644 index 0000000..04eee88 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_murena.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_murena_foreground.webp b/app/src/main/res/mipmap-xxhdpi/ic_murena_foreground.webp new file mode 100644 index 0000000..538a5ff Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_murena_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_murena_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_murena_round.webp new file mode 100644 index 0000000..2cec68b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_murena_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_murena.webp b/app/src/main/res/mipmap-xxxhdpi/ic_murena.webp new file mode 100644 index 0000000..ddee171 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_murena.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_murena_foreground.webp b/app/src/main/res/mipmap-xxxhdpi/ic_murena_foreground.webp new file mode 100644 index 0000000..63bef30 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_murena_foreground.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_murena_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_murena_round.webp new file mode 100644 index 0000000..bea8acc Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_murena_round.webp differ diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml index a71491b..6733324 100644 --- a/app/src/main/res/values-night/styles.xml +++ b/app/src/main/res/values-night/styles.xml @@ -11,11 +11,11 @@ --> <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> - <item name="colorPrimary">@color/teal_light</item> - <item name="colorAccent">@color/teal_light</item> <!-- checkboxes, text fields --> + <item name="colorPrimary">@color/e_accent_dark</item> + <item name="colorAccent">@color/e_accent_dark</item> <!-- checkboxes, text fields --> <item name="android:colorBackground">@color/black_900</item> <!-- background --> - <item name="android:statusBarColor">@color/black_900</item> - <item name="actionModeBackground">@color/black_900</item> + <item name="android:statusBarColor">@color/e_accent_dark</item> + <item name="actionModeBackground">@color/e_accent_dark</item> <!-- Action bar background & text color --> <item name="colorSurface">@color/black_800b</item> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 00ae975..8501c22 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -13,5 +13,7 @@ <color name="teal_dark">#2a6e60</color> <!-- Action bar background in action mode (light mode) --> <color name="red_light">#fe4d2e</color> <!-- Danger text (dark mode) --> <color name="red_dark">#c30000</color> <!-- Danger text (light mode) --> + <color name="e_accent_light">#0086FF</color> + <color name="e_accent_dark">#5DB2FF</color> </resources> diff --git a/app/src/main/res/values/ic_murena_background.xml b/app/src/main/res/values/ic_murena_background.xml new file mode 100644 index 0000000..08a499b --- /dev/null +++ b/app/src/main/res/values/ic_murena_background.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <color name="ic_murena_background">#FFFFFF</color> +</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 4f0902d..c213f1c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,11 +1,11 @@ <resources> <!-- Main app theme; dark theme styles see values-night/styles.xml --> <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar"> - <item name="colorPrimary">@color/teal</item> - <item name="colorAccent">@color/teal</item> <!-- checkboxes, text fields --> + <item name="colorPrimary">@color/e_accent_light</item> + <item name="colorAccent">@color/e_accent_light</item> <!-- checkboxes, text fields --> <item name="android:colorBackground">@color/white</item> <!-- background --> - <item name="android:statusBarColor">@color/teal</item> - <item name="actionModeBackground">@color/teal_dark</item> + <item name="android:statusBarColor">@color/e_accent_light</item> + <item name="actionModeBackground">@color/e_accent_light</item> </style> <style name="DangerText" parent="@android:style/TextAppearance"> diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml index f94a598..16c99fc 100644 --- a/app/src/main/res/values/values.xml +++ b/app/src/main/res/values/values.xml @@ -4,7 +4,7 @@ The translatable="false" attribute is just an additional safety. --> <!-- Main app constants --> - <string name="app_name" translatable="false">ntfy</string> + <string name="app_name" translatable="false">Murena Box</string> <string name="app_base_url" translatable="false">https://ntfy.sh</string> <!-- If changed, you must also change google-services.json! --> <!-- Main activity -->