diff options
Diffstat (limited to 'app/src/main/java')
-rw-r--r-- | app/src/main/java/org/connectbot/HelpActivity.java | 6 | ||||
-rw-r--r-- | app/src/main/java/org/connectbot/WizardActivity.java | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java index d82777d..f597d7f 100644 --- a/app/src/main/java/org/connectbot/HelpActivity.java +++ b/app/src/main/java/org/connectbot/HelpActivity.java @@ -28,6 +28,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.LinearLayout; +import android.widget.TextView; /** * @author Kenny Root @@ -49,7 +50,10 @@ public class HelpActivity extends Activity { getResources().getText(R.string.title_help))); AssetManager am = this.getAssets(); - LinearLayout content = (LinearLayout)this.findViewById(R.id.topics); + LinearLayout content = (LinearLayout) findViewById(R.id.topics); + + TextView versionString = (TextView) findViewById(R.id.version); + versionString.setText(BuildConfig.VERSION_NAME); try { for (String name : am.list(HELPDIR)) { diff --git a/app/src/main/java/org/connectbot/WizardActivity.java b/app/src/main/java/org/connectbot/WizardActivity.java index 35a60ca..711043d 100644 --- a/app/src/main/java/org/connectbot/WizardActivity.java +++ b/app/src/main/java/org/connectbot/WizardActivity.java @@ -26,6 +26,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import android.widget.TextView; import android.widget.ViewFlipper; /** @@ -43,11 +44,15 @@ public class WizardActivity extends Activity { super.onCreate(savedInstanceState); setContentView(R.layout.act_wizard); - this.flipper = (ViewFlipper) findViewById(R.id.wizard_flipper); + flipper = (ViewFlipper) findViewById(R.id.wizard_flipper); // inflate the layout for EULA step LayoutInflater inflater = LayoutInflater.from(this); - this.flipper.addView(inflater.inflate(R.layout.wiz_eula, this.flipper, false)); + + View eula = inflater.inflate(R.layout.wiz_eula, flipper, false); + TextView versionString = (TextView) eula.findViewById(R.id.version); + versionString.setText(BuildConfig.VERSION_NAME); + flipper.addView(eula); // Add a view for each help topic we want the user to see. String[] topics = getResources().getStringArray(R.array.list_wizard_topics); |