diff options
Diffstat (limited to 'wallet')
| -rw-r--r-- | wallet/.gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | wallet/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt | 1 | ||||
| -rw-r--r-- | wallet/src/main/res/drawable/ic_home_black_24dp.xml | 25 | ||||
| -rw-r--r-- | wallet/src/main/res/layout/payment_details.xml | 12 | ||||
| -rw-r--r-- | wallet/src/main/res/values/dimens.xml | 24 |
5 files changed, 11 insertions, 56 deletions
diff --git a/wallet/.gitlab-ci.yml b/wallet/.gitlab-ci.yml index 4c1f9a8..a07cb28 100644 --- a/wallet/.gitlab-ci.yml +++ b/wallet/.gitlab-ci.yml @@ -11,6 +11,10 @@ wallet_test: stage: test extends: .binary_deps script: ./gradlew :wallet:lint :wallet:assembleRelease + artifacts: + paths: + - wallet/build/reports/lint-results.html + expire_in: 1 week wallet_deploy_nightly: stage: deploy @@ -18,6 +22,7 @@ wallet_deploy_nightly: only: refs: - master + needs: ["wallet_test"] script: # Ensure that key exists - test -z "$DEBUG_KEYSTORE" && exit 0 diff --git a/wallet/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt b/wallet/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt index 4f8ab82..45ecf37 100644 --- a/wallet/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt +++ b/wallet/src/main/java/net/taler/wallet/history/WalletHistoryFragment.kt @@ -31,7 +31,6 @@ import androidx.lifecycle.Observer import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager.VERTICAL -import kotlinx.android.synthetic.main.fragment_show_balance.* import kotlinx.android.synthetic.main.fragment_show_history.* import net.taler.wallet.R import net.taler.wallet.WalletViewModel diff --git a/wallet/src/main/res/drawable/ic_home_black_24dp.xml b/wallet/src/main/res/drawable/ic_home_black_24dp.xml deleted file mode 100644 index ed8aa1e..0000000 --- a/wallet/src/main/res/drawable/ic_home_black_24dp.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - ~ This file is part of GNU Taler - ~ (C) 2020 Taler Systems S.A. - ~ - ~ GNU Taler is free software; you can redistribute it and/or modify it under the - ~ terms of the GNU General Public License as published by the Free Software - ~ Foundation; either version 3, or (at your option) any later version. - ~ - ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License along with - ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> - --> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="24dp" - android:height="24dp" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> - <path - android:fillColor="#FF000000" - android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/> -</vector> diff --git a/wallet/src/main/res/layout/payment_details.xml b/wallet/src/main/res/layout/payment_details.xml index 60d1d73..50c027a 100644 --- a/wallet/src/main/res/layout/payment_details.xml +++ b/wallet/src/main/res/layout/payment_details.xml @@ -30,7 +30,7 @@ android:id="@+id/errorView" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" + android:layout_margin="16dp" android:textAlignment="center" android:textColor="@android:color/holo_red_dark" android:textSize="22sp" @@ -47,9 +47,9 @@ android:id="@+id/orderLabelView" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_horizontal_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:layout_marginStart="16dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="16dp" android:text="@string/payment_label_order_summary" android:textAlignment="center" android:visibility="invisible" @@ -63,7 +63,7 @@ android:id="@+id/orderView" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" + android:layout_margin="16dp" android:layout_marginTop="16dp" android:textAlignment="center" android:textAppearance="@style/TextAppearance.AppCompat.Headline" @@ -92,7 +92,7 @@ android:id="@+id/productsList" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" + android:layout_margin="16dp" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/wallet/src/main/res/values/dimens.xml b/wallet/src/main/res/values/dimens.xml deleted file mode 100644 index 2bbc14d..0000000 --- a/wallet/src/main/res/values/dimens.xml +++ /dev/null @@ -1,24 +0,0 @@ -<!-- - ~ This file is part of GNU Taler - ~ (C) 2020 Taler Systems S.A. - ~ - ~ GNU Taler is free software; you can redistribute it and/or modify it under the - ~ terms of the GNU General Public License as published by the Free Software - ~ Foundation; either version 3, or (at your option) any later version. - ~ - ~ GNU Taler is distributed in the hope that it will be useful, but WITHOUT ANY - ~ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - ~ A PARTICULAR PURPOSE. See the GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License along with - ~ GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/> - --> - -<resources> - <!-- Default screen margins, per the Android Design guidelines. --> - <dimen name="activity_horizontal_margin">16dp</dimen> - <dimen name="activity_vertical_margin">16dp</dimen> - <dimen name="nav_header_vertical_spacing">8dp</dimen> - <dimen name="nav_header_height">176dp</dimen> - <dimen name="fab_margin">16dp</dimen> -</resources>
\ No newline at end of file |