Merge remote-tracking branch 'origin/main'

app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
         android:usesCleartextTraffic="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Default"
+        android:theme="@style/Theme.UiTemplate"
         tools:targetApi="31">
         <activity
             android:name=".ui.RootActivity"

app/src/main/res/layout/fragment_login.xml

@@ -30,6 +30,7 @@
         android:id="@+id/login"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        style="@style/Theme.UiTemplate.Button"
         android:text="@string/login_button" />
 
     <ProgressBar

app/src/main/res/values/colors.xml

@@ -7,4 +7,13 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="AccentBlue">#2B56F6</color>
+    <color name="BackgroundGray">#F6F6F6</color>
+    <color name="TextBlack">#252525</color>
+    <color name="ErrorRed">#EB5757</color>
+    <color name="Gray2">#F0F0F0</color>
+    <color name="Gray5">#979797</color>
+    <color name="Gray6">#4F4F4F</color>
+    <color name="Black2">#272727</color>
+    <color name="Black3">#130F26</color>
 </resources>

app/src/main/res/values/styles.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.UiTemplate.Button" parent="Widget.Material3.Button">
+        <item name="android:colorBackground">@color/AccentBlue</item>
+        <item name="cornerRadius">50dp</item>
+        <item name="android:height">59dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:fontFamily">@font/gilroysemibold</item>
+        <item name="iconGravity">textEnd</item>
+        <item name="iconPadding">10dp</item>
+    </style>
+</resources>

app/src/main/res/values/themes.xml

@@ -1,16 +1,10 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Default" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
+    <style name="Base.Theme.UiTemplate" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- Customize your light theme here. -->
+        <item name="colorPrimary">@color/AccentBlue</item>
+        <item name="android:colorBackground">@color/white</item>
     </style>
+
+    <style name="Theme.UiTemplate" parent="Base.Theme.UiTemplate" />
 </resources>