Commit 551d3423 authored by Elodie Gauthier's avatar Elodie Gauthier

Downgrade targetSdkVersion to 22

(To turn on by default all permission requests, even from Android 6)
It is easier for Android app novice user and avoid misbehavior of LIG-Aikuma app.

These changes update the app to version 3.1.
parent 961557f1
apply plugin: 'com.android.application'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 27
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "org.getalp.ligaikuma"
minSdkVersion 16
targetSdkVersion 25
targetSdkVersion 22
multiDexEnabled = true
versionCode 3
versionName "3.0"
versionName "3.1"
}
buildTypes {
release {
......@@ -34,8 +34,8 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile project(path: ':waveform_view_library')
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-core-utils:25.3.1'
compile 'com.android.support:appcompat-v7:27.0.2'
compile 'com.android.support:support-core-utils:27.0.2'
compile 'com.itextpdf:itextg:5.5.10'
testCompile 'junit:junit:4.12'
}
......@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.getalp.ligaikuma.lig_aikuma.lig_aikuma"
android:versionCode="3"
android:versionName="3.0">
android:versionName="3.1">
<uses-sdk android:minSdkVersion="14"/>
......
......@@ -202,7 +202,7 @@ public class RecordingLig extends Recording {
importMapping(recordingUUID, getId());
// Write the index file
super.index(sourceVerId, getVersionName() + "-" + getId());
index(sourceVerId, getVersionName() + "-" + getId());
}
JSONObject encodedRecording = this.encode();
......
......@@ -70,11 +70,12 @@ public class ListenFragment extends Fragment implements OnClickListener {
if (fromUser)
seekBar.setProgress(originalProgress);
}
public void onStopTrackingTouch(SeekBar _seekBar) {};
public void onStartTrackingTouch(SeekBar _seekBar) {
public void onStopTrackingTouch(SeekBar _seekBar) {}
public void onStartTrackingTouch(SeekBar _seekBar) {
originalProgress = seekBar.getProgress();
};
});
}
});
seekBar.invalidate();
}
......@@ -103,8 +104,8 @@ public class ListenFragment extends Fragment implements OnClickListener {
isPlayed = false;
play ();
}
public void onStartTrackingTouch(SeekBar _seekBar) {};
});
public void onStartTrackingTouch(SeekBar _seekBar) {}
});
seekBar.invalidate();
}
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Lig-Aikuma</string>
<string name="app_name">LIG-Aikuma</string>
<string name="record">Recording</string>
<string name="cancel">Cancel</string>
<string name="speaker_name">Name</string>
......
......@@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:3.0.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
......@@ -15,6 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
}
}
......
#Tue Apr 04 16:26:34 CEST 2017
#Thu Feb 22 18:51:10 CET 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
apply plugin: 'com.android.library'
android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 27
buildToolsVersion "26.0.2"
defaultConfig {
minSdkVersion 16
targetSdkVersion 25
targetSdkVersion 22
}
buildTypes {
release {
......@@ -18,7 +18,7 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile ('com.android.support:appcompat-v7:25.3.1') {
compile ('com.android.support:appcompat-v7:27.0.2') {
exclude module: 'support-annotations'
}
testCompile 'junit:junit:4.12'
......
......@@ -94,7 +94,7 @@ public class CheapAMR extends CheapSoundFile {
}
public void ReadFile(File inputFile)
throws java.io.FileNotFoundException,
throws
java.io.IOException {
super.ReadFile(inputFile);
mNumFrames = 0;
......
......@@ -192,4 +192,4 @@ public class CheapMP3 extends CheapSoundFile {
static private int BITRATES_MPEG2_L3[] = {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0 };
static private int SAMPLERATES_MPEG1_L3[] = {44100, 48000, 32000, 0 };
static private int SAMPLERATES_MPEG2_L3[] = {22050, 24000, 16000, 0 };
};
}
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