diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3fa6060978b52d020aaed2deca867a3d3d0926d1..7f82f02ca560d5bae537655295bf16ec6c67294e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,7 +7,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
- android:theme="@style/AppTheme">
+ android:theme="@style/Theme">
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/org/xphnx/ameixa/IceImageUtils.java b/app/src/main/java/org/xphnx/ameixa/IceImageUtils.java
index 0fee1bd719c4b7d3f78870fa2ebd54246ca18d86..3b3d42fb316ad36ffc152a5aa44c5327fcdaec9d 100644
--- a/app/src/main/java/org/xphnx/ameixa/IceImageUtils.java
+++ b/app/src/main/java/org/xphnx/ameixa/IceImageUtils.java
@@ -107,9 +107,9 @@ class BitmapWorkerTask extends AsyncTask<Integer, Void, Bitmap> {
Resources res;
int resId, width, height;
- public BitmapWorkerTask(ImageView imageView) {
+ BitmapWorkerTask(ImageView imageView) {
- imageViewReference = new WeakReference<ImageView>(imageView);
+ imageViewReference = new WeakReference<>(imageView);
}
// Decode image in background
@@ -125,7 +125,7 @@ class BitmapWorkerTask extends AsyncTask<Integer, Void, Bitmap> {
@Override
protected void onPostExecute(Bitmap bitmap) {
- if (imageViewReference != null && bitmap != null) {
+ if (bitmap != null) {
final ImageView imageView = imageViewReference.get();
diff --git a/app/src/main/java/org/xphnx/ameixa/IceScreenUtils.java b/app/src/main/java/org/xphnx/ameixa/IceScreenUtils.java
index d2b42ae1cb37d3f0c5463b7b67e95a867aadffd9..7f8100aa9d37c6ba201dbb60eebdd44850137160 100644
--- a/app/src/main/java/org/xphnx/ameixa/IceScreenUtils.java
+++ b/app/src/main/java/org/xphnx/ameixa/IceScreenUtils.java
@@ -4,8 +4,7 @@ import android.content.Context;
class IceScreenUtils {
- static float densityScale(Context context) {
-
- return (context.getResources().getDisplayMetrics().density);
+ static float densityScale(Context c) {
+ return (c.getResources().getDisplayMetrics().density);
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/xphnx/ameixa/LicenseActivity.java b/app/src/main/java/org/xphnx/ameixa/LicenseActivity.java
index f892b8c5e62a89f0aeb0f04ae973d3c88e541cbe..43b62abda00cb669a66992db5923757eb9b2c223 100644
--- a/app/src/main/java/org/xphnx/ameixa/LicenseActivity.java
+++ b/app/src/main/java/org/xphnx/ameixa/LicenseActivity.java
@@ -14,7 +14,6 @@ public class LicenseActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
-
super.onCreate(savedInstanceState);
createLayout();
}
@@ -22,7 +21,6 @@ public class LicenseActivity extends AppCompatActivity {
private void createLayout() {
// main centered layout
-
LinearLayout.LayoutParams smallLayoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, 1f);
float scale = IceScreenUtils.densityScale(getApplicationContext());
int padding = Math.round(64 * scale);
@@ -40,7 +38,6 @@ public class LicenseActivity extends AppCompatActivity {
frameLayout.addView(baseLayout);
// gpl button
-
LinearLayout sourceLayout = new LinearLayout(this);
sourceLayout.setOrientation(LinearLayout.HORIZONTAL);
sourceLayout.setLayoutParams(smallLayoutParams);
@@ -52,7 +49,7 @@ public class LicenseActivity extends AppCompatActivity {
sourceClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
sourceClickLayout.setGravity(Gravity.CENTER);
sourceLayout.addView(sourceClickLayout);
- sourceClickLayout.setOnClickListener((View v) -> gplLink(v));
+ sourceClickLayout.setOnClickListener(this::gplLink);
TextView sourceText = new TextView(this);
sourceText.setText(R.string.codelicense);
@@ -62,7 +59,6 @@ public class LicenseActivity extends AppCompatActivity {
sourceClickLayout.addView(sourceText);
// cc button
-
LinearLayout imgLayout = new LinearLayout(this);
imgLayout.setOrientation(LinearLayout.HORIZONTAL);
imgLayout.setLayoutParams(smallLayoutParams);
@@ -75,7 +71,7 @@ public class LicenseActivity extends AppCompatActivity {
imgClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
imgClickLayout.setGravity(Gravity.CENTER);
imgLayout.addView(imgClickLayout);
- imgClickLayout.setOnClickListener((View v) -> ccLink(v));
+ imgClickLayout.setOnClickListener(this::ccLink);
TextView aboutText = new TextView(this);
aboutText.setText(R.string.imageslicense);
@@ -86,14 +82,12 @@ public class LicenseActivity extends AppCompatActivity {
}
public void gplLink(View v) {
-
Uri uri = Uri.parse(getString(R.string.urlgplv3));
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
startActivity(intent);
}
public void ccLink(View v) {
-
Uri uri = Uri.parse(getString(R.string.urlccbysa4));
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
startActivity(intent);
diff --git a/app/src/main/java/org/xphnx/ameixa/MainActivity.java b/app/src/main/java/org/xphnx/ameixa/MainActivity.java
index e856f0a678ffff7634dd119f04eb7813a0e6a94e..fe073a276b9d9b70bd65531d272e6cdc1b41820c 100644
--- a/app/src/main/java/org/xphnx/ameixa/MainActivity.java
+++ b/app/src/main/java/org/xphnx/ameixa/MainActivity.java
@@ -3,9 +3,9 @@ package org.xphnx.ameixa;
import android.content.Intent;
import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
+import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
@@ -17,7 +17,6 @@ public class MainActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
-
super.onCreate(savedInstanceState);
createLayout();
}
@@ -55,7 +54,7 @@ public class MainActivity extends AppCompatActivity {
sourceClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
sourceClickLayout.setGravity(Gravity.CENTER);
sourceLayout.addView(sourceClickLayout);
- sourceClickLayout.setOnClickListener((View v) -> gitLink(v));
+ sourceClickLayout.setOnClickListener(this::gitLink);
Button sourceButton = new Button(this);
sourceButton.setLayoutParams(buttonParams);
@@ -83,7 +82,7 @@ public class MainActivity extends AppCompatActivity {
aboutClickLayout.setLayoutParams(new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT));
aboutClickLayout.setGravity(Gravity.CENTER);
aboutLayout.addView(aboutClickLayout);
- aboutClickLayout.setOnClickListener((View v) -> licenseShow(v));
+ aboutClickLayout.setOnClickListener(this::licenseShow);
Button aboutButton = new Button(this);
aboutButton.setLayoutParams(buttonParams);
@@ -100,7 +99,6 @@ public class MainActivity extends AppCompatActivity {
}
public void gitLink(View v) {
-
Uri uri = Uri.parse(getString(R.string.sourcecodelink));
Intent intent = new Intent(Intent.ACTION_VIEW, uri);
startActivity(intent);
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7826ad63ad3669623a58c71cc38061f58e238e7f..4301e43143a923a6269c8b60ac5caeb842198545 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,12 +1,12 @@
<resources>
<string name="app_name">Ameixa</string>
- <string name="sourcecodetext">Código fuente</string>
- <string name="licensetext">licencia</string>
+ <string name="sourcecodetext">Código Fuente</string>
+ <string name="licensetext">Licencia</string>
<string name="sourcecodelink">https://gitlab.com/xphnx/ameixa</string>
<string name="codelicense">El código fuente de este programa está disponible bajo la GNU General Public License v3.</string>
- <string name="imageslicense">Las imágenes incluidas en este programa están disponibles bajo la licencia Creative Commons Attribution Share Alike 4.0, excepto para aquellos trabajos derivados que no sean compatibles con la misma. (Ver Créditos).</string>
- <string name="urlgplv3">http://choosealicense.com/licenses/gpl-3.0/</string>
- <string name="urlccbysa4">https://creativecommons.org/licenses/by-sa/4.0/</string>
+ <string name="imageslicense">Las imágenes incluidas en este programa están disponibles bajo la licencia Creative Commons Attribution Share Alike 4.0, excepto para aquellos trabajos derivados que no sean compatibles con la misma. (ver créditos).</string>
+ <string name="urlgplv3">https://choosealicense.com/licenses/gpl-3.0</string>
+ <string name="urlccbysa4">https://creativecommons.org/licenses/by-sa/4.0</string>
<!-- <bool name="config_iconpack">true</bool>-->
</resources>
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index 63fc816444614bd64f68a372d1f93211628ee51d..146c0e15320a2e7b33a1dba1710b07e81d3acefa 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -1,6 +1,3 @@
<resources>
- <!-- Example customization of dimensions originally defined in res/values/dimens.xml
- (such as screen margins) for screens with more than 820dp of available width. This
- would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
<dimen name="activity_horizontal_margin">64dp</dimen>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e4a50b5dd5ccebef1b268719dd6aa75668103a4c..a6ab6e14ffd16b0e5ee811c166aec96bb600b9d4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
<resources>
<string name="app_name">Ameixa</string>
- <string name="sourcecodetext">Source code</string>
+ <string name="sourcecodetext">Source Code</string>
<string name="licensetext">License</string>
<string name="sourcecodelink">https://gitlab.com/xphnx/ameixa</string>
<string name="codelicense">This program\'s source code is available under the GNU General Public License v3.</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5e404d91d4f0049491920c10141e038d697d0e4c..29ac7671f4fabff0b9d7074aa8f86df7f30c68c0 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
<resources>
<!-- Base application theme. -->
- <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+ <style name="Theme" parent="Theme.AppCompat.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>