From 261ceb523ae139f7f28e9f17b94ac2308a2f4eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Sch=C3=B8pp?= Date: Thu, 15 Aug 2019 11:30:06 +0200 Subject: [PATCH 01/59] Update build tools and vital dependencies --- .idea/compiler.xml | 22 -- .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 6 - .idea/inspectionProfiles/Project_Default.xml | 36 --- .idea/misc.xml | 42 +--- .idea/runConfigurations.xml | 12 - .idea/vcs.xml | 2 +- BitcoinWalletTracker.iml | 2 +- app/app.iml | 227 ++++++++++-------- app/build.gradle | 49 ++-- .../ExampleInstrumentedTest.java | 4 +- app/src/main/AndroidManifest.xml | 32 +-- .../BitcoinWalletTracker/AccountAdapter.java | 19 +- .../BitcoinWalletTracker/BitcoinUtils.java | 2 +- .../BitcoinWalletTracker/MainActivity.java | 23 +- .../TransactionAdapter.java | 6 +- .../barcode/BarcodeCaptureActivity.java | 6 +- .../qrStuff/camera/CameraSource.java | 6 +- .../qrStuff/camera/CameraSourcePreview.java | 2 +- .../main/res/layout-land/activity_main.xml | 4 +- .../main/res/layout-land/overview_card.xml | 18 +- .../res/layout-land/overview_settings.xml | 16 +- app/src/main/res/layout/account_folded.xml | 16 +- app/src/main/res/layout/account_unfolded.xml | 16 +- app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/layout/no_accounts.xml | 16 +- app/src/main/res/layout/overview_card.xml | 16 +- app/src/main/res/layout/overview_settings.xml | 16 +- app/src/main/res/layout/qr_popup_layout.xml | 11 +- build.gradle | 2 +- gradle.properties | 2 + gradle/wrapper/gradle-wrapper.properties | 4 +- 32 files changed, 269 insertions(+), 373 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 7c59303..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index ad53516..3573ff6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,49 +1,9 @@ - - - - - + - - - - - 1.8 - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/BitcoinWalletTracker.iml b/BitcoinWalletTracker.iml index df5df6f..5dd1284 100644 --- a/BitcoinWalletTracker.iml +++ b/BitcoinWalletTracker.iml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index c4a5558..d81ff0f 100644 --- a/app/app.iml +++ b/app/app.iml @@ -23,22 +23,20 @@ - - + + - - + - + - - + - + @@ -49,13 +47,6 @@ - - - - - - - @@ -63,6 +54,13 @@ + + + + + + + @@ -70,13 +68,6 @@ - - - - - - - @@ -84,99 +75,123 @@ - + + + + + + + + + + + - - - - + + + + + - - - - - - - - - - + + + + + + + + - + - - - - - + + - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index dc9191a..e45eddc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion '26.0.2' + compileSdkVersion 28 defaultConfig { applicationId 'io.github.jangerhard.BitcoinWalletTracker' minSdkVersion 21 - targetSdkVersion 27 - versionCode 5 - versionName "1.0.4" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + targetSdkVersion 28 + versionCode 6 + versionName '2.0.0' + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' vectorDrawables.useSupportLibrary = true } buildTypes { @@ -33,27 +32,27 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:27.0.1' - compile 'com.android.support:recyclerview-v7:27.0.1' - compile 'com.android.support:cardview-v7:27.0.1' - compile 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0-rc01' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0-beta02' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - compile 'com.android.volley:volley:1.0.0' // Used for HTTP requests - compile 'com.google.code.gson:gson:2.8.2' // Used to serialize JSON - compile 'com.google.android.gms:play-services-vision:11.6.0' // Used for QR scanning - compile 'com.google.zxing:core:3.2.1' // QR generation - compile 'com.journeyapps:zxing-android-embedded:3.2.0@aar' // QR generation - compile 'com.baoyz.pullrefreshlayout:library:1.2.0' // Pull to refresh library - compile 'jp.wasabeef:recyclerview-animators:2.2.7' // Scroll animations - compile 'com.yarolegovich:lovely-dialog:1.0.7' // Material Dialogs - compile 'com.ramotion.foldingcell:folding-cell:1.2.1' // Foldable - compile 'com.wajahatkarim3.EasyFlipView:EasyFlipView:1.0.2' // Flip views - compile 'com.github.medyo:android-about-page:1.2.1' // About page - compile 'org.bitcoinj:bitcoinj-core:0.14.5' // Bitcoin support library + implementation 'com.android.volley:volley:1.1.0' // Used for HTTP requests + implementation 'com.google.code.gson:gson:2.8.5' // Used to serialize JSON + implementation 'com.google.android.gms:play-services-vision:18.0.0' // Used for QR scanning + implementation 'com.google.zxing:core:3.2.1' // QR generation + implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar' // QR generation + implementation 'com.baoyz.pullrefreshlayout:library:1.2.0' // Pull to refresh library + implementation 'jp.wasabeef:recyclerview-animators:2.2.7' // Scroll animations + implementation 'com.yarolegovich:lovely-dialog:1.0.7' // Material Dialogs + implementation 'com.ramotion.foldingcell:folding-cell:1.2.1' // Foldable + implementation 'com.wajahatkarim3.EasyFlipView:EasyFlipView:1.0.2' // Flip views + implementation 'com.github.medyo:android-about-page:1.2.1' // About page + implementation 'org.bitcoinj:bitcoinj-core:0.14.5' // Bitcoin support library - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.12' } diff --git a/app/src/androidTest/java/io/github/jangerhard/BitcoinWalletTracker/ExampleInstrumentedTest.java b/app/src/androidTest/java/io/github/jangerhard/BitcoinWalletTracker/ExampleInstrumentedTest.java index 1c2b128..d733cf0 100644 --- a/app/src/androidTest/java/io/github/jangerhard/BitcoinWalletTracker/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/io/github/jangerhard/BitcoinWalletTracker/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package io.github.jangerhard.BitcoinWalletTracker; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7c56cca..da9df40 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,34 +1,34 @@ + package="io.github.jangerhard.BitcoinWalletTracker"> - - + + + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher" + android:supportsRtl="true" + android:theme="@style/AppThemeDark"> - - + + - - - + + + - + - \ No newline at end of file + diff --git a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/AccountAdapter.java b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/AccountAdapter.java index 486c2c2..0c8a932 100644 --- a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/AccountAdapter.java +++ b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/AccountAdapter.java @@ -1,12 +1,14 @@ package io.github.jangerhard.BitcoinWalletTracker; +import java.util.HashSet; +import java.util.Locale; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.PopupMenu; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.MenuInflater; import android.view.MenuItem; @@ -15,16 +17,13 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; - +import androidx.appcompat.widget.PopupMenu; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.ramotion.foldingcell.FoldingCell; import com.yarolegovich.lovelydialog.LovelyStandardDialog; import com.yarolegovich.lovelydialog.LovelyTextInputDialog; -import java.util.HashSet; -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public class AccountAdapter extends RecyclerView.Adapter { private HashSet unfoldedIndexes = new HashSet<>(); @@ -154,7 +153,7 @@ public void onClick(View view) { holder.transactionList.setLayoutManager( new LinearLayoutManager( - mContext, LinearLayoutManager.VERTICAL, false)); + mContext, RecyclerView.VERTICAL, false)); TransactionAdapter transactionAdapter = new TransactionAdapter(mContext, account.getTxs(), account.getAddress()); diff --git a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/BitcoinUtils.java b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/BitcoinUtils.java index cc13761..395d980 100644 --- a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/BitcoinUtils.java +++ b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/BitcoinUtils.java @@ -2,7 +2,7 @@ import android.content.SharedPreferences; import android.graphics.Bitmap; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; diff --git a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/MainActivity.java b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/MainActivity.java index 20e0c86..966f371 100644 --- a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/MainActivity.java +++ b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/MainActivity.java @@ -1,5 +1,7 @@ package io.github.jangerhard.BitcoinWalletTracker; +import java.util.List; + import android.app.Activity; import android.content.ClipData; import android.content.ClipboardManager; @@ -7,11 +9,6 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.app.AppCompatDelegate; -import android.support.v7.widget.CardView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; import android.util.Log; import android.view.View; import android.widget.Button; @@ -21,7 +18,11 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; - +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import com.android.volley.NetworkError; import com.android.volley.NoConnectionError; import com.android.volley.ParseError; @@ -42,16 +43,12 @@ import com.yarolegovich.lovelydialog.LovelyCustomDialog; import com.yarolegovich.lovelydialog.LovelyStandardDialog; import com.yarolegovich.lovelydialog.LovelyTextInputDialog; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.List; - import io.github.jangerhard.BitcoinWalletTracker.qrStuff.barcode.BarcodeCaptureActivity; import jp.wasabeef.recyclerview.animators.LandingAnimator; import mehdi.sakout.aboutpage.AboutPage; import mehdi.sakout.aboutpage.Element; +import org.json.JSONException; +import org.json.JSONObject; public class MainActivity extends AppCompatActivity { @@ -314,7 +311,7 @@ public void onRefresh() { // adapter.notifyDataSetChanged(); recyclerView.setLayoutManager(new LinearLayoutManager(this, - LinearLayoutManager.VERTICAL, false)); + RecyclerView.VERTICAL, false)); recyclerView.setItemAnimator(new LandingAnimator()); recyclerView.setAdapter(adapter); } diff --git a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/TransactionAdapter.java b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/TransactionAdapter.java index 4d60158..68d66b6 100644 --- a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/TransactionAdapter.java +++ b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/TransactionAdapter.java @@ -1,14 +1,14 @@ package io.github.jangerhard.BitcoinWalletTracker; +import java.util.List; + import android.content.Context; import android.graphics.Color; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; - -import java.util.List; +import androidx.recyclerview.widget.RecyclerView; public class TransactionAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/barcode/BarcodeCaptureActivity.java b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/barcode/BarcodeCaptureActivity.java index 0d9ec2c..d483525 100644 --- a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/barcode/BarcodeCaptureActivity.java +++ b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/barcode/BarcodeCaptureActivity.java @@ -30,9 +30,9 @@ import android.hardware.Camera; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.appcompat.app.AppCompatActivity; import android.util.DisplayMetrics; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/camera/CameraSource.java b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/camera/CameraSource.java index ad2d176..8ac2909 100644 --- a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/camera/CameraSource.java +++ b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/camera/CameraSource.java @@ -25,9 +25,9 @@ import android.hardware.Camera.CameraInfo; import android.os.Build; import android.os.SystemClock; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresPermission; -import android.support.annotation.StringDef; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresPermission; +import androidx.annotation.StringDef; import android.util.Log; import android.view.Surface; import android.view.SurfaceHolder; diff --git a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/camera/CameraSourcePreview.java b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/camera/CameraSourcePreview.java index 8b1b0b2..339e389 100644 --- a/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/camera/CameraSourcePreview.java +++ b/app/src/main/java/io/github/jangerhard/BitcoinWalletTracker/qrStuff/camera/CameraSourcePreview.java @@ -18,7 +18,7 @@ import android.Manifest; import android.content.Context; import android.content.res.Configuration; -import android.support.annotation.RequiresPermission; +import androidx.annotation.RequiresPermission; import android.util.AttributeSet; import android.util.Log; import android.view.SurfaceHolder; diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index 495be2c..c0b6f93 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -44,7 +44,7 @@ app:refreshColor="@color/colorPrimary" app:refreshType="smartisan"> - - \ No newline at end of file + diff --git a/app/src/main/res/layout-land/overview_card.xml b/app/src/main/res/layout-land/overview_card.xml index 7d3de8f..cd4ec3e 100644 --- a/app/src/main/res/layout-land/overview_card.xml +++ b/app/src/main/res/layout-land/overview_card.xml @@ -1,12 +1,12 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/layout-land/overview_settings.xml b/app/src/main/res/layout-land/overview_settings.xml index e9282b5..873c160 100644 --- a/app/src/main/res/layout-land/overview_settings.xml +++ b/app/src/main/res/layout-land/overview_settings.xml @@ -1,11 +1,11 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/account_folded.xml b/app/src/main/res/layout/account_folded.xml index fe7525b..95e1df9 100644 --- a/app/src/main/res/layout/account_folded.xml +++ b/app/src/main/res/layout/account_folded.xml @@ -1,12 +1,12 @@ - + - + diff --git a/app/src/main/res/layout/account_unfolded.xml b/app/src/main/res/layout/account_unfolded.xml index af1c92d..294718e 100644 --- a/app/src/main/res/layout/account_unfolded.xml +++ b/app/src/main/res/layout/account_unfolded.xml @@ -1,10 +1,10 @@ - + - - \ No newline at end of file + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1f80c1e..bc0b42f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -37,7 +37,7 @@ app:refreshType="smartisan"> - - \ No newline at end of file + diff --git a/app/src/main/res/layout/no_accounts.xml b/app/src/main/res/layout/no_accounts.xml index 34030a4..77cb1ec 100644 --- a/app/src/main/res/layout/no_accounts.xml +++ b/app/src/main/res/layout/no_accounts.xml @@ -1,12 +1,12 @@ - + - + diff --git a/app/src/main/res/layout/overview_card.xml b/app/src/main/res/layout/overview_card.xml index b90a209..dead035 100644 --- a/app/src/main/res/layout/overview_card.xml +++ b/app/src/main/res/layout/overview_card.xml @@ -1,11 +1,11 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/overview_settings.xml b/app/src/main/res/layout/overview_settings.xml index 2adf7eb..da20155 100644 --- a/app/src/main/res/layout/overview_settings.xml +++ b/app/src/main/res/layout/overview_settings.xml @@ -1,11 +1,11 @@ - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/qr_popup_layout.xml b/app/src/main/res/layout/qr_popup_layout.xml index 083b848..d870b3c 100644 --- a/app/src/main/res/layout/qr_popup_layout.xml +++ b/app/src/main/res/layout/qr_popup_layout.xml @@ -1,17 +1,20 @@ - + android:layout_height="wrap_content" + tools:ignore="MissingConstraints" /> + android:gravity="center_horizontal" + tools:ignore="MissingConstraints" /> - \ No newline at end of file + diff --git a/build.gradle b/build.gradle index a46100d..aef4984 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.0-alpha03' + classpath 'com.android.tools.build:gradle:3.4.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle.properties b/gradle.properties index aac7c9b..9e6fce1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,6 +9,8 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e8074e3..ff49a92 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 04 19:31:40 CEST 2017 +#Thu Aug 15 10:14:31 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip From 237cd30447d85584406bc425a4b7f381bb6bd775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Sch=C3=B8pp?= Date: Thu, 15 Aug 2019 17:04:42 +0200 Subject: [PATCH 02/59] Update easyflipview and fix cardview-bug --- app/app.iml | 12 + app/build.gradle | 2 +- .../main/res/layout-land/overview_card.xml | 141 ++++++------ .../res/layout-land/overview_settings.xml | 190 ++++++++-------- app/src/main/res/layout/activity_main.xml | 5 +- app/src/main/res/layout/overview_card.xml | 128 ++++++----- app/src/main/res/layout/overview_settings.xml | 215 +++++++++--------- 7 files changed, 366 insertions(+), 327 deletions(-) diff --git a/app/app.iml b/app/app.iml index d81ff0f..5e32f8e 100644 --- a/app/app.iml +++ b/app/app.iml @@ -87,15 +87,24 @@ + + + + + + + + + @@ -103,9 +112,12 @@ + + + diff --git a/app/build.gradle b/app/build.gradle index e45eddc..cdaefc4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -50,7 +50,7 @@ dependencies { implementation 'jp.wasabeef:recyclerview-animators:2.2.7' // Scroll animations implementation 'com.yarolegovich:lovely-dialog:1.0.7' // Material Dialogs implementation 'com.ramotion.foldingcell:folding-cell:1.2.1' // Foldable - implementation 'com.wajahatkarim3.EasyFlipView:EasyFlipView:1.0.2' // Flip views + implementation 'com.wajahatkarim3.EasyFlipView:EasyFlipView:2.1.2' // Flip views implementation 'com.github.medyo:android-about-page:1.2.1' // About page implementation 'org.bitcoinj:bitcoinj-core:0.14.5' // Bitcoin support library diff --git a/app/src/main/res/layout-land/overview_card.xml b/app/src/main/res/layout-land/overview_card.xml index cd4ec3e..75600c8 100644 --- a/app/src/main/res/layout-land/overview_card.xml +++ b/app/src/main/res/layout-land/overview_card.xml @@ -1,95 +1,100 @@ - + - + android:layout_height="wrap_content" + android:padding="@dimen/activity_horizontal_margin" + app:cardBackgroundColor="@color/colorPrimary" + android:layout_weight="2" + app:cardCornerRadius="3dp"> - - - - - + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp"> + android:layout_centerInParent="true" + android:orientation="vertical"> + android:textSize="20sp" + android:textStyle="italic" /> + android:textSize="28sp" /> - - + - + - + - + + + + android:layout_alignParentBottom="true"> - + + + + + - + - + + diff --git a/app/src/main/res/layout-land/overview_settings.xml b/app/src/main/res/layout-land/overview_settings.xml index 873c160..7b87a24 100644 --- a/app/src/main/res/layout-land/overview_settings.xml +++ b/app/src/main/res/layout-land/overview_settings.xml @@ -1,120 +1,126 @@ - - - + + - - + android:layout_height="match_parent" + android:padding="@dimen/activity_horizontal_margin" + app:cardBackgroundColor="@color/colorPrimary" + app:cardCornerRadius="3dp"> - + android:padding="16dp"> - + + + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp"> - - - + + + + + + + + + + + + + - - - + - - - - - - - -