From aea3571ca595366e7421731583475fa41646af9b Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Tue, 14 Nov 2017 19:03:58 +0100
Subject: [PATCH] Fixed title screen animation for Lollipop+ Larger buttons
 overall and better spacing between replies.

---
 .../ui_blue_textbutton_disabled_pressed.9.png | Bin 310 -> 314 bytes
 ...i_blue_textbutton_disabled_unpressed.9.png | Bin 293 -> 298 bytes
 .../ui_blue_textbutton_enabled_pressed.9.png  | Bin 315 -> 319 bytes
 ...ui_blue_textbutton_enabled_unpressed.9.png | Bin 325 -> 326 bytes
 AndorsTrail/res/values/ui_dimen.xml           |   2 +
 AndorsTrail/res/values/ui_styles.xml          |   4 ++
 .../activity/ConversationActivity.java        |  38 +++++++++++++++---
 .../activity/StartScreenActivity.java         |   8 ++++
 8 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/AndorsTrail/res/drawable/ui_blue_textbutton_disabled_pressed.9.png b/AndorsTrail/res/drawable/ui_blue_textbutton_disabled_pressed.9.png
index 7a0c7898b695044387745c653031040af5b2e932..a86889d6753ea9f0ac57d0071c00e7917bb2806e 100644
GIT binary patch
delta 239
zcmV<L01*GS0=fc_Q-2N#9vjy-=@|e30LMv0K~y-)?Ug|agFp;LpW-=$3bq^1;VD86
zH{=waqnoy1p%+OvRmwP35uuAV5ST^s=ZDGv1M9-q6lGf*Q~h}iWM-%;0A<}w5<pck
zv&qFp4AgZUAq2|0p{kBaIw1rA%nT9nfnl*U$Duln=X-ydt!ORgSiJ+qz$tb)JH`)z
z`A%4#e^9}e_`l}2!3J$+BH}Mw8FiNudf#7p+|H;fZQCLutagnhr<h$lGjmmSz{|Rs
pB;cy*X6Et2?`qrG#!n>K_XI%0Sb|?KCpZ8A002ovPDHLkV1n;zYHt7l

delta 235
zcmV<H02Kea0=5E>Q-1>qCL<cbHK70i0K-W{K~y-)?UhXm!Y~j<U!~_LSg3A#j-Fze
z!-Y9T&*4Ue3SMN~*dj@2OLe6N2C|rW`SLSgVBPRFNyXN}T>UNvnHj1IK-IKK0H`Wv
zmMmPxpuX=3Ay73fb$!Un2_XPrW{8N73d^N^?Caw+zYXWv++=c2)hj3lXVfKU_SX0z
zn12#h{4d~3U}J9<BH~Y5nffl*=)-W~em$Y8bX|vtu-Y}2oMP6V&CFHR0k4`i3BXm=
l&CKHm|54j6Hhv=6x(Dn7SAmCVTloM0002ovPDHLkV1i<OY=-~<

diff --git a/AndorsTrail/res/drawable/ui_blue_textbutton_disabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_blue_textbutton_disabled_unpressed.9.png
index 8701c21e2ff8ea8975a70cb4eec140a12253b599..46df2bdfcf8fb4bed72bd9d4b7cbeb70e26b7acf 100644
GIT binary patch
delta 223
zcmV<503iRR0;&R#Q-2N#9WJV<e)#|Z0Jlj*K~y-)&6L3j0x=Lpf0k{;9JG_9i4gE;
z307bU9)*DvF@1PZA%cy>lc2kkHCeOZKj%LllVpIhq>@8wZc*wFVTqX$LI4qAyW5Z2
zr{e+Mdl+Njocmy?DbPJ$MzEFMWPu$TM%7q-vukQ5!ltaMVOUMgeu1S%tR$Mnc%5wJ
zX4+-G)U0Rr-xpAw+)SIA^{?SsYZEgA0Eh?xp!Hg`dfd*-Z;k%_Y9+g2a#oA4?NX@N
ZdjfvvS8#ZAT&Ms5002ovPDHLkV1h}4XAl4Y

delta 218
zcmV<0044vb0;K|wQ-1>qB@OL5YpnnP0J2F$K~y-)-IT!%0wEAZKbvht4%!JcK}bAW
zf)!YTN0Uh?V*2o+CYaa=o=nzVKv1~&&-|B{Au~W(LdhfXZ86rL!vZtIIR_%bcDG-&
zPsanSwNOgI81u#uIndo-7O<7vB!L4OM$}k+uxo1;h2^ZOVN*@beu0IqX5L@3rPNG^
z#7h0)2UI6D)23$QYe%)#ftdjSL<9hkavimL+|K>4#yGtoF}rzER^88bDKy%90xE-6
UZ#btbb^rhX07*qoM6N<$f^Fhnm;e9(

diff --git a/AndorsTrail/res/drawable/ui_blue_textbutton_enabled_pressed.9.png b/AndorsTrail/res/drawable/ui_blue_textbutton_enabled_pressed.9.png
index 918a74ef9789216c52c58cc924810b65731c1760..46012a9d4a31c59b48d91901fab7be16b2ca0dcc 100644
GIT binary patch
delta 244
zcmV<Q01N-S0>1)~Q-2N#9t>3FY~BC>0L)25K~y-)?Uk_&!axi~A5kVq9SMq*43G&j
zh2`N+o+1-4KuQXbQnP|-2%zLhPEjNZu;k8u=hONBgS7CJqTSlYSbsJKnHj1IKvC6`
z1W;AXY;tfu2DNQV2!W!iDG$f!I3WZ8%nT9nVZwar9_9W8>}{{zY;8U_)jMbmj!l=b
zVf+xxH)47AK?Q5#|C-;14cgp^h(B!Qsk@la`%A~|d_q-eng$Ue*)^7&Vs`P&%vIF^
uFRFTyfUByTnU5EKQ`=tJeoy>20JsC=v{-T>1xaZD0000<MNUMnLSTa7`E8T{

delta 240
zcmV<M01yAa0=oi`Q-1>qCN!B6ux0=N0LV#1K~y-)?UlU^!Y~j<Ur;7U9SMq*43G&j
z#p#B#Zi-C604XUzO3eyK!=LOZu^<(2(sjP)&-UGC$P3R|RJ>a_RlkWrW`?Q)P&I9m
z0IG_aB^#G9sPB712vki=z1vU92_XPrW{8O26_!iqsJBnxcxfJH*OqgtUO_Q<LS1ra
zAH@&Bd`(#Ke}FH6-Dk595x?2WWA3H~eLM|Zjt5kguImsHvRz}zDQ4~2%v@C+@TzH(
q1YA|!%sg)RRc(8z`#tmD0N@Ib16OhQg6uy40000<MNUMnLSTZC_h^>@

diff --git a/AndorsTrail/res/drawable/ui_blue_textbutton_enabled_unpressed.9.png b/AndorsTrail/res/drawable/ui_blue_textbutton_enabled_unpressed.9.png
index a3c1f1f49ecd2dbc1f0d57d48aef4ef97b19ea1f..51efaf9c8c4f1b394a7cc145acff5e609400bda7 100644
GIT binary patch
delta 251
zcmV<X00jTV0>%Q6Q-2N#9TtMB#%BNk0MkiCK~y-)&6L3jgFp~P|4QyQ5J(EJ4h3si
zyx4%H*npQoTL^3iDImuj67U>I1>->$k~q64jF1ltBF^LO>^eX!CY=|+AJ5^>g?Ehg
zF)<iB=P(QdhzMofE~+nGgQ}{K=Q*skUyMTxG(K+&SXsBAu5<wa^nDL&Eqh=B#h5Kt
zKF3ogZdcVTk&ZiN6^E&sslxcpN-P%5#z(wop`Io%snNP-|9t?Pi$XnBHS<%$6h*<#
zIRF3=&Hvyz6RlqNt2l;sF$>!LCS<ky*j@`2>n3TKU4Yh>7JdK#002ovPDHLkV1lg6
BY0Lls

delta 250
zcmV<W00sZX0>uK5Q-1>qB_ZG92TlM00MbcBK~y-)&6KeT!!Qs<zf5{B5J(2_92R&6
z;l>Mi6ffZBuvQ3YgA9-|MFOq^nc!R)K@y*Y4Kn0|KnUIE=^r{ECY8?%;E#Ryx^Tu=
zFBLOm=NzoHAR<&vx2V4KE$X^PS(Y%ye0dyVM&t9gFsqsl)N{80fMFP5jA3t>A)(Y3
zDzD?Ike-{CER)(Dql%j)B};0?Z{C$`e8e*gWtu_d>Q6IE+<?tRp-hvK`Kh6_*6f@E
z01(mq2hW8_^}1ihF|-R=knUF@s@=!-T2rxZ0u?k|e;Igf8vp<R07*qoM6N<$g8x}<
A*8l(j

diff --git a/AndorsTrail/res/values/ui_dimen.xml b/AndorsTrail/res/values/ui_dimen.xml
index 557164cb0..cbcb0f9dd 100644
--- a/AndorsTrail/res/values/ui_dimen.xml
+++ b/AndorsTrail/res/values/ui_dimen.xml
@@ -18,6 +18,8 @@
 
 	<dimen name="conversation_statementpadding">5dp</dimen>
 	<dimen name="conversation_textsize">16sp</dimen>
+	<dimen name="conversation_replyseparator_margintop">5dp</dimen>
+	<dimen name="conversation_replyseparator_marginbottom">5dp</dimen>
 
 	<dimen name="actionbar_text">12sp</dimen>
 	<dimen name="statusbar_text">11sp</dimen>
diff --git a/AndorsTrail/res/values/ui_styles.xml b/AndorsTrail/res/values/ui_styles.xml
index ded72a03a..03a19855a 100644
--- a/AndorsTrail/res/values/ui_styles.xml
+++ b/AndorsTrail/res/values/ui_styles.xml
@@ -72,6 +72,10 @@
     <style name="AndorsTrail_Blue_TextButton" parent="android:style/Widget.Button">
         <item name="android:background">@drawable/ui_blue_textbutton</item>
         <item name="android:textColor">@color/ui_blue_textbutton_textcolor</item>
+        <item name="android:paddingTop">20dp</item>
+        <item name="android:paddingBottom">20dp</item>
+        <item name="android:paddingLeft">5dp</item>
+        <item name="android:paddingRight">5dp</item>
     </style>
 
     <style name="AndorsTrail_Blue_ImageButton" parent="android:style/Widget.ImageButton">
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
index 217d8870d..e7500c843 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java
@@ -22,6 +22,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
@@ -134,11 +135,16 @@ public final class ConversationActivity
 	}
 
 	private int getSelectedReplyIndex() {
+		int j = 0;
 		for (int i = 0; i < replyGroup.getChildCount(); ++i) {
 			final View v = replyGroup.getChildAt(i);
 			if (v == null) continue;
+			if (!(v instanceof RadioButton)) {
+				continue;
+			}
 			final RadioButton rb = (RadioButton) v;
-			if (rb.isChecked()) return i;
+			if (rb.isChecked()) return j;
+			j++;
 		}
 		return -1;
 	}
@@ -147,12 +153,21 @@ public final class ConversationActivity
 		int replyCount = replyGroup.getChildCount();
 		if (replyCount <= 0) return;
 		if (i < 0) i = 0;
-		else if (i >= replyCount) i = replyCount - 1;
+		else if (i >= (replyCount+1)/2) i = replyCount/2;
 
-		View v = replyGroup.getChildAt(i);
-		if (v == null) return;
-		RadioButton rb = (RadioButton) v;
-		rb.setChecked(true);
+		for (int j = 0; j < replyGroup.getChildCount(); ++j) {
+			View v = replyGroup.getChildAt(j);
+			if (v == null) continue;
+			if (!(v instanceof RadioButton)) {
+				continue;
+			}
+			i--;
+			if (i < 0) {
+				RadioButton rb = (RadioButton) v;
+				rb.setChecked(true);
+				break;
+			}
+		}
 	}
 
 	@Override
@@ -200,6 +215,9 @@ public final class ConversationActivity
 		for (int i = 0; i < replyGroup.getChildCount(); ++i) {
 			final View v = replyGroup.getChildAt(i);
 			if (v == null) continue;
+			if (!(v instanceof RadioButton)) {
+				continue;
+			}
 			final RadioButton rb = (RadioButton) v;
 			if (rb.isChecked()) {
 				return rb;
@@ -449,6 +467,14 @@ public final class ConversationActivity
 		rb.setShadowLayer(1, 1, 1, Color.BLACK);
 		rb.setFocusable(false);
 		rb.setFocusableInTouchMode(false);
+		if (replyGroup.getChildCount() > 0) { //For all but the first.
+			ImageView iv = new ImageView(this);
+			iv.setBackgroundResource(R.drawable.ui_blue_listseparator);
+			RadioGroup.LayoutParams ivLayoutParams = new RadioGroup.LayoutParams(RadioGroup.LayoutParams.MATCH_PARENT, RadioGroup.LayoutParams.WRAP_CONTENT);
+			ivLayoutParams.setMargins(0, getResources().getDimensionPixelOffset(R.dimen.conversation_replyseparator_margintop), 0, getResources().getDimensionPixelOffset(R.dimen.conversation_replyseparator_marginbottom));
+			iv.setLayoutParams(ivLayoutParams);
+			replyGroup.addView(iv, ivLayoutParams);
+		}
 		replyGroup.addView(rb, layoutParams);
 	}
 	
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
index aea9a3543..eccd3343a 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java
@@ -2,10 +2,12 @@ package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.Intent;
 import android.content.res.Resources;
+import android.graphics.drawable.AnimationDrawable;
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 import android.view.KeyEvent;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
@@ -64,6 +66,12 @@ public final class StartScreenActivity extends FragmentActivity implements OnNew
 	}
 
 	
+	@Override
+	public void onWindowFocusChanged(boolean hasFocus) {
+		super.onWindowFocusChanged(hasFocus);
+		((AnimationDrawable)((ImageView)findViewById(R.id.title_logo)).getDrawable()).start();
+	}
+	
 	@Override
 	protected void onResume() {
 		super.onResume();