From f39ca7c8b70f1d4a38bed8540a684954eb74f4ad Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Mon, 29 Oct 2018 03:04:10 +0200 Subject: [PATCH 1/2] Downgrade to wpandroid's Android API level --- android/build.gradle | 2 +- example/android/app/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index a72032fa73ba6f..43e0cde1720cdd 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -40,7 +40,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 26 ndk { abiFilters "armeabi-v7a", "x86" diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index c606671192a540..5613d3c340bfda 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -91,7 +91,7 @@ android { defaultConfig { minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 26 ndk { abiFilters "armeabi-v7a", "x86" From e25607f81354dcf8a678e0354a62a8c7f4d42355 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Mon, 29 Oct 2018 03:05:00 +0200 Subject: [PATCH 2/2] Android cleanup --- android/src/main/res/drawable-hdpi/tile.9.png | Bin 196 -> 0 bytes .../res/drawable/ic_reorder_black_24dp.xml | 9 ---- android/src/main/res/menu/main.xml | 23 ---------- .../res/values-sw600dp/template-dimens.xml | 24 ---------- .../res/values-sw600dp/template-styles.xml | 25 ----------- .../main/res/values-v11/template-styles.xml | 22 --------- .../src/main/res/values-v21/base-colors.xml | 23 ---------- .../res/values-v21/base-template-styles.xml | 26 ----------- android/src/main/res/values/base-strings.xml | 28 ------------ android/src/main/res/values/dimens.xml | 20 --------- .../main/res/values/fragmentview_strings.xml | 19 -------- android/src/main/res/values/strings.xml | 4 +- .../src/main/res/values/template-dimens.xml | 7 --- .../src/main/res/values/template-styles.xml | 42 ------------------ .../main/res/values-v11/template-styles.xml | 22 --------- .../res/values-v21/base-template-styles.xml | 26 ----------- .../app/src/main/res/values/base-strings.xml | 28 ------------ .../base-colors.xml => values/colors.xml} | 4 +- .../app/src/main/res/values/strings.xml | 1 + .../src/main/res/values/template-styles.xml | 5 ++- 20 files changed, 8 insertions(+), 350 deletions(-) delete mode 100644 android/src/main/res/drawable-hdpi/tile.9.png delete mode 100644 android/src/main/res/drawable/ic_reorder_black_24dp.xml delete mode 100644 android/src/main/res/menu/main.xml delete mode 100644 android/src/main/res/values-sw600dp/template-dimens.xml delete mode 100644 android/src/main/res/values-sw600dp/template-styles.xml delete mode 100644 android/src/main/res/values-v11/template-styles.xml delete mode 100644 android/src/main/res/values-v21/base-colors.xml delete mode 100644 android/src/main/res/values-v21/base-template-styles.xml delete mode 100644 android/src/main/res/values/base-strings.xml delete mode 100644 android/src/main/res/values/dimens.xml delete mode 100644 android/src/main/res/values/fragmentview_strings.xml delete mode 100644 android/src/main/res/values/template-styles.xml delete mode 100644 example/android/app/src/main/res/values-v11/template-styles.xml delete mode 100644 example/android/app/src/main/res/values-v21/base-template-styles.xml delete mode 100644 example/android/app/src/main/res/values/base-strings.xml rename example/android/app/src/main/res/{values-v21/base-colors.xml => values/colors.xml} (86%) diff --git a/android/src/main/res/drawable-hdpi/tile.9.png b/android/src/main/res/drawable-hdpi/tile.9.png deleted file mode 100644 index 135862883e26eddce2b19db021adf62e10357ad0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^d_XM3!3HF=W8NDADajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MQNTcjv*DdlK%YvZ_jLY;KT`zX$+@~lcus~rX(d9r71A} z`ThO9P5{3!^Gb##?W|{)7_*qnaG3jle#z^Ewh3!L+OJDkI - - diff --git a/android/src/main/res/menu/main.xml b/android/src/main/res/menu/main.xml deleted file mode 100644 index 29c52f8ed465f6..00000000000000 --- a/android/src/main/res/menu/main.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - diff --git a/android/src/main/res/values-sw600dp/template-dimens.xml b/android/src/main/res/values-sw600dp/template-dimens.xml deleted file mode 100644 index 22074a2bdbaf60..00000000000000 --- a/android/src/main/res/values-sw600dp/template-dimens.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - @dimen/margin_huge - @dimen/margin_medium - - diff --git a/android/src/main/res/values-sw600dp/template-styles.xml b/android/src/main/res/values-sw600dp/template-styles.xml deleted file mode 100644 index 03d1974183dd64..00000000000000 --- a/android/src/main/res/values-sw600dp/template-styles.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/android/src/main/res/values-v11/template-styles.xml b/android/src/main/res/values-v11/template-styles.xml deleted file mode 100644 index 8c1ea66f28907a..00000000000000 --- a/android/src/main/res/values-v11/template-styles.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/android/src/main/res/values/base-strings.xml b/android/src/main/res/values/base-strings.xml deleted file mode 100644 index 4f296e20a9b069..00000000000000 --- a/android/src/main/res/values/base-strings.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - Aztec React Native example - - - - diff --git a/android/src/main/res/values/dimens.xml b/android/src/main/res/values/dimens.xml deleted file mode 100644 index 8c5b99af6bdbac..00000000000000 --- a/android/src/main/res/values/dimens.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - 100dp - \ No newline at end of file diff --git a/android/src/main/res/values/fragmentview_strings.xml b/android/src/main/res/values/fragmentview_strings.xml deleted file mode 100644 index 7b9d9ec4f3c52b..00000000000000 --- a/android/src/main/res/values/fragmentview_strings.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - Show Log - Hide Log - diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 642e022ff0fce2..5b3c79dd838556 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -16,7 +16,5 @@ --> - Element - Grid Layout Manager - Linear Layout Manager + Aztec React Native example \ No newline at end of file diff --git a/android/src/main/res/values/template-dimens.xml b/android/src/main/res/values/template-dimens.xml index 39e710b5ca358c..bedb28fb4a736d 100644 --- a/android/src/main/res/values/template-dimens.xml +++ b/android/src/main/res/values/template-dimens.xml @@ -18,15 +18,8 @@ - 4dp 8dp 16dp 32dp - 64dp - - - - @dimen/margin_medium - @dimen/margin_medium diff --git a/android/src/main/res/values/template-styles.xml b/android/src/main/res/values/template-styles.xml deleted file mode 100644 index 6e7d593dd8b50a..00000000000000 --- a/android/src/main/res/values/template-styles.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - diff --git a/example/android/app/src/main/res/values-v11/template-styles.xml b/example/android/app/src/main/res/values-v11/template-styles.xml deleted file mode 100644 index 8c1ea66f28907a..00000000000000 --- a/example/android/app/src/main/res/values-v11/template-styles.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/example/android/app/src/main/res/values/base-strings.xml b/example/android/app/src/main/res/values/base-strings.xml deleted file mode 100644 index 4f296e20a9b069..00000000000000 --- a/example/android/app/src/main/res/values/base-strings.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - Aztec React Native example - - - - diff --git a/example/android/app/src/main/res/values-v21/base-colors.xml b/example/android/app/src/main/res/values/colors.xml similarity index 86% rename from example/android/app/src/main/res/values-v21/base-colors.xml rename to example/android/app/src/main/res/values/colors.xml index 58f08a3a8491e8..c2832bdb7b1ec7 100644 --- a/example/android/app/src/main/res/values-v21/base-colors.xml +++ b/example/android/app/src/main/res/values/colors.xml @@ -17,7 +17,7 @@ - #00BCD4 - #00838F + #00BCD4 + #00838F diff --git a/example/android/app/src/main/res/values/strings.xml b/example/android/app/src/main/res/values/strings.xml index 642e022ff0fce2..45031ada040fa9 100644 --- a/example/android/app/src/main/res/values/strings.xml +++ b/example/android/app/src/main/res/values/strings.xml @@ -16,6 +16,7 @@ --> + Aztec React Native example Element Grid Layout Manager Linear Layout Manager diff --git a/example/android/app/src/main/res/values/template-styles.xml b/example/android/app/src/main/res/values/template-styles.xml index 6e7d593dd8b50a..199025ef2359d8 100644 --- a/example/android/app/src/main/res/values/template-styles.xml +++ b/example/android/app/src/main/res/values/template-styles.xml @@ -18,7 +18,10 @@ -