From fd7721044a75235b730eaa4a86e9ab44b985bdc6 Mon Sep 17 00:00:00 2001
From: xphnx <xphnx@riseup.net>
Date: Sun, 7 Jan 2018 16:47:49 +0100
Subject: [PATCH] reverting MainActivity and updating changelog
---
CHANGELOG.md | 10 +++++
.../java/org/xphnx/ameixa/MainActivity.java | 39 +------------------
2 files changed, 12 insertions(+), 37 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4f1f2b2d..815e821f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+**v3.0.9**
+
+More icons and some fixes
+Fix #3
+
+**v3.0.8**
+
+More icons and some fixes
+
+
**v3.0.7**
More icons and some fixes
diff --git a/app/src/main/java/org/xphnx/ameixa/MainActivity.java b/app/src/main/java/org/xphnx/ameixa/MainActivity.java
index 60cf3e617..fe2f6c9ef 100644
--- a/app/src/main/java/org/xphnx/ameixa/MainActivity.java
+++ b/app/src/main/java/org/xphnx/ameixa/MainActivity.java
@@ -43,39 +43,6 @@ public class MainActivity extends AppCompatActivity {
frameLayout.addView( baseLayout );
- // icon view button
-
- LinearLayout iconLayout = new LinearLayout( this );
- iconLayout.setOrientation( LinearLayout.HORIZONTAL );
- iconLayout.setLayoutParams( smallLayoutParams );
- iconLayout.setGravity( Gravity.CENTER_VERTICAL );
- baseLayout.addView( iconLayout );
-
- LinearLayout iconClickLayout = new LinearLayout( this );
- iconClickLayout.setOrientation( LinearLayout.HORIZONTAL );
- iconClickLayout.setLayoutParams( new LinearLayout.LayoutParams( LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT ) );
- iconClickLayout.setGravity( Gravity.CENTER );
- iconLayout.addView( iconClickLayout );
- iconClickLayout.setOnClickListener( new View.OnClickListener() {
- @Override
- public void onClick( View v ) {
- iconView( v );
- }
- });
-
- Button iconButton = new Button( this );
- iconButton.setLayoutParams( buttonParams );
- iconButton.setBackground( new BitmapDrawable( getResources(), IceImageUtils.bitmapLoad( getApplicationContext().getResources(), R.drawable.ic_icon_button, Math.round( 48 * scale ), Math.round( 48 * scale ) ) ) );
- iconButton.setClickable(false);
- iconClickLayout.addView( iconButton );
-
- TextView iconText = new TextView( this );
- iconText.setText( "view icons" );
- iconText.setTextSize( 24 );
- iconText.setTextColor( ContextCompat.getColor( getApplicationContext(), R.color.colorPrimaryDark) );
- iconText.setPadding( 64, 64, 64, 64 );
- iconClickLayout.addView( iconText );
-
// source code button
@@ -100,8 +67,7 @@ public class MainActivity extends AppCompatActivity {
Button sourceButton = new Button( this );
sourceButton.setLayoutParams( buttonParams );
sourceButton.setBackground( new BitmapDrawable( getResources(), IceImageUtils.bitmapLoad( getApplicationContext().getResources(), R.drawable.ic_source_button, Math.round( 48 * scale ), Math.round( 48 * scale ) ) ) );
- sourceButton.setClickable(false);
- sourceClickLayout.addView( sourceButton );
+ sourceClickLayout.addView( sourceButton );
TextView sourceText = new TextView( this );
sourceText.setText( R.string.sourcecodetext );
@@ -133,8 +99,7 @@ public class MainActivity extends AppCompatActivity {
Button aboutButton = new Button( this );
aboutButton.setLayoutParams( buttonParams );
aboutButton.setBackground( new BitmapDrawable( getResources(), IceImageUtils.bitmapLoad( getApplicationContext().getResources(), R.drawable.ic_license_button, Math.round( 48 * scale ), Math.round( 48 * scale ) ) ) );
- aboutButton.setClickable(false);
- aboutClickLayout.addView( aboutButton );
+ aboutClickLayout.addView( aboutButton );
TextView aboutText = new TextView( this );
aboutText.setText( R.string.licensetext );
--
GitLab