fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-03-09 21:20:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

add Dark Theme

Browse Source
This commit is contained in:
tibbi 2016-07-20 18:51:12 +02:00
parent 37871e9bdc
commit c28308b1e3
16 changed files with 123 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,15 +63,19 @@
<activity
android:name=".activities.LicenseActivity"
android:label="@string/third_party_licences"/>
android:label="@string/third_party_licences"
android:parentActivityName=".activities.AboutActivity"/>
<activity
android:name=".activities.AboutActivity"
android:label="@string/about"/>
android:label="@string/about"
android:parentActivityName=".activities.MainActivity"/>
<activity
android:name=".activities.SettingsActivity"
android:label="@string/settings"/>
android:allowTaskReparenting="true"
android:label="@string/settings"
android:parentActivityName=".activities.AboutActivity"/>
<receiver
android:name=".HardwareShutterReceiver">

8
app/src/main/java/com/simplemobiletools/camera/Config.java
View File

@ -22,6 +22,14 @@ public class Config {
mPrefs.edit().putBoolean(Constants.IS_FIRST_RUN, firstRun).apply();
}
public boolean getIsDarkTheme() {
return mPrefs.getBoolean(Constants.IS_DARK_THEME, false);
}
public void setIsDarkTheme(boolean isDarkTheme) {
mPrefs.edit().putBoolean(Constants.IS_DARK_THEME, isDarkTheme).apply();
}
public boolean getLongTapEnabled() {
return mPrefs.getBoolean(Constants.LONG_TAP, true);
}

1
app/src/main/java/com/simplemobiletools/camera/Constants.java
View File

@ -8,6 +8,7 @@ public class Constants {
// shared preferences
public static final String PREFS_KEY = "Camera";
public static final String IS_FIRST_RUN = "is_first_run";
public static final String IS_DARK_THEME = "is_dark_theme";
public static final String LONG_TAP = "long_tap";
public static final String FOCUS_BEFORE_CAPTURE = "focus_before_capture";
public static final String SOUND = "sound";

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

@ -5,7 +5,6 @@ import android.content.Intent;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.view.Menu;
@ -23,7 +22,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
public class AboutActivity extends AppCompatActivity {
public class AboutActivity extends SimpleActivity {
@BindView(R.id.about_copyright) TextView mCopyright;
@BindView(R.id.about_email) TextView mEmailTV;
@BindView(R.id.about_rate_us) View mRateUs;

3
app/src/main/java/com/simplemobiletools/camera/activities/LicenseActivity.java
View File

@ -3,14 +3,13 @@ package com.simplemobiletools.camera.activities;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import com.simplemobiletools.camera.R;
import butterknife.ButterKnife;
import butterknife.OnClick;
public class LicenseActivity extends AppCompatActivity {
public class LicenseActivity extends SimpleActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {

3
app/src/main/java/com/simplemobiletools/camera/activities/MainActivity.java
View File

@ -21,7 +21,6 @@ import android.os.Handler;
import android.provider.MediaStore;
import android.support.v4.app.ActivityCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.view.KeyEvent;
import android.view.SurfaceView;
import android.view.View;
@ -48,7 +47,7 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
public class MainActivity extends AppCompatActivity
public class MainActivity extends SimpleActivity
implements SensorEventListener, PreviewListener, PhotoProcessor.MediaSavedListener, MediaScannerConnection.OnScanCompletedListener {
@BindView(R.id.view_holder) RelativeLayout mViewHolder;
@BindView(R.id.toggle_camera) ImageView mToggleCameraBtn;

21
app/src/main/java/com/simplemobiletools/camera/activities/SettingsActivity.java
View File

@ -1,7 +1,7 @@
package com.simplemobiletools.camera.activities;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v4.app.TaskStackBuilder;
import android.support.v7.widget.AppCompatSpinner;
import android.support.v7.widget.SwitchCompat;
@ -13,7 +13,8 @@ import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.OnItemSelected;
public class SettingsActivity extends AppCompatActivity {
public class SettingsActivity extends SimpleActivity {
@BindView(R.id.settings_dark_theme) SwitchCompat mDarkThemeSwitch;
@BindView(R.id.settings_long_tap) SwitchCompat mLongTapSwitch;
@BindView(R.id.settings_focus_before_capture) SwitchCompat mFocusBeforeCaptureSwitch;
@BindView(R.id.settings_sound) SwitchCompat mSoundSwitch;
@ -29,6 +30,7 @@ public class SettingsActivity extends AppCompatActivity {
mConfig = Config.newInstance(getApplicationContext());
ButterKnife.bind(this);
setupDarkTheme();
setupLongTap();
setupFocusBeforeCapture();
setupSound();
@ -36,6 +38,10 @@ public class SettingsActivity extends AppCompatActivity {
setupMaxResolution();
}
private void setupDarkTheme() {
mDarkThemeSwitch.setChecked(mConfig.getIsDarkTheme());
}
private void setupLongTap() {
mLongTapSwitch.setChecked(mConfig.getLongTapEnabled());
}
@ -56,6 +62,13 @@ public class SettingsActivity extends AppCompatActivity {
mMaxResolutionSpinner.setSelection(mConfig.getMaxResolution());
}
@OnClick(R.id.settings_dark_theme_holder)
public void handleDarkTheme() {
mDarkThemeSwitch.setChecked(!mDarkThemeSwitch.isChecked());
mConfig.setIsDarkTheme(mDarkThemeSwitch.isChecked());
restartActivity();
}
@OnClick(R.id.settings_long_tap_holder)
public void handleLongTapToTrigger() {
mLongTapSwitch.setChecked(!mLongTapSwitch.isChecked());
@ -84,4 +97,8 @@ public class SettingsActivity extends AppCompatActivity {
public void handleMaxResolution() {
mConfig.setMaxResolution(mMaxResolutionSpinner.getSelectedItemPosition());
}
private void restartActivity() {
TaskStackBuilder.create(getApplicationContext()).addNextIntentWithParentStack(getIntent()).startActivities();
}
}

35
app/src/main/java/com/simplemobiletools/camera/activities/SimpleActivity.java Normal file
View File

@ -0,0 +1,35 @@
package com.simplemobiletools.camera.activities;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import com.simplemobiletools.camera.Config;
import com.simplemobiletools.camera.R;
public class SimpleActivity extends AppCompatActivity {
protected Config mConfig;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
mConfig = Config.newInstance(getApplicationContext());
int theme = mConfig.getIsDarkTheme() ? R.style.AppTheme_Base_Dark : R.style.AppTheme_Base;
if (this instanceof MainActivity) {
theme = mConfig.getIsDarkTheme() ? R.style.FullScreenTheme_Dark : R.style.FullScreenTheme;
}
setTheme(theme);
super.onCreate(savedInstanceState);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
}

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

@ -12,6 +12,32 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/settings_dark_theme_holder"
android:layout_width="match_parent"
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_dark_theme_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/settings_padding"
android:text="@string/dark_theme"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/settings_dark_theme"
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_long_tap_holder"
android:layout_width="match_parent"

1
app/src/main/res/values-it/strings.xml
View File

@ -15,6 +15,7 @@
<!-- Settings -->
<string name="settings">Impostazioni</string>
<string name="dark_theme">Tema scuro</string>
<string name="long_tap_capture">Tocco prolungato per la cattura</string>
<string name="focus_before_capture">Messa a fuoco prima della cattura</string>
<string name="force_ratio">Forza proporzione 16:9</string>

1
app/src/main/res/values-ja/strings.xml
View File

@ -15,6 +15,7 @@
<!-- Settings -->
<string name="settings">設定</string>
<string name="dark_theme">ダークテーマ</string>
<string name="long_tap_capture">長押ししてキャプチャする</string>
<string name="focus_before_capture">キャプチャ前に再度焦点を合わせる</string>
<string name="force_ratio">強制的に 16:9 レシオにする</string>

1
app/src/main/res/values-sv/strings.xml
View File

@ -15,6 +15,7 @@
<!-- Settings -->
<string name="settings">Inställningar</string>
<string name="dark_theme">Mörkt tema</string>
<string name="long_tap_capture">Långtryck för bildtagning</string>
<string name="focus_before_capture">Fokusera om innan bildtagning</string>
<string name="force_ratio">Tvinga 16:9-förhållande</string>

4
app/src/main/res/values-v21/styles.xml
View File

@ -4,4 +4,8 @@
<item name="android:windowTranslucentNavigation">true</item>
</style>
<style name="FullScreenTheme.Dark" parent="AppTheme.Base.Dark">
<item name="android:windowTranslucentNavigation">true</item>
</style>
</resources>

4
app/src/main/res/values-v23/styles.xml
View File

@ -4,5 +4,9 @@
<item name="android:windowTranslucentNavigation">true</item>
</style>
<style name="FullScreenTheme.Dark" parent="AppTheme.Base.Dark">
<item name="android:windowTranslucentNavigation">true</item>
</style>
<style name="SpinnerItem" parent="@android:style/Widget.TextView"/>
</resources>

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

@ -15,6 +15,7 @@
<!-- Settings -->
<string name="settings">Settings</string>
<string name="dark_theme">Dark theme</string>
<string name="long_tap_capture">Long tap to capture</string>
<string name="focus_before_capture">Refocus before capture</string>
<string name="force_ratio">Force 16:9 ratio</string>

12
app/src/main/res/values/styles.xml
View File

@ -13,7 +13,19 @@
<item name="android:textSize">@dimen/normal_text_size</item>
</style>
<style name="AppTheme.Base.Dark" parent="Theme.AppCompat">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="actionBarStyle">@style/AppTheme.ActionBarStyle</item>
<item name="android:spinnerItemStyle">@style/SpinnerItem</item>
<item name="spinnerDropDownItemStyle">@style/SpinnerItem.DropDownItem</item>
<item name="android:spinnerDropDownItemStyle">@style/SpinnerItem.DropDownItem</item>
<item name="android:textSize">@dimen/normal_text_size</item>
</style>
<style name="FullScreenTheme" parent="AppTheme.Base"/>
<style name="FullScreenTheme.Dark" parent="AppTheme.Base.Dark"/>
<style name="AppTheme.ActionBarStyle" parent="@style/Base.Widget.AppCompat.ActionBar">
<item name="background">@color/colorPrimary</item>