Skip to content

Commit 24f34c2

Browse files
authored
Merge pull request #146 from xdtianyu/feature/add_number_appeal
add number appeal, closed #32
2 parents a861293 + 89b7ccb commit 24f34c2

File tree

11 files changed

+523
-18
lines changed

11 files changed

+523
-18
lines changed

app/build.gradle

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ android {
2424
setProperty("archivesBaseName", "CallerInfo-v$versionName")
2525

2626
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
27+
28+
vectorDrawables.useSupportLibrary = true
2729
}
2830

2931
signingConfigs {
@@ -68,7 +70,7 @@ dependencies {
6870
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
6971
androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
7072
androidTestImplementation 'com.android.support.test.espresso:espresso-idling-resource:3.0.2'
71-
androidTestImplementation ('com.android.support.test.espresso:espresso-contrib:2.2.2') {
73+
androidTestImplementation('com.android.support.test.espresso:espresso-contrib:2.2.2') {
7274
exclude group: 'com.android.support', module: 'appcompat-v7'
7375
exclude group: 'com.android.support', module: 'support-v4'
7476
exclude group: 'com.android.support', module: 'design'
@@ -82,6 +84,8 @@ dependencies {
8284
implementation "com.android.support:cardview-v7:${rootProject.ext.supportVersion}"
8385
implementation "com.android.support:design:${rootProject.ext.supportVersion}"
8486
implementation "com.android.support:support-v4:${rootProject.ext.supportVersion}"
87+
implementation "com.android.support.constraint:constraint-layout:${rootProject.ext.constraintVersion}"
88+
implementation "com.android.support:customtabs:${rootProject.ext.supportVersion}"
8589

8690
implementation 'org.xdty.phone.number:phone-number:0.7.18'
8791
implementation 'org.xdty.preference:color-picker:0.0.4'
@@ -107,6 +111,10 @@ dependencies {
107111
implementation 'io.requery:requery:1.4.0'
108112
implementation 'io.requery:requery-android:1.4.0'
109113
annotationProcessor 'io.requery:requery-processor:1.4.0'
114+
115+
implementation('net.openid:appauth:0.7.1') {
116+
exclude group: 'com.android.support', module: 'customtabs'
117+
}
110118
}
111119

112120
apply from: '../signing.gradle'

app/src/main/AndroidManifest.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
android:name="android.permission.READ_LOGS"
1616
tools:ignore="ProtectedPermissions"/>
1717

18+
<uses-sdk tools:overrideLibrary="android.support.customtabs,net.openid.appauth"/>
19+
1820
<application
1921
android:name=".application.Application"
2022
android:allowBackup="true"
@@ -57,6 +59,27 @@
5759
android:taskAffinity=".activity.MarkActivity"
5860
android:theme="@style/Theme.AppCompat.Light.Dialog">
5961
</activity>
62+
<activity
63+
android:name=".activity.AppealActivity"
64+
android:label="@string/number_appeal">
65+
<intent-filter>
66+
<action android:name="org.xdty.callerinfo.NUMBER_APPEAL"/>
67+
<category android:name="android.intent.category.DEFAULT"/>
68+
</intent-filter>
69+
</activity>
70+
71+
<activity
72+
android:name="net.openid.appauth.RedirectUriReceiverActivity"
73+
tools:node="replace">
74+
<intent-filter>
75+
<action android:name="android.intent.action.VIEW"/>
76+
77+
<category android:name="android.intent.category.DEFAULT"/>
78+
<category android:name="android.intent.category.BROWSABLE"/>
79+
80+
<data android:scheme="org.xdty.callerinfo"/>
81+
</intent-filter>
82+
</activity>
6083

6184
<service android:name=".service.FloatWindow"/>
6285
<service android:name=".service.MarkWindow"/>

0 commit comments

Comments
 (0)