Set IntroActivity's texts and images.

This commit is contained in:
B. Petersen
2016-11-24 17:39:00 +01:00
parent ed442de0a4
commit 70b900649e
14 changed files with 78 additions and 116 deletions
@@ -485,7 +485,7 @@ public class AccountSettingsActivity extends BaseFragment implements Notificatio
view = new TextInfoPrivacyCell(mContext);
}
if( i==rowInfoBelowMailPw2) {
((TextInfoPrivacyCell) view).setText(LocaleController.getString("MyAccoutExplain", R.string.MyAccountExplain));
((TextInfoPrivacyCell) view).setText(LocaleController.getString("MyAccoutExplain", R.string.MyAccountExplain)+"\n");
view.setBackgroundResource(R.drawable.greydivider); // has shadow top+bottom
}
else if( i==rowInfoBelowSendPw) {
@@ -70,22 +70,22 @@ public class IntroActivity extends Activity {
R.drawable.intro1
};
titles = new int[]{
R.string.Page7Title,
R.string.Page6Title,
R.string.Page5Title,
R.string.Page4Title,
R.string.Page3Title,
R.string.Page2Title,
R.string.Page1Title
R.string.Intro7Headline,
R.string.Intro6Headline,
R.string.Intro5Headline,
R.string.Intro4Headline,
R.string.Intro3Headline,
R.string.Intro2Headline,
R.string.Intro1Headline
};
messages = new int[]{
R.string.Page7Message,
R.string.Page6Message,
R.string.Page5Message,
R.string.Page4Message,
R.string.Page3Message,
R.string.Page2Message,
R.string.Page1Message
R.string.Intro7Message,
R.string.Intro6Message,
R.string.Intro5Message,
R.string.Intro4Message,
R.string.Intro3Message,
R.string.Intro2Message,
R.string.Intro1Message
};
} else {
icons = new int[]{
@@ -98,27 +98,27 @@ public class IntroActivity extends Activity {
R.drawable.intro7
};
titles = new int[]{
R.string.Page1Title,
R.string.Page2Title,
R.string.Page3Title,
R.string.Page4Title,
R.string.Page5Title,
R.string.Page6Title,
R.string.Page7Title
R.string.Intro1Headline,
R.string.Intro2Headline,
R.string.Intro3Headline,
R.string.Intro4Headline,
R.string.Intro5Headline,
R.string.Intro6Headline,
R.string.Intro7Headline
};
messages = new int[]{
R.string.Page1Message,
R.string.Page2Message,
R.string.Page3Message,
R.string.Page4Message,
R.string.Page5Message,
R.string.Page6Message,
R.string.Page7Message
R.string.Intro1Message,
R.string.Intro2Message,
R.string.Intro3Message,
R.string.Intro4Message,
R.string.Intro5Message,
R.string.Intro6Message,
R.string.Intro7Message
};
}
viewPager = (ViewPager) findViewById(R.id.intro_view_pager);
TextView startMessagingButton = (TextView) findViewById(R.id.start_messaging_button);
startMessagingButton.setText(LocaleController.getString("StartMessaging", R.string.StartMessaging).toUpperCase());
startMessagingButton.setText(LocaleController.getString("StartMessaging", R.string.IntroStartMessaging).toUpperCase());
if (Build.VERSION.SDK_INT >= 21) {
StateListAnimator animator = new StateListAnimator();
animator.addState(new int[]{android.R.attr.state_pressed}, ObjectAnimator.ofFloat(startMessagingButton, "translationZ", AndroidUtilities.dp(2), AndroidUtilities.dp(4)).setDuration(200));