From 2e253fb6a8a6342e4caef688f8f2d65d22235de4 Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Fri, 23 Jan 2015 18:38:45 -1000 Subject: [PATCH] provisioning dialog rework // FREEBIE --- AndroidManifest.xml | 1 + build.gradle | 5 +- res/drawable-hdpi/icon_dialog.png | Bin 0 -> 2881 bytes res/drawable-mdpi/icon_dialog.png | Bin 0 -> 1812 bytes res/drawable-xhdpi/icon_dialog.png | Bin 0 -> 4491 bytes res/drawable-xxhdpi/icon_dialog.png | Bin 0 -> 9601 bytes res/layout/device_provisioning_activity.xml | 46 --------- res/values/strings.xml | 16 ++++ res/values/styles.xml | 9 ++ .../securesms/DeviceProvisioningActivity.java | 88 ++++++++++++------ .../thoughtcrime/securesms/util/SpanUtil.java | 35 +++++++ 11 files changed, 123 insertions(+), 77 deletions(-) create mode 100644 res/drawable-hdpi/icon_dialog.png create mode 100644 res/drawable-mdpi/icon_dialog.png create mode 100644 res/drawable-xhdpi/icon_dialog.png create mode 100644 res/drawable-xxhdpi/icon_dialog.png delete mode 100644 res/layout/device_provisioning_activity.xml create mode 100644 src/org/thoughtcrime/securesms/util/SpanUtil.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e5b79e0d2a..bcadff2bfe 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -95,6 +95,7 @@ android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> diff --git a/build.gradle b/build.gradle index aaf2669978..0b287cfca5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' + classpath 'com.android.tools.build:gradle:1.0.1' classpath files('libs/gradle-witness.jar') } } @@ -29,6 +29,7 @@ repositories { maven { url "https://raw.github.com/whispersystems/maven/master/shortcutbadger/releases/" } + jcenter() } dependencies { @@ -40,6 +41,7 @@ dependencies { compile 'org.apache.httpcomponents:httpclient-android:4.3.5' compile 'com.github.chrisbanes.photoview:library:1.2.3' compile 'com.makeramen:roundedimageview:1.5.0' + compile 'com.afollestad:material-dialogs:0.6.1.5' compile 'com.soundcloud.android:android-crop:0.9.10@aar' compile 'com.android.support:appcompat-v7:21.0.3' compile 'com.melnykov:floatingactionbutton:1.1.0' @@ -73,6 +75,7 @@ dependencyVerification { 'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1', 'com.github.chrisbanes.photoview:library:8b5344e206f125e7ba9d684008f36c4992d03853c57e5814125f88496126e3cc', 'com.makeramen:roundedimageview:7dda2e78c406760e5c356ccce59b0df46b5b171cf18abb891998594405021548', + 'com.afollestad:material-dialogs:ccb013e6572c86cfcca433855cf0dbfbff9b5e7bb9d1f504b761a6bc6f467b60', 'com.soundcloud.android:android-crop:ffd4b973cf6e97f7d64118a0dc088df50e9066fd5634fe6911dd0c0c5d346177', 'com.android.support:appcompat-v7:5dbeb5316d0a6027d646ae552804c3baa5e3bd53f7f33db50904d51505c8a0e5', 'com.melnykov:floatingactionbutton:0679ad9f7d61eb7aeab91e8dc56358cdedd5b1c1b9c48464499ffa05c40d3985', diff --git a/res/drawable-hdpi/icon_dialog.png b/res/drawable-hdpi/icon_dialog.png new file mode 100644 index 0000000000000000000000000000000000000000..0ed7d0332bc2934cda7796a15adbcb4744cf1943 GIT binary patch literal 2881 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 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/icon_dialog.png b/res/drawable-mdpi/icon_dialog.png new file mode 100644 index 0000000000000000000000000000000000000000..7f2dbb42e9a3cde842a7ef9c6a60294fe827d776 GIT binary patch literal 1812 zcmV+v2kZEWP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 literal 0 HcmV?d00001 diff --git a/res/layout/device_provisioning_activity.xml b/res/layout/device_provisioning_activity.xml deleted file mode 100644 index 3f33d55179..0000000000 --- a/res/layout/device_provisioning_activity.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - -