olgamiller/SSTVEncoder2
1
0
Fork 0
mirror of https://github.com/olgamiller/SSTVEncoder2.git synced 2025-12-06 06:52:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Gradle updates

Browse source
This commit is contained in:
Olga Miller 2018-03-10 12:49:32 +01:00
parent dc835c180f
commit 3300b75ff1
10 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/build.gradle
View file

@ -1,12 +1,11 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 25 compileSdkVersion 26
buildToolsVersion "25"
defaultConfig { defaultConfig {
applicationId "om.sstvencoder" applicationId "om.sstvencoder"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 26
versionCode 22 versionCode 22
versionName "2.1" versionName "2.1"
} }
@ -20,5 +19,6 @@ android {
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.1.1' compile 'com.android.support:appcompat-v7:26.1.0'
compile "com.android.support:exifinterface:26.1.0"
} }

2
app/src/main/java/om/sstvencoder/ColorFragment.java
View file

@ -64,7 +64,7 @@ public class ColorFragment extends DialogFragment
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
View view = getActivity().getLayoutInflater().inflate(R.layout.fragment_color, null); View view = getActivity().getLayoutInflater().inflate(R.layout.fragment_color, null);
ColorPaletteView colorView = (ColorPaletteView) view.findViewById(R.id.select_color); ColorPaletteView colorView = view.findViewById(R.id.select_color);
colorView.setColor(mColor); colorView.setColor(mColor);
colorView.addOnColorSelectedListener(this); colorView.addOnColorSelectedListener(this);
builder.setTitle(mTitle); builder.setTitle(mTitle);

4
app/src/main/java/om/sstvencoder/CropView.java
View file

@ -26,11 +26,11 @@ import android.graphics.Rect;
import android.graphics.RectF; import android.graphics.RectF;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.view.GestureDetectorCompat; import android.support.v4.view.GestureDetectorCompat;
import android.support.v7.widget.AppCompatImageView;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.ScaleGestureDetector; import android.view.ScaleGestureDetector;
import android.widget.ImageView;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.IOException; import java.io.IOException;
@ -40,7 +40,7 @@ import om.sstvencoder.ModeInterfaces.ModeSize;
import om.sstvencoder.TextOverlay.Label; import om.sstvencoder.TextOverlay.Label;
import om.sstvencoder.TextOverlay.LabelCollection; import om.sstvencoder.TextOverlay.LabelCollection;
public class CropView extends ImageView { public class CropView extends AppCompatImageView {
private class GestureListener extends GestureDetector.SimpleOnGestureListener { private class GestureListener extends GestureDetector.SimpleOnGestureListener {
@Override @Override
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {

14
app/src/main/java/om/sstvencoder/EditTextActivity.java
View file

@ -63,9 +63,9 @@ public class EditTextActivity extends AppCompatActivity
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_edit_text); setContentView(R.layout.activity_edit_text);
mEditColor = EditColorMode.None; mEditColor = EditColorMode.None;
mEditBold = (CheckBox) findViewById(R.id.edit_bold); mEditBold = findViewById(R.id.edit_bold);
mEditItalic = (CheckBox) findViewById(R.id.edit_italic); mEditItalic = findViewById(R.id.edit_italic);
mEditOutline = (CheckBox) findViewById(R.id.edit_outline); mEditOutline = findViewById(R.id.edit_outline);
} }
@Override @Override
@ -86,7 +86,7 @@ public class EditTextActivity extends AppCompatActivity
} }
private void initText() { private void initText() {
EditText editText = (EditText) findViewById(R.id.edit_text); EditText editText = findViewById(R.id.edit_text);
int clearTextIcon = android.R.drawable.ic_menu_close_clear_cancel; int clearTextIcon = android.R.drawable.ic_menu_close_clear_cancel;
Drawable drawable = ContextCompat.getDrawable(this, clearTextIcon); Drawable drawable = ContextCompat.getDrawable(this, clearTextIcon);
editText.setText(mLabel.getText()); editText.setText(mLabel.getText());
@ -146,7 +146,7 @@ public class EditTextActivity extends AppCompatActivity
} }
private void initFontFamilySpinner(String familyName) { private void initFontFamilySpinner(String familyName) {
Spinner spinner = (Spinner) findViewById(R.id.edit_font_family); Spinner spinner = findViewById(R.id.edit_font_family);
spinner.setOnItemSelectedListener(this); spinner.setOnItemSelectedListener(this);
mFontFamilySet = new FontFamilySet(); mFontFamilySet = new FontFamilySet();
mSelectedFontFamily = mFontFamilySet.getFontFamily(familyName); mSelectedFontFamily = mFontFamilySet.getFontFamily(familyName);
@ -157,7 +157,7 @@ public class EditTextActivity extends AppCompatActivity
} }
private void initTextSizeSpinner(float textSize) { private void initTextSizeSpinner(float textSize) {
Spinner spinner = (Spinner) findViewById(R.id.edit_text_size); Spinner spinner = findViewById(R.id.edit_text_size);
spinner.setOnItemSelectedListener(this); spinner.setOnItemSelectedListener(this);
String[] sizeList = new String[]{"Small", "Normal", "Large", "Huge"}; String[] sizeList = new String[]{"Small", "Normal", "Large", "Huge"};
spinner.setAdapter(new ArrayAdapter<>(this, spinner.setAdapter(new ArrayAdapter<>(this,
@ -166,7 +166,7 @@ public class EditTextActivity extends AppCompatActivity
} }
private void initOutlineSizeSpinner(float outlineSize) { private void initOutlineSizeSpinner(float outlineSize) {
Spinner spinner = (Spinner) findViewById(R.id.edit_outline_size); Spinner spinner = findViewById(R.id.edit_outline_size);
spinner.setOnItemSelectedListener(this); spinner.setOnItemSelectedListener(this);
String[] sizeList = new String[]{"Thin", "Normal", "Thick"}; String[] sizeList = new String[]{"Thin", "Normal", "Thick"};
spinner.setAdapter(new ArrayAdapter<>(this, spinner.setAdapter(new ArrayAdapter<>(this,

12
app/src/main/java/om/sstvencoder/MainActivity.java
View file

@ -24,7 +24,7 @@ import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.database.Cursor; import android.database.Cursor;
import android.media.ExifInterface; import android.support.media.ExifInterface;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@ -65,7 +65,7 @@ public class MainActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
mCropView = (CropView) findViewById(R.id.cropView); mCropView = findViewById(R.id.cropView);
mEncoder = new Encoder(new MainActivityMessenger(this), getProgressBar(), getProgressBar2()); mEncoder = new Encoder(new MainActivityMessenger(this), getProgressBar(), getProgressBar2());
mSettings = new Settings(this); mSettings = new Settings(this);
@ -79,14 +79,14 @@ public class MainActivity extends AppCompatActivity {
} }
private ProgressBarWrapper getProgressBar() { private ProgressBarWrapper getProgressBar() {
ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar); ProgressBar progressBar = findViewById(R.id.progressBar);
TextView progressBarText = (TextView) findViewById(R.id.progressBarText); TextView progressBarText = findViewById(R.id.progressBarText);
return new ProgressBarWrapper(progressBar, progressBarText); return new ProgressBarWrapper(progressBar, progressBarText);
} }
private ProgressBarWrapper getProgressBar2() { private ProgressBarWrapper getProgressBar2() {
ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar2); ProgressBar progressBar = findViewById(R.id.progressBar2);
TextView progressBarText = (TextView) findViewById(R.id.progressBarText2); TextView progressBarText = findViewById(R.id.progressBarText2);
return new ProgressBarWrapper(progressBar, progressBarText); return new ProgressBarWrapper(progressBar, progressBarText);
} }

2
app/src/main/java/om/sstvencoder/Utility.java
View file

@ -19,7 +19,7 @@ import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Rect; import android.graphics.Rect;
import android.media.ExifInterface; import android.support.media.ExifInterface;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Environment; import android.os.Environment;

5
app/src/main/res/layout/activity_edit_text.xml
View file

@ -71,6 +71,7 @@
style="?android:attr/listSeparatorTextViewStyle" style="?android:attr/listSeparatorTextViewStyle"
android:layout_span="2" android:layout_span="2"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:onClick="onOutlineClick" android:onClick="onOutlineClick"
android:text="@string/outline"/> android:text="@string/outline"/>
@ -105,6 +106,7 @@
<LinearLayout <LinearLayout
android:clickable="true" android:clickable="true"
android:focusable="true"
android:onClick="onColorClick"> android:onClick="onColorClick">
<View <View
@ -114,6 +116,7 @@
android:layout_margin="6sp" android:layout_margin="6sp"
android:background="@android:color/white" android:background="@android:color/white"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:onClick="onColorClick"/> android:onClick="onColorClick"/>
</LinearLayout> </LinearLayout>
@ -127,6 +130,7 @@
<LinearLayout <LinearLayout
android:clickable="true" android:clickable="true"
android:focusable="true"
android:onClick="onOutlineColorClick"> android:onClick="onOutlineColorClick">
<View <View
@ -136,6 +140,7 @@
android:layout_margin="6sp" android:layout_margin="6sp"
android:background="@android:color/white" android:background="@android:color/white"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:onClick="onOutlineColorClick"/> android:onClick="onOutlineColorClick"/>
</LinearLayout> </LinearLayout>

2
app/src/main/res/xml/paths.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android"> <paths>
<external-path <external-path
name="media" name="media"
path="."/> path="."/>

4
build.gradle
View file

@ -3,9 +3,10 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.android.tools.build:gradle:3.0.1'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -15,6 +16,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
} }
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Mon Dec 28 10:00:20 PST 2015 #Tue Feb 27 20:24:42 CET 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip