diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 46dfa00..b243968 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -51,6 +51,16 @@ android:screenOrientation="portrait" android:theme="@style/Theme.Bitsy.NoActionBar" android:windowSoftInputMode="adjustPan"/> + + + + \ No newline at end of file diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt index 2853d47..2dd9d16 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt @@ -43,6 +43,6 @@ object Constants { /** Key used to store the night mode setting into the shared preferences */ const val KEY_NIGHT_MODE_ACTIVATED = "key_night_mode_activated" - + const val MERCHANTS_WEBSERVICE_URL = "https://websvc.palmpay.io/" } diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Helper.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Helper.kt index bff3aef..0015e00 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Helper.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Helper.kt @@ -54,7 +54,7 @@ class Helper { val newFile = File(imagePath, "image.png") // Create and return image uri - return FileProvider.getUriForFile(context, "cy.agorise.FileProvider", newFile) + return FileProvider.getUriForFile(context, "cy.agorise.bitsybitshareswallet.FileProvider", newFile) } } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_receive_transaction.xml b/app/src/main/res/layout/fragment_receive_transaction.xml index 0db1ef4..fefdfc9 100644 --- a/app/src/main/res/layout/fragment_receive_transaction.xml +++ b/app/src/main/res/layout/fragment_receive_transaction.xml @@ -5,10 +5,6 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" - android:paddingStart="@dimen/activity_horizontal_margin" - android:paddingEnd="@dimen/activity_horizontal_margin" tools:context=".fragments.ReceiveTransactionFragment"> @@ -64,6 +62,8 @@ style="@style/Widget.Bitsy.TextInputLayout" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/spacing_same_topic" android:visibility="gone" android:hint="@string/text__asset" @@ -87,6 +87,8 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="0dp" + android:paddingStart="@dimen/activity_horizontal_margin" + android:paddingEnd="@dimen/activity_horizontal_margin" android:background="?android:windowBackground" app:layout_constraintTop_toBottomOf="@+id/tilAsset" app:layout_constraintBottom_toBottomOf="parent"> @@ -96,7 +98,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="@dimen/spacing_different_topic" - android:layout_marginBottom="@dimen/spacing_different_topic" + android:layout_marginBottom="@dimen/spacing_same_topic" app:layout_constraintDimensionRatio="1:1" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@+id/llText" @@ -108,6 +110,7 @@ android:id="@+id/llText" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/spacing_same_topic" android:orientation="vertical" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@+id/ivQR"> diff --git a/app/src/main/res/xml/tmp_image_path.xml b/app/src/main/res/xml/tmp_image_path.xml new file mode 100644 index 0000000..0df2dd4 --- /dev/null +++ b/app/src/main/res/xml/tmp_image_path.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file