From 4c35ebc36f8bfd43b018a149c249f058f5a05789 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 11 Jul 2016 20:15:21 +0200
Subject: [PATCH] allow using the app in landscape

---
 app/src/main/AndroidManifest.xml              |  12 +-
 .../simplemobiletools/flashlight/Config.java  |   2 -
 .../{activities => }/Constants.java           |   2 +-
 .../flashlight/activities/AboutActivity.java  |  11 +-
 app/src/main/res/layout/activity_about.xml    | 160 +++++++++---------
 app/src/main/res/values-ja/strings.xml        |   3 +-
 app/src/main/res/values/strings.xml           |   3 +-
 7 files changed, 89 insertions(+), 104 deletions(-)
 rename app/src/main/java/com/simplemobiletools/flashlight/{activities => }/Constants.java (76%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8d9daf7..c6c0496 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,11 +4,8 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.CAMERA"/>
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false"/>
-
     <uses-permission android:name="android.permission.FLASHLIGHT"/>
+
     <uses-feature
         android:name="android.hardware.camera.flash"
         android:required="true"/>
@@ -21,7 +18,6 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".activities.MainActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/BlackSplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -32,13 +28,11 @@
 
         <activity
             android:name=".activities.AboutActivity"
-            android:label="@string/about"
-            android:screenOrientation="portrait"/>
+            android:label="@string/about"/>
 
         <activity
             android:name=".activities.LicenseActivity"
-            android:label="@string/third_party_licences"
-            android:screenOrientation="portrait"/>
+            android:label="@string/third_party_licences"/>
 
         <receiver
             android:name=".MyWidgetProvider"
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/Config.java b/app/src/main/java/com/simplemobiletools/flashlight/Config.java
index 9dd6934..f882f6c 100644
--- a/app/src/main/java/com/simplemobiletools/flashlight/Config.java
+++ b/app/src/main/java/com/simplemobiletools/flashlight/Config.java
@@ -3,8 +3,6 @@ package com.simplemobiletools.flashlight;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.simplemobiletools.flashlight.activities.Constants;
-
 public class Config {
     private SharedPreferences mPrefs;
 
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/Constants.java b/app/src/main/java/com/simplemobiletools/flashlight/Constants.java
similarity index 76%
rename from app/src/main/java/com/simplemobiletools/flashlight/activities/Constants.java
rename to app/src/main/java/com/simplemobiletools/flashlight/Constants.java
index be1747c..b35370a 100644
--- a/app/src/main/java/com/simplemobiletools/flashlight/activities/Constants.java
+++ b/app/src/main/java/com/simplemobiletools/flashlight/Constants.java
@@ -1,4 +1,4 @@
-package com.simplemobiletools.flashlight.activities;
+package com.simplemobiletools.flashlight;
 
 public class Constants {
     // shared preferences
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/activities/AboutActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/activities/AboutActivity.java
index 05b94a8..102ab93 100644
--- a/app/src/main/java/com/simplemobiletools/flashlight/activities/AboutActivity.java
+++ b/app/src/main/java/com/simplemobiletools/flashlight/activities/AboutActivity.java
@@ -23,7 +23,6 @@ import butterknife.OnClick;
 
 public class AboutActivity extends AppCompatActivity {
     @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_rate_us) View mRateUs;
 
@@ -37,7 +36,6 @@ public class AboutActivity extends AppCompatActivity {
         mRes = getResources();
 
         setupEmail();
-        setupVersion();
         setupCopyright();
         setupRateUs();
     }
@@ -50,15 +48,10 @@ public class AboutActivity extends AppCompatActivity {
         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() {
+        final String versionName = BuildConfig.VERSION_NAME;
         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);
     }
 
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 152f60e..8ec0b9e 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -1,93 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    android:id="@+id/about_holder"
+<ScrollView
+    android:id="@+id/about_scrollview"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="@dimen/activity_margin">
+    android:fillViewport="true">
 
-    <TextView
-        android:id="@+id/about_website"
+    <RelativeLayout
+        android:id="@+id/about_holder"
         android:layout_width="match_parent"
         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:paddingTop="@dimen/activity_margin"
-        android:text="@string/third_party_licences_underlined"
-        android:textColor="@color/colorPrimary"/>
+        android:paddingLeft="@dimen/activity_margin"
+        android:paddingTop="@dimen/activity_margin">
 
-    <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"/>
+        <TextView
+            android:id="@+id/about_website"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:autoLink="web"
+            android:text="@string/website"/>
 
-    <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"/>
+        <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"/>
 
-    <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_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_version"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@+id/about_copyright"
-        android:gravity="center_horizontal"
-        android:text="v 1.0"/>
+        <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_copyright"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:gravity="center_horizontal"
-        android:text="Copyright © Simple Mobile Tools 2016"/>
+        <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: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>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f1da282..a7950a2 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -10,8 +10,7 @@
     <string name="third_party_licences_underlined"><u>サードパーティー ライセンス</u></string>
     <string name="rate_us_underlined"><u>Play ストアで評価してください</u></string>
     <string name="follow_us">フォローしてください:</string>
-    <string name="version">v %1$s</string>
-    <string name="copyright">Copyright © Simple Mobile Tools %1$d</string>
+    <string name="copyright">v %1$s\nCopyright © Simple Mobile Tools %2$d</string>
 
     <!--License-->
     <string name="notice">このアプリは、私の人生を容易にするために、次のサードパーティのライブラリーを使用しています。 ありがとうございます。</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 86e018f..f3612b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,8 +10,7 @@
     <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="follow_us">Follow us:</string>
-    <string name="version">v %1$s</string>
-    <string name="copyright">Copyright © Simple Mobile Tools %1$d</string>
+    <string name="copyright">v %1$s\nCopyright © Simple Mobile Tools %2$d</string>
 
     <!--License-->
     <string name="notice">This app uses the following third party libraries to make my life easier. Thank you.</string>