olgamiller/SSTVEncoder2
1
0
Fork 0
mirror of https://github.com/olgamiller/SSTVEncoder2.git synced 2026-04-21 06:03:53 +00:00
Code Issues Projects Releases Packages 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
Download patch file Download diff file Expand all files Collapse all files

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) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
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.addOnColorSelectedListener(this);
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.support.annotation.NonNull;
import android.support.v4.view.GestureDetectorCompat;
import android.support.v7.widget.AppCompatImageView;
import android.util.AttributeSet;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.ScaleGestureDetector;
import android.widget.ImageView;
import java.io.BufferedInputStream;
import java.io.IOException;
@ -40,7 +40,7 @@ import om.sstvencoder.ModeInterfaces.ModeSize;
import om.sstvencoder.TextOverlay.Label;
import om.sstvencoder.TextOverlay.LabelCollection;
public class CropView extends ImageView {
public class CropView extends AppCompatImageView {
private class GestureListener extends GestureDetector.SimpleOnGestureListener {
@Override
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);
setContentView(R.layout.activity_edit_text);
mEditColor = EditColorMode.None;
mEditBold = (CheckBox) findViewById(R.id.edit_bold);
mEditItalic = (CheckBox) findViewById(R.id.edit_italic);
mEditOutline = (CheckBox) findViewById(R.id.edit_outline);
mEditBold = findViewById(R.id.edit_bold);
mEditItalic = findViewById(R.id.edit_italic);
mEditOutline = findViewById(R.id.edit_outline);
}
@Override
@ -86,7 +86,7 @@ public class EditTextActivity extends AppCompatActivity
}
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;
Drawable drawable = ContextCompat.getDrawable(this, clearTextIcon);
editText.setText(mLabel.getText());
@ -146,7 +146,7 @@ public class EditTextActivity extends AppCompatActivity
}
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);
mFontFamilySet = new FontFamilySet();
mSelectedFontFamily = mFontFamilySet.getFontFamily(familyName);
@ -157,7 +157,7 @@ public class EditTextActivity extends AppCompatActivity
}
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);
String[] sizeList = new String[]{"Small", "Normal", "Large", "Huge"};
spinner.setAdapter(new ArrayAdapter<>(this,
@ -166,7 +166,7 @@ public class EditTextActivity extends AppCompatActivity
}
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);
String[] sizeList = new String[]{"Thin", "Normal", "Thick"};
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.pm.PackageManager;
import android.database.Cursor;
import android.media.ExifInterface;
import android.support.media.ExifInterface;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@ -65,7 +65,7 @@ public class MainActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
mCropView = (CropView) findViewById(R.id.cropView);
mCropView = findViewById(R.id.cropView);
mEncoder = new Encoder(new MainActivityMessenger(this), getProgressBar(), getProgressBar2());
mSettings = new Settings(this);
@ -79,14 +79,14 @@ public class MainActivity extends AppCompatActivity {
}
private ProgressBarWrapper getProgressBar() {
ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar);
TextView progressBarText = (TextView) findViewById(R.id.progressBarText);
ProgressBar progressBar = findViewById(R.id.progressBar);
TextView progressBarText = findViewById(R.id.progressBarText);
return new ProgressBarWrapper(progressBar, progressBarText);
}
private ProgressBarWrapper getProgressBar2() {
ProgressBar progressBar = (ProgressBar) findViewById(R.id.progressBar2);
TextView progressBarText = (TextView) findViewById(R.id.progressBarText2);
ProgressBar progressBar = findViewById(R.id.progressBar2);
TextView progressBarText = findViewById(R.id.progressBarText2);
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.Intent;
import android.graphics.Rect;
import android.media.ExifInterface;
import android.support.media.ExifInterface;
import android.net.Uri;
import android.os.Build;
import android.os.Environment;