fenix
/
Simple-Calculator
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow rotating some screens

This commit is contained in:
tibbi 2016-07-17 22:20:50 +02:00
parent 1fe67c9463
commit 92115c04b5
3 changed files with 85 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/AndroidManifest.xml
View File

@ -29,13 +29,11 @@
<activity <activity
android:name=".activities.AboutActivity" android:name=".activities.AboutActivity"
android:label="@string/about" android:label="@string/about"/>
android:screenOrientation="portrait"/>
<activity <activity
android:name=".activities.LicenseActivity" android:name=".activities.LicenseActivity"
android:label="@string/third_party_licences" android:label="@string/third_party_licences"/>
android:screenOrientation="portrait"/>
<receiver <receiver
android:name=".MyWidgetProvider" android:name=".MyWidgetProvider"

11
app/src/main/java/com/simplemobiletools/calculator/activities/AboutActivity.java
View File

@ -23,7 +23,6 @@ import butterknife.OnClick;
public class AboutActivity extends AppCompatActivity { public class AboutActivity extends AppCompatActivity {
@BindView(R.id.about_copyright) TextView mCopyright; @BindView(R.id.about_copyright) TextView mCopyright;
@BindView(R.id.about_version) TextView mVersion;
@BindView(R.id.about_email) TextView mEmailTV; @BindView(R.id.about_email) TextView mEmailTV;
@BindView(R.id.about_rate_us) View mRateUs; @BindView(R.id.about_rate_us) View mRateUs;
@ -37,7 +36,6 @@ public class AboutActivity extends AppCompatActivity {
mRes = getResources(); mRes = getResources();
setupEmail(); setupEmail();
setupVersion();
setupCopyright(); setupCopyright();
setupRateUs(); setupRateUs();
} }
@ -50,15 +48,10 @@ public class AboutActivity extends AppCompatActivity {
mEmailTV.setMovementMethod(LinkMovementMethod.getInstance()); mEmailTV.setMovementMethod(LinkMovementMethod.getInstance());
} }
private void setupVersion() {
final String versionName = BuildConfig.VERSION_NAME;
final String versionText = String.format(mRes.getString(R.string.version), versionName);
mVersion.setText(versionText);
}
private void setupCopyright() { private void setupCopyright() {
final String versionName = BuildConfig.VERSION_NAME;
final int year = Calendar.getInstance().get(Calendar.YEAR); final int year = Calendar.getInstance().get(Calendar.YEAR);
final String copyrightText = String.format(mRes.getString(R.string.copyright), year); final String copyrightText = String.format(mRes.getString(R.string.copyright), versionName, year);
mCopyright.setText(copyrightText); mCopyright.setText(copyrightText);
} }

160
app/src/main/res/layout/activity_about.xml
View File

@ -1,93 +1,95 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <ScrollView
android:id="@+id/about_holder" android:id="@+id/about_scrollview"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="@dimen/activity_margin"> android:fillViewport="true">
<TextView <RelativeLayout
android:id="@+id/about_website" android:id="@+id/about_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autoLink="web"
android:text="@string/website"/>
<TextView
android:id="@+id/about_email_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/about_website"
android:layout_marginTop="@dimen/activity_margin"
android:text="@string/email_label"/>
<TextView
android:id="@+id/about_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/about_email_label"
android:text="@string/email"/>
<TextView
android:id="@+id/about_rate_us"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/about_email"
android:layout_marginTop="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:text="@string/rate_us_underlined"
android:textColor="@color/colorPrimary"/>
<TextView
android:id="@+id/about_license"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/about_rate_us"
android:layout_marginTop="@dimen/activity_margin"
android:paddingBottom="@dimen/activity_margin" android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin" android:paddingLeft="@dimen/activity_margin"
android:text="@string/third_party_licences_underlined" android:paddingTop="@dimen/activity_margin">
android:textColor="@color/colorPrimary"/>
<TextView <TextView
android:id="@+id/about_follow_us" android:id="@+id/about_website"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/about_license" android:autoLink="web"
android:paddingBottom="@dimen/social_padding" android:text="@string/website"/>
android:paddingTop="@dimen/activity_margin"
android:text="@string/follow_us"/>
<ImageView <TextView
android:id="@+id/about_facebook" android:id="@+id/about_email_label"
android:layout_width="@dimen/social_logo" android:layout_width="match_parent"
android:layout_height="@dimen/social_logo" android:layout_height="wrap_content"
android:layout_below="@+id/about_follow_us" android:layout_below="@+id/about_website"
android:src="@mipmap/facebook"/> android:layout_marginTop="@dimen/activity_margin"
android:text="@string/email_label"/>
<ImageView <TextView
android:id="@+id/about_gplus" android:id="@+id/about_email"
android:layout_width="@dimen/social_logo" android:layout_width="match_parent"
android:layout_height="@dimen/social_logo" android:layout_height="wrap_content"
android:layout_below="@+id/about_follow_us" android:layout_below="@+id/about_email_label"
android:layout_marginLeft="@dimen/social_padding" android:text="@string/email"/>
android:layout_toRightOf="@+id/about_facebook"
android:src="@mipmap/gplus"/>
<TextView <TextView
android:id="@+id/about_version" android:id="@+id/about_rate_us"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/about_copyright" android:layout_below="@+id/about_email"
android:gravity="center_horizontal" android:layout_marginTop="@dimen/activity_margin"
android:text="v 1.0"/> android:paddingTop="@dimen/activity_margin"
android:text="@string/rate_us_underlined"
android:textColor="@color/colorPrimary"/>
<TextView <TextView
android:id="@+id/about_copyright" android:id="@+id/about_license"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_below="@+id/about_rate_us"
android:gravity="center_horizontal" android:layout_marginTop="@dimen/activity_margin"
android:text="Copyright © Simple Mobile Tools 2016"/> android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:text="@string/third_party_licences_underlined"
android:textColor="@color/colorPrimary"/>
</RelativeLayout> <TextView
android:id="@+id/about_follow_us"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/about_license"
android:paddingBottom="@dimen/social_padding"
android:paddingTop="@dimen/activity_margin"
android:text="@string/follow_us"/>
<ImageView
android:id="@+id/about_facebook"
android:layout_width="@dimen/social_logo"
android:layout_height="@dimen/social_logo"
android:layout_below="@+id/about_follow_us"
android:src="@mipmap/facebook"/>
<ImageView
android:id="@+id/about_gplus"
android:layout_width="@dimen/social_logo"
android:layout_height="@dimen/social_logo"
android:layout_below="@+id/about_follow_us"
android:layout_marginLeft="@dimen/social_padding"
android:layout_toRightOf="@+id/about_facebook"
android:src="@mipmap/gplus"/>
<TextView
android:id="@+id/about_copyright"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_below="@+id/about_gplus"
android:gravity="center_horizontal|bottom"
android:paddingTop="@dimen/activity_margin"
android:text="v1.0\nCopyright © Simple Mobile Tools 2016"/>
</RelativeLayout>
</ScrollView>