diff --git a/.gitignore b/.gitignore index eb66e639..bf4d9877 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -<<<<<<< HEAD # Built application files build/ @@ -10,23 +9,13 @@ local.properties # Gradle generated files .gradle/ +build/ # Signing files .signing/ # User-specific configurations -.idea/libraries/ -.idea/workspace.xml -.idea/tasks.xml -.idea/.name -.idea/compiler.xml -.idea/copyright/profiles_settings.xml -.idea/encodings.xml -.idea/inspectionProfiles/Project_Default.xml -.idea/misc.xml -.idea/modules.xml -.idea/scopes/scope_settings.xml -.idea/vcs.xml +.idea/ *.iml # OS-specific files @@ -37,11 +26,3 @@ local.properties .Trashes ehthumbs.db Thumbs.db -======= -.gradle/ -.idea/ -build/ -gen/ -*.iml -module_android-smsmms.xml ->>>>>>> added android-smsmms diff --git a/.travis.yml b/.travis.yml index 6e20d1a7..53f09134 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ android: - tools # The BuildTools version used by your project - - build-tools-22.0.1 + - build-tools-23.0.0 # The SDK version used to compile your project - android-22 diff --git a/QKSMS/build.gradle b/QKSMS/build.gradle index 52c50486..241209fe 100644 --- a/QKSMS/build.gradle +++ b/QKSMS/build.gradle @@ -1,11 +1,3 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' - } -} apply plugin: 'com.android.application' repositories { @@ -16,11 +8,10 @@ android { lintOptions { checkReleaseBuilds false abortOnError false - } compileSdkVersion 22 - buildToolsVersion '22.0.1' + buildToolsVersion '23.0.0' defaultConfig { versionCode 110 @@ -33,7 +24,7 @@ android { release { minifyEnabled true shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'qksms-proguard.pro' + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'qksms-proguard.pro' } } } @@ -57,12 +48,11 @@ dependencies { compile 'com.koushikdutta.ion:ion:1.1.7' // Google libraries - compile 'com.android.support:appcompat-v7:22.2.0' - compile 'com.android.support:support-v13:22.2.0' - compile 'com.android.support:recyclerview-v7:22.2.0' + compile 'com.android.support:appcompat-v7:22.2.1' + compile 'com.android.support:support-v13:22.2.1' + compile 'com.android.support:recyclerview-v7:22.2.1' compile 'com.google.android.gms:play-services-analytics:7.5.0' // External services compile 'com.crittercism:crittercism-android-agent:5.0.3' - compile files('libs/endlessjabbersdk.jar') } diff --git a/QKSMS/libs/endlessjabbersdk.jar b/QKSMS/libs/endlessjabbersdk.jar deleted file mode 100644 index 55a014e7..00000000 Binary files a/QKSMS/libs/endlessjabbersdk.jar and /dev/null differ diff --git a/QKSMS/manifest-merger-release-report.txt b/QKSMS/manifest-merger-release-report.txt deleted file mode 100644 index 45567444..00000000 --- a/QKSMS/manifest-merger-release-report.txt +++ /dev/null @@ -1,822 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from AndroidManifest.xml:2:1 - package - ADDED from AndroidManifest.xml:3:5 - android:versionName - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 - xmlns:android - ADDED from AndroidManifest.xml:4:5 - android:versionCode - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 -uses-permission#android.permission.ACCESS_COARSE_LOCATION -ADDED from AndroidManifest.xml:6:5 - android:name - ADDED from AndroidManifest.xml:6:22 -uses-permission#android.permission.ACCESS_FINE_LOCATION -ADDED from AndroidManifest.xml:7:5 - android:name - ADDED from AndroidManifest.xml:7:22 -uses-permission#android.permission.ACCESS_NETWORK_STATE -ADDED from AndroidManifest.xml:8:5 -MERGED from com.google.android.gms:play-services-analytics:7.5.0:22:5 - android:name - ADDED from AndroidManifest.xml:8:22 -uses-permission#android.permission.ACCESS_WIFI_STATE -ADDED from AndroidManifest.xml:9:5 - android:name - ADDED from AndroidManifest.xml:9:22 -uses-permission#android.permission.CALL_PHONE -ADDED from AndroidManifest.xml:10:5 - android:name - ADDED from AndroidManifest.xml:10:22 -uses-permission#android.permission.CAMERA -ADDED from AndroidManifest.xml:11:5 - android:name - ADDED from AndroidManifest.xml:11:22 -uses-permission#android.permission.CHANGE_CONFIGURATION -ADDED from AndroidManifest.xml:12:5 - android:name - ADDED from AndroidManifest.xml:12:22 -uses-permission#android.permission.CHANGE_NETWORK_STATE -ADDED from AndroidManifest.xml:13:5 - android:name - ADDED from AndroidManifest.xml:13:22 -uses-permission#android.permission.CHANGE_WIFI_STATE -ADDED from AndroidManifest.xml:14:5 - android:name - ADDED from AndroidManifest.xml:14:22 -uses-permission#android.permission.FLASHLIGHT -ADDED from AndroidManifest.xml:15:5 - android:name - ADDED from AndroidManifest.xml:15:22 -uses-permission#android.permission.GET_ACCOUNTS -ADDED from AndroidManifest.xml:16:5 - android:name - ADDED from AndroidManifest.xml:16:22 -uses-permission#android.permission.INTERNET -ADDED from AndroidManifest.xml:17:5 -MERGED from com.google.android.gms:play-services-analytics:7.5.0:21:5 - android:name - ADDED from AndroidManifest.xml:17:22 -uses-permission#android.permission.MANAGE_ACCOUNTS -ADDED from AndroidManifest.xml:18:5 - android:name - ADDED from AndroidManifest.xml:18:22 -uses-permission#android.permission.NFC -ADDED from AndroidManifest.xml:19:5 - android:name - ADDED from AndroidManifest.xml:19:22 -uses-permission#android.permission.READ_CALL_LOG -ADDED from AndroidManifest.xml:20:5 - android:name - ADDED from AndroidManifest.xml:20:22 -uses-permission#android.permission.READ_CONTACTS -ADDED from AndroidManifest.xml:21:5 - android:name - ADDED from AndroidManifest.xml:21:22 -uses-permission#android.permission.READ_PHONE_STATE -ADDED from AndroidManifest.xml:22:5 - android:name - ADDED from AndroidManifest.xml:22:22 -uses-permission#android.permission.READ_PROFILE -ADDED from AndroidManifest.xml:23:5 - android:name - ADDED from AndroidManifest.xml:23:22 -uses-permission#android.permission.READ_EXTERNAL_STORAGE -ADDED from AndroidManifest.xml:24:5 - android:name - ADDED from AndroidManifest.xml:24:22 -uses-permission#android.permission.READ_SMS -ADDED from AndroidManifest.xml:25:5 - android:name - ADDED from AndroidManifest.xml:25:22 -uses-permission#android.permission.RECEIVE_BOOT_COMPLETED -ADDED from AndroidManifest.xml:26:5 - android:name - ADDED from AndroidManifest.xml:26:22 -uses-permission#android.permission.RECEIVE_MMS -ADDED from AndroidManifest.xml:27:5 - android:name - ADDED from AndroidManifest.xml:27:22 -uses-permission#android.permission.RECEIVE_SMS -ADDED from AndroidManifest.xml:28:5 - android:name - ADDED from AndroidManifest.xml:28:22 -uses-permission#android.permission.RECORD_AUDIO -ADDED from AndroidManifest.xml:29:5 - android:name - ADDED from AndroidManifest.xml:29:22 -uses-permission#android.permission.SEND_SMS -ADDED from AndroidManifest.xml:30:5 - android:name - ADDED from AndroidManifest.xml:30:22 -uses-permission#android.permission.SYSTEM_ALERT_WINDOW -ADDED from AndroidManifest.xml:31:5 - android:name - ADDED from AndroidManifest.xml:31:22 -uses-permission#android.permission.USE_CREDENTIALS -ADDED from AndroidManifest.xml:32:5 - android:name - ADDED from AndroidManifest.xml:32:22 -uses-permission#android.permission.VIBRATE -ADDED from AndroidManifest.xml:33:5 - android:name - ADDED from AndroidManifest.xml:33:22 -uses-permission#android.permission.WRITE_CONTACTS -ADDED from AndroidManifest.xml:34:5 - android:name - ADDED from AndroidManifest.xml:34:22 -uses-permission#android.permission.WAKE_LOCK -ADDED from AndroidManifest.xml:35:5 - android:name - ADDED from AndroidManifest.xml:35:22 -uses-permission#android.permission.WRITE_EXTERNAL_STORAGE -ADDED from AndroidManifest.xml:36:5 - android:name - ADDED from AndroidManifest.xml:36:22 -uses-permission#android.permission.WRITE_SMS -ADDED from AndroidManifest.xml:37:5 - android:name - ADDED from AndroidManifest.xml:37:22 -uses-permission#com.android.vending.BILLING -ADDED from AndroidManifest.xml:38:5 - android:name - ADDED from AndroidManifest.xml:38:22 -application -ADDED from AndroidManifest.xml:40:5 -MERGED from com.android.support:appcompat-v7:22.2.0:22:5 -MERGED from com.android.support:support-v4:22.2.0:22:5 -MERGED from qksms:qkms:unspecified:9:5 -MERGED from com.github.johnkil.android-robototextview:robototextview:2.1.0:11:5 -MERGED from com.melnykov:floatingactionbutton:1.3.0:12:5 -MERGED from com.android.support:support-v4:22.2.0:22:5 -MERGED from com.pushbullet:android-extensions:1.0.4:9:5 -MERGED from com.android.support:support-v4:22.2.0:22:5 -MERGED from com.nispok:snackbar:2.10.6:10:5 -MERGED from com.android.support:support-v4:22.2.0:22:5 -MERGED from com.android.support:appcompat-v7:22.2.0:22:5 -MERGED from com.android.support:support-v4:22.2.0:22:5 -MERGED from com.android.support:support-v13:22.2.0:22:5 -MERGED from com.android.support:support-v4:22.2.0:22:5 -MERGED from com.android.support:support-v4:22.2.0:22:5 -MERGED from com.google.android.gms:play-services-analytics:7.5.0:24:5 -MERGED from com.google.android.gms:play-services-base:7.5.0:20:5 -MERGED from com.android.support:support-v4:22.2.0:22:5 - android:label - ADDED from AndroidManifest.xml:44:9 - android:allowBackup - ADDED from AndroidManifest.xml:42:9 - android:icon - ADDED from AndroidManifest.xml:43:9 - android:largeHeap - ADDED from AndroidManifest.xml:45:9 - android:theme - ADDED from AndroidManifest.xml:46:9 - android:name - ADDED from AndroidManifest.xml:41:9 -activity#com.moez.QKSMS.ui.popup.QKComposeActivity -ADDED from AndroidManifest.xml:47:9 - android:excludeFromRecents - ADDED from AndroidManifest.xml:49:13 - android:windowSoftInputMode - ADDED from AndroidManifest.xml:52:13 - android:theme - ADDED from AndroidManifest.xml:51:13 - android:taskAffinity - ADDED from AndroidManifest.xml:50:13 - android:name - ADDED from AndroidManifest.xml:48:13 -intent-filter#android.intent.action.SEND+android.intent.action.SENDTO+android.intent.category.BROWSABLE+android.intent.category.DEFAULT -ADDED from AndroidManifest.xml:53:13 -action#android.intent.action.SEND -ADDED from AndroidManifest.xml:54:17 - android:name - ADDED from AndroidManifest.xml:54:25 -action#android.intent.action.SENDTO -ADDED from AndroidManifest.xml:55:17 - android:name - ADDED from AndroidManifest.xml:55:25 -category#android.intent.category.DEFAULT -ADDED from AndroidManifest.xml:57:17 - android:name - ADDED from AndroidManifest.xml:57:27 -category#android.intent.category.BROWSABLE -ADDED from AndroidManifest.xml:58:17 - android:name - ADDED from AndroidManifest.xml:58:27 -data -ADDED from AndroidManifest.xml:60:17 - android:scheme - ADDED from AndroidManifest.xml:60:23 -intent-filter#android.intent.action.SEND+android.intent.category.DEFAULT -ADDED from AndroidManifest.xml:65:13 -activity#com.moez.QKSMS.ui.MainActivity -ADDED from AndroidManifest.xml:80:9 - android:label - ADDED from AndroidManifest.xml:83:13 - android:launchMode - ADDED from AndroidManifest.xml:84:13 - android:windowSoftInputMode - ADDED from AndroidManifest.xml:86:13 - android:icon - ADDED from AndroidManifest.xml:82:13 - android:logo - ADDED from AndroidManifest.xml:85:13 - android:name - ADDED from AndroidManifest.xml:81:13 -intent-filter#android.intent.action.MAIN -ADDED from AndroidManifest.xml:87:13 -action#android.intent.action.MAIN -ADDED from AndroidManifest.xml:88:17 - android:name - ADDED from AndroidManifest.xml:88:25 -activity-alias#com.moez.QKSMS.ui.MainActivity-Teal -ADDED from AndroidManifest.xml:92:9 - android:enabled - ADDED from AndroidManifest.xml:94:13 - android:label - ADDED from AndroidManifest.xml:96:13 - android:targetActivity - ADDED from AndroidManifest.xml:97:13 - android:icon - ADDED from AndroidManifest.xml:95:13 - android:name - ADDED from AndroidManifest.xml:93:13 -intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:98:13 -category#android.intent.category.LAUNCHER -ADDED from AndroidManifest.xml:101:17 - android:name - ADDED from AndroidManifest.xml:101:27 -activity-alias#com.moez.QKSMS.ui.MainActivity-Red -ADDED from AndroidManifest.xml:104:9 - android:enabled - ADDED from AndroidManifest.xml:106:13 - android:label - ADDED from AndroidManifest.xml:108:13 - android:targetActivity - ADDED from AndroidManifest.xml:109:13 - android:icon - ADDED from AndroidManifest.xml:107:13 - android:name - ADDED from AndroidManifest.xml:105:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Pink -ADDED from AndroidManifest.xml:116:9 - android:enabled - ADDED from AndroidManifest.xml:118:13 - android:label - ADDED from AndroidManifest.xml:120:13 - android:targetActivity - ADDED from AndroidManifest.xml:121:13 - android:icon - ADDED from AndroidManifest.xml:119:13 - android:name - ADDED from AndroidManifest.xml:117:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Purple -ADDED from AndroidManifest.xml:128:9 - android:enabled - ADDED from AndroidManifest.xml:130:13 - android:label - ADDED from AndroidManifest.xml:132:13 - android:targetActivity - ADDED from AndroidManifest.xml:133:13 - android:icon - ADDED from AndroidManifest.xml:131:13 - android:name - ADDED from AndroidManifest.xml:129:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-DeepPurple -ADDED from AndroidManifest.xml:140:9 - android:enabled - ADDED from AndroidManifest.xml:142:13 - android:label - ADDED from AndroidManifest.xml:144:13 - android:targetActivity - ADDED from AndroidManifest.xml:145:13 - android:icon - ADDED from AndroidManifest.xml:143:13 - android:name - ADDED from AndroidManifest.xml:141:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Indigo -ADDED from AndroidManifest.xml:152:9 - android:enabled - ADDED from AndroidManifest.xml:154:13 - android:label - ADDED from AndroidManifest.xml:156:13 - android:targetActivity - ADDED from AndroidManifest.xml:157:13 - android:icon - ADDED from AndroidManifest.xml:155:13 - android:name - ADDED from AndroidManifest.xml:153:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Blue -ADDED from AndroidManifest.xml:164:9 - android:enabled - ADDED from AndroidManifest.xml:166:13 - android:label - ADDED from AndroidManifest.xml:168:13 - android:targetActivity - ADDED from AndroidManifest.xml:169:13 - android:icon - ADDED from AndroidManifest.xml:167:13 - android:name - ADDED from AndroidManifest.xml:165:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-LightBlue -ADDED from AndroidManifest.xml:176:9 - android:enabled - ADDED from AndroidManifest.xml:178:13 - android:label - ADDED from AndroidManifest.xml:180:13 - android:targetActivity - ADDED from AndroidManifest.xml:181:13 - android:icon - ADDED from AndroidManifest.xml:179:13 - android:name - ADDED from AndroidManifest.xml:177:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Cyan -ADDED from AndroidManifest.xml:188:9 - android:enabled - ADDED from AndroidManifest.xml:190:13 - android:label - ADDED from AndroidManifest.xml:192:13 - android:targetActivity - ADDED from AndroidManifest.xml:193:13 - android:icon - ADDED from AndroidManifest.xml:191:13 - android:name - ADDED from AndroidManifest.xml:189:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Green -ADDED from AndroidManifest.xml:200:9 - android:enabled - ADDED from AndroidManifest.xml:202:13 - android:label - ADDED from AndroidManifest.xml:204:13 - android:targetActivity - ADDED from AndroidManifest.xml:205:13 - android:icon - ADDED from AndroidManifest.xml:203:13 - android:name - ADDED from AndroidManifest.xml:201:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-LightGreen -ADDED from AndroidManifest.xml:212:9 - android:enabled - ADDED from AndroidManifest.xml:214:13 - android:label - ADDED from AndroidManifest.xml:216:13 - android:targetActivity - ADDED from AndroidManifest.xml:217:13 - android:icon - ADDED from AndroidManifest.xml:215:13 - android:name - ADDED from AndroidManifest.xml:213:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Lime -ADDED from AndroidManifest.xml:224:9 - android:enabled - ADDED from AndroidManifest.xml:226:13 - android:label - ADDED from AndroidManifest.xml:228:13 - android:targetActivity - ADDED from AndroidManifest.xml:229:13 - android:icon - ADDED from AndroidManifest.xml:227:13 - android:name - ADDED from AndroidManifest.xml:225:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Yellow -ADDED from AndroidManifest.xml:236:9 - android:enabled - ADDED from AndroidManifest.xml:238:13 - android:label - ADDED from AndroidManifest.xml:240:13 - android:targetActivity - ADDED from AndroidManifest.xml:241:13 - android:icon - ADDED from AndroidManifest.xml:239:13 - android:name - ADDED from AndroidManifest.xml:237:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Amber -ADDED from AndroidManifest.xml:248:9 - android:enabled - ADDED from AndroidManifest.xml:250:13 - android:label - ADDED from AndroidManifest.xml:252:13 - android:targetActivity - ADDED from AndroidManifest.xml:253:13 - android:icon - ADDED from AndroidManifest.xml:251:13 - android:name - ADDED from AndroidManifest.xml:249:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Orange -ADDED from AndroidManifest.xml:260:9 - android:enabled - ADDED from AndroidManifest.xml:262:13 - android:label - ADDED from AndroidManifest.xml:264:13 - android:targetActivity - ADDED from AndroidManifest.xml:265:13 - android:icon - ADDED from AndroidManifest.xml:263:13 - android:name - ADDED from AndroidManifest.xml:261:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-DeepOrange -ADDED from AndroidManifest.xml:272:9 - android:enabled - ADDED from AndroidManifest.xml:274:13 - android:label - ADDED from AndroidManifest.xml:276:13 - android:targetActivity - ADDED from AndroidManifest.xml:277:13 - android:icon - ADDED from AndroidManifest.xml:275:13 - android:name - ADDED from AndroidManifest.xml:273:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Brown -ADDED from AndroidManifest.xml:284:9 - android:enabled - ADDED from AndroidManifest.xml:286:13 - android:label - ADDED from AndroidManifest.xml:288:13 - android:targetActivity - ADDED from AndroidManifest.xml:289:13 - android:icon - ADDED from AndroidManifest.xml:287:13 - android:name - ADDED from AndroidManifest.xml:285:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-Grey -ADDED from AndroidManifest.xml:296:9 - android:enabled - ADDED from AndroidManifest.xml:298:13 - android:label - ADDED from AndroidManifest.xml:300:13 - android:targetActivity - ADDED from AndroidManifest.xml:301:13 - android:icon - ADDED from AndroidManifest.xml:299:13 - android:name - ADDED from AndroidManifest.xml:297:13 -activity-alias#com.moez.QKSMS.ui.MainActivity-BlueGrey -ADDED from AndroidManifest.xml:308:9 - android:enabled - ADDED from AndroidManifest.xml:310:13 - android:label - ADDED from AndroidManifest.xml:312:13 - android:targetActivity - ADDED from AndroidManifest.xml:313:13 - android:icon - ADDED from AndroidManifest.xml:311:13 - android:name - ADDED from AndroidManifest.xml:309:13 -activity#com.moez.QKSMS.ui.welcome.WelcomeActivity -ADDED from AndroidManifest.xml:321:9 - android:theme - ADDED from AndroidManifest.xml:323:13 - android:name - ADDED from AndroidManifest.xml:322:13 -activity#com.moez.QKSMS.ui.popup.QKReplyActivity -ADDED from AndroidManifest.xml:326:9 - android:excludeFromRecents - ADDED from AndroidManifest.xml:328:13 - android:windowSoftInputMode - ADDED from AndroidManifest.xml:331:13 - android:theme - ADDED from AndroidManifest.xml:330:13 - android:taskAffinity - ADDED from AndroidManifest.xml:329:13 - android:name - ADDED from AndroidManifest.xml:327:13 -activity#com.moez.QKSMS.ui.popup.MessagePickerActivity -ADDED from AndroidManifest.xml:334:9 - android:excludeFromRecents - ADDED from AndroidManifest.xml:336:13 - android:noHistory - ADDED from AndroidManifest.xml:337:13 - android:theme - ADDED from AndroidManifest.xml:339:13 - android:taskAffinity - ADDED from AndroidManifest.xml:338:13 - android:name - ADDED from AndroidManifest.xml:335:13 -activity#com.moez.QKSMS.ui.mms.SlideshowActivity -ADDED from AndroidManifest.xml:341:9 - android:name - ADDED from AndroidManifest.xml:341:19 -receiver#com.moez.QKSMS.receiver.WearableIntentReceiver -ADDED from AndroidManifest.xml:343:9 - android:exported - ADDED from AndroidManifest.xml:345:13 - android:name - ADDED from AndroidManifest.xml:344:13 -intent-filter#com.moez.QKSMS.receiver.WearableIntentReceiver.REPLY -ADDED from AndroidManifest.xml:346:13 -action#com.moez.QKSMS.receiver.WearableIntentReceiver.REPLY -ADDED from AndroidManifest.xml:347:17 - android:name - ADDED from AndroidManifest.xml:347:25 -receiver#com.moez.QKSMS.receiver.SmsReceiver -ADDED from AndroidManifest.xml:352:9 - android:enabled - ADDED from AndroidManifest.xml:354:13 - android:permission - ADDED from AndroidManifest.xml:355:13 - android:name - ADDED from AndroidManifest.xml:353:13 -intent-filter#android.provider.Telephony.SMS_DELIVER -ADDED from AndroidManifest.xml:356:13 -action#android.provider.Telephony.SMS_DELIVER -ADDED from AndroidManifest.xml:357:17 - android:name - ADDED from AndroidManifest.xml:357:25 -receiver#com.moez.QKSMS.receiver.IconColorReceiver -ADDED from AndroidManifest.xml:360:9 - android:enabled - ADDED from AndroidManifest.xml:362:13 - android:exported - ADDED from AndroidManifest.xml:363:13 - android:name - ADDED from AndroidManifest.xml:361:13 -intent-filter#android.intent.action.PACKAGE_CHANGED -ADDED from AndroidManifest.xml:364:13 -action#android.intent.action.PACKAGE_CHANGED -ADDED from AndroidManifest.xml:365:17 - android:name - ADDED from AndroidManifest.xml:365:25 -intent-filter#com.moez.QKSMS.action.PENDING_PACKAGE_CHANGE -ADDED from AndroidManifest.xml:369:13 -action#com.moez.QKSMS.action.PENDING_PACKAGE_CHANGE -ADDED from AndroidManifest.xml:370:17 - android:name - ADDED from AndroidManifest.xml:370:25 -receiver#com.moez.QKSMS.receiver.SmsReceiverLegacy -ADDED from AndroidManifest.xml:375:9 - android:enabled - ADDED from AndroidManifest.xml:377:13 - android:name - ADDED from AndroidManifest.xml:376:13 -intent-filter#android.provider.Telephony.SMS_RECEIVED -ADDED from AndroidManifest.xml:378:13 - android:priority - ADDED from AndroidManifest.xml:378:28 -action#android.provider.Telephony.SMS_RECEIVED -ADDED from AndroidManifest.xml:379:17 - android:name - ADDED from AndroidManifest.xml:379:25 -receiver#com.moez.QKSMS.receiver.PushReceiver -ADDED from AndroidManifest.xml:384:9 - android:permission - ADDED from AndroidManifest.xml:386:13 - android:name - ADDED from AndroidManifest.xml:385:13 -intent-filter#android.provider.Telephony.WAP_PUSH_DELIVER+android.provider.Telephony.WAP_PUSH_RECEIVED -ADDED from AndroidManifest.xml:387:13 -action#android.provider.Telephony.WAP_PUSH_RECEIVED -ADDED from AndroidManifest.xml:388:17 - android:name - ADDED from AndroidManifest.xml:388:25 -action#android.provider.Telephony.WAP_PUSH_DELIVER -ADDED from AndroidManifest.xml:389:17 - android:name - ADDED from AndroidManifest.xml:389:25 -receiver#com.moez.QKSMS.analytics.AnalyticsReportReceiver -ADDED from AndroidManifest.xml:394:9 - android:name - ADDED from AndroidManifest.xml:394:19 -intent-filter#android.intent.action.BOOT_COMPLETED -ADDED from AndroidManifest.xml:395:13 -action#android.intent.action.BOOT_COMPLETED -ADDED from AndroidManifest.xml:396:17 - android:name - ADDED from AndroidManifest.xml:396:25 -receiver#com.moez.QKSMS.receiver.BootReceiver -ADDED from AndroidManifest.xml:399:9 - android:name - ADDED from AndroidManifest.xml:399:19 -receiver#com.klinker.android.send_message.SentReceiver -ADDED from AndroidManifest.xml:404:9 - android:name - ADDED from AndroidManifest.xml:404:19 -intent-filter#com.moez.QKSMS.SMS_SENT -ADDED from AndroidManifest.xml:405:13 -action#com.moez.QKSMS.SMS_SENT -ADDED from AndroidManifest.xml:406:17 - android:name - ADDED from AndroidManifest.xml:406:25 -receiver#com.moez.QKSMS.receiver.DeliveredReceiver -ADDED from AndroidManifest.xml:409:9 - android:name - ADDED from AndroidManifest.xml:409:19 -intent-filter#com.moez.QKSMS.SMS_DELIVERED -ADDED from AndroidManifest.xml:410:13 -action#com.moez.QKSMS.SMS_DELIVERED -ADDED from AndroidManifest.xml:411:17 - android:name - ADDED from AndroidManifest.xml:411:25 -receiver#com.moez.QKSMS.receiver.MessageFailedReceiver -ADDED from AndroidManifest.xml:414:9 - android:name - ADDED from AndroidManifest.xml:414:19 -intent-filter#com.moez.QKSMS.NOTIFY_SMS_FAILURE -ADDED from AndroidManifest.xml:415:13 -action#com.moez.QKSMS.NOTIFY_SMS_FAILURE -ADDED from AndroidManifest.xml:416:17 - android:name - ADDED from AndroidManifest.xml:416:25 -receiver#com.moez.QKSMS.receiver.MarkReadReceiver -ADDED from AndroidManifest.xml:419:9 - android:name - ADDED from AndroidManifest.xml:419:19 -intent-filter#com.moez.QKSMS.MARK_READ -ADDED from AndroidManifest.xml:420:13 -action#com.moez.QKSMS.MARK_READ -ADDED from AndroidManifest.xml:421:17 - android:name - ADDED from AndroidManifest.xml:421:25 -receiver#com.moez.QKSMS.receiver.MarkSeenReceiver -ADDED from AndroidManifest.xml:424:9 - android:name - ADDED from AndroidManifest.xml:424:19 -intent-filter#com.moez.QKSMS.MARK_SEEN -ADDED from AndroidManifest.xml:425:13 -action#com.moez.QKSMS.MARK_SEEN -ADDED from AndroidManifest.xml:426:17 - android:name - ADDED from AndroidManifest.xml:426:25 -receiver#com.moez.QKSMS.ui.widget.WidgetProvider -ADDED from AndroidManifest.xml:430:9 - android:name - ADDED from AndroidManifest.xml:430:19 -intent-filter#android.appwidget.action.APPWIDGET_UPDATE -ADDED from AndroidManifest.xml:431:13 -action#android.appwidget.action.APPWIDGET_UPDATE -ADDED from AndroidManifest.xml:432:17 - android:name - ADDED from AndroidManifest.xml:432:25 -intent-filter#com.moez.QKSMS.intent.action.ACTION_NOTIFY_DATASET_CHANGED -ADDED from AndroidManifest.xml:434:13 -action#com.moez.QKSMS.intent.action.ACTION_NOTIFY_DATASET_CHANGED -ADDED from AndroidManifest.xml:435:17 - android:name - ADDED from AndroidManifest.xml:435:25 -meta-data#android.appwidget.provider -ADDED from AndroidManifest.xml:438:13 - android:resource - ADDED from AndroidManifest.xml:440:17 - android:name - ADDED from AndroidManifest.xml:439:17 -receiver#com.moez.QKSMS.receiver.NightModeAutoReceiver -ADDED from AndroidManifest.xml:443:9 - android:name - ADDED from AndroidManifest.xml:443:19 -receiver#com.mariussoft.endlessjabber.sdk.EndlessJabberReceiver -ADDED from AndroidManifest.xml:444:9 - android:enabled - ADDED from AndroidManifest.xml:446:13 - android:name - ADDED from AndroidManifest.xml:445:13 -intent-filter#com.mariussoft.endlessjabber.action.extend -ADDED from AndroidManifest.xml:447:13 -action#com.mariussoft.endlessjabber.action.extend -ADDED from AndroidManifest.xml:448:17 - android:name - ADDED from AndroidManifest.xml:448:25 -service#com.mariussoft.endlessjabber.sdk.EndlessJabberWakefulService -ADDED from AndroidManifest.xml:452:9 - android:name - ADDED from AndroidManifest.xml:452:18 -service#com.moez.QKSMS.receiver.UnreadBadgeService -ADDED from AndroidManifest.xml:454:9 - android:exported - ADDED from AndroidManifest.xml:456:13 - android:name - ADDED from AndroidManifest.xml:455:13 -service#com.moez.QKSMS.service.HeadlessSmsSendService -ADDED from AndroidManifest.xml:459:9 - android:exported - ADDED from AndroidManifest.xml:461:13 - android:permission - ADDED from AndroidManifest.xml:462:13 - android:name - ADDED from AndroidManifest.xml:460:13 -intent-filter#android.intent.action.RESPOND_VIA_MESSAGE+android.intent.category.DEFAULT -ADDED from AndroidManifest.xml:463:13 -action#android.intent.action.RESPOND_VIA_MESSAGE -ADDED from AndroidManifest.xml:464:17 - android:name - ADDED from AndroidManifest.xml:464:25 -service#com.moez.QKSMS.service.PushbulletService -ADDED from AndroidManifest.xml:474:9 - android:permission - ADDED from AndroidManifest.xml:476:13 - android:name - ADDED from AndroidManifest.xml:475:13 -intent-filter#com.pushbullet.android.extension.MessagingExtension -ADDED from AndroidManifest.xml:477:13 -action#com.pushbullet.android.extension.MessagingExtension -ADDED from AndroidManifest.xml:478:17 - android:name - ADDED from AndroidManifest.xml:478:25 -meta-data#protocolVersion -ADDED from AndroidManifest.xml:481:13 - android:value - ADDED from AndroidManifest.xml:483:17 - android:name - ADDED from AndroidManifest.xml:482:17 -service#com.android.mms.transaction.TransactionService -ADDED from AndroidManifest.xml:485:9 - android:name - ADDED from AndroidManifest.xml:485:18 -service#com.moez.QKSMS.service.NotificationService -ADDED from AndroidManifest.xml:486:9 - android:name - ADDED from AndroidManifest.xml:486:18 -service#com.moez.QKSMS.service.MarkReadService -ADDED from AndroidManifest.xml:487:9 - android:name - ADDED from AndroidManifest.xml:487:18 -service#com.moez.QKSMS.service.MarkSeenService -ADDED from AndroidManifest.xml:488:9 - android:name - ADDED from AndroidManifest.xml:488:18 -service#com.moez.QKSMS.service.DeleteUnreadMessageService -ADDED from AndroidManifest.xml:489:9 - android:name - ADDED from AndroidManifest.xml:489:18 -service#com.moez.QKSMS.service.CopyUnreadMessageTextService -ADDED from AndroidManifest.xml:490:9 - android:name - ADDED from AndroidManifest.xml:490:18 -service#com.moez.QKSMS.ui.widget.WidgetService -ADDED from AndroidManifest.xml:491:9 - android:permission - ADDED from AndroidManifest.xml:493:13 - android:name - ADDED from AndroidManifest.xml:492:13 -uses-sdk -INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested -MERGED from qksms:slidingMenu:unspecified:7:5 -MERGED from com.android.support:appcompat-v7:22.2.0:20:5 -MERGED from com.android.support:support-v4:22.2.0:20:5 -MERGED from qksms:colorPicker:unspecified:7:5 -MERGED from qksms:qkms:unspecified:5:5 -MERGED from com.github.johnkil.android-robototextview:robototextview:2.1.0:7:5 -MERGED from com.melnykov:floatingactionbutton:1.3.0:8:5 -MERGED from com.android.support:recyclerview-v7:22.2.0:20:5 -MERGED from com.android.support:support-v4:22.2.0:20:5 -MERGED from com.pushbullet:android-extensions:1.0.4:5:5 -MERGED from com.klinkerapps:android-chips:1.0.0:22:5 -MERGED from com.android.support:support-v4:22.2.0:20:5 -MERGED from com.nispok:snackbar:2.10.6:6:5 -MERGED from com.android.support:recyclerview-v7:22.2.0:20:5 -MERGED from com.android.support:support-v4:22.2.0:20:5 -MERGED from com.github.lzyzsd:circleprogress:1.1.0:7:5 -MERGED from me.leolin:ShortcutBadger:1.1.1:7:5 -MERGED from com.android.support:appcompat-v7:22.2.0:20:5 -MERGED from com.android.support:support-v4:22.2.0:20:5 -MERGED from com.android.support:support-v13:22.2.0:20:5 -MERGED from com.android.support:support-v4:22.2.0:20:5 -MERGED from com.android.support:recyclerview-v7:22.2.0:20:5 -MERGED from com.android.support:support-v4:22.2.0:20:5 -MERGED from com.google.android.gms:play-services-analytics:7.5.0:18:5 -MERGED from com.google.android.gms:play-services-base:7.5.0:18:5 -MERGED from com.android.support:support-v4:22.2.0:20:5 -MERGED from com.squareup.leakcanary:leakcanary-android-no-op:1.3:20:5 - android:targetSdkVersion - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 - android:minSdkVersion - INJECTED from AndroidManifest.xml:0:0 - INJECTED from AndroidManifest.xml:0:0 -uses-permission#com.sec.android.provider.badge.permission.READ -ADDED from me.leolin:ShortcutBadger:1.1.1:19:5 - android:name - ADDED from me.leolin:ShortcutBadger:1.1.1:19:22 -uses-permission#com.sec.android.provider.badge.permission.WRITE -ADDED from me.leolin:ShortcutBadger:1.1.1:20:5 - android:name - ADDED from me.leolin:ShortcutBadger:1.1.1:20:22 -uses-permission#com.htc.launcher.permission.READ_SETTINGS -ADDED from me.leolin:ShortcutBadger:1.1.1:23:5 - android:name - ADDED from me.leolin:ShortcutBadger:1.1.1:23:22 -uses-permission#com.htc.launcher.permission.UPDATE_SHORTCUT -ADDED from me.leolin:ShortcutBadger:1.1.1:24:5 - android:name - ADDED from me.leolin:ShortcutBadger:1.1.1:24:22 -uses-permission#com.sonyericsson.home.permission.BROADCAST_BADGE -ADDED from me.leolin:ShortcutBadger:1.1.1:27:5 - android:name - ADDED from me.leolin:ShortcutBadger:1.1.1:27:22 -uses-permission#com.anddoes.launcher.permission.UPDATE_COUNT -ADDED from me.leolin:ShortcutBadger:1.1.1:30:5 - android:name - ADDED from me.leolin:ShortcutBadger:1.1.1:30:22 -uses-permission#com.majeur.launcher.permission.UPDATE_BADGE -ADDED from me.leolin:ShortcutBadger:1.1.1:33:5 - android:name - ADDED from me.leolin:ShortcutBadger:1.1.1:33:22 -meta-data#com.google.android.gms.version -ADDED from com.google.android.gms:play-services-base:7.5.0:21:9 - android:value - ADDED from com.google.android.gms:play-services-base:7.5.0:23:13 - android:name - ADDED from com.google.android.gms:play-services-base:7.5.0:22:13 diff --git a/QKSMS/qksms-proguard.pro b/QKSMS/qksms-proguard.pro index 395f3324..efd029bd 100644 --- a/QKSMS/qksms-proguard.pro +++ b/QKSMS/qksms-proguard.pro @@ -76,4 +76,4 @@ -dontwarn freemarker.** # freemarker templating library (for creating hCards) not used -dontwarn org.jsoup.** # jsoup library (for hCard parsing) not used -dontwarn sun.misc.Perf --keep class ezvcard.property.** { *; } # keep all VCard properties (created at runtime) \ No newline at end of file +-keep class ezvcard.property.** { *; } # keep all VCard properties (created at runtime) diff --git a/QKSMS/src/androidTest/java/com/moez/QKSMS/common/emoji/EmojiRegistryTest.java b/QKSMS/src/androidTest/java/com/moez/QKSMS/common/emoji/EmojiRegistryTest.java index 107fa588..6f991a38 100644 --- a/QKSMS/src/androidTest/java/com/moez/QKSMS/common/emoji/EmojiRegistryTest.java +++ b/QKSMS/src/androidTest/java/com/moez/QKSMS/common/emoji/EmojiRegistryTest.java @@ -67,4 +67,4 @@ public class EmojiRegistryTest extends TestCase { String expected = EmojiParser.parseToUnicode("\n:" + Emojis.SMILEY + ":\n"); assertEquals(EmojiParser.parseToUnicode(expected), EmojiRegistry.parseEmojis(src)); } -} \ No newline at end of file +} diff --git a/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java b/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java new file mode 100644 index 00000000..953607bc --- /dev/null +++ b/QKSMS/src/androidTest/java/com/moez/QKSMS/common/utils/DateFormatterTest.java @@ -0,0 +1,40 @@ +package com.moez.QKSMS.common.utils; + +import android.content.SharedPreferences; +import android.test.AndroidTestCase; +import android.util.Log; + +import com.moez.QKSMS.ui.MainActivity; +import com.moez.QKSMS.ui.settings.SettingsFragment; + +import java.text.SimpleDateFormat; +import java.util.Locale; + +public class DateFormatterTest extends AndroidTestCase { + protected void setUp() throws Exception { + super.setUp(); + } + + public void test24Hours(){ + SharedPreferences prefs = MainActivity.getPrefs(getContext()); + prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, true).commit(); + assertTrue(DateFormatter.accountFor24HourTime(getContext(), new SimpleDateFormat("h:mm a")).equals(new SimpleDateFormat("H:mm"))); + prefs.edit().putBoolean(SettingsFragment.TIMESTAMPS_24H, false).commit(); + } + + public void testFlippedMonthDay(){ + Locale.setDefault(Locale.UK); + Log.d("TestFlippedMonthDay", DateFormatter.accountForFlippedDayMonth(new SimpleDateFormat("MMM d, h:mm a")).toPattern()); + assertTrue(DateFormatter.accountForFlippedDayMonth(new SimpleDateFormat("MMM d, h:mm a")).equals(new SimpleDateFormat("d MMM, h:mm a"))); + Locale.setDefault(Locale.US); + assertTrue(DateFormatter.accountForFlippedDayMonth(new SimpleDateFormat("MMM d, h:mm a")).equals(new SimpleDateFormat("MMM d, h:mm a"))); + } + + public void testDateSymbolsAPI(){ + assertEquals(new SimpleDateFormat("H:mm a").toPattern(), "H:mm a"); + } + + protected void tearDown() throws Exception { + super.tearDown(); + } +} diff --git a/QKSMS/src/main/assets/fonts/Lato-Bold.ttf b/QKSMS/src/main/assets/fonts/Lato-Bold.ttf new file mode 100644 index 00000000..74343694 Binary files /dev/null and b/QKSMS/src/main/assets/fonts/Lato-Bold.ttf differ diff --git a/QKSMS/src/main/assets/fonts/Lato-Hairline.ttf b/QKSMS/src/main/assets/fonts/Lato-Hairline.ttf new file mode 100644 index 00000000..288be295 Binary files /dev/null and b/QKSMS/src/main/assets/fonts/Lato-Hairline.ttf differ diff --git a/QKSMS/src/main/assets/fonts/Lato-Light.ttf b/QKSMS/src/main/assets/fonts/Lato-Light.ttf new file mode 100644 index 00000000..a958067a Binary files /dev/null and b/QKSMS/src/main/assets/fonts/Lato-Light.ttf differ diff --git a/QKSMS/src/main/assets/fonts/Lato-Regular.ttf b/QKSMS/src/main/assets/fonts/Lato-Regular.ttf new file mode 100644 index 00000000..04ea8efb Binary files /dev/null and b/QKSMS/src/main/assets/fonts/Lato-Regular.ttf differ diff --git a/QKSMS/src/main/java/android/location/Country.java b/QKSMS/src/main/java/android/location/Country.java index 9da135cf..7c1485d8 100644 --- a/QKSMS/src/main/java/android/location/Country.java +++ b/QKSMS/src/main/java/android/location/Country.java @@ -199,4 +199,4 @@ public class Country implements Parcelable { public String toString() { return "Country {ISO=" + mCountryIso + ", source=" + mSource + ", time=" + mTimestamp + "}"; } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/android/location/CountryDetector.java b/QKSMS/src/main/java/android/location/CountryDetector.java index 39a9c754..4ea6e9c6 100644 --- a/QKSMS/src/main/java/android/location/CountryDetector.java +++ b/QKSMS/src/main/java/android/location/CountryDetector.java @@ -134,4 +134,4 @@ public class CountryDetector { } } } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/android/location/CountryListener.java b/QKSMS/src/main/java/android/location/CountryListener.java index d5de336d..e36db412 100644 --- a/QKSMS/src/main/java/android/location/CountryListener.java +++ b/QKSMS/src/main/java/android/location/CountryListener.java @@ -27,4 +27,4 @@ public interface CountryListener { * @param country the changed or detected country. */ void onCountryDetected(Country country); -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/android/location/ICountryDetector.java b/QKSMS/src/main/java/android/location/ICountryDetector.java index 03650f7a..99aca864 100644 --- a/QKSMS/src/main/java/android/location/ICountryDetector.java +++ b/QKSMS/src/main/java/android/location/ICountryDetector.java @@ -38,4 +38,4 @@ interface ICountryDetector * Remove the listener */ void removeCountryListener(ICountryListener listener); -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/android/location/ICountryListener.java b/QKSMS/src/main/java/android/location/ICountryListener.java index 9e59bee8..d211b4db 100644 --- a/QKSMS/src/main/java/android/location/ICountryListener.java +++ b/QKSMS/src/main/java/android/location/ICountryListener.java @@ -23,4 +23,4 @@ package android.location; interface ICountryListener { void onCountryDetected(Country country); -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/google/android/mms/APN.java b/QKSMS/src/main/java/com/google/android/mms/APN.java index 861a6eca..e4c26b1a 100644 --- a/QKSMS/src/main/java/com/google/android/mms/APN.java +++ b/QKSMS/src/main/java/com/google/android/mms/APN.java @@ -14,4 +14,4 @@ public class APN { public APN() { } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/google/android/mms/MMSPart.java b/QKSMS/src/main/java/com/google/android/mms/MMSPart.java index 582c9b4b..de5a05d2 100644 --- a/QKSMS/src/main/java/com/google/android/mms/MMSPart.java +++ b/QKSMS/src/main/java/com/google/android/mms/MMSPart.java @@ -7,4 +7,4 @@ public class MMSPart { public String MimeType = ""; public byte[] Data; public Uri Path; -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/EndlessJabberInterface.java b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/EndlessJabberInterface.java new file mode 100644 index 00000000..df4c5c26 --- /dev/null +++ b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/EndlessJabberInterface.java @@ -0,0 +1,105 @@ +package com.mariussoft.endlessjabber.sdk; + +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.net.Uri; + +public class EndlessJabberInterface { + + /** Checks whether or not EndlessJabber is installed */ + public static boolean IsInstalled(Context ctx) { + + PackageManager pm = ctx.getPackageManager(); + try { + pm.getPackageInfo("com.mariussoft.endlessjabber", PackageManager.GET_ACTIVITIES); + return true; + } catch (NameNotFoundException e) { + return false; + } + } + + /** Opens up GooglePlay and redirects it to the EndlessJabber app */ + public static void OpenGooglePlayLink(Context ctx) { + final String appPackageName = "com.mariussoft.endlessjabber"; + try { + ctx.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + appPackageName))); + } catch (android.content.ActivityNotFoundException anfe) { + ctx.startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://play.google.com/store/apps/details?id=" + appPackageName))); + } + } + + /** Launches EndlessJabber */ + public static void LaunchEndlessJabber(Context ctx) { + Intent intent = ctx.getPackageManager().getLaunchIntentForPackage("com.mariussoft.endlessjabber"); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + ctx.startActivity(intent); + } + + /** + * Enables integration by specifying which class to call + * + * @param context + * The context to use + * @param concreteImplementation + * The concrete implementation to call on events + * @param sendSMS + * If true, your app will be responsible for sending SMS messages + * as well as presisting them to the SMS repository + * @param sendMMS + * If true, your app will be responsible for sending & persisting + * MMS messages to the MMS repository + * @throws Exception + */ + @SuppressWarnings("rawtypes") + public static void EnableIntegration(Context context, Class concreteImplementation, boolean sendSMS, boolean sendMMS) throws Exception { + Class clazz = concreteImplementation; + if (!IEndlessJabberImplementation.class.isAssignableFrom(clazz)) { + throw new Exception("Class must implement IEndlessJabberImplementation"); + } + + SharedPreferences.Editor editor = context.getSharedPreferences("EndlessJabberSDK", Context.MODE_PRIVATE).edit(); + editor.putString("InterfaceClass", concreteImplementation.getName()); + editor.putBoolean("SendSMS", sendSMS); + editor.putBoolean("SendMMS", sendMMS); + editor.commit(); + + SendInfoToEndlessJabber(context); + } + + /** Disables integration */ + @SuppressWarnings("rawtypes") + public static void DisableIntegration(Context context, Class nameOfImplementation) { + SharedPreferences.Editor editor = context.getSharedPreferences("EndlessJabberSDK", Context.MODE_PRIVATE).edit(); + editor.clear(); + editor.commit(); + + SendInfoToEndlessJabber(context); + } + + /** + * Refresh integration info with EndlessJabber + * + * @param ctx + * Context to use + */ + static void SendInfoToEndlessJabber(Context context) { + String EndlessJabber_INTENT = "com.mariussoft.endlessjabber.action.extendResponse"; + SharedPreferences prefs = context.getSharedPreferences("EndlessJabberSDK", Context.MODE_PRIVATE); + + Intent i = new Intent(); + i.setAction(EndlessJabber_INTENT); + i.putExtra("Action", "UpdateInfo"); + i.putExtra("PackageName", context.getPackageName()); + i.putExtra("Enabled", prefs.contains("InterfaceClass")); + + if (prefs.contains("InterfaceClass")) { + i.putExtra("SendSMS", prefs.getBoolean("SendSMS", false)); + i.putExtra("SendMMS", prefs.getBoolean("SendMMS", false)); + } + + context.sendBroadcast(i); + } +} diff --git a/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/EndlessJabberReceiver.java b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/EndlessJabberReceiver.java new file mode 100644 index 00000000..9eebc92c --- /dev/null +++ b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/EndlessJabberReceiver.java @@ -0,0 +1,22 @@ +package com.mariussoft.endlessjabber.sdk; + +import android.content.Context; +import android.content.Intent; + +public class EndlessJabberReceiver extends WakefulBroadcastReceiver { + + public static final String EndlessJabber_INTENT = "com.mariussoft.endlessjabber.action.extend"; + + @Override + public void onReceive(Context context, Intent intent) { + + if (intent.getAction().equals(EndlessJabber_INTENT)) { + + // This is the Intent to deliver to our service. + Intent service = new Intent(context, EndlessJabberWakefulService.class); + service.putExtras(intent.getExtras()); + + startWakefulService(context, service); + } + } +} diff --git a/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/EndlessJabberWakefulService.java b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/EndlessJabberWakefulService.java new file mode 100644 index 00000000..dbe22a51 --- /dev/null +++ b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/EndlessJabberWakefulService.java @@ -0,0 +1,78 @@ +package com.mariussoft.endlessjabber.sdk; + +import android.app.IntentService; +import android.content.Context; +import android.content.Intent; +import android.os.Bundle; + +public class EndlessJabberWakefulService extends IntentService { + + public EndlessJabberWakefulService() { + super("EndlessJabberWakefulService"); + } + + @Override + protected void onHandleIntent(Intent intent) { + Context context = getApplicationContext(); + + // Get the class to call + String implemenationClass = context.getSharedPreferences("EndlessJabberSDK", Context.MODE_PRIVATE).getString("InterfaceClass", null); + + if (implemenationClass == null) { + return; + } + + IEndlessJabberImplementation instanceOfMyClass; + try { + instanceOfMyClass = (IEndlessJabberImplementation) Class.forName(implemenationClass).newInstance(); + + Bundle extras = intent.getExtras(); + + switch (extras.getString("Action")) { + case "UpdateRead": { + long time = extras.getLong("Time"); + int conversationID = extras.getInt("ConversationID"); + instanceOfMyClass.UpdateReadMessages(context, time, conversationID); + break; + } + case "DeleteThread": { + + int conversationID = extras.getInt("ConversationID"); + instanceOfMyClass.DeleteThread(context, conversationID); + break; + } + case "SendMMS": { + + boolean save = extras.getBoolean("Save"); + boolean send = extras.getBoolean("Send"); + String[] Recipients = extras.getStringArray("Recipients"); + + MMSPart[] parts = new MMSPart[extras.getParcelableArray("Parts").length]; + + for (int i = 0; i < parts.length; i++) { + parts[i] = (MMSPart) extras.getParcelableArray("Parts")[i]; + } + + instanceOfMyClass.SendMMS(context, Recipients, parts, extras.getString("Subject"), save, send); + break; + } + case "SendSMS": { + boolean send = extras.getBoolean("Send"); + String[] Recipients = extras.getStringArray("Recipients"); + String message = extras.getString("Message"); + + instanceOfMyClass.SendSMS(context, Recipients, message, send); + break; + } + case "UpdateInfo": { + EndlessJabberInterface.SendInfoToEndlessJabber(context); + break; + } + } + } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { + + } + + EndlessJabberReceiver.completeWakefulIntent(intent); + } +} diff --git a/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/IEndlessJabberImplementation.java b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/IEndlessJabberImplementation.java new file mode 100644 index 00000000..eddd832c --- /dev/null +++ b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/IEndlessJabberImplementation.java @@ -0,0 +1,50 @@ +package com.mariussoft.endlessjabber.sdk; + +import android.content.Context; + +/** + * + * Interface to implement EndlessJabber integration + * + */ +public interface IEndlessJabberImplementation { + + /** + * Update all messages in the SMS/MMS repositories as read where the time <= the provided time as well as where the threadID matches the provided ID + * @param context The context to utilize + * @param time The 'time' in the SMS database to use when marking messages as read + * (NOTE* for MMS divide by 1000 as MMS repository stores times as 1/1000th of the SMS) + * @param threadID The ID of the thread in the SMS/MMS repositories to update + */ + void UpdateReadMessages(Context context, long time, int threadID); + + /** + * Delete any messages/conversations in the SMS/MMS repositories where the threadID matches the provided ID + * @param context The context to utilize + * @param threadID The ID of the thread in the SMS/MMS repositories to delete + */ + void DeleteThread(Context context,int threadID); + + /** + * Method gets called when EndlessJabber is requested to send an MMS message via the web app + * @param context The context to utilize + * @param recipients List of recipients to send message to + * @param parts The message parts to send along with message + * @param subject The MMS subject of the message + * @param save Whether or not to save the MMS to the MMS repository + * @param send If true, send the message along with saving it to the MMS repository + * NOTE: On KitKat save will be true only when enabled in the SDK & your app is the default messaging app on the system + * + * If both save & send are false, this call is only for informational purposes (e.g. modify notifications, update UI, etc...) + */ + void SendMMS(Context context, String[] recipients, MMSPart[] parts, String subject, boolean save, boolean send); + + /** + * Method gets called when EndlessJabber is requested to send an SMS message via the web app + * @param context The context to utilize + * @param recipients List of recipients to send message to + * @param message The message to send + * @param send If true, send the message along with saving it to the SMS repository, otherwise this is only for informational purposes (e.g. modify notifications, update UI, etc...) + */ + void SendSMS(Context context, String[] recipients, String message, boolean send); +} diff --git a/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/MMSPart.java b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/MMSPart.java new file mode 100644 index 00000000..278aa6d5 --- /dev/null +++ b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/MMSPart.java @@ -0,0 +1,57 @@ +package com.mariussoft.endlessjabber.sdk; + +import android.os.Parcel; +import android.os.Parcelable; + +/** + * + * An MMS attachment + * + */ +public class MMSPart implements Parcelable { + /** + * The name of the MMS attachment + */ + public String Name = ""; + /** + * The MimeType of the MMS attachment + */ + public String MimeType = ""; + /** + * The byte[] of the MMS attachment + */ + public byte[] Data; + + public MMSPart() { + } + + public MMSPart(Parcel parcel) { + Name = parcel.readString(); + MimeType = parcel.readString(); + Data = new byte[parcel.readInt()]; + parcel.readByteArray(Data); + } + + @Override + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel dest, int arg1) { + dest.writeString(Name); + dest.writeString(MimeType); + dest.writeInt(Data.length); + dest.writeByteArray(Data); + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + public MMSPart createFromParcel(Parcel in) { + return new MMSPart(in); + } + + public MMSPart[] newArray(int size) { + return new MMSPart[size]; + } + }; +} \ No newline at end of file diff --git a/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/WakefulBroadcastReceiver.java b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/WakefulBroadcastReceiver.java new file mode 100644 index 00000000..d75f50a5 --- /dev/null +++ b/QKSMS/src/main/java/com/mariussoft/endlessjabber/sdk/WakefulBroadcastReceiver.java @@ -0,0 +1,135 @@ +package com.mariussoft.endlessjabber.sdk; + +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +import android.content.BroadcastReceiver; +import android.content.ComponentName; +import android.content.Context; +import android.content.Intent; +import android.os.PowerManager; +import android.util.Log; +import android.util.SparseArray; + +/** + * Helper for the common pattern of implementing a {@link BroadcastReceiver} + * that receives a device wakeup event and then passes the work off + * to a {@link android.app.Service}, while ensuring that the + * device does not go back to sleep during the transition. + * + *

This class takes care of creating and managing a partial wake lock + * for you; you must request the {@link android.Manifest.permission#WAKE_LOCK} + * permission to use it.

+ * + *

Example

+ * + *

A {@link WakefulBroadcastReceiver} uses the method + * {@link WakefulBroadcastReceiver#startWakefulService startWakefulService()} + * to start the service that does the work. This method is comparable to + * {@link android.content.Context#startService startService()}, except that + * the {@link WakefulBroadcastReceiver} is holding a wake lock when the service + * starts. The intent that is passed with + * {@link WakefulBroadcastReceiver#startWakefulService startWakefulService()} + * holds an extra identifying the wake lock.

+ * + * {@sample development/samples/Support4Demos/src/com/example/android/supportv4/content/SimpleWakefulReceiver.java complete} + * + *

The service (in this example, an {@link android.app.IntentService}) does + * some work. When it is finished, it releases the wake lock by calling + * {@link WakefulBroadcastReceiver#completeWakefulIntent + * completeWakefulIntent(intent)}. The intent it passes as a parameter + * is the same intent that the {@link WakefulBroadcastReceiver} originally + * passed in.

+ * + * {@sample development/samples/Support4Demos/src/com/example/android/supportv4/content/SimpleWakefulService.java complete} + */ +public abstract class WakefulBroadcastReceiver extends BroadcastReceiver { + private static final String EXTRA_WAKE_LOCK_ID = "android.support.content.wakelockid"; + + private static final SparseArray mActiveWakeLocks + = new SparseArray(); + private static int mNextId = 1; + + /** + * Do a {@link android.content.Context#startService(android.content.Intent) + * Context.startService}, but holding a wake lock while the service starts. + * This will modify the Intent to hold an extra identifying the wake lock; + * when the service receives it in {@link android.app.Service#onStartCommand + * Service.onStartCommand}, it should pass back the Intent it receives there to + * {@link #completeWakefulIntent(android.content.Intent)} in order to release + * the wake lock. + * + * @param context The Context in which it operate. + * @param intent The Intent with which to start the service, as per + * {@link android.content.Context#startService(android.content.Intent) + * Context.startService}. + */ + public static ComponentName startWakefulService(Context context, Intent intent) { + synchronized (mActiveWakeLocks) { + int id = mNextId; + mNextId++; + if (mNextId <= 0) { + mNextId = 1; + } + + intent.putExtra(EXTRA_WAKE_LOCK_ID, id); + ComponentName comp = context.startService(intent); + if (comp == null) { + return null; + } + + PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE); + PowerManager.WakeLock wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, + "wake:" + comp.flattenToShortString()); + wl.setReferenceCounted(false); + wl.acquire(60*1000); + mActiveWakeLocks.put(id, wl); + return comp; + } + } + + /** + * Finish the execution from a previous {@link #startWakefulService}. Any wake lock + * that was being held will now be released. + * + * @param intent The Intent as originally generated by {@link #startWakefulService}. + * @return Returns true if the intent is associated with a wake lock that is + * now released; returns false if there was no wake lock specified for it. + */ + public static boolean completeWakefulIntent(Intent intent) { + final int id = intent.getIntExtra(EXTRA_WAKE_LOCK_ID, 0); + if (id == 0) { + return false; + } + synchronized (mActiveWakeLocks) { + PowerManager.WakeLock wl = mActiveWakeLocks.get(id); + if (wl != null) { + wl.release(); + mActiveWakeLocks.remove(id); + return true; + } + // We return true whether or not we actually found the wake lock + // the return code is defined to indicate whether the Intent contained + // an identifier for a wake lock that it was supposed to match. + // We just log a warning here if there is no wake lock found, which could + // happen for example if this function is called twice on the same + // intent or the process is killed and restarted before processing the intent. + Log.w("WakefulBroadcastReceiver", "No active wake lock id #" + id); + return true; + } + } +} \ No newline at end of file diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java index 7e408f0b..f7db2b48 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/DialogHelper.java @@ -4,6 +4,7 @@ import android.util.Log; import android.view.View; import com.moez.QKSMS.R; import com.moez.QKSMS.data.Conversation; +import com.moez.QKSMS.transaction.SmsHelper; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.conversationlist.ConversationListAdapter; import com.moez.QKSMS.ui.dialog.DefaultSmsHelper; @@ -22,6 +23,27 @@ public class DialogHelper { showDeleteConversationDialog(context, threadIds); } + public static void showDeleteFailedMessagesDialog(final MainActivity context, final long threadId) { + new DefaultSmsHelper(context, null, R.string.not_default_delete).showIfNotDefault(null); + + new QKDialog() + .setContext(context) + .setTitle(R.string.delete_all_failed) + .setMessage(R.string.delete_all_failed_confirmation) + .setPositiveButton(R.string.yes, new View.OnClickListener() { + + @Override + public void onClick(View v) { + new Thread(new Runnable() { + public void run() { + SmsHelper.deleteFailedMessages(context, threadId); + } + }).start(); + } + }).setNegativeButton(R.string.cancel, null) + .show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); + } + public static void showDeleteConversationDialog(final MainActivity context, final List threadIds) { new DefaultSmsHelper(context, null, R.string.not_default_delete).showIfNotDefault(null); @@ -70,4 +92,5 @@ public class DialogHelper { }).setNegativeButton(R.string.cancel, null) .show(context.getFragmentManager(), QKDialog.CONFIRMATION_TAG); } + } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java index ea3d0291..11b231fc 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/FontManager.java @@ -121,12 +121,12 @@ public class FontManager { } // Otherwise, get the heavy font weight. - if (fontWeight == RobotoTypefaceManager.TextWeight.LIGHT) { - return RobotoTypefaceManager.TextWeight.NORMAL; - } else if (fontFamily == RobotoTypefaceManager.FontFamily.ROBOTO) { - return RobotoTypefaceManager.TextWeight.MEDIUM; + if (fontWeight == TypefaceManager.TextWeight.LIGHT) { + return TypefaceManager.TextWeight.NORMAL; + } else if (fontFamily == TypefaceManager.FontFamily.ROBOTO || fontFamily == TypefaceManager.FontFamily.LATO) { + return TypefaceManager.TextWeight.MEDIUM; } else { - return RobotoTypefaceManager.TextWeight.BOLD; + return TypefaceManager.TextWeight.BOLD; } } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTextViewUtils.java b/QKSMS/src/main/java/com/moez/QKSMS/common/TextViewUtils.java similarity index 85% rename from QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTextViewUtils.java rename to QKSMS/src/main/java/com/moez/QKSMS/common/TextViewUtils.java index 27679f94..23f667a3 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTextViewUtils.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/TextViewUtils.java @@ -29,13 +29,13 @@ import com.moez.QKSMS.R; * * @author Evgeny Shishkin */ -public class RobotoTextViewUtils { +public class TextViewUtils { - private RobotoTextViewUtils() { + private TextViewUtils() { } /** - * Typeface initialization using the attributes. Used in RobotoTextView constructor. + * Typeface initialization using the attributes. Used in TextView constructor. * * @param textView The roboto text view * @param context The context the widget is running in, through which it can @@ -49,15 +49,15 @@ public class RobotoTextViewUtils { TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.RobotoTextView); if (a.hasValue(R.styleable.RobotoTextView_typeface)) { - int typefaceValue = a.getInt(R.styleable.RobotoTextView_typeface, RobotoTypefaceManager.Typeface.ROBOTO_REGULAR); - typeface = RobotoTypefaceManager.obtainTypeface(context, typefaceValue); + int typefaceValue = a.getInt(R.styleable.RobotoTextView_typeface, TypefaceManager.Typeface.ROBOTO_REGULAR); + typeface = TypefaceManager.obtainTypeface(context, typefaceValue); } a.recycle(); } if (typeface == null) { - typeface = RobotoTypefaceManager.obtainTypeface(context, RobotoTypefaceManager.Typeface.ROBOTO_REGULAR); + typeface = TypefaceManager.obtainTypeface(context, TypefaceManager.Typeface.ROBOTO_REGULAR); } setTypeface(textView, typeface); @@ -86,4 +86,4 @@ public class RobotoTextViewUtils { paint.setTypeface(typeface); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTypefaceManager.java b/QKSMS/src/main/java/com/moez/QKSMS/common/TypefaceManager.java similarity index 70% rename from QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTypefaceManager.java rename to QKSMS/src/main/java/com/moez/QKSMS/common/TypefaceManager.java index 244b02cd..3ff2a6ec 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/RobotoTypefaceManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/TypefaceManager.java @@ -6,7 +6,7 @@ import android.util.SparseArray; /** * Stripped down version of https://github.com/johnkil/Android-RobotoTextView/blob/master/robototextview/src/main/java/com/devspark/robototextview/util/RobotoTypefaceManager.java */ -public class RobotoTypefaceManager { +public class TypefaceManager { private final static SparseArray mTypefaces = new SparseArray<>(); @@ -113,6 +113,58 @@ public class RobotoTypefaceManager { throw new IllegalArgumentException("`textWeight` attribute value " + textWeight + " is not supported for this font family " + fontFamily); } + } else if (fontFamily == FontFamily.LATO) { + if (textWeight == TextWeight.NORMAL) { + switch (textStyle) { + case TextStyle.NORMAL: + typeface = Typeface.LATO_REGULAR; + break; + default: + throw new IllegalArgumentException("`textStyle` attribute value " + textStyle + + " is not supported for this fontFamily " + fontFamily + + " and textWeight " + textWeight); + } + } else if (textWeight == TextWeight.THIN) { + switch (textStyle) { + case TextStyle.NORMAL: + typeface = Typeface.LATO_THIN; + break; + default: + throw new IllegalArgumentException("`textStyle` attribute value " + textStyle + + " is not supported for this fontFamily " + fontFamily + + " and textWeight " + textWeight); + } + } else if (textWeight == TextWeight.LIGHT) { + switch (textStyle) { + case TextStyle.NORMAL: + typeface = Typeface.LATO_LIGHT; + break; + default: + throw new IllegalArgumentException("`textStyle` attribute value " + textStyle + + " is not supported for this fontFamily " + fontFamily + + " and textWeight " + textWeight); + } + } else if (textWeight == TextWeight.MEDIUM) { + switch (textStyle) { + case TextStyle.NORMAL: + typeface = Typeface.LATO_MEDIUM; + break; + default: + throw new IllegalArgumentException("`textStyle` attribute value " + textStyle + + " is not supported for this fontFamily " + fontFamily + + " and textWeight " + textWeight); + } + } else if (textWeight == TextWeight.BOLD) { + switch (textStyle) { + default: + throw new IllegalArgumentException("`textStyle` attribute value " + textStyle + + " is not supported for this fontFamily " + fontFamily + + " and textWeight " + textWeight); + } + } else { + throw new IllegalArgumentException("`textWeight` attribute value " + textWeight + + " is not supported for this font family " + fontFamily); + } } else { throw new IllegalArgumentException("Unknown `fontFamily` attribute value " + fontFamily); } @@ -143,6 +195,18 @@ public class RobotoTypefaceManager { case Typeface.ROBOTO_CONDENSED_BOLD: typefacePath = "fonts/RobotoCondensed-Bold.ttf"; break; + case Typeface.LATO_THIN: + typefacePath = "fonts/Lato-Hairline.ttf"; + break; + case Typeface.LATO_LIGHT: + typefacePath = "fonts/Lato-Light.ttf"; + break; + case Typeface.LATO_REGULAR: + typefacePath = "fonts/Lato-Regular.ttf"; + break; + case Typeface.LATO_MEDIUM: + typefacePath = "fonts/Lato-Bold.ttf"; + break; default: throw new IllegalArgumentException("Unknown `typeface` attribute value " + typefaceValue); } @@ -158,11 +222,16 @@ public class RobotoTypefaceManager { public final static int ROBOTO_CONDENSED_LIGHT = 12; public final static int ROBOTO_CONDENSED_REGULAR = 14; public final static int ROBOTO_CONDENSED_BOLD = 16; + public final static int LATO_THIN = 22; + public final static int LATO_LIGHT = 24; + public final static int LATO_REGULAR = 26; + public final static int LATO_MEDIUM = 28; } public class FontFamily { public static final int ROBOTO = 0; public static final int ROBOTO_CONDENSED = 1; + public static final int LATO = 2; } public class TextWeight { @@ -177,4 +246,4 @@ public class RobotoTypefaceManager { public static final int NORMAL = 0; } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/Emojis.java b/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/Emojis.java index 8b353284..a6680036 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/Emojis.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/emoji/Emojis.java @@ -846,4 +846,4 @@ public class Emojis { public static final String LARGE_BLUE_DIAMOND = "large_blue_diamond"; public static final String SMALL_ORANGE_DIAMOND = "small_orange_diamond"; public static final String SMALL_BLUE_DIAMOND = "small_blue_diamond"; -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java b/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java index 1e94ca96..43a6c28e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/google/DraftCache.java @@ -257,4 +257,4 @@ public class DraftCache { String s = String.format(format, args); Log.d(TAG, "[DraftCache/" + Thread.currentThread().getId() + "] " + s); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java index a98089ca..7826be4c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java @@ -4,91 +4,107 @@ import android.content.Context; import android.content.SharedPreferences; import android.text.format.DateUtils; +import com.moez.QKSMS.QKSMSApp; +import com.moez.QKSMS.R; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.settings.SettingsFragment; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Locale; public abstract class DateFormatter { public static String getConversationTimestamp(Context context, long date) { - SharedPreferences prefs = MainActivity.getPrefs(context); - SimpleDateFormat formatter = new SimpleDateFormat("D, y"); + SimpleDateFormat formatter; - if (formatter.format(date).equals(formatter.format(System.currentTimeMillis()))) { - formatter = new SimpleDateFormat(prefs.getBoolean(SettingsFragment.TIMESTAMPS_24H, false) ? "H:mm" : "h:mm a"); + if (isSameDay(date)) { + formatter = accountFor24HourTime(context, new SimpleDateFormat("h:mm a")); + } else if (isSameWeek(date)) { + formatter = new SimpleDateFormat("EEE"); + } else if (isSameYear(date)) { + formatter = new SimpleDateFormat("MMM d"); } else { - formatter = new SimpleDateFormat("w, y"); - if (formatter.format(date).equals(formatter.format(System.currentTimeMillis()))) { - formatter = new SimpleDateFormat("EEE"); - } else { - formatter = new SimpleDateFormat("y"); - if (formatter.format(date).equals(formatter.format(System.currentTimeMillis()))) { - formatter = new SimpleDateFormat("MMM d"); - } else { - formatter = new SimpleDateFormat("MMM d y"); - } - } + formatter = new SimpleDateFormat("MMM d y"); } return formatter.format(date); } - public static String getMessageTimestamp(Context context, long date) { + private static boolean isSameDay(long date) { + SimpleDateFormat formatter = new SimpleDateFormat("D, y"); + return formatter.format(date).equals(formatter.format(System.currentTimeMillis())); + } + + private static boolean isSameWeek(long date) { + SimpleDateFormat formatter = new SimpleDateFormat("w, y"); + return formatter.format(date).equals(formatter.format(System.currentTimeMillis())); + } + + private static boolean isSameYear(long date) { + SimpleDateFormat formatter = new SimpleDateFormat("y"); + return formatter.format(date).equals(formatter.format(System.currentTimeMillis())); + } + + private static boolean isYesterday(long date) { + SimpleDateFormat formatter = new SimpleDateFormat("yD"); + return Integer.parseInt(formatter.format(date)) + 1 == Integer.parseInt(formatter.format(System.currentTimeMillis())); + } + + public static SimpleDateFormat accountFor24HourTime(Context context, SimpleDateFormat input) { //pass in 12 hour time. If needed, change to 24 hr. SharedPreferences prefs = MainActivity.getPrefs(context); boolean isUsing24HourTime = prefs.getBoolean(SettingsFragment.TIMESTAMPS_24H, false); - SimpleDateFormat formatter = new SimpleDateFormat("D, y"); - if (formatter.format(date).equals(formatter.format(System.currentTimeMillis()))) { - return new SimpleDateFormat(isUsing24HourTime ? "H:mm" : "h:mm a").format(date); + if (isUsing24HourTime) { + return new SimpleDateFormat(input.toPattern().replace('h', 'H').replaceAll(" a", "")); + } else return input; + } + + public static SimpleDateFormat accountForFlippedDayMonth(SimpleDateFormat input) { //Pass in MMM d, if needed, change to d MMM. fix https://github.com/qklabs/qksms/issues/128. + boolean shouldBeFlipped = !(Locale.getDefault().equals(Locale.US) || Locale.getDefault().equals(Locale.CANADA)); + + if (shouldBeFlipped) { + return new SimpleDateFormat(input.toPattern().replaceAll("MMM", "temp").replaceAll("d", "MMM").replaceAll("temp", "d")); + } else return input; + } + + public static String getMessageTimestamp(Context context, long date) { + + if (isSameDay(date)) { + return accountFor24HourTime(context, new SimpleDateFormat("h:mm a")).format(date); + } else if (isYesterday(date)) { + return context.getString(R.string.date_yesterday) +" " + accountFor24HourTime(context, new SimpleDateFormat("h:mm a")).format(date); + } else if (isSameWeek(date)) { + return accountFor24HourTime(context, new SimpleDateFormat("EEE h:mm a")).format(date); + } else if (isSameYear(date)) { + return accountForFlippedDayMonth(accountFor24HourTime(context, new SimpleDateFormat("MMM d, h:mm a"))).format(date); } - // Yesterday - formatter = new SimpleDateFormat("yD"); - if (Integer.parseInt(formatter.format(date)) + 1 == Integer.parseInt(formatter.format(System.currentTimeMillis()))) { - return "Yesterday " + new SimpleDateFormat(isUsing24HourTime ? "H:mm" : "h:mm a").format(date); - } - - // In the same week - formatter = new SimpleDateFormat("w, y"); - if (formatter.format(date).equals(formatter.format(System.currentTimeMillis()))) { - return new SimpleDateFormat(isUsing24HourTime ? "EEE H:mm" : "EEE h:mm a").format(date); - } - - // In the same year - formatter = new SimpleDateFormat("y"); - if (formatter.format(date).equals(formatter.format(System.currentTimeMillis()))) { - return new SimpleDateFormat(isUsing24HourTime ? "MMM d, H:mm" : "MMM d, h:mm a").format(date); - } - - return new SimpleDateFormat(isUsing24HourTime ? "MMM d y, H:mm" : "MMM d y, h:mm a").format(date); + return accountForFlippedDayMonth(accountFor24HourTime(context, new SimpleDateFormat("MMM d y, h:mm a"))).format(date); } public static String getDate(Context context, long date) { - SharedPreferences prefs = MainActivity.getPrefs(context); - SimpleDateFormat formatter = new SimpleDateFormat(prefs.getBoolean(SettingsFragment.TIMESTAMPS_24H, false) ? "MMMM d y, H:mm:ss" : "MMMM d y, h:mm:ss a"); + SimpleDateFormat formatter = accountForFlippedDayMonth(accountFor24HourTime(context, new SimpleDateFormat("MMMM d y, h:mm:ss a"))); return formatter.format(date); } public static String getRelativeTimestamp(long date) { String relativeTimestamp = (String) DateUtils.getRelativeTimeSpanString(date); if (relativeTimestamp.equals("in 0 minutes") || relativeTimestamp.equals("0 minutes ago")) - return "Just now"; + return QKSMSApp.getApplication().getString(com.moez.QKSMS.R.string.date_just_now); return relativeTimestamp; } public static String getSummaryTimestamp(Context context, String time) { - SharedPreferences prefs = MainActivity.getPrefs(context); - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("H:mm"); Date date; try { date = simpleDateFormat.parse(time); - simpleDateFormat = prefs.getBoolean(SettingsFragment.TIMESTAMPS_24H, false) ? new SimpleDateFormat("H:mm") : new SimpleDateFormat("h:mm a"); + simpleDateFormat = accountFor24HourTime(context, new SimpleDateFormat("H:mm")); time = simpleDateFormat.format(date); - } catch (Exception e) { + } catch (ParseException e) { e.printStackTrace(); } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/AndroidCustomField.java b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/AndroidCustomField.java index 739304ca..ccbbc9df 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/AndroidCustomField.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/AndroidCustomField.java @@ -120,4 +120,4 @@ public class AndroidCustomField extends VCardProperty { warnings.add(new Warning("Items must contain exactly one value.")); } } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/ContactOperations.java b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/ContactOperations.java index 81936e04..be8017bd 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/ContactOperations.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/ContactOperations.java @@ -557,4 +557,4 @@ public class ContactOperations { return contentValues; } } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/DataMappings.java b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/DataMappings.java index e90f6777..1262294c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/DataMappings.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/vcard/DataMappings.java @@ -284,4 +284,4 @@ public class DataMappings { private DataMappings(){ //hide constructor } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java b/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java index 99116b49..395b8c5b 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/Contact.java @@ -1182,4 +1182,4 @@ public class Contact { private static void log(String msg) { Log.d(TAG, msg); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java index 742176b3..dd382386 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactHelper.java @@ -17,7 +17,7 @@ import android.provider.BaseColumns; import android.provider.ContactsContract; import android.telephony.PhoneNumberUtils; import android.util.Log; -import com.moez.QKSMS.common.RobotoTypefaceManager; +import com.moez.QKSMS.common.TypefaceManager; import com.moez.QKSMS.common.utils.Units; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; @@ -205,7 +205,7 @@ public class ContactHelper { Paint paint = new Paint(Paint.ANTI_ALIAS_FLAG); paint.setColor(Color.WHITE); - paint.setTypeface(RobotoTypefaceManager.obtainTypeface(context, RobotoTypefaceManager.Typeface.ROBOTO_LIGHT)); + paint.setTypeface(TypefaceManager.obtainTypeface(context, TypefaceManager.Typeface.ROBOTO_LIGHT)); paint.setTextSize(length / 2); Rect bounds = new Rect(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactList.java b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactList.java index 1d2a7309..5b034b7a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/ContactList.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/ContactList.java @@ -175,4 +175,4 @@ public class ContactList extends ArrayList { private void log(String msg) { Log.d(LogTag.TAG, "[ContactList] " + msg); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/Conversation.java b/QKSMS/src/main/java/com/moez/QKSMS/data/Conversation.java index 7cc9b78a..953c016d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/Conversation.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/Conversation.java @@ -1468,4 +1468,4 @@ public class Conversation { } return address; } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/ConversationLegacy.java b/QKSMS/src/main/java/com/moez/QKSMS/data/ConversationLegacy.java index 462099f1..ea897198 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/ConversationLegacy.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/ConversationLegacy.java @@ -318,4 +318,4 @@ public class ConversationLegacy { } }.execute((Void[]) null); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/Message.java b/QKSMS/src/main/java/com/moez/QKSMS/data/Message.java index 2a7723b2..baf3db9e 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/Message.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/Message.java @@ -193,4 +193,4 @@ public class Message { e.printStackTrace(); } } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java b/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java index e8c3fa92..e7a180d4 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/data/RecipientIdCache.java @@ -273,4 +273,4 @@ public class RecipientIdCache { }.start(); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/CountedDataInputStream.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/CountedDataInputStream.java index e5b25b61..6523f3ce 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/CountedDataInputStream.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/CountedDataInputStream.java @@ -133,4 +133,4 @@ class CountedDataInputStream extends FilterInputStream { readOrThrow(buf); return new String(buf, charset); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInvalidFormatException.java b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInvalidFormatException.java index 51eba406..aa32e2eb 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInvalidFormatException.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/exif/ExifInvalidFormatException.java @@ -20,4 +20,4 @@ public class ExifInvalidFormatException extends Exception { public ExifInvalidFormatException(String meg) { super(meg); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabException.java b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabException.java index a5db16ef..7a47277c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabException.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/external/iab/IabException.java @@ -40,4 +40,4 @@ public class IabException extends Exception { /** Returns the IAB result (error) that this exception signals. */ public IabResult getResult() { return mResult; } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/MarkSeenService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/MarkSeenService.java index 9ac8deeb..ed035c3c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/service/MarkSeenService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/service/MarkSeenService.java @@ -18,4 +18,4 @@ public class MarkSeenService extends IntentService { SmsHelper.markMmsSeen(this); NotificationManager.update(this); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java b/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java index 4797d808..98e1b894 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/transaction/SmsHelper.java @@ -542,6 +542,35 @@ public class SmsHelper { return messages; } + public static List deleteFailedMessages(Context context, long threadId) { + + Log.d(TAG, "Deleting failed messages"); + + List messages = new ArrayList(); + + try { + cursor = context.getContentResolver().query(SMS_CONTENT_PROVIDER, new String[]{COLUMN_ID}, FAILED_SELECTION, null, sortDateDesc); + cursor.moveToFirst(); + for (int i = 0; i < cursor.getCount(); i++) { + messages.add(new Message(context, cursor.getLong(cursor.getColumnIndexOrThrow(COLUMN_ID)))); + cursor.moveToNext(); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + cursor.close(); + } + + for (Message m : messages) + { + if(m.getThreadId() == threadId) { + Log.d(TAG, "Deleting failed message to " + m.getName() + "\n Body: " + m.getBody()); + m.delete(); + } + } + return messages; + } + /** * Add an SMS to the given URI. * diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java index a30d6c7f..ad408427 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/conversationlist/ConversationListFragment.java @@ -51,8 +51,9 @@ public class ConversationListFragment extends QKFragment implements LoaderManage private final int MENU_VIEW_DETAILS = 3; private final int MENU_MARK_READ = 4; private final int MENU_MARK_UNREAD = 5; - private final int MENU_DELETE_CONVERSATION = 6; - private final int MENU_MULTI_SELECT = 7; + private final int MENU_DELETE_FAILED = 6; + private final int MENU_DELETE_CONVERSATION = 7; + private final int MENU_MULTI_SELECT = 8; private RecyclerView mRecyclerView; private FloatingActionButton mFab; @@ -193,6 +194,10 @@ public class ConversationListFragment extends QKFragment implements LoaderManage dialog.addMenuItem(R.string.menu_notification_settings, MENU_NOTIFICATION_SETTINGS); dialog.addMenuItem(R.string.menu_view_details, MENU_VIEW_DETAILS); + if (conversation.hasError()) { + dialog.addMenuItem(R.string.delete_all_failed, MENU_DELETE_FAILED); + } + dialog.addMenuItem(R.string.menu_delete_conversation, MENU_DELETE_CONVERSATION); dialog.buildMenu(new AdapterView.OnItemClickListener() { @@ -233,6 +238,10 @@ public class ConversationListFragment extends QKFragment implements LoaderManage case MENU_DELETE_CONVERSATION: DialogHelper.showDeleteConversationDialog((MainActivity) mContext, threadId); break; + case MENU_DELETE_FAILED: + //Deletes all failed messages from all conversations + DialogHelper.showDeleteFailedMessagesDialog((MainActivity) mContext, threadId); + break; } } }).show(((MainActivity) mContext).getFragmentManager(), "conversation options"); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/AsyncDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/AsyncDialog.java index ddbad5f5..89e164a0 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/AsyncDialog.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/dialog/AsyncDialog.java @@ -159,4 +159,4 @@ public class AsyncDialog { } } } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItemCache.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItemCache.java index 65b2e4f1..35760e74 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItemCache.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageItemCache.java @@ -60,4 +60,4 @@ public class MessageItemCache extends LruCache { } return item; } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java index 5a4517a4..999a605f 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListFragment.java @@ -1,5 +1,6 @@ package com.moez.QKSMS.ui.messagelist; +import android.app.Activity; import android.app.AlertDialog; import android.app.LoaderManager; import android.content.ClipData; @@ -218,8 +219,8 @@ public class MessageListFragment extends QKContentFragment implements ActivityLa } @Override - public void onStart() { - super.onStart(); + public void onAttach(Activity activity) { + super.onAttach(activity); // Make sure to notify that this conversation has been opened. This will mark it as read, load new drafts, etc. onOpenConversation(); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java index d7b5229c..45e08edc 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListViewHolder.java @@ -234,4 +234,4 @@ public class MessageListViewHolder extends ClickyViewHolder impleme } } } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKComposeActivity.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKComposeActivity.java index ecb405c2..e2b73091 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKComposeActivity.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/popup/QKComposeActivity.java @@ -148,4 +148,4 @@ public class QKComposeActivity extends QKPopupActivity implements ComposeView.On mStarredContactsView.collapse(); mCompose.requestReplyTextFocus(); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/QKResponseAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/QKResponseAdapter.java index 03427894..3b976274 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/QKResponseAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/settings/QKResponseAdapter.java @@ -64,4 +64,4 @@ class ViewHolder { int position; QKTextView mResponseIndex; QKEditText mResponse; -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java index 7b7c3753..4bce5f11 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AutoCompleteContactView.java @@ -10,7 +10,7 @@ import com.android.ex.chips.RecipientEditTextView; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.RobotoTypefaceManager; +import com.moez.QKSMS.common.TypefaceManager; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.settings.SettingsFragment; @@ -57,8 +57,8 @@ public class AutoCompleteContactView extends RecipientEditTextView implements Li @Override public void refresh() { - setTypeface(RobotoTypefaceManager.obtainTypeface(mContext, FontManager.getFontFamily(mContext), - FontManager.getFontWeight(mContext, false), RobotoTypefaceManager.TextStyle.NORMAL)); + setTypeface(TypefaceManager.obtainTypeface(mContext, FontManager.getFontFamily(mContext), + FontManager.getFontWeight(mContext, false), TypefaceManager.TextStyle.NORMAL)); setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, FontManager.TEXT_TYPE_PRIMARY)); setTextColor(ThemeManager.getTextOnBackgroundPrimary()); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java index 167624ad..4e726f25 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/AvatarView.java @@ -24,7 +24,7 @@ import android.widget.ImageView; import com.moez.QKSMS.R; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.RobotoTypefaceManager; +import com.moez.QKSMS.common.TypefaceManager; import com.moez.QKSMS.common.utils.ImageUtils; import com.moez.QKSMS.common.utils.PhoneNumberUtils; import com.moez.QKSMS.common.utils.Units; @@ -77,7 +77,7 @@ public class AvatarView extends ImageView implements View.OnClickListener, LiveV mPaint.setTextSize(Units.dpToPx(context, 32)); mPaint.setTextAlign(Paint.Align.CENTER); mPaint.setAntiAlias(true); - mPaint.setTypeface(RobotoTypefaceManager.obtainTypeface(context, RobotoTypefaceManager.Typeface.ROBOTO_LIGHT)); + mPaint.setTypeface(TypefaceManager.obtainTypeface(context, TypefaceManager.Typeface.ROBOTO_LIGHT)); final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.AvatarView, defStyle, 0); for (int i = 0; i < a.getIndexCount(); i++) { diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java index 253b1614..411f81de 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/ComposeView.java @@ -357,7 +357,7 @@ public class ComposeView extends LinearLayout implements View.OnClickListener, L if (mButtonState != buttonState) { mButtonState = buttonState; - float translation = Units.dpToPx(mContext, 16) / 3; + float translation = Units.dpToPx(mContext, 14) / 3; float barRotation1 = mButtonBar1.getRotation(); float barTranslation1 = mButtonBar1.getTranslationY(); float barRotation2 = mButtonBar2.getRotation(); @@ -367,23 +367,18 @@ public class ComposeView extends LinearLayout implements View.OnClickListener, L float barRotationTarget2 = mButtonState == SendButtonState.ATTACH ? 90 : 135; float barTranslationTarget2 = mButtonState == SendButtonState.SEND ? translation : 0; - if (barRotation1 != barRotationTarget1) { - ObjectAnimator.ofFloat(mButtonBar1, "rotation", barRotation1, barRotationTarget1) - .setDuration(ANIMATION_DURATION) - .start(); - ObjectAnimator.ofFloat(mButtonBar2, "rotation", barRotation2, barRotationTarget2) - .setDuration(ANIMATION_DURATION) - .start(); - } - - if (barTranslation1 != barTranslationTarget1) { - ObjectAnimator.ofFloat(mButtonBar1, "translationY", barTranslation1, barTranslationTarget1) - .setDuration(ANIMATION_DURATION) - .start(); - ObjectAnimator.ofFloat(mButtonBar2, "translationY", barTranslation2, barTranslationTarget2) - .setDuration(ANIMATION_DURATION) - .start(); - } + ObjectAnimator.ofFloat(mButtonBar1, "rotation", barRotation1, barRotationTarget1) + .setDuration(ANIMATION_DURATION) + .start(); + ObjectAnimator.ofFloat(mButtonBar2, "rotation", barRotation2, barRotationTarget2) + .setDuration(ANIMATION_DURATION) + .start(); + ObjectAnimator.ofFloat(mButtonBar1, "translationY", barTranslation1, barTranslationTarget1) + .setDuration(ANIMATION_DURATION) + .start(); + ObjectAnimator.ofFloat(mButtonBar2, "translationY", barTranslation2, barTranslationTarget2) + .setDuration(ANIMATION_DURATION) + .start(); } } diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/MessageListRecyclerView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/MessageListRecyclerView.java index e5c0f2d7..0d5c529a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/MessageListRecyclerView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/MessageListRecyclerView.java @@ -77,4 +77,4 @@ public class MessageListRecyclerView extends RecyclerView { return mContextMenuInfo; } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/MmsImageView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/MmsImageView.java index fd040b50..50176134 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/MmsImageView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/MmsImageView.java @@ -37,4 +37,4 @@ public class MmsImageView extends ImageView { super.setImageDrawable(drawable); } } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java index 2b5f6c3b..df966063 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKEditText.java @@ -11,7 +11,7 @@ import android.util.TypedValue; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.RobotoTypefaceManager; +import com.moez.QKSMS.common.TypefaceManager; import com.moez.QKSMS.ui.ThemeManager; import com.moez.QKSMS.ui.settings.SettingsFragment; @@ -97,8 +97,8 @@ public class QKEditText extends android.widget.EditText implements LiveView { // Typeface and colors int fontFamily = FontManager.getFontFamily(mContext); int fontWeight = FontManager.getFontWeight(mContext, false); - setTypeface(RobotoTypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight, - RobotoTypefaceManager.TextStyle.NORMAL)); + setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight, + TypefaceManager.TextStyle.NORMAL)); setTextColor(ThemeManager.getTextOnBackgroundPrimary()); setHintTextColor(ThemeManager.getTextOnBackgroundSecondary()); diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKLinearLayout.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKLinearLayout.java index 8b17b198..233cee5d 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKLinearLayout.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKLinearLayout.java @@ -74,4 +74,4 @@ public class QKLinearLayout extends LinearLayout { background.mutate().setColorFilter(mBackgroundTint, PorterDuff.Mode.MULTIPLY); super.setBackgroundDrawable(background); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java index 6d64efc3..9cddea2c 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/QKTextView.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.moez.QKSMS.interfaces.LiveView; import com.moez.QKSMS.common.FontManager; import com.moez.QKSMS.common.LiveViewManager; -import com.moez.QKSMS.common.RobotoTypefaceManager; +import com.moez.QKSMS.common.TypefaceManager; import com.moez.QKSMS.common.utils.MessageUtils; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.ThemeManager; @@ -162,8 +162,8 @@ public class QKTextView extends TextView implements LiveView { // Typeface int fontFamily = FontManager.getFontFamily(mContext); int fontWeight = FontManager.getFontWeight(mContext, FontManager.getIsFontHeavy(mType)); - setTypeface(RobotoTypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight, - RobotoTypefaceManager.TextStyle.NORMAL)); + setTypeface(TypefaceManager.obtainTypeface(mContext, fontFamily, fontWeight, + TypefaceManager.TextStyle.NORMAL)); // Text size and color setTextSize(TypedValue.COMPLEX_UNIT_SP, FontManager.getTextSize(mContext, mType)); @@ -172,4 +172,4 @@ public class QKTextView extends TextView implements LiveView { // Markdown support enabled setText(getText(), BufferType.NORMAL); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/RobotoTextView.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/RobotoTextView.java index f4e9f314..742e568a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/RobotoTextView.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/RobotoTextView.java @@ -3,7 +3,7 @@ package com.moez.QKSMS.ui.view; import android.content.Context; import android.support.v7.widget.AppCompatTextView; import android.util.AttributeSet; -import com.moez.QKSMS.common.RobotoTextViewUtils; +import com.moez.QKSMS.common.TextViewUtils; public class RobotoTextView extends AppCompatTextView { @@ -15,7 +15,7 @@ public class RobotoTextView extends AppCompatTextView { super(context, attrs); if (!isInEditMode()) { - RobotoTextViewUtils.initTypeface(this, context, attrs); + TextViewUtils.initTypeface(this, context, attrs); } } @@ -23,8 +23,8 @@ public class RobotoTextView extends AppCompatTextView { super(context, attrs, defStyle); if (!isInEditMode()) { - RobotoTextViewUtils.initTypeface(this, context, attrs); + TextViewUtils.initTypeface(this, context, attrs); } } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/WrappingLinearLayoutManager.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/WrappingLinearLayoutManager.java index a713c000..f176daf0 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/WrappingLinearLayoutManager.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/WrappingLinearLayoutManager.java @@ -189,4 +189,4 @@ public class WrappingLinearLayoutManager extends android.support.v7.widget.Linea recycler.recycleView(child); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerDialog.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerDialog.java index b850d543..038024ac 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerDialog.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerDialog.java @@ -116,4 +116,4 @@ public class ColorPickerDialog extends DialogFragment implements ColorPickerSwat mPalette.setVisibility(View.GONE); } } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerPalette.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerPalette.java index 1cd48e54..d7cddb29 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerPalette.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerPalette.java @@ -128,4 +128,4 @@ public class ColorPickerPalette extends TableLayout { mDescription = resources.getString(R.string.color_swatch_description); mDescriptionSelected = resources.getString(R.string.color_swatch_description_selected); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerSwatch.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerSwatch.java index d0692eea..df97e6be 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerSwatch.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorPickerSwatch.java @@ -50,4 +50,4 @@ public class ColorPickerSwatch extends FrameLayout implements View.OnClickListen public interface OnColorSelectedListener { void onColorSelected(int color); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorStateDrawable.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorStateDrawable.java index 7ad2967c..a72a909a 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorStateDrawable.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/view/colorpicker/ColorStateDrawable.java @@ -40,4 +40,4 @@ public class ColorStateDrawable extends LayerDrawable { return super.onStateChange(states); } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java index 33b006bf..f61feba6 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/widget/WidgetService.java @@ -296,4 +296,4 @@ public class WidgetService extends RemoteViewsService { } } -} \ No newline at end of file +} diff --git a/QKSMS/src/main/res/drawable-v21/button_background_transparent.xml b/QKSMS/src/main/res/drawable-v21/button_background_transparent.xml index 04d0a80f..ce3a60c1 100644 --- a/QKSMS/src/main/res/drawable-v21/button_background_transparent.xml +++ b/QKSMS/src/main/res/drawable-v21/button_background_transparent.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/QKSMS/src/main/res/drawable-v21/button_background_transparent_light.xml b/QKSMS/src/main/res/drawable-v21/button_background_transparent_light.xml index 961a641d..c9777e2a 100644 --- a/QKSMS/src/main/res/drawable-v21/button_background_transparent_light.xml +++ b/QKSMS/src/main/res/drawable-v21/button_background_transparent_light.xml @@ -6,4 +6,4 @@ - \ No newline at end of file + diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_000.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_000.png index 460454de..71682635 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_000.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_000.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_001.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_001.png index db088282..b203c727 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_001.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_001.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_002.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_002.png index 6b40e374..6bb58907 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_002.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_002.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_003.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_003.png index 61aac9cd..780b1eb4 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_003.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_003.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_004.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_004.png index c46f6b49..9b43cad2 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_004.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_004.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_005.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_005.png index 6a6f9754..cdadd876 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_005.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_005.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_006.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_006.png index ba5696c5..98c6696e 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_006.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_006.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_007.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_007.png index 2eb15476..310761a8 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_007.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_007.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_008.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_008.png index 36e6e6c3..e264b7f5 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_008.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_008.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_009.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_009.png index 911c02fb..ffbf3fcd 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_009.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_009.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_010.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_010.png index 75a56ff2..51fab10e 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_010.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_010.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_011.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_011.png index cf57b6c4..e305e7a2 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_011.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_011.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_012.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_012.png index 5b5fbd20..8fd1d1ab 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_012.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_012.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_013.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_013.png index 48ae7142..aff761d1 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_013.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_013.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_014.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_014.png index d34f9af9..a8a8836f 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_014.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_014.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_015.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_015.png index e3749911..469c50f2 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_015.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_off_mtrl_015.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_000.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_000.png index 90738fd7..469c50f2 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_000.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_000.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_001.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_001.png index b1070d20..f0dba58d 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_001.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_001.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_002.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_002.png index 3f1cc3c2..c157990a 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_002.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_002.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_003.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_003.png index b54f0842..3bf482fe 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_003.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_003.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_004.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_004.png index 14a4d109..66027b4f 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_004.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_004.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_005.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_005.png index 19410b91..0a429111 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_005.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_005.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_006.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_006.png index a36b2240..94182038 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_006.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_006.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_007.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_007.png index 85a6c7d3..c3f6df2c 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_007.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_007.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_008.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_008.png index 0978d608..30fc52fb 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_008.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_008.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_009.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_009.png index 58b5b87e..4262a97f 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_009.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_009.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_010.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_010.png index a41e9a6a..b2fd7393 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_010.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_010.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_011.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_011.png index d0cfee5f..42e2669c 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_011.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_011.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_012.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_012.png index a05d3322..941f5f48 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_012.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_012.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_013.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_013.png index 1b610da7..f06412f4 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_013.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_013.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_014.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_014.png index e0aab935..35c4c12c 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_014.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_014.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_015.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_015.png index 871ca036..71682635 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_015.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_check_to_on_mtrl_015.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_radio_off.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_radio_off.png index e4556b66..d266f8b3 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_radio_off.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_radio_off.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/btn_radio_on.png b/QKSMS/src/main/res/drawable-xxhdpi/btn_radio_on.png index 4aa01840..336ba26b 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/btn_radio_on.png and b/QKSMS/src/main/res/drawable-xxhdpi/btn_radio_on.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/dialog_background.9.png b/QKSMS/src/main/res/drawable-xxhdpi/dialog_background.9.png index 4c760289..684c03a1 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/dialog_background.9.png and b/QKSMS/src/main/res/drawable-xxhdpi/dialog_background.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_arrow_left.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_arrow_left.png index dae7e192..7ccf22fb 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_arrow_left.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_arrow_left.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_arrow_right.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_arrow_right.png index c829f2ca..ae22961e 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_arrow_right.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_arrow_right.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_call.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_call.png index e3bd22e2..2f931964 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_call.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_call.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_camera.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_camera.png index c1a3549b..1308ca8a 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_camera.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_camera.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_cancel.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_cancel.png index faa409f8..e0f8e8c0 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_cancel.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_cancel.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_delete.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_delete.png index 0e95e9b1..2ce0387d 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_delete.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_delete.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_drop_down.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_drop_down.png index 818fa704..50e1b0da 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_drop_down.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_drop_down.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_fold.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_fold.png index 4b249ac1..e9b0edee 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_fold.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_fold.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_info_fill.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_info_fill.png index c2dbf182..ef8be2c9 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_info_fill.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_info_fill.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_mute.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_mute.png index f6be6287..acf094fc 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_mute.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_mute.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_photo.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_photo.png index d1200242..ec10236c 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_photo.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_photo.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_scrollbar.9.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_scrollbar.9.png index 2994d18b..939910d8 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_scrollbar.9.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_scrollbar.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_search.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_search.png index 06cf9c75..b60db23c 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_search.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_search.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_timer.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_timer.png index d68241d1..a7cbe9c3 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_timer.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_timer.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/ic_unfold.png b/QKSMS/src/main/res/drawable-xxhdpi/ic_unfold.png index e878a82c..10774eef 100755 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/ic_unfold.png and b/QKSMS/src/main/res/drawable-xxhdpi/ic_unfold.png differ diff --git a/QKSMS/src/main/res/drawable-xxhdpi/send_background.png b/QKSMS/src/main/res/drawable-xxhdpi/send_background.png index 4f69dffc..7351258b 100644 Binary files a/QKSMS/src/main/res/drawable-xxhdpi/send_background.png and b/QKSMS/src/main/res/drawable-xxhdpi/send_background.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/ab_shadow.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/ab_shadow.9.png index 8071886c..15d6c5fb 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/ab_shadow.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/ab_shadow.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/message_neutral.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/message_neutral.9.png index a678c4db..5ac51fe6 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/message_neutral.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/message_neutral.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/message_neutral_2.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/message_neutral_2.9.png index 4e8fdcda..20604207 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/message_neutral_2.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/message_neutral_2.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/message_received.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/message_received.9.png index d61822a5..04a161fe 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/message_received.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/message_received.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/message_received_2.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/message_received_2.9.png index 76dc757e..b381dbdb 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/message_received_2.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/message_received_2.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/message_received_alt.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/message_received_alt.9.png index 83f6d157..1ba46121 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/message_received_alt.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/message_received_alt.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/message_received_alt_2.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/message_received_alt_2.9.png index 19cd1407..29646e67 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/message_received_alt_2.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/message_received_alt_2.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/message_sent.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/message_sent.9.png index 2442d90e..cc4b2dd0 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/message_sent.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/message_sent.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_2.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_2.9.png index f6b2aa05..98e95cac 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_2.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_2.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_alt.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_alt.9.png index 5aa7d18c..e5aa210e 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_alt.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_alt.9.png differ diff --git a/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_alt_2.9.png b/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_alt_2.9.png index ebbf3770..960dfb7f 100644 Binary files a/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_alt_2.9.png and b/QKSMS/src/main/res/drawable-xxxhdpi/message_sent_alt_2.9.png differ diff --git a/QKSMS/src/main/res/drawable/button_background_transparent.xml b/QKSMS/src/main/res/drawable/button_background_transparent.xml index ed2f45e4..7f28622d 100644 --- a/QKSMS/src/main/res/drawable/button_background_transparent.xml +++ b/QKSMS/src/main/res/drawable/button_background_transparent.xml @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/QKSMS/src/main/res/drawable/button_background_transparent_light.xml b/QKSMS/src/main/res/drawable/button_background_transparent_light.xml index 3f0cc3dd..42157aae 100644 --- a/QKSMS/src/main/res/drawable/button_background_transparent_light.xml +++ b/QKSMS/src/main/res/drawable/button_background_transparent_light.xml @@ -12,4 +12,4 @@ - \ No newline at end of file + diff --git a/QKSMS/src/main/res/layout/list_item_message_in.xml b/QKSMS/src/main/res/layout/list_item_message_in.xml index be756a2e..10241df8 100644 --- a/QKSMS/src/main/res/layout/list_item_message_in.xml +++ b/QKSMS/src/main/res/layout/list_item_message_in.xml @@ -57,6 +57,7 @@ android:id="@+id/text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:gravity="center_vertical" android:autoLink="all" android:background="@drawable/message_received_2" android:linksClickable="true" diff --git a/QKSMS/src/main/res/layout/list_item_message_out.xml b/QKSMS/src/main/res/layout/list_item_message_out.xml index ceebb734..63bb7d78 100644 --- a/QKSMS/src/main/res/layout/list_item_message_out.xml +++ b/QKSMS/src/main/res/layout/list_item_message_out.xml @@ -57,6 +57,7 @@ android:id="@+id/text_view" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:gravity="center_vertical" android:autoLink="all" android:background="@drawable/message_sent_2" android:linksClickable="true" diff --git a/QKSMS/src/main/res/layout/view_starred_contacts.xml b/QKSMS/src/main/res/layout/view_starred_contacts.xml index e18e7785..1744f1ef 100644 --- a/QKSMS/src/main/res/layout/view_starred_contacts.xml +++ b/QKSMS/src/main/res/layout/view_starred_contacts.xml @@ -50,4 +50,4 @@ - \ No newline at end of file + diff --git a/QKSMS/src/main/res/layout/widget.xml b/QKSMS/src/main/res/layout/widget.xml index 32070fed..c069a938 100644 --- a/QKSMS/src/main/res/layout/widget.xml +++ b/QKSMS/src/main/res/layout/widget.xml @@ -26,10 +26,11 @@ android:id="@+id/widget_label" android:layout_width="0dp" android:layout_height="wrap_content" - android:paddingLeft="24dp" - android:paddingRight="24dp" android:layout_weight="1" android:freezesText="true" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:singleLine="true" android:textSize="20sp" /> Largest - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-cs/strings.xml b/QKSMS/src/main/res/values-cs/strings.xml index 24e36238..4926104d 100755 --- a/QKSMS/src/main/res/values-cs/strings.xml +++ b/QKSMS/src/main/res/values-cs/strings.xml @@ -451,8 +451,9 @@ Největší - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-da/strings.xml b/QKSMS/src/main/res/values-da/strings.xml index 93ec6918..bb41385c 100755 --- a/QKSMS/src/main/res/values-da/strings.xml +++ b/QKSMS/src/main/res/values-da/strings.xml @@ -452,6 +452,7 @@ Almindelig Sammentrængt + Lato Tynd diff --git a/QKSMS/src/main/res/values-de/strings.xml b/QKSMS/src/main/res/values-de/strings.xml index 0fcf96ca..5a27a960 100755 --- a/QKSMS/src/main/res/values-de/strings.xml +++ b/QKSMS/src/main/res/values-de/strings.xml @@ -396,6 +396,9 @@ Textformatierung Benutze Markdown-Syntax um fett, unterstrichen und kursiv in deinen Nachrichten zu verwenden Want read indicators? + Gestern + Gerade eben + Bonus theme colors Delayed messaging @@ -452,6 +455,7 @@ Normal Zusammengefasst + Lato Dünn diff --git a/QKSMS/src/main/res/values-el/strings.xml b/QKSMS/src/main/res/values-el/strings.xml index 24974b58..cebd549d 100644 --- a/QKSMS/src/main/res/values-el/strings.xml +++ b/QKSMS/src/main/res/values-el/strings.xml @@ -279,8 +279,9 @@ Largest - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-es/strings.xml b/QKSMS/src/main/res/values-es/strings.xml index f50c1050..9fff312e 100755 --- a/QKSMS/src/main/res/values-es/strings.xml +++ b/QKSMS/src/main/res/values-es/strings.xml @@ -450,8 +450,9 @@ Más grande - Regular - Condensada + Roboto Regular + Roboto Condensada + Lato Ligera diff --git a/QKSMS/src/main/res/values-fi/strings.xml b/QKSMS/src/main/res/values-fi/strings.xml index 735e8b91..5417d820 100755 --- a/QKSMS/src/main/res/values-fi/strings.xml +++ b/QKSMS/src/main/res/values-fi/strings.xml @@ -452,6 +452,7 @@ Tavallinen Tiivistetty + Lato Kevyt diff --git a/QKSMS/src/main/res/values-fr/strings.xml b/QKSMS/src/main/res/values-fr/strings.xml index 6bf858b5..9c48c73b 100755 --- a/QKSMS/src/main/res/values-fr/strings.xml +++ b/QKSMS/src/main/res/values-fr/strings.xml @@ -450,8 +450,9 @@ Très grande - Régulier - Condensé + Roboto Régulier + Roboto Condensé + Lato Léger diff --git a/QKSMS/src/main/res/values-hi/strings.xml b/QKSMS/src/main/res/values-hi/strings.xml index 741ed006..b202e644 100755 --- a/QKSMS/src/main/res/values-hi/strings.xml +++ b/QKSMS/src/main/res/values-hi/strings.xml @@ -452,6 +452,7 @@ नियमित संक्षिप्त + Lato प्रकाश diff --git a/QKSMS/src/main/res/values-hr/strings.xml b/QKSMS/src/main/res/values-hr/strings.xml index cd7003fa..be060c66 100644 --- a/QKSMS/src/main/res/values-hr/strings.xml +++ b/QKSMS/src/main/res/values-hr/strings.xml @@ -280,8 +280,9 @@ Largest - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-in/strings.xml b/QKSMS/src/main/res/values-in/strings.xml index 534b7bfb..cbc6ed93 100755 --- a/QKSMS/src/main/res/values-in/strings.xml +++ b/QKSMS/src/main/res/values-in/strings.xml @@ -449,8 +449,9 @@ Largest - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-it/strings.xml b/QKSMS/src/main/res/values-it/strings.xml index 2e1001ec..016b3c1a 100755 --- a/QKSMS/src/main/res/values-it/strings.xml +++ b/QKSMS/src/main/res/values-it/strings.xml @@ -452,8 +452,9 @@ Moez Bhatti\Shane Creighton-Young Più grande - Regolare - Condensato + Roboto Regolare + Roboto Condensato + Lato Sottile diff --git a/QKSMS/src/main/res/values-iw/strings.xml b/QKSMS/src/main/res/values-iw/strings.xml index a7764954..651e5f2c 100755 --- a/QKSMS/src/main/res/values-iw/strings.xml +++ b/QKSMS/src/main/res/values-iw/strings.xml @@ -450,8 +450,9 @@ גדול מאד - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-ko/strings.xml b/QKSMS/src/main/res/values-ko/strings.xml index 9937bb81..716352c2 100755 --- a/QKSMS/src/main/res/values-ko/strings.xml +++ b/QKSMS/src/main/res/values-ko/strings.xml @@ -449,8 +449,9 @@ 매우크게 - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-lt/strings.xml b/QKSMS/src/main/res/values-lt/strings.xml index dc9debe4..1aa4b5db 100755 --- a/QKSMS/src/main/res/values-lt/strings.xml +++ b/QKSMS/src/main/res/values-lt/strings.xml @@ -453,6 +453,7 @@ Įprastas Suspaustas + Lato Plonesnis diff --git a/QKSMS/src/main/res/values-ne/strings.xml b/QKSMS/src/main/res/values-ne/strings.xml index e61c379c..999d7e45 100755 --- a/QKSMS/src/main/res/values-ne/strings.xml +++ b/QKSMS/src/main/res/values-ne/strings.xml @@ -450,8 +450,9 @@ Largest - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-nl/strings.xml b/QKSMS/src/main/res/values-nl/strings.xml index 47027865..da310cf4 100755 --- a/QKSMS/src/main/res/values-nl/strings.xml +++ b/QKSMS/src/main/res/values-nl/strings.xml @@ -450,8 +450,9 @@ Grootste - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-no/strings.xml b/QKSMS/src/main/res/values-no/strings.xml index 5f106085..c0bb619b 100755 --- a/QKSMS/src/main/res/values-no/strings.xml +++ b/QKSMS/src/main/res/values-no/strings.xml @@ -450,8 +450,9 @@ Største - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-pl/strings.xml b/QKSMS/src/main/res/values-pl/strings.xml index 00493c1f..a32f3820 100755 --- a/QKSMS/src/main/res/values-pl/strings.xml +++ b/QKSMS/src/main/res/values-pl/strings.xml @@ -451,8 +451,9 @@ Największy - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Cienka diff --git a/QKSMS/src/main/res/values-pt-rBR/strings.xml b/QKSMS/src/main/res/values-pt-rBR/strings.xml index a22541a3..8f66d514 100755 --- a/QKSMS/src/main/res/values-pt-rBR/strings.xml +++ b/QKSMS/src/main/res/values-pt-rBR/strings.xml @@ -452,8 +452,9 @@ Plural form: Conversas serão excluídas. Maior - Regular - Condensado + Roboto Regular + Roboto Condensado + Lato Leve diff --git a/QKSMS/src/main/res/values-pt/strings.xml b/QKSMS/src/main/res/values-pt/strings.xml index 0b6cde31..632c0c47 100755 --- a/QKSMS/src/main/res/values-pt/strings.xml +++ b/QKSMS/src/main/res/values-pt/strings.xml @@ -450,8 +450,9 @@ Ainda Maior - Regular - Condensado + Roboto Regular + Roboto Condensado + Lato Simples diff --git a/QKSMS/src/main/res/values-ro/strings.xml b/QKSMS/src/main/res/values-ro/strings.xml index 7b00c3dd..87c181eb 100755 --- a/QKSMS/src/main/res/values-ro/strings.xml +++ b/QKSMS/src/main/res/values-ro/strings.xml @@ -453,6 +453,7 @@ Obișnuit Condensat + Lato Slab diff --git a/QKSMS/src/main/res/values-ru/strings.xml b/QKSMS/src/main/res/values-ru/strings.xml index f01caf8d..43085c76 100755 --- a/QKSMS/src/main/res/values-ru/strings.xml +++ b/QKSMS/src/main/res/values-ru/strings.xml @@ -452,8 +452,9 @@ Самый крупный - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Тонкий diff --git a/QKSMS/src/main/res/values-sk/strings.xml b/QKSMS/src/main/res/values-sk/strings.xml index 57ed0ee0..61aca135 100755 --- a/QKSMS/src/main/res/values-sk/strings.xml +++ b/QKSMS/src/main/res/values-sk/strings.xml @@ -451,8 +451,9 @@ Obrovské - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Tenké diff --git a/QKSMS/src/main/res/values-sv/strings.xml b/QKSMS/src/main/res/values-sv/strings.xml index e963aaf0..4e812335 100755 --- a/QKSMS/src/main/res/values-sv/strings.xml +++ b/QKSMS/src/main/res/values-sv/strings.xml @@ -450,8 +450,9 @@ Störst - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values-tl/strings.xml b/QKSMS/src/main/res/values-tl/strings.xml index 1db60b97..14db8451 100755 --- a/QKSMS/src/main/res/values-tl/strings.xml +++ b/QKSMS/src/main/res/values-tl/strings.xml @@ -452,6 +452,7 @@ Karaniwan Makipot + Lato Manipis diff --git a/QKSMS/src/main/res/values-tr/strings.xml b/QKSMS/src/main/res/values-tr/strings.xml index 9af8dc20..8389288b 100755 --- a/QKSMS/src/main/res/values-tr/strings.xml +++ b/QKSMS/src/main/res/values-tr/strings.xml @@ -452,6 +452,7 @@ Normal Yakınlaştırılmış + Lato İnce diff --git a/QKSMS/src/main/res/values-zh-rCN/strings.xml b/QKSMS/src/main/res/values-zh-rCN/strings.xml index 120ec88d..7defea9a 100755 --- a/QKSMS/src/main/res/values-zh-rCN/strings.xml +++ b/QKSMS/src/main/res/values-zh-rCN/strings.xml @@ -451,6 +451,7 @@ 常规 紧缩 + Lato 纤细 diff --git a/QKSMS/src/main/res/values-zh/strings.xml b/QKSMS/src/main/res/values-zh/strings.xml index 680620f4..e4e30209 100755 --- a/QKSMS/src/main/res/values-zh/strings.xml +++ b/QKSMS/src/main/res/values-zh/strings.xml @@ -452,8 +452,9 @@ 最大 - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato Light diff --git a/QKSMS/src/main/res/values/attrs.xml b/QKSMS/src/main/res/values/attrs.xml index fc207164..8ede7a86 100644 --- a/QKSMS/src/main/res/values/attrs.xml +++ b/QKSMS/src/main/res/values/attrs.xml @@ -45,6 +45,18 @@ + + + + + + + + + + + + diff --git a/QKSMS/src/main/res/values/integers.xml b/QKSMS/src/main/res/values/integers.xml index 8027d931..0d48446c 100644 --- a/QKSMS/src/main/res/values/integers.xml +++ b/QKSMS/src/main/res/values/integers.xml @@ -11,6 +11,7 @@ 0 1 + 2 diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index dd8f1387..9cf570f3 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -333,8 +333,12 @@ These changes will take effect the next time QKSMS is opened Delete conversation + + Delete failed messages Are you sure you would like to delete the conversation? + + Are you sure you would like to all failed messages? APNs not set @@ -706,6 +710,8 @@ Automatic configuration failed Try searching for your carrier\'s APN settings (MMSC, Port, and Proxy) and entering them in Settings > Advanced. + Yesterday + Just now Bonus theme colors @@ -752,8 +758,9 @@ - Regular - Condensed + Roboto Regular + Roboto Condensed + Lato diff --git a/build.gradle b/build.gradle index 5770e82a..e51aef8b 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,6 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.1' + classpath 'com.android.tools.build:gradle:1.3.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d53a7f32..b6c4b948 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip diff --git a/settings.gradle b/settings.gradle index fe34702d..6dbbe5f2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':QKSMS' \ No newline at end of file +include ':QKSMS'