fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-05-22 09:54:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

allow rotating the device

Browse Source
This commit is contained in:
tibbi 2016-07-11 20:40:05 +02:00
parent 8124181fa3
commit 974fe17f6d
4 changed files with 207 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,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;
@ -39,7 +38,6 @@ public class AboutActivity extends AppCompatActivity {
mRes = getResources(); mRes = getResources();
setupEmail(); setupEmail();
setupVersion();
setupCopyright(); setupCopyright();
setupRateUs(); setupRateUs();
} }
@ -70,15 +68,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>

239
app/src/main/res/layout/activity_settings.xml
View File

@ -1,139 +1,146 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <ScrollView
android:id="@+id/settings_holder" android:id="@+id/settings_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="wrap_content">
android:orientation="vertical">
<RelativeLayout <LinearLayout
android:id="@+id/settings_long_tap_holder" android:id="@+id/settings_holder"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding" android:orientation="vertical">
android:background="?android:attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
<TextView <RelativeLayout
android:id="@+id/settings_long_tap_label" android:id="@+id/settings_long_tap_holder"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_marginTop="@dimen/settings_padding"
android:paddingLeft="@dimen/settings_padding" android:background="?android:attr/selectableItemBackground"
android:text="@string/long_tap_capture"/> android:padding="@dimen/activity_margin">
<android.support.v7.widget.SwitchCompat <TextView
android:id="@+id/settings_long_tap" android:id="@+id/settings_long_tap_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:text="@string/long_tap_capture"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/settings_long_tap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:background="@null"
android:clickable="false"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_focus_before_capture_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_marginTop="@dimen/settings_padding"
android:background="@null" android:background="?android:attr/selectableItemBackground"
android:clickable="false"/> android:padding="@dimen/activity_margin">
</RelativeLayout> <TextView
android:id="@+id/settings_focus_before_capture_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:text="@string/focus_before_capture"/>
<RelativeLayout <android.support.v7.widget.SwitchCompat
android:id="@+id/settings_focus_before_capture_holder" android:id="@+id/settings_focus_before_capture"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding" android:layout_alignParentRight="true"
android:background="?android:attr/selectableItemBackground" android:background="@null"
android:padding="@dimen/activity_margin"> android:clickable="false"/>
<TextView </RelativeLayout>
android:id="@+id/settings_focus_before_capture_label"
android:layout_width="wrap_content" <RelativeLayout
android:id="@+id/settings_sound_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_marginTop="@dimen/settings_padding"
android:paddingLeft="@dimen/settings_padding" android:background="?android:attr/selectableItemBackground"
android:text="@string/focus_before_capture"/> android:padding="@dimen/activity_margin">
<android.support.v7.widget.SwitchCompat <TextView
android:id="@+id/settings_focus_before_capture" android:id="@+id/settings_sound_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:text="@string/shutter_sound"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/settings_sound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:background="@null"
android:clickable="false"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_force_ratio_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_marginTop="@dimen/settings_padding"
android:background="@null" android:background="?android:attr/selectableItemBackground"
android:clickable="false"/> android:padding="@dimen/activity_margin">
</RelativeLayout> <TextView
android:id="@+id/settings_force_ratio_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:text="@string/force_ratio"/>
<RelativeLayout <android.support.v7.widget.SwitchCompat
android:id="@+id/settings_sound_holder" android:id="@+id/settings_force_ratio"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding" android:layout_alignParentRight="true"
android:background="?android:attr/selectableItemBackground" android:background="@null"
android:padding="@dimen/activity_margin"> android:clickable="false"/>
<TextView </RelativeLayout>
android:id="@+id/settings_sound_label"
android:layout_width="wrap_content" <RelativeLayout
android:id="@+id/settings_max_resolution_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_marginTop="@dimen/settings_padding"
android:paddingLeft="@dimen/settings_padding" android:paddingBottom="@dimen/activity_margin"
android:text="@string/shutter_sound"/> android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/settings_padding"
android:paddingTop="@dimen/activity_margin">
<android.support.v7.widget.SwitchCompat <TextView
android:id="@+id/settings_sound" android:id="@+id/settings_max_resolution_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_centerVertical="true"
android:background="@null" android:paddingLeft="@dimen/settings_padding"
android:clickable="false"/> android:text="@string/max_size"/>
</RelativeLayout> <android.support.v7.widget.AppCompatSpinner
android:id="@+id/settings_max_resolution"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:entries="@array/max_resolutions"/>
<RelativeLayout </RelativeLayout>
android:id="@+id/settings_force_ratio_holder" </LinearLayout>
android:layout_width="match_parent" </ScrollView>
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding"
android:background="?android:attr/selectableItemBackground"
android:padding="@dimen/activity_margin">
<TextView
android:id="@+id/settings_force_ratio_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:text="@string/force_ratio"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/settings_force_ratio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:background="@null"
android:clickable="false"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_max_resolution_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/settings_padding"
android:paddingBottom="@dimen/activity_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/settings_padding"
android:paddingTop="@dimen/activity_margin">
<TextView
android:id="@+id/settings_max_resolution_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:text="@string/max_size"/>
<android.support.v7.widget.AppCompatSpinner
android:id="@+id/settings_max_resolution"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:entries="@array/max_resolutions"/>
</RelativeLayout>
</LinearLayout>

3
app/src/main/res/values/strings.xml
View File

@ -30,8 +30,7 @@
<string name="third_party_licences_underlined"><u>Third party licences</u></string> <string name="third_party_licences_underlined"><u>Third party licences</u></string>
<string name="rate_us_underlined"><u>Rate us in the Play Store</u></string> <string name="rate_us_underlined"><u>Rate us in the Play Store</u></string>
<string name="follow_us">Follow us:</string> <string name="follow_us">Follow us:</string>
<string name="version">v %1$s</string> <string name="copyright">v %1$s\nCopyright © Simple Mobile Tools %2$d</string>
<string name="copyright">Copyright © Simple Mobile Tools %1$d</string>
<!--License--> <!--License-->
<string name="notice">This app uses the following third party libraries to make my life easier. Thank you.</string> <string name="notice">This app uses the following third party libraries to make my life easier. Thank you.</string>