Commit 03e20867 authored by axet's avatar axet 🍄

Merge branch 'callrecorder-1.6.41'

parents 16427623 4448fa72
Pipeline #43173884 passed with stage
in 48 seconds
......@@ -10,8 +10,8 @@ android {
applicationId "com.github.axet.callrecorder"
minSdkVersion 9
targetSdkVersion 26
versionCode 195
versionName "1.6.40"
versionCode 196
versionName "1.6.41"
}
signingConfigs {
release {
......@@ -70,7 +70,7 @@ clean.doLast {
preBuild.dependsOn fetch
dependencies {
implementation 'com.github.axet:android-audio-library:1.0.143' // implementation project(':android-audio-library')
api "org.apache.commons:commons-csv:1.5"
implementation 'com.github.axet:android-audio-library:1.0.147' // implementation project(':android-audio-library')
implementation "org.apache.commons:commons-csv:1.5"
testImplementation 'junit:junit:4.12'
}
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/axet/Library/Android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
-dontobfuscate
-keep class com.github.axet.vorbisjni.Vorbis {*;}
-keep class com.github.axet.lamejni.Lame {*;}
-keep class com.github.axet.opusjni.Opus {*;}
-keep class com.github.axet.androidlibrary.widgets.SearchView {*;}
-dontwarn org.slf4j.**
-dontwarn net.sourceforge.javaflacencoder.**
-dontwarn com.jssrc.resample.**
-dontwarn org.apache.commons.**
-dontwarn de.innosystec.unrar.**
\ No newline at end of file
......@@ -23,6 +23,7 @@ import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.github.axet.androidlibrary.widgets.PopupWindowCompat;
import com.github.axet.callrecorder.R;
import com.github.axet.callrecorder.app.CallApplication;
import com.github.axet.callrecorder.app.Storage;
......@@ -68,12 +69,6 @@ public class RecentCallActivity extends AppCompatActivity {
w.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
}
public static Rect getOnScreenRect(View v) {
int[] loc = new int[2];
v.getLocationOnScreen(loc);
return new Rect(loc[0], loc[1], loc[0] + v.getWidth(), loc[1] + v.getHeight());
}
int getAppTheme() {
return CallApplication.getTheme(this, R.style.AppThemeDialogLight, R.style.Theme_AppCompat_DayNight_Dialog);
}
......@@ -161,7 +156,7 @@ public class RecentCallActivity extends AppCompatActivity {
@Override
public boolean dispatchTouchEvent(MotionEvent event) {
Rect rect = getOnScreenRect(w.getDecorView());
Rect rect = PopupWindowCompat.getOnScreenRect(w.getDecorView());
if (rect.contains((int) event.getRawX(), (int) event.getRawY()))
onUserInteraction();
return c.dispatchTouchEvent(event);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment