diff --git a/app/build.gradle b/app/build.gradle
index 087f45d..e584f0e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@
applicationId "nl.digital_me.dummyandroidapp"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.compileSdkVersion
- versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 75
+ versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 76
versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.5"
multiDexEnabled true
@@ -140,7 +140,7 @@
//compile fileTree(dir: 'libs', include: ['*.jar'])
testImplementation "junit:junit:$rootProject.ext.junitVersion"
testImplementation "org.mockito:mockito-core:2.19.0"
- implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
- implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
+ implementation 'androidx.appcompat:appcompat:1.0.0'
+ implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.multidex:multidex:2.0.0'
}
diff --git a/app/src/main/java/nl/digital_me/dummyandroidapp/BrowseCard.java b/app/src/main/java/nl/digital_me/dummyandroidapp/BrowseCard.java
index 33b02d3..cdc92d8 100644
--- a/app/src/main/java/nl/digital_me/dummyandroidapp/BrowseCard.java
+++ b/app/src/main/java/nl/digital_me/dummyandroidapp/BrowseCard.java
@@ -2,15 +2,6 @@
import android.content.Intent;
import android.content.pm.PackageInfo;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
@@ -18,21 +9,25 @@
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-
import android.widget.EditText;
import android.widget.TextView;
-import java.util.logging.Logger;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
public class BrowseCard extends AppCompatActivity {
/**
- * The {@link android.support.v4.view.PagerAdapter} that will provide
+ * The {@link androidx.core.view.PagerAdapter} that will provide
* fragments for each of the sections. We use a
* {@link FragmentPagerAdapter} derivative, which will keep every
* loaded fragment in memory. If this becomes too memory intensive, it
* may be best to switch to a
- * {@link android.support.v4.app.FragmentStatePagerAdapter}.
+ * {@link androidx.core.app.FragmentStatePagerAdapter}.
*/
private SectionsPagerAdapter mSectionsPagerAdapter;
diff --git a/app/src/main/java/nl/digital_me/dummyandroidapp/DisplayMessageActivity.java b/app/src/main/java/nl/digital_me/dummyandroidapp/DisplayMessageActivity.java
index 02f952e..c6d6fb9 100644
--- a/app/src/main/java/nl/digital_me/dummyandroidapp/DisplayMessageActivity.java
+++ b/app/src/main/java/nl/digital_me/dummyandroidapp/DisplayMessageActivity.java
@@ -2,13 +2,10 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.design.widget.FloatingActionButton;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.View;
import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+
public class DisplayMessageActivity extends AppCompatActivity {
@Override
diff --git a/app/src/main/res/layout/activity_browse_card.xml b/app/src/main/res/layout/activity_browse_card.xml
index d2e4292..ac311e4 100644
--- a/app/src/main/res/layout/activity_browse_card.xml
+++ b/app/src/main/res/layout/activity_browse_card.xml
@@ -1,33 +1,45 @@
-
+ android:id="@+id/main_content"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fitsSystemWindows="true"
+ tools:context=".BrowseCard">
-
-
+
-
+
-
+
-
-
+
-
+
diff --git a/app/src/main/res/layout/activity_display_message.xml b/app/src/main/res/layout/activity_display_message.xml
index 8f72e13..f55dfde 100644
--- a/app/src/main/res/layout/activity_display_message.xml
+++ b/app/src/main/res/layout/activity_display_message.xml
@@ -1,25 +1,34 @@
-
-
+
-
+
-
+
-
-
+
diff --git a/app/src/main/res/layout/content_display_message.xml b/app/src/main/res/layout/content_display_message.xml
index e810210..3328328 100644
--- a/app/src/main/res/layout/content_display_message.xml
+++ b/app/src/main/res/layout/content_display_message.xml
@@ -1,13 +1,15 @@
+ tools:context="nl.digital_me.dummyandroidapp.DisplayMessageActivity"
+ tools:showIn="@layout/activity_display_message">
diff --git a/app/src/main/res/layout/fragment_browse_card.xml b/app/src/main/res/layout/fragment_browse_card.xml
index ba2e905..f9ee629 100644
--- a/app/src/main/res/layout/fragment_browse_card.xml
+++ b/app/src/main/res/layout/fragment_browse_card.xml
@@ -1,31 +1,36 @@
-
-
+
@@ -34,13 +39,13 @@
android:layout_height="match_parent">
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_column="0"
+ android:ems="10"
+ android:hint="Contact Name"
+ android:inputType="textPersonName" />
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_column="0"
+ android:ems="10"
+ android:hint="Email address"
+ android:inputType="textEmailAddress" />
+ android:hint="Phone number"
+ android:inputType="phone" />
diff --git a/build.gradle b/build.gradle
index 3101fbc..e41673e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,6 +19,7 @@
// For the Gradle plugin and its deps
maven { url "https://maven.google.com" }
jcenter()
+ google()
}
dependencies {
@@ -32,6 +33,7 @@
jcenter()
// For the support libraries
maven { url "https://maven.google.com" }
+ google()
}
}
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index b1bd5e6..992533f 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -11,7 +11,7 @@
# This is the minimum version number required.
# Update this, if you use features of a newer version
-fastlane_version "2.137.0"
+fastlane_version "2.144.0"
default_platform :android
@@ -232,6 +232,16 @@
build_secret: "ecffdd52c995054f79161c3570ed769f2bacf2dd3082e2aba7489b147c29ce7d"
)
end
+
+
+ desc "Submit a new build to Firebase App Distribution"
+ lane :beta_firebase do |options|
+ gradle(task: "assembleRelease")
+ firebase_app_distribution(
+ app: "1:79978046456:android:ec6742f538f9269b",
+ apk_path: "app/build/outputs/apk/#{getFlavorName(options)}/release/app-#{getFlavorName(options)}-release.apk",
+ )
+ end
desc "Deploy a new version to the Google Play"
lane :alpha do |options|
diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile
index 447d006..4e0f109 100644
--- a/fastlane/Pluginfile
+++ b/fastlane/Pluginfile
@@ -1,3 +1,4 @@
# TODO: Reimplement our actions in a plugin to be shared between projects, or use an existing plugin.
#gem "fastlane-plugin-commit_android_version_bump", git: "https://github.com/digital-me/fastlane-plugin-commit_android_version_bump"
-#gem "increment_version_code", git "https://github.com/Jems22/fastlane-plugin-increment_version_code/tree/v0.4.3"
\ No newline at end of file
+#gem "increment_version_code", git "https://github.com/Jems22/fastlane-plugin-increment_version_code/tree/v0.4.3"
+gem 'fastlane-plugin-firebase_app_distribution'
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/77.txt b/fastlane/metadata/android/en-US/changelogs/77.txt
new file mode 100644
index 0000000..098b6f7
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/77.txt
@@ -0,0 +1,3 @@
+- Nothing visible
+- Backports from Dappre
+- Improves PL
\ No newline at end of file
diff --git a/fastlane/metadata/android/nl-NL/changelogs/77.txt b/fastlane/metadata/android/nl-NL/changelogs/77.txt
new file mode 100644
index 0000000..2ebc369
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/77.txt
@@ -0,0 +1,3 @@
+- Niets zichtbaar
+- Backports van Dappre
+- Verbeterd PL
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index af40687..dbbf8aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -38,3 +38,5 @@
org.gradle.parallel=true
org.gradle.daemon=true
org.gradle.caching=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/lazyDir/Gemfile.lock b/lazyDir/Gemfile.lock
index f3383a3..19f6d2b 100644
--- a/lazyDir/Gemfile.lock
+++ b/lazyDir/Gemfile.lock
@@ -5,6 +5,22 @@
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
atomos (0.1.3)
+ aws-eventstream (1.0.3)
+ aws-partitions (1.286.0)
+ aws-sdk-core (3.92.0)
+ aws-eventstream (~> 1.0, >= 1.0.2)
+ aws-partitions (~> 1, >= 1.239.0)
+ aws-sigv4 (~> 1.1)
+ jmespath (~> 1.0)
+ aws-sdk-kms (1.30.0)
+ aws-sdk-core (~> 3, >= 3.71.0)
+ aws-sigv4 (~> 1.1)
+ aws-sdk-s3 (1.61.1)
+ aws-sdk-core (~> 3, >= 3.83.0)
+ aws-sdk-kms (~> 1)
+ aws-sigv4 (~> 1.1)
+ aws-sigv4 (1.1.1)
+ aws-eventstream (~> 1.0, >= 1.0.2)
babosa (1.0.3)
claide (1.0.3)
colored (1.2)
@@ -13,13 +29,13 @@
highline (~> 1.7.2)
declarative (0.0.10)
declarative-option (0.1.0)
- digest-crc (0.4.1)
+ digest-crc (0.5.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.5)
emoji_regex (1.0.1)
- excon (0.70.0)
- faraday (0.17.1)
+ excon (0.73.0)
+ faraday (0.17.3)
multipart-post (>= 1.2, < 3)
faraday-cookie_jar (0.0.6)
faraday (>= 0.7.4)
@@ -27,22 +43,23 @@
faraday_middleware (0.13.1)
faraday (>= 0.7.4, < 1.0)
fastimage (2.1.7)
- fastlane (2.137.0)
+ fastlane (2.144.0)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.3, < 3.0.0)
+ aws-sdk-s3 (~> 1.0)
babosa (>= 1.0.2, < 2.0.0)
bundler (>= 1.12.0, < 3.0.0)
colored
commander-fastlane (>= 4.4.6, < 5.0.0)
dotenv (>= 2.1.1, < 3.0.0)
emoji_regex (>= 0.1, < 2.0)
- excon (>= 0.45.0, < 1.0.0)
+ excon (>= 0.71.0, < 1.0.0)
faraday (~> 0.17)
faraday-cookie_jar (~> 0.0.6)
faraday_middleware (~> 0.13.1)
fastimage (>= 2.1.0, < 3.0.0)
gh_inspector (>= 1.1.2, < 2.0.0)
- google-api-client (>= 0.21.2, < 0.24.0)
+ google-api-client (>= 0.29.2, < 0.37.0)
google-cloud-storage (>= 1.15.0, < 2.0.0)
highline (>= 1.7.2, < 2.0.0)
json (< 3.0.0)
@@ -61,45 +78,49 @@
tty-screen (>= 0.6.3, < 1.0.0)
tty-spinner (>= 0.8.0, < 1.0.0)
word_wrap (~> 1.0.0)
- xcodeproj (>= 1.8.1, < 2.0.0)
+ xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
+ fastlane-plugin-firebase_app_distribution (0.1.4)
gh_inspector (1.1.3)
- google-api-client (0.23.9)
+ google-api-client (0.36.4)
addressable (~> 2.5, >= 2.5.1)
- googleauth (>= 0.5, < 0.7.0)
+ googleauth (~> 0.9)
httpclient (>= 2.8.1, < 3.0)
- mime-types (~> 3.0)
+ mini_mime (~> 1.0)
representable (~> 3.0)
retriable (>= 2.0, < 4.0)
- signet (~> 0.9)
- google-cloud-core (1.4.1)
+ signet (~> 0.12)
+ google-cloud-core (1.5.0)
google-cloud-env (~> 1.0)
- google-cloud-env (1.3.0)
- faraday (~> 0.11)
- google-cloud-storage (1.16.0)
+ google-cloud-errors (~> 1.0)
+ google-cloud-env (1.3.1)
+ faraday (>= 0.17.3, < 2.0)
+ google-cloud-errors (1.0.0)
+ google-cloud-storage (1.25.1)
+ addressable (~> 2.5)
digest-crc (~> 0.4)
- google-api-client (~> 0.23)
+ google-api-client (~> 0.33)
google-cloud-core (~> 1.2)
- googleauth (>= 0.6.2, < 0.10.0)
- googleauth (0.6.7)
- faraday (~> 0.12)
+ googleauth (~> 0.9)
+ mini_mime (~> 1.0)
+ googleauth (0.11.0)
+ faraday (>= 0.17.3, < 2.0)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
- signet (~> 0.7)
+ signet (~> 0.12)
highline (1.7.10)
http-cookie (1.0.3)
domain_name (~> 0.5)
httpclient (2.8.3)
+ jmespath (1.4.0)
json (2.3.0)
jwt (2.1.0)
memoist (0.16.2)
- mime-types (3.3)
- mime-types-data (~> 3.2015)
- mime-types-data (3.2019.1009)
- mini_magick (4.9.5)
+ mini_magick (4.10.1)
+ mini_mime (1.0.2)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
@@ -116,29 +137,29 @@
rouge (2.0.7)
rubyzip (1.3.0)
security (0.1.3)
- signet (0.12.0)
+ signet (0.13.0)
addressable (~> 2.3)
- faraday (~> 0.9)
+ faraday (>= 0.17.3, < 2.0)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
- simctl (1.6.6)
+ simctl (1.6.8)
CFPropertyList
naturally
slack-notifier (2.3.2)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
- tty-cursor (0.7.0)
- tty-screen (0.7.0)
- tty-spinner (0.9.2)
+ tty-cursor (0.7.1)
+ tty-screen (0.7.1)
+ tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
- unicode-display_width (1.6.0)
+ unicode-display_width (1.7.0)
word_wrap (1.0.0)
- xcodeproj (1.13.0)
+ xcodeproj (1.15.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
@@ -154,9 +175,10 @@
DEPENDENCIES
fastlane
+ fastlane-plugin-firebase_app_distribution
RUBY VERSION
- ruby 2.4.6p354
+ ruby 2.6.5p114
BUNDLED WITH
- 1.13.7
+ 1.17.2