Skip to content

Commit

Permalink
replaced m3 styles with ui-lib ones
Browse files Browse the repository at this point in the history
  • Loading branch information
Rahul Gill committed Jul 28, 2022
1 parent 5f85b17 commit 2e5dff2
Show file tree
Hide file tree
Showing 47 changed files with 165 additions and 260 deletions.
5 changes: 3 additions & 2 deletions mifospay/build.gradle
View file
Expand Up @@ -29,6 +29,7 @@ android {
}

lintOptions {
abortOnError false
disable 'InvalidPackage'
}

Expand Down Expand Up @@ -99,8 +100,8 @@ dependencies {

implementation project(':core')

implementation 'com.github.rahul-gill.mifos-ui-library:uihouse:alpha-test'
lintChecks 'com.github.rahul-gill.mifos-ui-library:lint:alpha-test'
implementation 'com.github.rahul-gill.mifos-ui-library:uihouse:alpha-2.1'
lintChecks 'com.github.rahul-gill.mifos-ui-library:lint:alpha-2.1'
}

apply plugin: 'com.google.gms.google-services'
19 changes: 8 additions & 11 deletions mifospay/src/main/res/layout/activity_bank_account_detail.xml
View file
Expand Up @@ -114,7 +114,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Mifos.DesignSystem.Components.Button.Outline"
android:text="@string/setup_upi"
android:visibility="visible"/>

Expand All @@ -123,20 +123,17 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium"
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Mifos.DesignSystem.Components.Button.Outline"
android:text="@string/delete_bank"
android:visibility="visible"/>

</LinearLayout>


<View
android:layout_width="match_parent"
android:layout_height="1dp"
style="@style/Mifos.DesignSystem.Components.HorizontalSpacer"
android:layout_marginVertical="@dimen/Mifos.DesignSystem.Spacing.marginBetweenSectionsHalf"
android:layout_marginHorizontal="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin"
android:background="?attr/colorOnBackground"
android:alpha="@dimen/alpha_least_emphasis"/>
android:layout_marginHorizontal="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin"/>

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -149,13 +146,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:contentPadding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPaddingLarger"
style="@style/Widget.Material3.CardView.Filled">
style="@style/Mifos.DesignSystem.Components.Cards.Filled">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/change_upi_pin"
style="@style/TextAppearance.Material3.TitleMedium"/>
style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>

<ImageView
android:layout_width="@dimen/Mifos.DesignSystem.Size.SmallIcon"
Expand All @@ -170,14 +167,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium"
style="@style/Widget.Material3.CardView.Filled"
style="@style/Mifos.DesignSystem.Components.Cards.Filled"
app:contentPadding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPaddingLarger">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/forgot_upi_pin"
style="@style/TextAppearance.Material3.TitleMedium"/>
style="@style/Mifos.DesignSystem.TextStyle.CardTitle"/>

<ImageView
android:layout_width="@dimen/Mifos.DesignSystem.Size.SmallIcon"
Expand Down
3 changes: 1 addition & 2 deletions mifospay/src/main/res/layout/activity_edit_password.xml
View file
Expand Up @@ -38,7 +38,6 @@
android:layout_marginHorizontal="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin"
android:paddingVertical="@dimen/Mifos.DesignSystem.Spacing.screenVerticalMargin">
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
android:id="@+id/til_edit_password_current"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -94,7 +93,7 @@
android:layout_height="wrap_content">

<Button
style="@style/Widget.Material3.Button.OutlinedButton"
style="@style/Mifos.DesignSystem.Components.Button.Outline"
android:id="@+id/btn_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
16 changes: 4 additions & 12 deletions mifospay/src/main/res/layout/activity_invoice.xml
View file
Expand Up @@ -41,43 +41,38 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextAppearance.Material3.LabelLarge"
style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
android:text="@string/invoice_details" />

<TextView
android:id="@+id/tv_merchantId"
android:layout_width="match_parent"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsMedium"/>

<TextView
android:id="@+id/tv_consumerId"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"/>

<TextView
android:id="@+id/tv_amount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"/>

<TextView
android:id="@+id/tv_itemsBought"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
android:text="@string/items_bought"/>

<TextView
android:id="@+id/tv_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
android:text="@string/status"/>

Expand All @@ -95,7 +90,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
style="@style/TextAppearance.Material3.BodyMedium"
android:text="@string/date"/>

</LinearLayout>
Expand All @@ -108,8 +102,7 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:layout_marginVertical="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
android:text="@string/payment_options_will_be_fetched_from_upi"
style="@style/TextAppearance.Material3.LabelLarge"/>
android:text="@string/payment_options_will_be_fetched_from_upi" />


<View
Expand All @@ -121,7 +114,7 @@
android:layout_height="wrap_content"
android:text="@string/unique_payment_link"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
style="@style/TextAppearance.Material3.LabelLarge"/>
style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"/>

<TextView
android:id="@+id/tv_paymentLink"
Expand Down Expand Up @@ -150,8 +143,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/unique_receipt_link"
style="@style/TextAppearance.Material3.LabelLarge"/>
android:text="@string/unique_receipt_link"/>

<TextView
android:id="@+id/tv_receiptLink"
Expand Down
6 changes: 3 additions & 3 deletions mifospay/src/main/res/layout/activity_link_bank_account.xml
View file
Expand Up @@ -53,7 +53,7 @@
android:layout_marginHorizontal="@dimen/Mifos.DesignSystem.Spacing.screenHorizontalMargin">

<TextView
style="@style/TextAppearance.Material3.LabelLarge"
style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/popular_banks"
Expand All @@ -75,7 +75,7 @@
android:text="@string/no_bank_account"
android:padding="@dimen/Mifos.DesignSystem.Spacing.CardInnerPadding"
android:gravity="center"
style="@style/TextAppearance.Material3.LabelSmall"
style="@style/Mifos.DesignSystem.TextStyle.Label"
android:visibility="gone"/>

<TextView
Expand All @@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
android:layout_marginBottom="@dimen/Mifos.DesignSystem.Spacing.listHeaderSpacing"
style="@style/TextAppearance.Material3.LabelLarge"
style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
android:text="@string/other_banks"/>

<androidx.recyclerview.widget.RecyclerView
Expand Down
2 changes: 1 addition & 1 deletion mifospay/src/main/res/layout/activity_login.xml
View file
Expand Up @@ -98,7 +98,7 @@
android:layout_marginStart="0dp"
android:layout_width="wrap_content"
android:text="@string/don_t_have_an_account"
android:alpha="@dimen/alpha_low_emphasis"/>
style="@style/Mifos.DesignSystem.TextStyle.Label"/>

<TextView
android:id="@+id/tv_create_account"
Expand Down
5 changes: 2 additions & 3 deletions mifospay/src/main/res/layout/activity_merchant_transaction.xml
View file
Expand Up @@ -87,7 +87,7 @@
android:layout_gravity="center"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
android:text="@string/test_user"
style="@style/TextAppearance.Material3.TitleLarge" />
style="@style/Mifos.DesignSystem.TextStyle.Heading" />

<TextView
android:id="@+id/tv_pay_to_vpa"
Expand All @@ -96,8 +96,7 @@
android:layout_gravity="center"
android:layout_marginTop="@dimen/marginItemsInSectionSmall"
android:text="@string/test_vpa"
style="@style/TextAppearance.Material3.TitleLarge"
android:alpha="@dimen/alpha_low_emphasis"/>
style="@style/Mifos.DesignSystem.TextStyle.SubHeading"/>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/et_amount"
Expand Down
5 changes: 2 additions & 3 deletions mifospay/src/main/res/layout/activity_mobile_verification.xml
View file
Expand Up @@ -47,7 +47,7 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:text="@string/enter_mobile_number"
style="@style/TextAppearance.Material3.TitleLarge">
style="@style/Mifos.DesignSystem.TextStyle.Heading">

</TextView>

Expand All @@ -56,8 +56,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/value_10dp"
android:layout_marginTop="@dimen/value_5dp"
android:text="@string/enter_mobile_number_description"
style="@style/TextAppearance.Material3.BodyMedium"/>
android:text="@string/enter_mobile_number_description" />

</LinearLayout>

Expand Down
15 changes: 6 additions & 9 deletions mifospay/src/main/res/layout/activity_new_si.xml
View file
Expand Up @@ -95,7 +95,7 @@
android:layout_height="wrap_content"
android:text="@string/valid_till"
android:layout_marginBottom="@dimen/marginItemsInSectionSmall"
style="@style/TextAppearance.Material3.BodyLarge"
style="@style/Mifos.DesignSystem.TextStyle.BodyLarger"
android:layout_gravity="center" />
<Button
android:id="@+id/btn_valid_till"
Expand Down Expand Up @@ -126,35 +126,32 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/sending_to"
style="@style/Mifos.DesignSystem.TextStyle.PrimaryColorBody"/>
style="@style/Mifos.DesignSystem.TextStyle.Label"/>

<TextView
android:id="@+id/tv_client_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextAppearance.Material3.TitleLarge"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"/>

<TextView
android:id="@+id/tv_client_vpa"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
style="@style/TextAppearance.Material3.TitleMedium"/>
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsLarge"
android:text="@string/amount"
style="@style/Mifos.DesignSystem.TextStyle.PrimaryColorBody"/>
style="@style/Mifos.DesignSystem.TextStyle.Label"/>

<TextView
android:id="@+id/tv_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"
style="@style/TextAppearance.Material3.TitleLarge"/>
android:layout_marginTop="@dimen/Mifos.DesignSystem.Spacing.marginBetweenItemsSmall"/>

<LinearLayout
android:id="@+id/ll_confirm_cancel"
Expand All @@ -169,7 +166,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
style="@style/Widget.Material3.Button.OutlinedButton"/>
style="@style/Mifos.DesignSystem.Components.Button.Outline"/>

<Button
android:id="@+id/btn_confirm"
Expand Down
3 changes: 1 addition & 2 deletions mifospay/src/main/res/layout/activity_notification.xml
View file
Expand Up @@ -44,8 +44,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/no_notification_found"
style="@style/TextAppearance.Material3.BodyLarge"
android:alpha="@dimen/alpha_low_emphasis"
style="@style/Mifos.DesignSystem.TextStyle.Label"
android:visibility="gone"/>


Expand Down

0 comments on commit 2e5dff2

Please sign in to comment.