mirror
/
SSTVEncoder2
kopia lustrzana https://github.com/olgamiller/SSTVEncoder2
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Gradle updates 29, with necessary replacement of android.support by androidx

pull/3/head
Olga Miller 2020-06-18 22:35:44 +02:00
rodzic 3027ee6cd5
commit 4fc704604b
18 zmienionych plików z 36 dodań i 35 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
app/build.gradle
Wyświetl plik

@ -1,11 +1,11 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 28
compileSdkVersion 29
defaultConfig {
applicationId "om.sstvencoder"
minSdkVersion 15
targetSdkVersion 28
targetSdkVersion 29
versionCode 24
versionName "2.3"
}
@ -19,6 +19,6 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation "com.android.support:exifinterface:28.0.0"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation "androidx.exifinterface:exifinterface:1.2.0"
}

2
app/src/main/AndroidManifest.xml
Wyświetl plik

@ -13,7 +13,7 @@
android:label="@string/app_name"
android:theme="@style/AppTheme">
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="om.sstvencoder"
android:exported="false"
android:grantUriPermissions="true">

4
app/src/main/java/om/sstvencoder/ColorFragment.java
Wyświetl plik

@ -19,8 +19,8 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import androidx.annotation.NonNull;
import androidx.fragment.app.DialogFragment;
import android.view.View;
import java.util.ArrayList;

2
app/src/main/java/om/sstvencoder/ColorPalette/ColorPaletteView.java
Wyświetl plik

@ -19,7 +19,7 @@ import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;

6
app/src/main/java/om/sstvencoder/CropView.java
Wyświetl plik

@ -25,9 +25,9 @@ import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.RectF;
import android.support.annotation.NonNull;
import android.support.v4.view.GestureDetectorCompat;
import android.support.v7.widget.AppCompatImageView;
import androidx.annotation.NonNull;
import androidx.core.view.GestureDetectorCompat;
import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet;
import android.view.GestureDetector;
import android.view.MotionEvent;

8
app/src/main/java/om/sstvencoder/EditTextActivity.java
Wyświetl plik

@ -18,10 +18,10 @@ package om.sstvencoder;
import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.support.annotation.ColorInt;
import android.support.v4.app.DialogFragment;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.ColorInt;
import androidx.fragment.app.DialogFragment;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.text.Editable;
import android.text.TextWatcher;

2
app/src/main/java/om/sstvencoder/FontFamilySet.java
Wyświetl plik

@ -15,7 +15,7 @@ limitations under the License.
*/
package om.sstvencoder;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.Xml;
import org.xmlpull.v1.XmlPullParser;

12
app/src/main/java/om/sstvencoder/MainActivity.java
Wyświetl plik

@ -24,16 +24,16 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.support.media.ExifInterface;
import androidx.exifinterface.media.ExifInterface;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.annotation.RequiresApi;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.appcompat.app.AppCompatActivity;
import android.system.ErrnoException;
import android.system.OsConstants;
import android.view.Menu;

2
app/src/main/java/om/sstvencoder/TextOverlay/IWriter.java
Wyświetl plik

@ -15,7 +15,7 @@ limitations under the License.
*/
package om.sstvencoder.TextOverlay;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.io.IOException;

2
app/src/main/java/om/sstvencoder/TextOverlay/LabelCollection.java
Wyświetl plik

@ -17,7 +17,7 @@ package om.sstvencoder.TextOverlay;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.io.IOException;
import java.util.LinkedList;

2
app/src/main/java/om/sstvencoder/TextOverlay/LabelContainer.java
Wyświetl plik

@ -17,7 +17,7 @@ package om.sstvencoder.TextOverlay;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import java.io.IOException;

2
app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java
Wyświetl plik

@ -22,7 +22,7 @@ import android.graphics.Path;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.Typeface;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
class LabelPainter {
private interface IDrawer {

2
app/src/main/java/om/sstvencoder/TextOverlayTemplate.java
Wyświetl plik

@ -15,7 +15,7 @@ limitations under the License.
*/
package om.sstvencoder;
import android.support.annotation.NonNull;
import androidx.annotation.NonNull;
import android.util.JsonReader;
import android.util.JsonToken;
import android.util.JsonWriter;

6
app/src/main/java/om/sstvencoder/Utility.java
Wyświetl plik

@ -19,13 +19,13 @@ import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.graphics.Rect;
import android.support.media.ExifInterface;
import androidx.exifinterface.media.ExifInterface;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.v4.content.FileProvider;
import androidx.annotation.NonNull;
import androidx.core.content.FileProvider;
import java.io.File;
import java.text.SimpleDateFormat;

4
app/src/main/res/layout/activity_edit_text.xml
Wyświetl plik

@ -86,7 +86,7 @@
android:id="@+id/edit_text_size"
android:layout_width="50dp"/>
<android.support.v4.widget.Space
<Space
android:layout_width="0dp"/>
<TextView
@ -121,7 +121,7 @@
</LinearLayout>
<android.support.v4.widget.Space
<Space
android:layout_width="0dp"/>
<TextView

2
build.gradle
Wyświetl plik

@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:4.0.0'
}
}

3
gradle.properties
Wyświetl plik

@ -11,5 +11,6 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useAndroidX=true
android.enableJetifier=true

2
gradle/wrapper/gradle-wrapper.properties vendored
Wyświetl plik

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists