From 257195d689162079072f458f027d441e1568c33a Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 28 Aug 2019 21:30:38 +0200 Subject: [PATCH] Changed appcolor from blue to purple. Added conversation colors. Re-added password visibility toggle. Re-added ShortcutBadger. --- build.gradle | 468 +++++++++--------- .../ic_visibility_grey600_24dp.png | Bin 0 -> 366 bytes .../ic_visibility_off_grey600_24dp.png | Bin 0 -> 560 bytes .../ic_visibility_off_white_24dp.png | Bin 0 -> 528 bytes .../ic_visibility_white_24dp.png | Bin 0 -> 472 bytes .../ic_visibility_grey600_24dp.png | Bin 0 -> 250 bytes .../ic_visibility_off_grey600_24dp.png | Bin 0 -> 387 bytes .../ic_visibility_off_white_24dp.png | Bin 0 -> 356 bytes .../ic_visibility_white_24dp.png | Bin 0 -> 310 bytes .../ic_visibility_grey600_24dp.png | Bin 0 -> 458 bytes .../ic_visibility_off_grey600_24dp.png | Bin 0 -> 706 bytes .../ic_visibility_off_white_24dp.png | Bin 0 -> 652 bytes .../ic_visibility_white_24dp.png | Bin 0 -> 581 bytes .../ic_visibility_grey600_24dp.png | Bin 0 -> 650 bytes .../ic_visibility_off_grey600_24dp.png | Bin 0 -> 1019 bytes .../ic_visibility_off_white_24dp.png | Bin 0 -> 919 bytes .../ic_visibility_white_24dp.png | Bin 0 -> 846 bytes res/drawable/info_round.xml | 30 +- res/layout/prompt_passphrase_activity.xml | 35 +- res/values/attrs.xml | 3 + res/values/colors.xml | 99 ++-- res/values/themes.xml | 7 + .../smssecure/PassphrasePromptActivity.java | 46 +- .../smssecure/color/MaterialColor.java | 1 + .../smssecure/color/MaterialColors.java | 16 +- .../notifications/MessageNotifier.java | 11 + 26 files changed, 418 insertions(+), 298 deletions(-) create mode 100644 res/drawable-hdpi/ic_visibility_grey600_24dp.png create mode 100644 res/drawable-hdpi/ic_visibility_off_grey600_24dp.png create mode 100644 res/drawable-hdpi/ic_visibility_off_white_24dp.png create mode 100644 res/drawable-hdpi/ic_visibility_white_24dp.png create mode 100644 res/drawable-mdpi/ic_visibility_grey600_24dp.png create mode 100644 res/drawable-mdpi/ic_visibility_off_grey600_24dp.png create mode 100644 res/drawable-mdpi/ic_visibility_off_white_24dp.png create mode 100644 res/drawable-mdpi/ic_visibility_white_24dp.png create mode 100644 res/drawable-xhdpi/ic_visibility_grey600_24dp.png create mode 100644 res/drawable-xhdpi/ic_visibility_off_grey600_24dp.png create mode 100644 res/drawable-xhdpi/ic_visibility_off_white_24dp.png create mode 100644 res/drawable-xhdpi/ic_visibility_white_24dp.png create mode 100644 res/drawable-xxhdpi/ic_visibility_grey600_24dp.png create mode 100644 res/drawable-xxhdpi/ic_visibility_off_grey600_24dp.png create mode 100644 res/drawable-xxhdpi/ic_visibility_off_white_24dp.png create mode 100644 res/drawable-xxhdpi/ic_visibility_white_24dp.png diff --git a/build.gradle b/build.gradle index 0defc7f70..67d9409bc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,223 +1,245 @@ -buildscript { - repositories { - maven { - url "https://repo1.maven.org/maven2" - } - // Required for the Gradle plugin - google() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' - classpath files('libs/gradle-witness.jar') - } -} - -apply plugin: 'com.android.application' -apply plugin: 'witness' - -repositories { - maven { - url "https://repo1.maven.org/maven2/" - } - google() - jcenter() - mavenLocal() -} - -subprojects { - ext.version_number = "2.4.0" - ext.group_info = "org.whispersystems" - ext.curve25519_version = "0.3.0" -} - -dependencies { - def supportVersion = '27.0.0' - - compile "com.android.support:appcompat-v7:$supportVersion" - compile "com.android.support:recyclerview-v7:$supportVersion" - compile "com.android.support:design:$supportVersion" - compile "com.android.support:support-v13:$supportVersion" - compile "com.android.support:cardview-v7:$supportVersion" - compile "com.android.support:preference-v7:$supportVersion" - compile "com.android.support:preference-v14:$supportVersion" - compile "com.android.support:gridlayout-v7:$supportVersion" - compile ("com.android.support:gridlayout-v7:$supportVersion") { - exclude module: 'support-v4' - } - compile 'com.android.support.constraint:constraint-layout:1.1.3' - - compile 'se.emilsjolander:stickylistheaders:2.7.0' - compile 'com.jpardogo.materialtabstrip:library:1.0.9' - compile 'info.guardianproject.trustedintents:trustedintents:0.2' - compile 'org.apache.httpcomponents:httpclient-android:4.3.5' - compile 'com.github.chrisbanes.photoview:library:1.2.3' - compile 'com.github.bumptech.glide:glide:3.7.0' - compile 'com.makeramen:roundedimageview:2.1.0' - compile 'com.pnikosis:materialish-progress:1.5' - compile project (':org.greenrobot.eventbus') - compile 'pl.tajchert:waitingdots:0.1.0' - compile 'com.melnykov:floatingactionbutton:1.3.0' - compile 'com.google.zxing:android-integration:3.1.0' - compile ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') { - exclude group: 'com.android.support', module: 'support-annotations' - } - - compile 'com.squareup.dagger:dagger:1.2.2' - annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2' - compileOnly 'com.squareup.dagger:dagger-compiler:1.2.2' - - compile ("com.doomonafireball.betterpickers:library:1.5.3") { - exclude group: 'com.android.support', module: 'support-v4' - } - - compile project (path: ':org.whispersystems.jobmanager') - compile project (path: ':org.whispersystems.libpastelog') - compile project (path: ':org.whispersystems.libsignal') - - compile 'com.annimon:stream:1.2.1' - compile ('com.takisoft.fix:colorpicker:0.9.1') { - exclude group: 'com.android.support', module: 'appcompat-v7' - exclude group: 'com.android.support', module: 'recyclerview-v7' - } - - compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.7' - compile 'com.fasterxml.jackson.core:jackson-core:2.8.7' - compile 'com.fasterxml.jackson.core:jackson-databind:2.8.7' - compile 'com.googlecode.libphonenumber:libphonenumber:8.3.3' - - compile project (':com.amulyakhare.textdrawable') - - compile ('com.klinkerapps:android-smsmms:5.1.4') - - testCompile 'junit:junit:4.12' - testCompile 'org.assertj:assertj-core:1.7.1' - testCompile 'org.mockito:mockito-core:1.9.5' - testCompile 'org.powermock:powermock-api-mockito:1.6.1' - testCompile 'org.powermock:powermock-module-junit4:1.6.1' - testCompile 'org.powermock:powermock-module-junit4-rule:1.6.1' - testCompile 'org.powermock:powermock-classloading-xstream:1.6.1' - - androidTestCompile 'com.android.support:multidex:1.0.2' - androidTestCompile 'com.android.support:multidex-instrumentation:1.0.2' - androidTestCompile 'com.google.dexmaker:dexmaker:1.2' - androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' - androidTestCompile ('org.assertj:assertj-core:1.7.1') { - exclude group: 'org.hamcrest', module: 'hamcrest-core' - } - androidTestCompile ('com.squareup.assertj:assertj-android:1.0.0') { - exclude group: 'org.hamcrest', module: 'hamcrest-core' - exclude group: 'com.android.support', module: 'support-annotations' - } -} - -dependencyVerification { - verify = [ - - ] -} - -android { - compileSdkVersion 27 - buildToolsVersion '27.0.0' - useLibrary 'org.apache.http.legacy' - - defaultConfig { - versionCode 145 - versionName "0.15.16" - - minSdkVersion 14 - targetSdkVersion 26 - - vectorDrawables.useSupportLibrary = true - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - packagingOptions { - exclude 'LICENSE.txt' - exclude 'LICENSE' - exclude 'NOTICE' - exclude 'asm-license.txt' - exclude 'META-INF/LICENSE' - exclude 'META-INF/NOTICE' - } - - signingConfigs { - release - } - - buildTypes { - debug { - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg' - testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg' - } - release { - minifyEnabled true - proguardFiles = buildTypes.debug.proguardFiles - testProguardFiles = buildTypes.debug.testProguardFiles - signingConfig signingConfigs.release - } - } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - androidTest { - java.srcDirs = ['test/androidTest/java'] - } - test { - java.srcDirs = ['test/unitTest/java'] - } - } - - lintOptions { - abortOnError false - } -} - -tasks.whenTaskAdded { task -> - if (task.name.equals("lint")) { - task.enabled = false - } -} - -def Properties props = new Properties() -def propFile = new File('signing.properties') - -if (propFile.canRead()){ - props.load(new FileInputStream(propFile)) - - if (props !=null && - props.containsKey('STORE_FILE') && - props.containsKey('STORE_PASSWORD') && - props.containsKey('KEY_ALIAS') && - props.containsKey('KEY_PASSWORD')) - { - android.signingConfigs.release.storeFile = file(props['STORE_FILE']) - android.signingConfigs.release.storePassword = props['STORE_PASSWORD'] - android.signingConfigs.release.keyAlias = props['KEY_ALIAS'] - android.signingConfigs.release.keyPassword = props['KEY_PASSWORD'] - } else { - println 'signing.properties found but some entries are missing' - android.buildTypes.release.signingConfig = null - } -}else { - println 'signing.properties not found' - android.buildTypes.release.signingConfig = null -} - -tasks.withType(JavaCompile){ - options.warnings = false -} +buildscript { + repositories { + maven { + url "https://repo1.maven.org/maven2" + } + // Required for the Gradle plugin + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.3.2' + classpath files('libs/gradle-witness.jar') + } +} + +apply plugin: 'com.android.application' +apply plugin: 'witness' + +repositories { + maven { + url "https://repo1.maven.org/maven2/" + } + // JW: added + maven { + url "https://raw.github.com/signalapp/maven/master/shortcutbadger/releases/" + content { + includeGroupByRegex "me\\.leolin.*" + } + } + google() + jcenter() + mavenLocal() +} + +subprojects { + ext.version_number = "2.4.0" + ext.group_info = "org.whispersystems" + ext.curve25519_version = "0.3.0" +} + +dependencies { + def supportVersion = '27.0.0' + + implementation "me.leolin:ShortcutBadger:1.1.16" // JW: added + compile "com.android.support:appcompat-v7:$supportVersion" + compile "com.android.support:recyclerview-v7:$supportVersion" + compile "com.android.support:design:$supportVersion" + compile "com.android.support:support-v13:$supportVersion" + compile "com.android.support:cardview-v7:$supportVersion" + compile "com.android.support:preference-v7:$supportVersion" + compile "com.android.support:preference-v14:$supportVersion" + compile "com.android.support:gridlayout-v7:$supportVersion" + compile ("com.android.support:gridlayout-v7:$supportVersion") { + exclude module: 'support-v4' + } + compile 'com.android.support.constraint:constraint-layout:1.1.3' + + compile 'se.emilsjolander:stickylistheaders:2.7.0' + compile 'com.jpardogo.materialtabstrip:library:1.0.9' + compile 'info.guardianproject.trustedintents:trustedintents:0.2' + compile 'org.apache.httpcomponents:httpclient-android:4.3.5' + compile 'com.github.chrisbanes.photoview:library:1.2.3' + compile 'com.github.bumptech.glide:glide:3.7.0' + compile 'com.makeramen:roundedimageview:2.1.0' + compile 'com.pnikosis:materialish-progress:1.5' + compile project (':org.greenrobot.eventbus') + compile 'pl.tajchert:waitingdots:0.1.0' + compile 'com.melnykov:floatingactionbutton:1.3.0' + compile 'com.google.zxing:android-integration:3.1.0' + compile ('com.davemorrissey.labs:subsampling-scale-image-view:3.6.0') { + exclude group: 'com.android.support', module: 'support-annotations' + } + + compile 'com.squareup.dagger:dagger:1.2.2' + annotationProcessor 'com.squareup.dagger:dagger-compiler:1.2.2' + compileOnly 'com.squareup.dagger:dagger-compiler:1.2.2' + + compile ("com.doomonafireball.betterpickers:library:1.5.3") { + exclude group: 'com.android.support', module: 'support-v4' + } + + compile project (path: ':org.whispersystems.jobmanager') + compile project (path: ':org.whispersystems.libpastelog') + compile project (path: ':org.whispersystems.libsignal') + + compile 'com.annimon:stream:1.2.1' + compile ('com.takisoft.fix:colorpicker:0.9.1') { + exclude group: 'com.android.support', module: 'appcompat-v7' + exclude group: 'com.android.support', module: 'recyclerview-v7' + } + + compile 'com.fasterxml.jackson.core:jackson-annotations:2.8.7' + compile 'com.fasterxml.jackson.core:jackson-core:2.8.7' + compile 'com.fasterxml.jackson.core:jackson-databind:2.8.7' + compile 'com.googlecode.libphonenumber:libphonenumber:8.3.3' + + compile project (':com.amulyakhare.textdrawable') + + compile ('com.klinkerapps:android-smsmms:5.1.4') + + testCompile 'junit:junit:4.12' + testCompile 'org.assertj:assertj-core:1.7.1' + testCompile 'org.mockito:mockito-core:1.9.5' + testCompile 'org.powermock:powermock-api-mockito:1.6.1' + testCompile 'org.powermock:powermock-module-junit4:1.6.1' + testCompile 'org.powermock:powermock-module-junit4-rule:1.6.1' + testCompile 'org.powermock:powermock-classloading-xstream:1.6.1' + + androidTestCompile 'com.android.support:multidex:1.0.2' + androidTestCompile 'com.android.support:multidex-instrumentation:1.0.2' + androidTestCompile 'com.google.dexmaker:dexmaker:1.2' + androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.2' + androidTestCompile ('org.assertj:assertj-core:1.7.1') { + exclude group: 'org.hamcrest', module: 'hamcrest-core' + } + androidTestCompile ('com.squareup.assertj:assertj-android:1.0.0') { + exclude group: 'org.hamcrest', module: 'hamcrest-core' + exclude group: 'com.android.support', module: 'support-annotations' + } +} + +dependencyVerification { + verify = [ + + ] +} + +android { + compileSdkVersion 27 + buildToolsVersion '27.0.0' + useLibrary 'org.apache.http.legacy' + + defaultConfig { + versionCode 145 + versionName "0.15.16.0-JW" + + minSdkVersion 14 + targetSdkVersion 26 + + vectorDrawables.useSupportLibrary = true + + /* JW: Add ABI splits */ + ndk { + abiFilters 'armeabi-v7a', 'x86' + } + + splits { + abi { + enable true + reset() + include 'armeabi-v7a', 'x86' + universalApk true + } + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + packagingOptions { + exclude 'LICENSE.txt' + exclude 'LICENSE' + exclude 'NOTICE' + exclude 'asm-license.txt' + exclude 'META-INF/LICENSE' + exclude 'META-INF/NOTICE' + } + + signingConfigs { + release + } + + buildTypes { + debug { + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg' + testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg' + } + release { + minifyEnabled true + proguardFiles = buildTypes.debug.proguardFiles + testProguardFiles = buildTypes.debug.testProguardFiles + signingConfig signingConfigs.release + } + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + androidTest { + java.srcDirs = ['test/androidTest/java'] + } + test { + java.srcDirs = ['test/unitTest/java'] + } + } + + lintOptions { + abortOnError false + } +} + +tasks.whenTaskAdded { task -> + if (task.name.equals("lint")) { + task.enabled = false + } +} + +def Properties props = new Properties() +def propFile = new File('signing.properties') + +if (propFile.canRead()){ + props.load(new FileInputStream(propFile)) + + if (props !=null && + props.containsKey('STORE_FILE') && + props.containsKey('STORE_PASSWORD') && + props.containsKey('KEY_ALIAS') && + props.containsKey('KEY_PASSWORD')) + { + android.signingConfigs.release.storeFile = file(props['STORE_FILE']) + android.signingConfigs.release.storePassword = props['STORE_PASSWORD'] + android.signingConfigs.release.keyAlias = props['KEY_ALIAS'] + android.signingConfigs.release.keyPassword = props['KEY_PASSWORD'] + } else { + println 'signing.properties found but some entries are missing' + android.buildTypes.release.signingConfig = null + } +}else { + println 'signing.properties not found' + android.buildTypes.release.signingConfig = null +} + +tasks.withType(JavaCompile){ + options.warnings = false +} diff --git a/res/drawable-hdpi/ic_visibility_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..619b076ea4aa5adfc3dc262972a4c3e7af8d3afc GIT binary patch literal 366 zcmV-!0g?WRP)dz4lotNp`5Fa{4-cz9)9!Nb_QLK016;|34! ztQ)cuO>c;ChLH2IY`}v@8$R(lXXq6%_6iOe^jyUv&E?lfvx?!Iy&u{uFXd+nrwq2^ z%=#>z#SX)qswoXZo!DZK3wNgUV!(n$M)Bm%;DX_{sFMjoibsH=1-4$5Dc`7!+glJE zC{$gDktv7Gs55c6(33s-V1P&srgB0X^+1P(ZI~=zP^4ogrDcxAl9n z3ks6H`=FR0QP%{5EtGz-f)r{Ip{5lYBSM2sWYmfbe}V7lx6wa60!S2;i(vnJYXATM M07*qoM6N<$f*hZpHUIzs literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-hdpi/ic_visibility_off_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..e6bddf2ef74062c9f17cdc2bc520de3371b9705a GIT binary patch literal 560 zcmV-00?+-4P){Y#>~m`HJUms@Ew878;r4hWZAIzwJK=(wxyS9z$l`|i`8cR#Ok;b*u>@2CsTS_+5rvchWx{iIQa5Kfu99Efg) zU_3tZFuCncJxxdR86F);CtLWX_+_a1GM{1R^Ph=E*#>9G?_MPKx-rn0f{c!u#!k6l zn0qr|kAY6dhK<*AYRDyr9aI%O)nW6<@MmPDd8WCNN+UiLrD(D`gBudzqIx)|sAoaP z{LWA;$5Nb)q0T1jM~}!oMP2Ya*)M~o_#t(1AKF`rddl-8D=F%NSDNB0=$3Go-yFG- zFVAjdA{+bZoy{u#izH3**njTm1d!vj=hw{4N|+( yP#R7H7dLdj!3tI7Q&0WA6@-M!2?iwoh58MBOQggVNiGKf0000?Ilv66$3sGW5{jD4 zH$r`215M%}p+N~L_{d7iMMFYQeky7b5820R*0P`H=q}JW3hKr~fQa2*fjKVMyW0ohpfV)T?MG-3p!y;R2hm-@L1VG4K@e7gqv|_q0fMj&+pz!8Xl!c{ zgcV?@$`R0T+@{?OY?{yyH09=S)TRl;u{*m0f^a-QmEjq>f&Ss&fo=|hP@7``YNEOZ zHz7V$gFO76(bRp@hh;1!p{PlYf`mOGg?2o_FN4XBTczvcRL4J$2yMi1{VoOm5+NIm1iX%iB3}%GSigxye};!gr_>w*=P3I zL-sSBcI1R8A%1Gnoxb#^hxa&YNVcLYLWU`s@ S+q;nf00006P)Nkl_U#TG5w%{Ggog?4^%XLs!=Fi)wzdny!`Kaue+n z9$Q(@Y2Kk-r&qaS#_$~5TNcwzd~{O0mfe7qDIQbM+2wa&Sy1?xT5r zP_CRAKZ|xJIA{j0t!8{Fu4QI?1Fq@i4q9)X~q_#9S|FFI^MpQJ0 z@CsWCeZrrbHf%2#C}E7`DYmyPRG)US^P0yDm(u9X^-$W+vVo0wyhpo24=InXtmFsP zd}ldbq#Am&i*JM29;F9wVY_+f(w_;L6{EI&Q{u4 z`Vb%7 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png b/res/drawable-mdpi/ic_visibility_off_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..08dcac59fa2be04157001d75797c630e7d7185b2 GIT binary patch literal 387 zcmV-}0et?6P)Nkl+yQpic7^wxK?E68{FNk;81Ye=i(Mz`a@4>x`w2)m6^pIzDd8lGrx@R zPeqd;w*-CwfDAhn6>0I5MC4J4f)+|*i}$lYOCS^-!6fY5v5|3DUPa1$$U5w%^MKAW zpGQDV1omN9krr=6ksuO8<6t$Q-HLGY{ikX`MOcK?8~#(yPZkXKor+|6VFj)im0wFAleK&x8?u8I%$|dYNVg|^8 z`a(Ph#5phM=G&K|xoCpk#f;&!I%npKURdyr002ovPDHLkV1gSguPFck literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_visibility_off_white_24dp.png b/res/drawable-mdpi/ic_visibility_off_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..fb21efe6d9e33ca059a00d2924f9c04ecffd7f35 GIT binary patch literal 356 zcmV-q0h|7bP)^-93{0;`}c# z$T7vQfa5q-l6pN&Fv|?%bXWIvP&gZ83q+5s)BLqPRGcYEtwTQTg(d1f2c6sirxogS z)u2%?hvhD5_c3Vg9t24-ljLqF0@x$>v?R4QTA@L5RBlrS!$k%=6J(#|lHMZy-hbl))>(zGe-E0i^$4Pe?gt6* z>D20KjOk_=ql;P Cgq$w` literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_visibility_white_24dp.png b/res/drawable-mdpi/ic_visibility_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..0e8e507f213398e3d59540a950821f0f513aef84 GIT binary patch literal 310 zcmV-60m=S}P)kn?(Pl|P6g=0DP=7~4;Q(=^(|okpPrFyOfVvZTM^vM6K?~}R zNTb+B?Mj6)g9AHLgi0Nv)^&LmPI=NZs7a{;oXX56u5k*JcA#uh5jg$#y}^#M`rc51 zQ@->RYD}sSr&9Bc4b;9=D3jQ*GDe8hF>1vqBDq7g7#Fmou8A;CByfp3q<{#y3OPod z66byB`gp;YXL|5`2uWoQ8?LO(kZc0sFIm*kDOZjB{WU@81L^a(3*?i%`Tzg`07*qo IM6N<$f{NvaivR!s literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_visibility_grey600_24dp.png b/res/drawable-xhdpi/ic_visibility_grey600_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..b121c9ae2967d12a6f905c37e49ec1abd2ea1e34 GIT binary patch literal 458 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 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..f88d24ff5ff7cb6691bd23c233a2cadb03254e0b GIT binary patch literal 919 zcmV;I18Dq-P)%h`-4Hx)amYvRxre- z4yuFdpgL&ifm+;b?V$r|aR)jEkJKASOd3qk%@C6Y7qpI!vPdH=W<9$&$Po^;w;io% ze#5H;#iY(Gslh@Hbgv)u)z|K{zjE%8};qv+{b==31%&1?$$B z#J9H9R5>VEujVA)vs`h|z>p@o)KukzvIl`GNPK3&N8+LprJmXjiBiX&31>%Yl~ENd=^7ec}^WTeS!2W~u%$cM3GjH&792Cf|Y= z%_iQwf0gP3ll2X{M!Ls!%9H-EeDw39r8}!H&??e(8gIRVq}ik6QioI%EYusQ*@x0S zBnSmbFGWASPr6rn1MMW&o+9rtiF8LsmtMXQDgO-RT%j+}R6djHS7W2g z&+dh)NuQ)1egq3?m+EFgJgd6eXa3dh1D$1){xM(fA?$Y2?JEClw>W9@A`kLUk*dr3 zH6tA>6ah83JVV;0CZr3CKT&LSrF1tNTbQ(NucZ7F#b_FwEZwh;HcIGaru7UN((zTi z*pR5hefF@VG1@d6Yiav=(gaA7hFAL5!Xmy>MF~=cpkSCQ29{Jry`m2WjuaG`CfoUL zU`RpHX|aX3`kxe(Hw!w;_lowdvn^y(UByX3B{R4E+@9D2zjK%U%=iDHuMAR9%?vZ2 zHSAz7hd9FicC?O#4eRBSn-nDl12r2LBLzc@6b$5SlqUrPI~zu%8wMW~Y@icxtLC8q t3f9*daRwa}tmj6}^^aQAL3PmJ%zx{}%V?bo;luy{002ovPDHLkV1nQ#wKxC( literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_visibility_white_24dp.png b/res/drawable-xxhdpi/ic_visibility_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..987af79f8b6e6b922788b3179b60ffdb3c2a6cfa GIT binary patch literal 846 zcmV-U1F`&xP)Y$Y`ItO4a50#d3$Dl)!vpwB9TZW z68|7natIf42M;qSRUYOJF63Y;<*!8n2k`{Y(ndaQJj)XtNP)zSBbh}PUUe~(!zCV+ zaSI<4#7EpjsYHol?xK@0I=F*ki3X?h1yT5%Qza}aSV5GQQz5}|6fH!pnIj|^?xPo7 zH_vhpM^Zy+s?=~K_wpP)=z6$I{GyQQ=)PkJRgweM4C4oMlPK^PXBE1&)QEyQHlSNZ zq4zi|(DZSKc)&fWnwljZTZt(~oQuUHE;AyH7aMn=yF+~7ZgjVZj>C;PvNmg@J)6}u z(nB}ju!=J!gE5x6IYf)ID~-m?su2hK@FtmFXRq|(ZOpi@*je&n3A!QT;1qr#m!COF z9E?CWUvlFFblp_Bt>eVWjKddMDwaRcmdr9Io2d@#Bz^Q z`)n*{IJNJ`a&7jBry0wUPW{zbRyehf!O}>vxVQ>ijZ?o7%hyirT5Ok#i`TK0I`w<7 z{E>G2wY?TDP_5)b1 z$+a+kgzh;XqwZyK@FKeRDUfU&%Ydc!NaDwSJjxbj1~##UN7z^XYLs&z=W{y`@^q>^$Zed@fs{)kkw_#GiGPki Y0k;+P7Z|;w(*OVf07*qoM6N<$f&zJt!2kdN literal 0 HcmV?d00001 diff --git a/res/drawable/info_round.xml b/res/drawable/info_round.xml index 668eaf3be..044c563d5 100644 --- a/res/drawable/info_round.xml +++ b/res/drawable/info_round.xml @@ -1,16 +1,16 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml index 0828f44f2..52215ae80 100644 --- a/res/layout/prompt_passphrase_activity.xml +++ b/res/layout/prompt_passphrase_activity.xml @@ -32,7 +32,40 @@ android:layout_marginRight="50dp" android:singleLine="true" android:paddingLeft="10dp" - android:paddingRight="10dp"/> + android:paddingRight="40dp"/> + + + + + + + + + + + diff --git a/res/values/colors.xml b/res/values/colors.xml index ce85dc422..69aa55c50 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,48 +1,51 @@ - - - #ff2090ea - #ff1c7ac5 - #552090ea - #882090ea - - #ffffffff - #ff000000 - #ffeeeeee - #ffdddddd - #ffe0e0e0 - #ffababab - #ffcccccc - #ffbbbbbb - #ff808080 - #ff595959 - #ff4d4d4d - #ff383838 - #ff111111 - - #7F111111 - - #32000000 - - @color/gray5 - #ffffffff - #ff000000 - #ff333333 - - #15000000 - #22ffffff - - #ff33b5e5 - - #ff111111 - #ff1f1f1f - #400099cc - #33ffffff - #66ffffff - - #ffeeeeee - #ff333333 - #ffd5d5d5 - #ff222222 - #400099cc - #40ffffff - + + + + #ff7365ad + #ff7365ad + #b9b2da + #9575cd + + #ffffffff + #ff000000 + #ffeeeeee + #ffdddddd + #ffe0e0e0 + #ffababab + #ffcccccc + #ffbbbbbb + #ff808080 + #ff595959 + #ff4d4d4d + #ff383838 + #ff111111 + + #7F111111 + + #32000000 + + @color/gray5 + #ffffffff + #ff000000 + #ff333333 + + #15000000 + #22ffffff + + + #7c4dff + + #ff111111 + #ff1f1f1f + #400099cc + #33ffffff + #66ffffff + + #ffeeeeee + #ff333333 + #ffd5d5d5 + #ff222222 + + #b39ddb + #40ffffff + diff --git a/res/values/themes.xml b/res/values/themes.xml index 8f71da661..cfc793160 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -48,6 +48,10 @@ #55000000 @drawable/ic_arrow_forward_light @drawable/lockscreen_watermark_light + + @color/gray5 + @drawable/ic_visibility_grey600_24dp + @drawable/ic_visibility_off_grey600_24dp