From 0bf05bfc53597986e1d79423285dbb9e866f319e Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 2 Jun 2016 15:47:13 +0200 Subject: [PATCH] add About section --- app/src/main/AndroidManifest.xml | 8 ++- .../camera/AboutActivity.java | 52 +++++++++++++++++ .../camera/MainActivity.java | 7 +++ app/src/main/res/layout/activity_about.xml | 55 ++++++++++++++++++ app/src/main/res/layout/activity_main.xml | 8 +++ app/src/main/res/mipmap-hdpi/about.png | Bin 0 -> 1174 bytes app/src/main/res/mipmap-mdpi/about.png | Bin 0 -> 801 bytes app/src/main/res/mipmap-xhdpi/about.png | Bin 0 -> 1578 bytes app/src/main/res/mipmap-xxhdpi/about.png | Bin 0 -> 2463 bytes app/src/main/res/mipmap-xxxhdpi/about.png | Bin 0 -> 3278 bytes app/src/main/res/values-v21/styles.xml | 3 +- app/src/main/res/values/strings.xml | 9 +++ app/src/main/res/values/styles.xml | 2 + 13 files changed, 141 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/com/simplemobiletools/camera/AboutActivity.java create mode 100644 app/src/main/res/layout/activity_about.xml create mode 100644 app/src/main/res/mipmap-hdpi/about.png create mode 100644 app/src/main/res/mipmap-mdpi/about.png create mode 100644 app/src/main/res/mipmap-xhdpi/about.png create mode 100644 app/src/main/res/mipmap-xxhdpi/about.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/about.png diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9fb86dd1..a4beede1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,12 +17,18 @@ android:theme="@style/AppTheme"> + android:screenOrientation="portrait" + android:theme="@style/FullScreenTheme"> + + diff --git a/app/src/main/java/com/simplemobiletools/camera/AboutActivity.java b/app/src/main/java/com/simplemobiletools/camera/AboutActivity.java new file mode 100644 index 00000000..153e61ca --- /dev/null +++ b/app/src/main/java/com/simplemobiletools/camera/AboutActivity.java @@ -0,0 +1,52 @@ +package com.simplemobiletools.camera; + +import android.content.res.Resources; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; +import android.text.Html; +import android.text.method.LinkMovementMethod; +import android.widget.TextView; + +import java.util.Calendar; + +import butterknife.BindView; +import butterknife.ButterKnife; + +public class AboutActivity extends AppCompatActivity { + @BindView(R.id.about_copyright) TextView copyright; + @BindView(R.id.about_version) TextView version; + @BindView(R.id.about_email) TextView emailTV; + private Resources res; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_about); + ButterKnife.bind(this); + res = getResources(); + + setupEmail(); + setupVersion(); + setupCopyright(); + } + + private void setupEmail() { + final String email = res.getString(R.string.email); + final String appName = res.getString(R.string.app_name); + final String href = "" + email + ""; + emailTV.setText(Html.fromHtml(href)); + emailTV.setMovementMethod(LinkMovementMethod.getInstance()); + } + + private void setupVersion() { + final String versionName = BuildConfig.VERSION_NAME; + final String versionText = String.format(res.getString(R.string.version), versionName); + version.setText(versionText); + } + + private void setupCopyright() { + final int year = Calendar.getInstance().get(Calendar.YEAR); + final String copyrightText = String.format(res.getString(R.string.copyright), year); + copyright.setText(copyrightText); + } +} diff --git a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java index a1902c3f..15d27f44 100644 --- a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java @@ -1,5 +1,6 @@ package com.simplemobiletools.camera; +import android.content.Intent; import android.hardware.Camera; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; @@ -75,6 +76,12 @@ public class MainActivity extends AppCompatActivity { preview.takePicture(); } + @OnClick(R.id.about) + public void launchAbout() { + final Intent intent = new Intent(getApplicationContext(), AboutActivity.class); + startActivity(intent); + } + private void hideNavigationBarIcons() { getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE); } diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml new file mode 100644 index 00000000..e1949cfe --- /dev/null +++ b/app/src/main/res/layout/activity_about.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 56fb20e0..46368d8e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,6 +10,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + yRG19otp z3EX-pQU0jp3Gy`+1}X61pc z43q9YA?1n-r0XK8JW<9S(w$RoI7+&U6v_h|XrhNPQl$8s9=_odd0++Yr2A6Av6k03 zU6cpbbBkH#o8<=UMN{$!&Z_>8|Wv#gT~r!mu1Dicm(5=7)e z6Xq=&H4mFeVjAT_2@{wT%7lJQt31$yX_g0m#QY`?T)_0n9}!ZR?ef4FW{W(q4f9+c z*oB#*NPeipjLQ=#OjsT$!X)K^0^*p1@=)g26Pt;=mkSAi8 z%ksk@rcQa{Hl|IUsK*S*52KiB<%JWNIX24^HJB0kA%Q7Z9{3igpX7rIOk93QVM59g zrTl`^5XJIA7?YGAQkal(LJfc5^g9*uMHrKm9}<{y<$#U6#Ho)mWk3ZcEOtV#4;Gitn$qc4fL9h>}Vak*d4$6pCJj2YfN5OCnr)~;c1~|wU1zf=?L8XG@2&#JEKqZ$Ge7i-99dvQP;QYw=LU z&*X28D^zN+QOg7J(aT;f7537_G(n}f%^oc^Dmg(PNivzDm*Z6E-JytsoZ&J9j1VVD ok~kv_&`u+t^P!e4TlSv%A3Ll`2waD!UH||907*qoM6N<$f>w4B{r~^~ literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/about.png b/app/src/main/res/mipmap-mdpi/about.png new file mode 100644 index 0000000000000000000000000000000000000000..e10918b867eac66e7e915b29021235e5f6ea0215 GIT binary patch literal 801 zcmV++1K#|JP)UxlvJ=kh90sVRSXVS@JCQ0i_@Oh-)egQaC{v|MnFVffiakX1 zv)I8|J`m9MO6Z;}Twx zMAaFR+-J=qCrBs&Nyb=W%{&RUM~nx!zVa7QwLpvsR&m`Us&=@9Yl)re0K*h<&8jty z;(AI-9*i=_A`TA!l4DpN4Dt-uVTEHGWy}&O)sf&bjlMI-X4NrB5mRET!f+Aum7S_1 z!6Sk^WV7lRp@KQDVC6y!%4)33G|;eX6A zH6Vp4$&V@~t~NNtGUg6lYCt!}ksnn|TrDw;>pltj(2a5AM;SAq7C4RTDp55dg(=C8 z1x#9@808ygR)NT13i9I?W?Z4Tf_Y3tfyiR=^5Ycdx{SSEVkYFr9?UXHg}}k| zC=k7@V0O!o2>)Tmv_WJsZ|PDq&R~{^X#^^8IJP$M6PDBwD%*2v*1GNKN!i#NDt z)DBVRajh~*Of3*+iVCi~Y*Kq9m}ku^#_3T2ddc#dHFrsI82F7edM6lkFA`iLOT`C(Wi}KJOA*GFmIV=NI#1RX(q{2poD`%i2`{h f*iDyy`vv>}3M)dB_9^(R00000NkvXXu0mjfHaK6Q literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/about.png b/app/src/main/res/mipmap-xhdpi/about.png new file mode 100644 index 0000000000000000000000000000000000000000..0f88a23638966bc4aea528f101104931d93c2c65 GIT binary patch literal 1578 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 M07*qoM6N<$g0(yY)Bpeg literal 0 HcmV?d00001 diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 2451207e..89394def 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -1,7 +1,6 @@ - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 68b3144a..f196406e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,13 @@ Simple Camera An error occurred at obtaining the camera + + + About + For more simple apps please visit:\nhttp://simplemobiletools.com + You can send your feedback and new app suggestions at: + hello@simplemobiletools.com + License + v %1$s + Copyright © Simple Mobile Tools %1$d diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 46a2d2a1..e072e90e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -9,6 +9,8 @@ @style/AppTheme.ActionBarStyle +