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

reuse some resources from the Commons library

This commit is contained in:
tibbi 2017-03-19 20:51:43 +01:00
parent 81ff55f9c9
commit 9f5d6ea75e
10 changed files with 17 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -32,7 +32,7 @@ android {
}
dependencies {
compile 'com.simplemobiletools:commons:2.13.5'
compile 'com.simplemobiletools:commons:2.13.7'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}

2
app/src/main/kotlin/com/simplemobiletools/camera/views/FocusRectView.kt
View File

@ -24,7 +24,7 @@ class FocusRectView(context: Context) : ViewGroup(context) {
init {
setWillNotDraw(false)
mHandler = Handler()
mPrimaryColor = resources.getColor(R.color.colorPrimary)
mPrimaryColor = resources.getColor(R.color.color_primary)
setupPaint()
}

18
app/src/main/res/layout/activity_main.xml
View File

@ -21,9 +21,9 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/side_icon_padding"
android:layout_marginTop="@dimen/side_icon_padding"
android:padding="@dimen/side_icon_padding"
android:layout_marginRight="@dimen/normal_margin"
android:layout_marginTop="@dimen/normal_margin"
android:padding="@dimen/normal_margin"
android:src="@mipmap/settings"/>
<ImageView
@ -32,8 +32,8 @@
android:layout_height="@dimen/icon_size"
android:layout_alignParentRight="true"
android:layout_below="@+id/settings"
android:layout_marginRight="@dimen/side_icon_padding"
android:padding="@dimen/side_icon_padding"
android:layout_marginRight="@dimen/normal_margin"
android:padding="@dimen/normal_margin"
android:src="@mipmap/videocam"/>
<ImageView
@ -42,8 +42,8 @@
android:layout_height="@dimen/icon_size"
android:layout_alignParentRight="true"
android:layout_below="@+id/toggle_photo_video"
android:layout_marginRight="@dimen/side_icon_padding"
android:padding="@dimen/side_preview_padding"/>
android:layout_marginRight="@dimen/normal_margin"
android:padding="@dimen/medium_margin"/>
<LinearLayout
android:id="@+id/btn_holder"
@ -58,7 +58,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_weight="1"
android:padding="@dimen/side_icon_padding"
android:padding="@dimen/normal_margin"
android:src="@mipmap/camera_front"/>
<ImageView
@ -73,7 +73,7 @@
android:layout_width="@dimen/icon_size"
android:layout_height="@dimen/icon_size"
android:layout_weight="1"
android:padding="@dimen/side_icon_padding"
android:padding="@dimen/normal_margin"
android:src="@mipmap/flash_off"/>
</LinearLayout>

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

@ -190,8 +190,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/settings_max_photo_resolution"
android:layout_toStartOf="@+id/settings_max_photo_resolution"
android:layout_toLeftOf="@+id/settings_back_video_resolution"
android:layout_toStartOf="@+id/settings_back_video_resolution"
android:paddingLeft="@dimen/medium_margin"
android:text="@string/back_camera_video_resolution"/>

5
app/src/main/res/values-sw600dp/dimens.xml
View File

@ -1,8 +1,3 @@
<resources>
<dimen name="icon_size">64dp</dimen>
<dimen name="settings_padding">12dp</dimen>
<dimen name="social_padding">12dp</dimen>
<dimen name="social_logo">50dp</dimen>
<dimen name="normal_text_size">18sp</dimen>
</resources>

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

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

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

@ -1,12 +0,0 @@
<resources>
<style name="FullScreenTheme" parent="AppTheme.Base">
<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>

4
app/src/main/res/values/colors.xml
View File

@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#fff68630</color>
<color name="colorPrimaryDark">#ffe27725</color>
<color name="colorAccent">@color/colorPrimary</color>
</resources>

9
app/src/main/res/values/dimens.xml
View File

@ -1,12 +1,3 @@
<resources>
<dimen name="activity_margin">16dp</dimen>
<dimen name="tiny_margin">4dp</dimen>
<dimen name="side_icon_padding">12dp</dimen>
<dimen name="side_preview_padding">8dp</dimen>
<dimen name="icon_size">56dp</dimen>
<dimen name="settings_padding">8dp</dimen>
<dimen name="social_padding">8dp</dimen>
<dimen name="social_logo">40dp</dimen>
<dimen name="normal_text_size">14sp</dimen>
</resources>

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

@ -2,53 +2,10 @@
<style name="AppTheme" parent="AppTheme.Base"/>
<style name="AppTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
<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 name="FullScreenTheme.Base" parent="AppTheme">
<item name="android:windowContentOverlay">@null</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>
<item name="android:windowBackground">@android:color/black</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>
<item name="titleTextStyle">@style/AppTheme.ActionBar.TitleTextStyle</item>
</style>
<style name="AppTheme.ActionBar.TitleTextStyle" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title">
<item name="android:fontFamily">sans-serif</item>
<item name="android:textSize">20sp</item>
</style>
<style name="SpinnerItem" parent="@android:style/Widget.TextView">
<item name="android:paddingRight">@dimen/activity_margin</item>
<item name="android:gravity">end</item>
</style>
<style name="SpinnerItem.DropDownItem" parent="@android:style/Widget.TextView">
<item name="android:gravity">center_vertical</item>
<item name="android:paddingTop">@dimen/settings_padding</item>
<item name="android:paddingBottom">@dimen/settings_padding</item>
<item name="android:paddingLeft">@dimen/activity_margin</item>
<item name="android:paddingRight">@dimen/activity_margin</item>
</style>
<style name="FullScreenTheme" parent="FullScreenTheme.Base"/>
</resources>