From 3305889fdf90e186edcf139906fa30de9fd53207 Mon Sep 17 00:00:00 2001
From: xphnx <xphnx@riseup.net>
Date: Tue, 31 May 2016 21:48:12 +0200
Subject: [PATCH] minor fixes colors.xml and licenseactivity
---
app/src/main/java/org/xphnx/ameixa/LicenseActivity.java | 8 ++++----
app/src/main/res/values/{colors.xml => color.xml} | 0
2 files changed, 4 insertions(+), 4 deletions(-)
rename app/src/main/res/values/{colors.xml => color.xml} (100%)
diff --git a/app/src/main/java/org/xphnx/ameixa/LicenseActivity.java b/app/src/main/java/org/xphnx/ameixa/LicenseActivity.java
index defdbd37c..d8cb44d05 100644
--- a/app/src/main/java/org/xphnx/ameixa/LicenseActivity.java
+++ b/app/src/main/java/org/xphnx/ameixa/LicenseActivity.java
@@ -64,7 +64,7 @@ public class LicenseActivity extends AppCompatActivity {
TextView sourceText = new TextView( this );
sourceText.setText( "This program's source code is avaiable under the GNU General Public License v3." );
- sourceText.setTextSize( 24 );
+ sourceText.setTextSize( 16 );
sourceText.setTextColor( ContextCompat.getColor( getApplicationContext(), R.color.colorPrimaryDark) );
sourceText.setPadding( padding, padding, padding, padding );
sourceClickLayout.addView( sourceText );
@@ -91,8 +91,8 @@ public class LicenseActivity extends AppCompatActivity {
});
TextView aboutText = new TextView( this );
- aboutText.setText( "The images included in this program are avaiable under the Creative Commons Attribution Share NonComercial Alike 4.0 license, except for non-compatible licenses images (See credits)." );
- aboutText.setTextSize( 24 );
+ aboutText.setText( "The images included in this program are avaiable under the Creative Commons Attribution Share NonComercial Alike 4.0 license, except for non-compatible derivates licenses (See credits)." );
+ aboutText.setTextSize( 16 );
aboutText.setTextColor( 0xffffffff );
aboutText.setPadding( padding, padding, padding, padding );
imgClickLayout.addView( aboutText );
@@ -108,7 +108,7 @@ public class LicenseActivity extends AppCompatActivity {
public void ccLink( View v ) {
- Uri uri = Uri.parse( "http://choosealicense.com/licenses/cc-by-nc-sa-4.0/" );
+ Uri uri = Uri.parse( "https://creativecommons.org/licenses/by-nc-sa/4.0/" );
Intent intent = new Intent( Intent.ACTION_VIEW, uri );
startActivity( intent );
}
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/color.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to app/src/main/res/values/color.xml
--
GitLab