IME-LONDON
/
Android_London
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

new issue fixes ui changes

new_design
Mohan Shiwakoti 1 year ago
parent
70be66a964
commit
7179c17f99
19 changed files with 194 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      .idea/assetWizardSettings.xml
  2. 2
      app/src/main/java/com/remit/jmecustomer/common/customwidgets/FontCache.java
  3. 79
      app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt
  4. 10
      app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt
  5. 6
      app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
  6. 4
      app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt
  7. 8
      app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
  8. 6
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java
  9. 6
      app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java
  10. 1
      app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java
  11. 3
      app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java
  12. 2
      app/src/main/res/drawable/ic_blue_button_with_white_border.xml
  13. 23
      app/src/main/res/drawable/ic_msg.xml
  14. 2
      app/src/main/res/drawable/light_blue_border_rounded.xml
  15. 4
      app/src/main/res/layout/finger_setup_pass_layout_fragment.xml
  16. 12
      app/src/main/res/layout/fragment_my_notice_detail.xml
  17. 2
      app/src/main/res/layout/fragment_my_notice_listing.xml
  18. 76
      app/src/main/res/layout/my_notice_list_viewholder.xml
  19. 23
      app/src/main/res/layout/toolbar_dashboard_v3.xml

5
.idea/assetWizardSettings.xml
View File

@ -317,8 +317,9 @@
</option>
<option name="values">
<map>
<entry key="outputName" value="baseline_delete_24" />
<entry key="sourceFile" value="$USER_HOME$/Downloads/24px (43) (1).svg" />
<entry key="assetSourceType" value="FILE" />
<entry key="outputName" value="ic_msg" />
<entry key="sourceFile" value="$USER_HOME$/Downloads/msg.svg" />
</map>
</option>
</PersistentState>

2
app/src/main/java/com/remit/jmecustomer/common/customwidgets/FontCache.java
View File

@ -15,7 +15,7 @@ public class FontCache {
SAN_HEAVY = "san_francisco_text_heavy.otf",
SAN_LIGHT = "san_francisco_text_light.otf",
SAN_MEDIUM = "san_francisco_text_medium.otf",
SAN_REGULAR = "volte_regular.ttf",
SAN_REGULAR = "volte_medium.ttf",
SAN_SEMIBOLD = "san_francisco_text_semibold.otf";

79
app/src/main/java/com/remit/jmecustomer/features/beneficiaryDetail/BeneficiaryDetailActivity.kt
View File

@ -105,20 +105,41 @@ class BeneficiaryDetailActivity : BaseActivity(),
binding.tvLocation.text = receiverInfoModel?.country
binding.tvInitial.text = getInitials(receiverInfoModel?.fullName ?: "")
binding.tvUpdate.setOnClickListener {
val intent = Intent(applicationContext, RecipientAddEditV3Activity::class.java)
intent.putExtra(
RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3,
receiverInfoModel
)
startActivityForResult(
intent,
RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3
)
if (receiverInfoModel?.hasVerifiedOTP == true) {
val intent = Intent(applicationContext, RecipientAddEditV3Activity::class.java)
intent.putExtra(
RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3,
receiverInfoModel
)
startActivityForResult(
intent,
RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3
)
} else {
val intent = Intent(
applicationContext,
BeneficiaryAddEditV3TermsActivity::class.java
)
intent.putExtra(
BeneficiaryAddEditV3TermsActivity.RECIPIENT_TERMS_BUNDLE_KEY_v3,
receiverInfoModel
)
startActivityForResult(
intent,
RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3
)
}
}
binding.agreeButton.setOnClickListener {
if (isPaymentSelected) {
if (receiverInfoModel?.hasVerifiedOTP!!) {
if (receiverInfoModel != null) {
if (receiverInfoModel?.paymentMethod == null || receiverInfoModel?.hasPartnerChanged() == true || receiverInfoModel?.isForceUpdate == "Y") {
updateCase(receiverInfoModel!!)
return@setOnClickListener
}
}
if (receiverInfoModel?.hasVerifiedOTP == true) {
val intent = Intent(
this@BeneficiaryDetailActivity,
SendMoneyV2Activity::class.java
@ -194,6 +215,15 @@ class BeneficiaryDetailActivity : BaseActivity(),
}
override fun proceedToEditRecipient(recipientInfoModel: ReceiverInfoV3Model?) {
val intent = Intent(applicationContext, RecipientAddEditV3Activity::class.java)
intent.putExtra(
RecipientAddEditV3Activity.RECIPIENT_INFO_BUNDLE_KEY_v3,
receiverInfoModel
)
startActivityForResult(
intent,
RecipientAddEditV3Activity.RECIPIENT_ACTION_EDIT_REQUEST_CODE_v3
)
}
override fun proceedToShowTermsConditions(recipientInfoModel: ReceiverInfoV3Model?) {
@ -203,6 +233,16 @@ class BeneficiaryDetailActivity : BaseActivity(),
genericDialogPromptListener: GenericPromptDialog.GenericDialogPromptListener?,
message: String?
) {
val genericPromptDialog = GenericPromptDialog()
genericPromptDialog.setTitleMessage(getString(R.string.important_text))
genericPromptDialog.setBodyMessage(message)
genericPromptDialog.setIconsRes(-1)
genericPromptDialog.setCancellable(true)
genericPromptDialog.setListener(genericDialogPromptListener)
if (!genericPromptDialog.isAdded) genericPromptDialog.show(
getSupportFragmentManager(),
"RECIPIENTEDITPROMPT"
)
}
private fun showBeneficiaryDeleteConfirmDialog(receiverId: String) {
@ -229,4 +269,23 @@ class BeneficiaryDetailActivity : BaseActivity(),
super.finish()
setResult(Constants.UPDATE_DELETE_CODE)
}
private fun updateCase(recipientInfoModel: ReceiverInfoV3Model) {
if (recipientInfoModel.paymentMethod == null || recipientInfoModel.hasPartnerChanged() || recipientInfoModel.getIsForceUpdate() == "Y") {
var message: String? = ""
if (recipientInfoModel.getIsForceUpdate() == "Y") {
message = getString(R.string.recipient_force_update_prompt_text)
} else if (recipientInfoModel.getPaymentMethod() != null && recipientInfoModel.getPaymentMethod()
.getId() == null
) message =
getString(R.string.recipient_profile_update_prompt_text) else message =
getString(R.string.recipient_bank_update_prompt_text)
promptToEditRecipient(object : GenericDialogPromptListener {
override fun onNegativeBtnPressed() {}
override fun onPositiveBtnPressed() {
proceedToEditRecipient(recipientInfoModel)
}
}, message)
}
}
}

10
app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeActivityV3.kt
View File

@ -36,6 +36,7 @@ import com.remit.jmecustomer.features.cashpickuptowallet.view.CashPickupToWallet
import com.remit.jmecustomer.features.changepassNPin.view.ChangePassNPinActivity
import com.remit.jmecustomer.features.changepassword.view.UserPasswordChangeV2Activity
import com.remit.jmecustomer.features.changetxnpin.view.ChangeTxnPinActivity
import com.remit.jmecustomer.features.customersupport.view.CustomerSupportFragment
import com.remit.jmecustomer.features.depositslip.view.DepositSlipActivity
import com.remit.jmecustomer.features.exrate.view.ExchangeRateActivity
import com.remit.jmecustomer.features.home.HomeParentViewContractV2
@ -145,7 +146,10 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
binding.tabLayout.addTab(tab3)
if (isTransactionComplete) {
resetTabs()
binding.tabLayout.getTabAt(1)?.setIcon(R.drawable.ic_transfers_selected)
binding.vpDashboard.currentItem = 1
binding.tabLayout.selectTab(binding.tabLayout.getTabAt(1))
}
binding.vpDashboard.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
@ -173,6 +177,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
homeFragmentV3.focusHome(true)
}
binding.tabLayout.selectTab(binding.tabLayout.getTabAt(position));
}
override fun onPageScrollStateChanged(state: Int) {
@ -217,6 +222,7 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
binding.toolbarHead.ivProfileImage.setOnClickListener(this)
binding.toolbarHead.clNotification.setOnClickListener(this)
binding.toolbarHead.ivMsg.setOnClickListener(this)
}
@ -701,6 +707,10 @@ class HomeActivityV3 : BaseActivity(), HomeParentViewContractV2,
MyNotificationActivity::class.java
)
)
R.id.iv_msg -> {
val newFragment = CustomerSupportFragment.newInstance()
newFragment.show(supportFragmentManager, "dialog")
}
}
}

6
app/src/main/java/com/remit/jmecustomer/features/homeV3/view/HomeFragmentV3.kt
View File

@ -177,11 +177,7 @@ class HomeFragmentV3 : BaseFragment(), View.OnClickListener,
override fun onResume() {
super.onResume()
if (homeViewModel != null) {
if (homeViewModel!!.notificationViewActive) {
homeViewModel?.getRequiredData()
}
}
homeViewModel?.getRequiredData()
}
fun focusHome(focus: Boolean) {

4
app/src/main/java/com/remit/jmecustomer/features/myTransfers/adapters/RecentTransactionsAdapter.kt
View File

@ -64,7 +64,7 @@ class RecentTransactionsAdapter(private var items: MutableList<RecentTransaction
if (item.displayActions != null) {
if (item.displayActions.contains(Constants.CancelStatus)) {
holder.bindings.tvResend.visibility = View.VISIBLE
holder.bindings.tvResend.text = mContext?.getString(R.string.request_to_cancel_text)
holder.bindings.tvResend.text =mContext?.getString(R.string.request_to_cancel_text)
}
if (item.displayActions.contains(Constants.AmendStatus)) {
holder.bindings.tvResend.visibility = View.GONE
@ -85,7 +85,7 @@ class RecentTransactionsAdapter(private var items: MutableList<RecentTransaction
holder.bindings.tvViewStatus.visibility = View.VISIBLE
holder.bindings.tvViewStatus.text = mContext?.getString(R.string.edit_details)
holder.bindings.tvResend.text =
mContext?.getString(R.string.cancel_transaction_text)
mContext?.getString(R.string.request_to_cancel_text)
} else if (item.displayActions.equals("")) {
holder.bindings.tvResend.visibility = View.GONE

8
app/src/main/java/com/remit/jmecustomer/features/myTransfers/view/MyTransfersFragment.kt
View File

@ -563,12 +563,18 @@ class MyTransfersFragment : BaseFragment(),
}
private fun promptCalendarPicker() {
val calendar = Calendar.getInstance()
calendar.add(Calendar.WEEK_OF_YEAR, -1)
val year = calendar.get(Calendar.YEAR)
val month = calendar.get(Calendar.MONTH) + 1 // January is represented by 0
val day = calendar.get(Calendar.DAY_OF_MONTH)
SpinnerDateRangePickerDialogBuilder()
.context(requireContext())
.spinnerTheme(R.style.NumberPickerStyle)
.showTitle(true)
.showDaySpinner(true)
.defaultDate(1990, 0, 1)
.setdefaultFromDate(year, month - 1, day)
.setCurrentDateAsMaxDate()
.minDate(2017, 9, 10)
.dialogTheme(R.style.DatePickerTheme)

6
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/add/RecipientAddV3ViewModel.java
View File

@ -324,7 +324,7 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
@Override
protected void unauthorizedAccess(String message) {
gateway.clearAllUserData();
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView());
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout());
}
}
@ -372,7 +372,7 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
receiverId = null;
sendMoneyRequiredDataV3 = null;
gateway.clearAllUserData();
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView());
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout());
}
}
@ -410,7 +410,7 @@ public class RecipientAddV3ViewModel extends RecipientAddEditBaseV3ViewModel {
@Override
protected void unauthorizedAccess(String message) {
gateway.clearAllUserData();
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView());
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout());
}
}

6
app/src/main/java/com/remit/jmecustomer/features/recipientmanagement/presenter/recipientaddeditV3/edit/RecipientEditV3ViewModel.java
View File

@ -426,7 +426,7 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel {
@Override
protected void unauthorizedAccess(String message) {
gateway.clearAllUserData();
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView());
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout());
}
}
@ -488,7 +488,7 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel {
receiverId = null;
sendMoneyRequiredDataV3 = null;
gateway.clearAllUserData();
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, null);
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout());
}
}
@ -526,7 +526,7 @@ public class RecipientEditV3ViewModel extends RecipientAddEditBaseV3ViewModel {
@Override
protected void unauthorizedAccess(String message) {
gateway.clearAllUserData();
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.exitView());
view.showPopUpMessage(message, CustomAlertDialog.AlertType.ALERT, alertType -> view.logout());
}
}
}

1
app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyRequestSummaryActivity.java
View File

@ -294,6 +294,7 @@ public class SendMoneyRequestSummaryActivity extends BaseActivity implements Se
Intent a = new Intent(this, HomeActivityV3.class);
a.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
a.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
a.putExtra("trans", true);
a.putExtra(BUNDLE_ACTION_FETCH_ALL_DATA, true);
startActivity(a);
finish();

3
app/src/main/java/com/remit/jmecustomer/features/settings/view/FingerSetUpPasswordFragment.java
View File

@ -6,6 +6,7 @@ import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.AppCompatImageView;
@ -47,7 +48,7 @@ public class FingerSetUpPasswordFragment extends BottomSheetDialogFragment
public static final String TAG = "SetUpPasswordFragment";
@BindView(R.id.btnContinue)
MaterialButton btnContinue;
Button btnContinue;
@BindView(R.id.edVerifyPassword)
TextInputEditText edVerifyPassword;

2
app/src/main/res/drawable/ic_blue_button_with_white_border.xml
View File

@ -4,7 +4,7 @@
<stroke
android:width="1dp"
android:color="#FFFFFF" />
<solid android:color="@color/bluebg" />
<solid android:color="@color/light_blue" />
<corners android:radius="@dimen/_15sdp" />
</shape>

23
app/src/main/res/drawable/ic_msg.xml
View File

@ -0,0 +1,23 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M9.501,2A7.488,7.488 0,0 0,2.783 12.82l-0.754,3.014a0.937,0.937 0,0 0,1.137 1.137l3.014,-0.754A7.5,7.5 0,1 0,9.501 2Z"
android:strokeAlpha="0.35"
android:fillAlpha="0.35"/>
<path
android:fillColor="#FF000000"
android:pathData="M20.851,16.35l1.121,4.484a0.937,0.937 0,0 1,-1.137 1.137L16.351,20.85Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M16.678,7.323a7.5,7.5 0,0 1,-9.354 9.354,7.5 7.5,0 1,0 9.354,-9.354Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M13.001,9L7.001,9A1,1 0,0 1,7.001 7h6a1,1 0,0 1,0 2Z"/>
<path
android:fillColor="#FF000000"
android:pathData="M11.001,13L7.001,13a1,1 0,0 1,0 -2h4a1,1 0,0 1,0 2Z"/>
</vector>

2
app/src/main/res/drawable/light_blue_border_rounded.xml
View File

@ -9,5 +9,5 @@
android:color="@color/light_blue_40"/>
<solid
android:color="@color/light_blue_5" />
android:color="@color/light_blue_10" />
</shape>

4
app/src/main/res/layout/finger_setup_pass_layout_fragment.xml
View File

@ -79,12 +79,14 @@
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
<Button
android:id="@+id/btnContinue"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_20sdp"
android:background="@color/light_blue"
android:text="@string/continue_text"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

12
app/src/main/res/layout/fragment_my_notice_detail.xml
View File

@ -12,23 +12,24 @@
android:background="@color/bright_gray2"
android:padding="@dimen/_8sdp">
<com.remit.jmecustomer.common.customwidgets.JmeTextView
<TextView
android:id="@+id/tv_my_notification_date"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/darkgray2"
style="@style/TextStyle.VolteSemiBold12"
android:textColor="@color/black_opacity_60"
android:textSize="@dimen/_10ssp"
app:layout_constraintBottom_toTopOf="@+id/tv_my_notification_title"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:txtfontName="@string/regular"
tools:text="@string/date_text" />
<com.remit.jmecustomer.common.customwidgets.JmeTextView
<TextView
android:id="@+id/tv_my_notification_title"
style="@style/TextStyle.VolteSemiBold20"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_5sdp"
@ -42,8 +43,6 @@
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_my_notification_date"
app:txtfontName="@string/bold"
tools:text="When developed " />
@ -74,7 +73,6 @@
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view16"
app:txtfontName="@string/regular"
tools:text="When developed " />
<ImageView

2
app/src/main/res/layout/fragment_my_notice_listing.xml
View File

@ -4,7 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:scrollbars="none"
android:id="@+id/myNoticeRv"
android:background="@color/body_light_grey"
android:background="@color/white"
xmlns:android="http://schemas.android.com/apk/res/android"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
android:orientation="vertical"

76
app/src/main/res/layout/my_notice_list_viewholder.xml
View File

@ -1,34 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/_10sdp"
android:layout_marginTop="@dimen/_15sdp"
android:layout_marginRight="@dimen/_10sdp"
android:paddingHorizontal="@dimen/_10sdp"
android:outlineAmbientShadowColor="@color/black"
android:outlineSpotShadowColor="@color/black"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="@dimen/_12sdp">
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/imgNotificationStat"
android:layout_marginTop="@dimen/_10sdp"
android:layout_width="@dimen/_18sdp"
android:layout_height="@dimen/_18sdp"
android:layout_marginRight="@dimen/commonMargin"
android:contentDescription="TODO"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/_10sdp">
android:paddingVertical="@dimen/_10sdp">
<LinearLayout
android:id="@+id/jmeDepositLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/_30sdp"
android:layout_weight="1"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/imgNotificationStat"
app:layout_constraintTop_toTopOf="parent">
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/tv_notification_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_4sdp"
android:layout_marginBottom="@dimen/_5sdp"
android:gravity="start"
android:textColor="@color/black_opacity_87"
android:textSize="@dimen/_10ssp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_notification_title"
app:layout_constraintTop_toBottomOf="@+id/tv_notification_body"
tools:text="@string/date_text" />
<TextView
style="@style/TextStyle.VolteSemiBold20"
android:id="@+id/tv_notification_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -58,37 +86,17 @@
app:layout_constraintTop_toBottomOf="@+id/tv_notification_title"
tools:text="When developed " />
<com.remit.jmecustomer.common.customwidgets.JmeTextView
android:id="@+id/tv_notification_date"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/_4sdp"
android:layout_marginBottom="@dimen/_5sdp"
android:gravity="start"
android:textColor="#757575"
android:textSize="@dimen/_10ssp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/tv_notification_title"
app:layout_constraintTop_toBottomOf="@+id/tv_notification_body"
app:txtfontName="@string/regular"
tools:text="@string/date_text" />
</LinearLayout>
<ImageView
android:id="@+id/imgNotificationStat"
android:layout_width="@dimen/_18sdp"
android:layout_height="@dimen/_18sdp"
android:layout_marginRight="@dimen/commonMargin"
android:layout_weight="1"
android:contentDescription="TODO"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
</LinearLayout>
<View
android:background="@color/black_opacity_16"
android:layout_width="match_parent"
android:layout_height="1dp"/>
</LinearLayout>

23
app/src/main/res/layout/toolbar_dashboard_v3.xml
View File

@ -17,19 +17,19 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_profile_image"
android:layout_width="@dimen/_26sdp"
android:layout_height="@dimen/_26sdp"
android:src="@drawable/ic_user"
android:layout_marginRight="@dimen/_12sdp"
android:layout_marginLeft="@dimen/_12sdp"
android:layout_marginRight="@dimen/_12sdp"
android:src="@drawable/ic_user"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_profile_name"
style="@style/TextStyle.VolteSemiBold16"
@ -53,23 +53,32 @@
android:orientation="horizontal"
app:layout_constraintGuide_begin="28dp" />
<ImageView
android:id="@+id/iv_msg"
android:layout_width="@dimen/_20sdp"
android:layout_height="@dimen/_20sdp"
android:layout_marginRight="@dimen/_16sdp"
app:layout_constraintBottom_toBottomOf="@+id/cl_notification"
app:layout_constraintEnd_toStartOf="@+id/cl_notification"
app:layout_constraintTop_toTopOf="@+id/cl_notification"
app:srcCompat="@drawable/ic_msg" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_notification"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="@dimen/_12sdp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/guideline5"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/guideline5">
<ImageView
app:layout_constraintTop_toTopOf="parent"
android:id="@+id/iv_notification"
android:layout_width="@dimen/_20sdp"
android:layout_height="@dimen/_20sdp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/icon_notification" />
<androidx.constraintlayout.widget.Guideline
@ -77,7 +86,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.5" />
app:layout_constraintGuide_percent="0.5769231" />
<TextView
android:id="@+id/tv_notification_count"

Write Preview
Loading…
Cancel
Save