Commit 33097dae by yuichiro ogawa

バージョンのリセット及びアプリケーション情報の修正

parent f04571a9
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
android:textColor="@color/text_color" android:textColor="@color/text_color"
android:textSize="@dimen/app_normal_text_size" /> android:textSize="@dimen/app_normal_text_size" />
<TextView <!-- <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
...@@ -43,9 +43,9 @@ ...@@ -43,9 +43,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dummy_str" android:text="@string/dummy_str"
android:textColor="@color/text_color" android:textColor="@color/text_color"
android:textSize="@dimen/app_normal_text_size" /> android:textSize="@dimen/app_normal_text_size" />-->
<TextView <!-- <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dummy_str" android:text="@string/dummy_str"
android:textColor="@color/text_color" android:textColor="@color/text_color"
android:textSize="@dimen/app_normal_text_size" /> android:textSize="@dimen/app_normal_text_size" />-->
<TextView <TextView
android:id="@+id/textCopyRight" android:id="@+id/textCopyRight"
......
...@@ -416,21 +416,21 @@ public class ABookSettingFragment extends PreferenceFragment { ...@@ -416,21 +416,21 @@ public class ABookSettingFragment extends PreferenceFragment {
TextView versionText = (TextView) mainView.findViewById(R.id.textVersion); TextView versionText = (TextView) mainView.findViewById(R.id.textVersion);
versionText.setText(version + "(" + releaseDate + ")\n" + "build:" + RawResourceUtil.getShortGitHash(getActivity())); versionText.setText(version + "(" + releaseDate + ")\n" + "build:" + RawResourceUtil.getShortGitHash(getActivity()));
TextView hpText = (TextView) mainView.findViewById(R.id.textHP); // TextView hpText = (TextView) mainView.findViewById(R.id.textHP);
hpText.setText(homePage); // hpText.setText(homePage);
TextView contractText = (TextView) mainView.findViewById(R.id.textContact); // TextView contractText = (TextView) mainView.findViewById(R.id.textContact);
contractText.setText(contactMail); // contractText.setText(contactMail);
contractText.setOnClickListener(new OnClickListener() { // contractText.setOnClickListener(new OnClickListener() {
@Override // @Override
public void onClick(View v) { // public void onClick(View v) {
Intent mailIntent = new Intent(); // Intent mailIntent = new Intent();
mailIntent.setAction(Intent.ACTION_SEND); // mailIntent.setAction(Intent.ACTION_SEND);
mailIntent.setType("text/plain"); // mailIntent.setType("text/plain");
mailIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { contactMail }); // mailIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { contactMail });
startActivity(mailIntent); // startActivity(mailIntent);
} // }
}); // });
TextView copyrightText = (TextView) mainView.findViewById(R.id.textCopyRight); TextView copyrightText = (TextView) mainView.findViewById(R.id.textCopyRight);
copyrightText.setText(copyright); copyrightText.setText(copyright);
......
...@@ -86,11 +86,11 @@ is_check_invalid_passward_limit=true ...@@ -86,11 +86,11 @@ is_check_invalid_passward_limit=true
repeat_default=true repeat_default=true
#Setting Info(設定画面のABookについての設定情報) #Setting Info(設定画面のABookについての設定情報)
version_name=1.2.0 version_name=1.0.0
release_date=2019/10/07 release_date=2019/12/24
copy_right=2016 AGENTEC Co.,Ltd. All rights reserved. copy_right=2016 AGENTEC Co.,Ltd. All rights reserved.
hope_page=http://www.agentec.jp hope_page=http://www.agentec.jp
contact_email=abook-appsupport@agentec.jp contact_email=
#Log Settings #Log Settings
log_level=2 log_level=2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment