Master copy #5
Open
Master copy #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- refactor of ui of header view
# Conflicts: # app/src/main/java/company/tap/tapuisample/adapters/CardTypeAdapter.kt # app/src/main/java/company/tap/tapuisample/fragments/BottomSheetDialog.kt # app/src/main/java/company/tap/tapuisample/webview/CustomWebViewClientContract.kt # app/src/main/java/company/tap/tapuisample/webview/TapCustomWebViewClient.kt # app/src/main/java/company/tap/tapuisample/webview/WebFragment.kt # app/src/main/java/company/tap/tapuisample/webview/WebViewContract.kt # app/src/main/res/layout/custom_bottom_sheet.xml # tapuilibrary/build.gradle # tapuilibrary/src/main/res/layout/tap_main_header.xml
- refactor of ui of header view
3- Remove elevation for PayButton and 22Items button 4- Arabic language alignment 5- Circle padding ( item count )
# Conflicts: # app/src/main/java/company/tap/tapuisample/fragments/BottomSheetDialog.kt
3- Remove elevation for PayButton and 22Items button 4- Arabic language alignment 5- Circle padding ( item count )
# Conflicts: # tapuilibrary/build.gradle
# Conflicts: # app/src/main/java/company/tap/tapuisample/fragments/BottomSheetDialog.kt # tapuilibrary/src/main/res/layout/tap_main_amount.xml
# Conflicts: # app/build.gradle # tapuilibrary/src/main/res/layout/tap_main_header.xml
# Conflicts: # app/build.gradle # app/src/main/java/company/tap/tapuisample/fragments/BottomSheetDialog.kt # app/src/main/res/layout/custom_bottom_sheet.xml # tapuilibrary/src/main/res/layout/tap_chip_group.xml # tapuilibrary/src/main/res/layout/tap_main_header.xml
The scrolling direction of the chips (KNET AND GOPAY etc) should be from right to left not from left to right.
- alert textview - error colors - warning colors -png added - re arrange input form
# Conflicts: # app/build.gradle # app/src/main/java/company/tap/tapuisample/fragments/BottomSheetDialog.kt
…a-ahlaam-branches
…/TapUIKit-Android into ola-ahlaam-branches
-bug fix nfc and scan switch shown - tabselect mobile and card text fix
…/TapUIKit-Android into ola-ahlaam-branches
…/TapUIKit-Android into ola-ahlaam-branches
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.