Change icons and remove pro version

This commit is contained in:
J-Jamet
2022-03-03 16:50:46 +01:00
parent 9ee9bf12ae
commit 99c2796014
66 changed files with 295 additions and 545 deletions

View File

@@ -43,30 +43,20 @@ android {
dimension "version"
applicationIdSuffix = ".libre"
buildConfigField "String", "BUILD_VERSION", "\"libre\""
buildConfigField "boolean", "FULL_VERSION", "true"
buildConfigField "boolean", "CLOSED_STORE", "false"
buildConfigField "String[]", "STYLES_DISABLED",
"{\"KeepassDXStyle_Red\"," +
"\"KeepassDXStyle_Red_Night\"," +
"\"KeepassDXStyle_Reply\"," +
"\"KeepassDXStyle_Reply_Night\"," +
"\"KeepassDXStyle_Purple\"," +
"\"KeepassDXStyle_Purple_Dark\"}"
buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
}
pro {
dimension "version"
applicationIdSuffix = ".pro"
buildConfigField "String", "BUILD_VERSION", "\"pro\""
buildConfigField "boolean", "FULL_VERSION", "true"
buildConfigField "boolean", "CLOSED_STORE", "true"
buildConfigField "String[]", "STYLES_DISABLED", "{}"
buildConfigField "String[]", "ICON_PACKS_DISABLED", "{}"
manifestPlaceholders = [ googleAndroidBackupAPIKey:"AEdPqrEAAAAIZiXvrQCzSV9LNI6-p7cjTKENZLHIrz_zaqZuQQ" ]
}
free {
dimension "version"
applicationIdSuffix = ".free"
buildConfigField "String", "BUILD_VERSION", "\"free\""
buildConfigField "boolean", "FULL_VERSION", "false"
buildConfigField "boolean", "CLOSED_STORE", "true"
buildConfigField "String[]", "STYLES_DISABLED",
"{\"KeepassDXStyle_Simple\"," +
@@ -86,7 +76,6 @@ android {
sourceSets {
libre.res.srcDir 'src/libre/res'
pro.res.srcDir 'src/pro/res'
free.res.srcDir 'src/free/res'
}

View File

@@ -1,61 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="108"
android:viewportHeight="108"
android:width="108dp"
android:height="108dp">
android:height="108dp"
android:viewportWidth="120"
android:viewportHeight="120">
<group
android:translateY="-332">
<group
android:translateY="332">
<path
android:pathData="M65.728516 32.791016L58.052734 35.904297 56.173828 48.380859 35.306641 69.267578 35.238281 73.759766 69.478516 108 108 108 108 70.810547 73.09375 35.904297 65.728516 32.791016Z"
android:strokeLineJoin="round"
android:strokeLineCap="round"
android:strokeMiterLimit="4" >
<aapt:attr name="android:fillColor">
<gradient
android:endColor="#0000"
android:endX="80"
android:endY="80"
android:startColor="#4e000000"
android:startX="0"
android:startY="0"
android:type="linear"/>
</aapt:attr>
</path>
</group>
<group
android:scaleX="0.3939503"
android:scaleY="0.3939503"
android:translateX="33.66343"
android:translateY="233.998">
<path
android:pathData="M88.76953 339.91602L4.1718754 424.59766 4.0000004 436 15.400391 435.82813 27.240234 424 40 424l0 -12 12 0 0 -12.73438 34.01172 -33.97656A8 8 0 0 1 84 360a8 8 0 0 1 8 -8 8 8 0 0 1 5.296882 2.01367l2.787098 -2.7832 -11.31445 -11.31445z"
android:fillColor="#eaeaea"
android:strokeWidth="1"
android:strokeColor="#58000000" />
</group>
<group
android:scaleX="0.3939503"
android:scaleY="0.3939503"
android:translateX="33.66343"
android:translateY="233.998">
<path
android:pathData="M4.0000004 340L4.1718754 351.40137 88.59863 435.82812 100 436 99.828122 424.59863 15.401367 340.17188Z"
android:fillColor="#81c784" />
</group>
<group
android:scaleX="0.3939503"
android:scaleY="0.3939503"
android:translateX="33.66343"
android:translateY="233.998">
<path
android:pathData="M81.39454 332.00195a27 27 0 0 0 -19.48634 7.90625 27 27 0 0 0 0 38.1836 27 27 0 0 0 38.1836 0 27 27 0 0 0 0 -38.1836 27 27 0 0 0 -18.69726 -7.90625zM92 352a8 8 0 0 1 8 8 8 8 0 0 1 -8 8 8 8 0 0 1 -8 -8 8 8 0 0 1 8 -8z"
android:fillColor="#eaeaea"
android:strokeWidth="1"
android:strokeColor="#58000000" />
</group>
android:translateX="6"
android:translateY="8">
<path
android:fillColor="#24000000"
android:strokeWidth="1.99999297"
android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
<path
android:fillColor="#24000000"
android:strokeWidth="1.99999297"
android:pathData="M63.9961,34.0059 C61.5643,34.096,59.2564,35.102,57.5352,36.8223 C53.7682,40.589,53.7682,46.6982,57.5352,50.4649 C61.3017,54.232,67.4073,54.232,71.1739,50.4649 C74.9409,46.6982,74.9409,40.589,71.1739,36.8223 C69.2766,34.9258,66.6768,33.9054,63.9962,34.0059 Z M68.1992,40.6954 C69.8278,40.6958,71.148,42.016,71.1484,43.6446 C71.148,45.2732,69.8278,46.5934,68.1992,46.5938 C66.5706,46.5934,65.2504,45.2732,65.25,43.6446 C65.2504,42.016,66.5706,40.6958,68.1992,40.6954 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
</group>
<group
android:translateX="6"
android:translateY="6">
<path
android:fillColor="#ffa726"
android:strokeWidth="1.99999297"
android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
<path
android:fillColor="#ffffff"
android:strokeWidth="1.99999297"
android:pathData="M63.9961,34.0059 C61.5643,34.096,59.2564,35.102,57.5352,36.8223 C53.7682,40.589,53.7682,46.6982,57.5352,50.4649 C61.3017,54.232,67.4073,54.232,71.1739,50.4649 C74.9409,46.6982,74.9409,40.589,71.1739,36.8223 C69.2766,34.9258,66.6768,33.9054,63.9962,34.0059 Z M68.1992,40.6954 C69.8278,40.6958,71.148,42.016,71.1484,43.6446 C71.148,45.2732,69.8278,46.5934,68.1992,46.5938 C66.5706,46.5934,65.2504,45.2732,65.25,43.6446 C65.2504,42.016,66.5706,40.6958,68.1992,40.6954 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
</group>
</vector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@@ -1,61 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="108"
android:viewportHeight="108"
android:width="108dp"
android:height="108dp">
android:height="108dp"
android:viewportWidth="120"
android:viewportHeight="120">
<group
android:translateY="-332">
<group
android:translateY="332">
<path
android:pathData="M65.728516 32.791016L58.052734 35.904297 56.173828 48.380859 35.306641 69.267578 35.238281 73.759766 69.478516 108 108 108 108 70.810547 73.09375 35.904297 65.728516 32.791016Z"
android:strokeLineJoin="round"
android:strokeLineCap="round"
android:strokeMiterLimit="4" >
<aapt:attr name="android:fillColor">
<gradient
android:endColor="#0000"
android:endX="80"
android:endY="80"
android:startColor="#4e000000"
android:startX="0"
android:startY="0"
android:type="linear"/>
</aapt:attr>
</path>
</group>
<group
android:scaleX="0.3939503"
android:scaleY="0.3939503"
android:translateX="33.66343"
android:translateY="233.998">
<path
android:pathData="M88.76953 339.91602L4.1718754 424.59766 4.0000004 436 15.400391 435.82813 27.240234 424 40 424l0 -12 12 0 0 -12.73438 34.01172 -33.97656A8 8 0 0 1 84 360a8 8 0 0 1 8 -8 8 8 0 0 1 5.296882 2.01367l2.787098 -2.7832 -11.31445 -11.31445z"
android:fillColor="#eaeaea"
android:strokeWidth="1"
android:strokeColor="#58000000"/>
</group>
<group
android:scaleX="0.3939503"
android:scaleY="0.3939503"
android:translateX="33.66343"
android:translateY="233.998">
<path
android:pathData="M4.0000004 340L4.1718754 351.40137 88.59863 435.82812 100 436 99.828122 424.59863 15.401367 340.17188Z"
android:fillColor="#64b5f6" />
</group>
<group
android:scaleX="0.3939503"
android:scaleY="0.3939503"
android:translateX="33.66343"
android:translateY="233.998">
<path
android:pathData="M81.39454 332.00195a27 27 0 0 0 -19.48634 7.90625 27 27 0 0 0 0 38.1836 27 27 0 0 0 38.1836 0 27 27 0 0 0 0 -38.1836 27 27 0 0 0 -18.69726 -7.90625zM92 352a8 8 0 0 1 8 8 8 8 0 0 1 -8 8 8 8 0 0 1 -8 -8 8 8 0 0 1 8 -8z"
android:fillColor="#eaeaea"
android:strokeWidth="1"
android:strokeColor="#58000000" />
</group>
android:translateX="6"
android:translateY="8">
<path
android:fillColor="#24000000"
android:strokeWidth="1.99999297"
android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
<path
android:fillColor="#24000000"
android:strokeWidth="1.99999297"
android:pathData="M64.501,35.0576 C63.7095,35.0576,62.918,35.3613,62.3115,35.9678 L55.0127,43.2666 C53.7998,44.4795,53.7998,46.4306,55.0127,47.6436 L62.3115,54.9424 C63.5244,56.1553,65.4775,56.1553,66.6904,54.9424 L73.9873,47.6436 C75.2002,46.4307,75.2002,44.4796,73.9873,43.2666 L66.6904,35.9678 C66.0839,35.3613,65.2924,35.0576,64.5009,35.0576 Z M67.6729,42.6006 C69.3298,42.6006,70.6729,43.9437,70.6729,45.6006 C70.6729,47.2575,69.3298,48.6006,67.6729,48.6006 C66.016,48.6006,64.6729,47.2575,64.6729,45.6006 C64.6729,43.9437,66.016,42.6006,67.6729,42.6006 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
</group>
<group
android:translateX="6"
android:translateY="6">
<path
android:fillColor="#ffa726"
android:strokeWidth="1.99999297"
android:pathData="M36,36 L36,40.2422 L67.7578,72 L72,72 L72,67.7578 L40.2422,36 Z" />
<path
android:fillColor="#ffffff"
android:strokeWidth="1.99999297"
android:pathData="M64.501,35.0576 C63.7095,35.0576,62.918,35.3613,62.3115,35.9678 L55.0127,43.2666 C53.7998,44.4795,53.7998,46.4306,55.0127,47.6436 L62.3115,54.9424 C63.5244,56.1553,65.4775,56.1553,66.6904,54.9424 L73.9873,47.6436 C75.2002,46.4307,75.2002,44.4796,73.9873,43.2666 L66.6904,35.9678 C66.0839,35.3613,65.2924,35.0576,64.5009,35.0576 Z M67.6729,42.6006 C69.3298,42.6006,70.6729,43.9437,70.6729,45.6006 C70.6729,47.2575,69.3298,48.6006,67.6729,48.6006 C66.016,48.6006,64.6729,47.2575,64.6729,45.6006 C64.6729,43.9437,66.016,42.6006,67.6729,42.6006 Z M48.3438,55.4141 L36,67.7578 L36,72 L40.2422,72 L44.7578,67.4844 L44.7578,67.5 L49,67.5 L49,63.2578 L48.9844,63.2578 L49,63.2422 L49,63.2578 L53.2578,63.2578 L53.2578,60.3281 Z" />
</group>
</vector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/green" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/green" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@@ -31,12 +31,14 @@ import android.util.Log
import android.view.Menu
import android.view.MenuItem
import android.view.View
import android.widget.TextView
import androidx.activity.result.ActivityResultLauncher
import androidx.activity.viewModels
import androidx.annotation.RequiresApi
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
import androidx.coordinatorlayout.widget.CoordinatorLayout
import androidx.core.view.isVisible
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import androidx.recyclerview.widget.SimpleItemAnimator
@@ -112,6 +114,10 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
toolbar.title = ""
setSupportActionBar(toolbar)
// Special title
val specialTitle: TextView = findViewById(R.id.file_selection_title_part_3)
specialTitle.isVisible = UriUtil.contributingUser(this)
// Create database button
createDatabaseButtonView = findViewById(R.id.create_database_button)
createDatabaseButtonView?.setOnClickListener { createNewFile() }
@@ -391,7 +397,7 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
super.onCreateOptionsMenu(menu)
if (mSpecialMode == SpecialMode.DEFAULT) {
MenuUtil.defaultMenuInflater(menuInflater, menu)
MenuUtil.defaultMenuInflater(this, menuInflater, menu)
}
Handler(Looper.getMainLooper()).post {

View File

@@ -539,7 +539,7 @@ class MainCredentialActivity : DatabaseModeActivity(), AdvancedUnlockFragment.Bu
}
if (mSpecialMode == SpecialMode.DEFAULT) {
MenuUtil.defaultMenuInflater(inflater, menu)
MenuUtil.defaultMenuInflater(this, inflater, menu)
}
super.onCreateOptionsMenu(menu)

View File

@@ -204,9 +204,10 @@ class SetOTPDialogFragment : DatabaseDialogFragment() {
android.R.layout.simple_spinner_item, mHotpTokenTypeArray!!).apply {
setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
}
// Proprietary only on closed and full version
// Proprietary only on full version
mTotpTokenTypeArray = OtpTokenType.getTotpTokenTypeValues(
BuildConfig.CLOSED_STORE && BuildConfig.FULL_VERSION)
UriUtil.contributingUser(activity)
)
totpTokenTypeAdapter = ArrayAdapter(activity,
android.R.layout.simple_spinner_item, mTotpTokenTypeArray!!).apply {
setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)

View File

@@ -25,7 +25,6 @@ import android.text.SpannableStringBuilder
import androidx.appcompat.app.AlertDialog
import androidx.core.text.HtmlCompat
import androidx.fragment.app.DialogFragment
import com.kunzisoft.keepass.BuildConfig
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.utils.UriUtil
@@ -40,22 +39,12 @@ class UnderDevelopmentFeatureDialogFragment : DialogFragment() {
val builder = AlertDialog.Builder(activity)
val stringBuilder = SpannableStringBuilder()
if (BuildConfig.CLOSED_STORE) {
if (BuildConfig.FULL_VERSION) {
stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_thanks), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
.append(HtmlCompat.fromHtml(getString(R.string.html_rose), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_work_hard), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n")
.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_upgrade), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")
builder.setPositiveButton(android.R.string.ok) { _, _ -> dismiss() }
} else {
stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_buy_pro), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n")
.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_encourage), HtmlCompat.FROM_HTML_MODE_LEGACY))
builder.setPositiveButton(R.string.download) { _, _ ->
UriUtil.gotoUrl(requireContext(), R.string.app_pro_url)
}
builder.setNegativeButton(android.R.string.cancel) { _, _ -> dismiss() }
}
if (UriUtil.contributingUser(activity)) {
stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_thanks), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
.append(HtmlCompat.fromHtml(getString(R.string.html_rose), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_work_hard), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n")
.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_upgrade), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")
builder.setPositiveButton(android.R.string.ok) { _, _ -> dismiss() }
} else {
stringBuilder.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature), HtmlCompat.FROM_HTML_MODE_LEGACY)).append("\n\n")
.append(HtmlCompat.fromHtml(getString(R.string.html_text_dev_feature_contibute), HtmlCompat.FROM_HTML_MODE_LEGACY)).append(" ")

View File

@@ -360,6 +360,13 @@ open class Education(val activity: Activity) {
context.resources.getBoolean(R.bool.education_setup_OTP_default))
}
fun setEducationScreenReclickedPerformed(context: Context) {
getEducationSharedPreferences(context)
.edit()
.putBoolean(context.getString(R.string.education_screen_reclicked_key), true)
.apply()
}
/**
* Defines if the reset education preference has been reclicked
*

View File

@@ -382,13 +382,17 @@ class NestedAppSettingsFragment : NestedSettingsFragment() {
findPreference<ListPreference>(getString(R.string.setting_style_key))?.setOnPreferenceChangeListener { _, newValue ->
var styleEnabled = true
val styleIdString = newValue as String
if (BuildConfig.CLOSED_STORE || !Education.isEducationScreenReclickedPerformed(activity))
if (!UriUtil.contributingUser(activity)) {
for (themeIdDisabled in BuildConfig.STYLES_DISABLED) {
if (themeIdDisabled == styleIdString) {
styleEnabled = false
ProFeatureDialogFragment().show(parentFragmentManager, "pro_feature_dialog")
ProFeatureDialogFragment().show(
parentFragmentManager,
"pro_feature_dialog"
)
}
}
}
if (styleEnabled) {
Stylish.assignStyle(activity, styleIdString)
// Relaunch the current activity to redraw theme
@@ -409,13 +413,17 @@ class NestedAppSettingsFragment : NestedSettingsFragment() {
findPreference<IconPackListPreference>(getString(R.string.setting_icon_pack_choose_key))?.setOnPreferenceChangeListener { _, newValue ->
var iconPackEnabled = true
val iconPackId = newValue as String
if (BuildConfig.CLOSED_STORE || !Education.isEducationScreenReclickedPerformed(activity))
if (!UriUtil.contributingUser(activity)) {
for (iconPackIdDisabled in BuildConfig.ICON_PACKS_DISABLED) {
if (iconPackIdDisabled == iconPackId) {
iconPackEnabled = false
ProFeatureDialogFragment().show(parentFragmentManager, "pro_feature_dialog")
ProFeatureDialogFragment().show(
parentFragmentManager,
"pro_feature_dialog"
)
}
}
}
if (iconPackEnabled) {
IconPackChooser.setSelectedIconPack(iconPackId)
}
@@ -509,9 +517,8 @@ class NestedAppSettingsFragment : NestedSettingsFragment() {
override fun onStop() {
super.onStop()
activity?.let { activity ->
if (mCount == 10) {
Education.getEducationSharedPreferences(activity).edit()
.putBoolean(getString(R.string.education_screen_reclicked_key), true).apply()
if (mCount == 10 && !BuildConfig.CLOSED_STORE) {
Education.setEducationScreenReclickedPerformed(activity)
}
}
}

View File

@@ -33,6 +33,7 @@ import com.kunzisoft.keepass.biometric.AdvancedUnlockManager
import com.kunzisoft.keepass.database.element.SortNodeEnum
import com.kunzisoft.keepass.education.Education
import com.kunzisoft.keepass.timeout.TimeoutHelper
import com.kunzisoft.keepass.utils.UriUtil
import java.util.*
object PreferencesUtil {
@@ -151,7 +152,7 @@ object PreferencesUtil {
fun setStyle(context: Context, styleString: String) {
var tempThemeString = styleString
if (BuildConfig.CLOSED_STORE || !Education.isEducationScreenReclickedPerformed(context)) {
if (!UriUtil.contributingUser(context)) {
if (tempThemeString in BuildConfig.STYLES_DISABLED) {
tempThemeString = Stylish.defaultStyle(context)
}

View File

@@ -25,17 +25,16 @@ import android.content.Intent
import android.view.Menu
import android.view.MenuInflater
import android.view.MenuItem
import com.kunzisoft.keepass.BuildConfig
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.activities.AboutActivity
import com.kunzisoft.keepass.settings.SettingsActivity
object MenuUtil {
fun defaultMenuInflater(inflater: MenuInflater, menu: Menu) {
fun defaultMenuInflater(context: Context, inflater: MenuInflater, menu: Menu) {
inflater.inflate(R.menu.settings, menu)
inflater.inflate(R.menu.about, menu)
if (!(BuildConfig.FULL_VERSION && BuildConfig.CLOSED_STORE))
if (!UriUtil.contributingUser(context))
menu.findItem(R.id.menu_contribute)?.isVisible = false
}

View File

@@ -30,6 +30,7 @@ import android.widget.Toast
import androidx.documentfile.provider.DocumentFile
import com.kunzisoft.keepass.R
import com.kunzisoft.keepass.app.database.FileDatabaseHistoryAction
import com.kunzisoft.keepass.education.Education
import java.io.*
import java.util.*
@@ -255,9 +256,16 @@ object UriUtil {
gotoUrl(context, context.getString(resId))
}
fun isExternalAppInstalled(context: Context, packageName: String): Boolean {
fun contributingUser(context: Context): Boolean {
return (Education.isEducationScreenReclickedPerformed(context)
|| isExternalAppInstalled(context, "com.kunzisoft.keepass.pro")
)
}
private fun isExternalAppInstalled(context: Context, packageName: String): Boolean {
try {
context.applicationContext.packageManager.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES)
Education.setEducationScreenReclickedPerformed(context)
return true
} catch (e: Exception) {
Log.e(TAG, "App not accessible", e)

Binary file not shown.

After

Width:  |  Height:  |  Size: 953 B

View File

@@ -103,6 +103,7 @@
android:layout_marginLeft="12dp"
android:textSize="32sp"
android:textStyle="bold"
android:visibility="gone"
android:shadowColor="#80000000"
android:shadowDx="2"
android:shadowDy="2"

View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/green" />
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>
</adaptive-icon>

View File

@@ -28,7 +28,7 @@
<string name="app_name" translatable="false">KeePassDX</string>
<string name="app_name_part1" translatable="false">KeePass</string>
<string name="app_name_part2" translatable="false">DX</string>
<string name="app_name_part3" translatable="false" />
<string name="app_name_part3" translatable="false">Pro</string>
<string name="app_pro_url" translatable="false">https://play.google.com/store/apps/details?id=com.kunzisoft.keepass.pro</string>
<string name="contribution_url" translatable="false">https://www.keepassdx.com/contribution</string>

View File

@@ -1,57 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="108"
android:viewportHeight="108"
android:width="108dp"
android:height="108dp">
<group
android:translateY="-332">
<group
android:translateY="332">
<path
android:pathData="M65.728516 32.791016L58.052734 35.904297 56.173828 48.380859 35.306641 69.267578 35.238281 73.759766 69.478516 108 108 108 108 70.810547 73.09375 35.904297 65.728516 32.791016Z"
android:strokeLineJoin="round"
android:strokeLineCap="round"
android:strokeMiterLimit="4" >
<aapt:attr name="android:fillColor">
<gradient
android:endColor="#0000"
android:endX="80"
android:endY="80"
android:startColor="#4e000000"
android:startX="0"
android:startY="0"
android:type="linear"/>
</aapt:attr>
</path>
</group>
<group
android:scaleX="0.3939503"
android:scaleY="0.3939503"
android:translateX="33.66343"
android:translateY="233.998">
<path
android:pathData="M88.76953 339.91602L4.1718754 424.59766 4.0000004 436 15.400391 435.82813 27.240234 424 40 424l0 -12 12 0 0 -12.73438 34.01172 -33.97656A8 8 0 0 1 84 360a8 8 0 0 1 8 -8 8 8 0 0 1 5.296882 2.01367l2.787098 -2.7832 -11.31445 -11.31445z"
android:fillColor="#DBDBDB" />
</group>
<group
android:scaleX="0.3939503"
android:scaleY="0.3939503"
android:translateX="33.66343"
android:translateY="233.998">
<path
android:pathData="M4.0000004 340L4.1718754 351.40137 88.59863 435.82812 100 436 99.828122 424.59863 15.401367 340.17188Z"
android:fillColor="#ffa726" />
</group>
<group
android:scaleX="0.3939503"
android:scaleY="0.3939503"
android:translateX="33.66343"
android:translateY="233.998">
<path
android:pathData="M81.39454 332.00195a27 27 0 0 0 -19.48634 7.90625 27 27 0 0 0 0 38.1836 27 27 0 0 0 38.1836 0 27 27 0 0 0 0 -38.1836 27 27 0 0 0 -18.69726 -7.90625zM92 352a8 8 0 0 1 8 8 8 8 0 0 1 -8 8 8 8 0 0 1 -8 -8 8 8 0 0 1 8 -8z"
android:fillColor="#eaeaea" />
</group>
</group>
</vector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2019 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/green" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2019 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/green" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2018 Jeremy Jamet / Kunzisoft.
This file is part of KeePassDX.
KeePassDX is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
KeePassDX is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with KeePassDX. If not, see <http://www.gnu.org/licenses/>.
-->
<resources>
<string name="app_name" translatable="false">KeePassDX Pro</string>
<string name="app_name_part3" translatable="false">Pro</string>
</resources>

View File

@@ -30,14 +30,14 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1016"
inkscape:window-height="1043"
id="namedview4"
showgrid="false"
inkscape:zoom="2.8284272"
inkscape:cx="67.839783"
inkscape:cy="79.540344"
inkscape:cx="-14.470711"
inkscape:cy="90.995306"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer5"
showguides="false"><inkscape:grid
@@ -55,23 +55,7 @@
id="stop1528" /><stop
style="stop-color:#439447;stop-opacity:1"
offset="1"
id="stop1530" /></linearGradient><linearGradient
id="linearGradient6069"
inkscape:collect="always"><stop
id="stop6071"
offset="0"
style="stop-color:#ffffff;stop-opacity:0.1" /><stop
id="stop6073"
offset="1"
style="stop-color:#03a9f4;stop-opacity:0" /></linearGradient><linearGradient
id="linearGradient6008"
inkscape:collect="always"><stop
id="stop6010"
offset="0"
style="stop-color:#000000;stop-opacity:0.206" /><stop
id="stop6012"
offset="1"
style="stop-color:#000000;stop-opacity:0;" /></linearGradient><marker
id="stop1530" /></linearGradient><marker
inkscape:stockid="Arrow1Mstart"
orient="auto"
refY="0.0"
@@ -326,15 +310,7 @@
id="path10446-5"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(0.6,0.6)" /></marker><linearGradient
gradientUnits="userSpaceOnUse"
y2="220"
x2="172"
y1="144"
x1="96"
id="linearGradient6014"
xlink:href="#linearGradient6008"
inkscape:collect="always" /><filter
transform="scale(0.6,0.6)" /></marker><filter
id="filter6016"
inkscape:label="Drop Shadow"
style="color-interpolation-filters:sRGB;"><feFlood
@@ -411,17 +387,7 @@
result="composite2"
operator="over"
in2="offset"
in="SourceGraphic" /></filter><radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,2,-1.9999999,0,61.97402,28)"
r="76"
fy="20.987013"
fx="20"
cy="20.987013"
cx="20"
id="radialGradient6075"
xlink:href="#linearGradient6069"
inkscape:collect="always" /><filter
in="SourceGraphic" /></filter><filter
id="filter6016-3"
inkscape:label="Drop Shadow"
style="color-interpolation-filters:sRGB"><feFlood
@@ -606,12 +572,37 @@
y1="0.25"
x2="192"
y2="192.00101"
gradientUnits="userSpaceOnUse" /></defs><g
gradientUnits="userSpaceOnUse" /><filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1631-3"><feFlood
flood-opacity="0.2"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1621-6" /><feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1623-7" /><feGaussianBlur
in="composite1"
stdDeviation="1"
result="blur"
id="feGaussianBlur1625-5" /><feOffset
dx="-2.41474e-15"
dy="2"
result="offset"
id="feOffset1627-3" /><feComposite
in="SourceGraphic"
in2="offset"
operator="over"
result="composite2"
id="feComposite1629-5" /></filter></defs><g
transform="matrix(1.25,0,0,-1.25,0,192)"
inkscape:label="Icon Template"
inkscape:groupmode="layer"
id="g10"
style="display:inline"
style="display:none"
sodipodi:insensitive="true"><g
id="g12"
transform="scale(0.8)"><g
@@ -1298,71 +1289,6 @@
id="path518"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 0,0.001 h 192 v 192 H 0 Z M 0.25,191.75 h 191.5 V 0.25 H 0.25 Z" /></g></g></g></g></g></g></g></g></g><g
style="display:none"
inkscape:label="Example"
id="layer1"
inkscape:groupmode="layer"
transform="translate(0,-48)"><g
transform="matrix(1.25,0,0,-1.25,0,47.000002)"
id="g4665"
style="opacity:1;fill:#ffcd3f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
transform="matrix(1.25,0,0,-1.25,0,49.000002)"
style="opacity:1;fill:#f2a50f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g5976" /><g
style="opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g5960"
transform="matrix(1.25,0,0,-1.25,0,48)" /><g
transform="matrix(1.25,0,0,-1.25,-2.5e-6,47.999997)"
style="opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g5964" /><g
transform="matrix(1.25,0,0,-1.25,-2.5e-6,47.999997)"
id="g5970"
style="opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
id="g9390"
style="opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
transform="translate(137,137)"
style="opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g9678" /><g
style="filter:url(#filter6016)"
id="g5036"><rect
ry="12"
y="68"
x="20"
height="152"
width="152"
id="rect4960"
style="opacity:1;fill:#03a9f4;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
inkscape:connector-curvature="0"
id="rect5026"
d="m 32,67 c -6.648,0 -12,5.352 -12,12 l 0,1 c 0,-6.648 5.352,-12 12,-12 l 128,0 c 6.648,0 12,5.352 12,12 l 0,-1 c 0,-6.648 -5.352,-12 -12,-12 L 32,67 Z"
style="opacity:1;fill:#35baf6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
id="rect5031"
transform="translate(0,48)"
d="m 20,160 0,1 c 0,6.648 5.352,12 12,12 l 128,0 c 6.648,0 12,-5.352 12,-12 l 0,-1 c 0,6.648 -5.352,12 -12,12 l -128,0 c -6.648,0 -12,-5.352 -12,-12 z"
style="opacity:1;fill:#0a91ce;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:connector-curvature="0" /></g><path
inkscape:connector-curvature="0"
id="path5438"
d="M 96,103 67.00781,115.00781 55,144 67.00781,172.99219 114.66797,221 160,221 c 6.648,0 12,-5.352 12,-12 l 0,-1 0,-45.64062 L 124.99219,115.00781 96,103 Z"
style="fill:url(#linearGradient6014);fill-opacity:1;stroke:none;stroke-width:2;stroke-opacity:0.6" /><g
style="filter:url(#filter6045)"
id="g6040"><path
inkscape:connector-curvature="0"
id="path5041"
d="m 137,144 a 41,41 0 0 1 -41,41 41,41 0 0 1 -41,-41 41,41 0 0 1 41,-41 41,41 0 0 1 41,41 z"
style="opacity:1;fill:#ffc107;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
id="circle5087"
d="m 96,102 a 41,41 0 0 0 -41,41 41,41 0 0 0 0.02148,0.58398 A 41,41 0 0 1 96,103 41,41 0 0 1 136.97852,143.41602 41,41 0 0 0 137,143 41,41 0 0 0 96,102 Z"
style="opacity:1;fill:#ffcd39;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:connector-curvature="0" /><path
id="circle5092"
d="M 136.97852,144.41602 A 41,41 0 0 1 96,185 41,41 0 0 1 55.021484,144.58398 41,41 0 0 0 55,145 a 41,41 0 0 0 41,41 41,41 0 0 0 41,-41 41,41 0 0 0 -0.0215,-0.58398 z"
style="opacity:1;fill:#f2a508;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:connector-curvature="0" /></g><path
inkscape:connector-curvature="0"
id="rect6059"
d="m 32,67 c -6.648,0 -12,5.352 -12,12 l 0,1 0,128 0,1 c 0,6.648 5.352,12 12,12 l 128,0 c 6.648,0 12,-5.352 12,-12 l 0,-1 0,-128 0,-1 c 0,-6.648 -5.352,-12 -12,-12 L 32,67 Z"
style="opacity:1;fill:url(#radialGradient6075);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g><g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Explaination"
@@ -1389,6 +1315,10 @@
id="tspan10746"
style="font-size:7.5px;line-height:1.25">for create long shadow </tspan></text>
<text
id="text10775"
y="142.93747"
@@ -1436,9 +1366,13 @@
style="font-size:7.5px;line-height:1.25"
id="tspan11070">shade and shadow values </tspan></text>
<path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart-3)"
d="m 70,134.125 -6.25,6.125 -80,0"
d="m 70,134.125 -6.25,6.125 h -80"
id="path10765"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" /><text
@@ -1468,10 +1402,14 @@
id="tspan10830"
style="font-size:7.5px;line-height:1.25">Color: White</tspan></text>
<path
inkscape:connector-curvature="0"
id="path10849"
d="m 108.15058,137.5 8,8 88,0"
d="m 108.15058,137.5 8,8 h 88"
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker10851)" /><text
id="text10855"
y="135.93747"
@@ -1504,6 +1442,10 @@
style="font-size:7.5px;line-height:1.25"
id="tspan11072">shade and shadow values </tspan></text>
<path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker10882)"
d="M 128.24166,19.646447 113.72307,19.48273 104.41844,12.235651"
@@ -1515,7 +1457,7 @@
id="path10886"
inkscape:connector-curvature="0" /><path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker10904)"
d="m 66.089986,40 -88,0"
d="m 66.089986,40 h -88"
id="path10902"
inkscape:connector-curvature="0" /><text
xml:space="preserve"
@@ -1594,6 +1536,10 @@
id="tspan10975"
style="font-size:7.5px;line-height:1.25">Location: 100%</tspan></text>
<image
y="-200.52631"
x="-420"
@@ -1681,9 +1627,13 @@
x="316.12024"
y="201.56247">shade and shadow values </tspan></text>
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker11098)"
d="M 76.112622,176 96,196 l 0,11.75"
d="M 76.112622,176 96,196 v 11.75"
id="path11096"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" /><text
@@ -1773,6 +1723,10 @@
y="357.56247"
id="tspan11152">Color: Black</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -1850,6 +1804,10 @@
id="tspan10975-1"
style="font-size:7.5px;line-height:1.25">Location: 100%</tspan></text>
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
d="m 80,-12 24.35355,23.958369 -0.17677,41.743534"
@@ -1857,16 +1815,17 @@
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccc" /><path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker11240)"
d="m 147.07821,118.46089 15.55635,-63.639606 34.29468,0"
d="m 147.07821,118.46089 15.55635,-63.639606 h 34.29468"
id="path11238"
inkscape:connector-curvature="0" /></g><g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Extrude Point"
style="display:inline"><path
style="display:none"
sodipodi:insensitive="true"><path
inkscape:connector-curvature="0"
id="path4670"
d="m 192,192 4,0 -4,4 z"
d="m 192,192 h 4 l -4,4 z"
style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /></g><g
inkscape:groupmode="layer"
id="layer4"
@@ -1897,19 +1856,21 @@
inkscape:connector-curvature="0" /></g><g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="Work"><path
inkscape:label="Work"
style="display:inline"><path
sodipodi:nodetypes="ccccccc"
style="display:inline;fill:#64b5f6;fill-opacity:1;stroke-width:4.42103624;filter:url(#filter1587)"
style="display:inline;fill:#ffa726;fill-opacity:1;stroke-width:4.42103624;filter:url(#filter1587)"
inkscape:connector-curvature="0"
d="m 56,56.419812 v 9.377649 l 70.20024,70.203029 h 9.37733 v -9.37765 L 65.377298,56.419812 Z"
id="path1717-0" /><path
sodipodi:nodetypes="ccccccccccccccccccccccccc"
id="path1719-9"
d="m 117.88447,52.01548 c -5.37556,0.199176 -10.47713,2.42304 -14.28187,6.225825 -8.327002,8.326347 -8.327002,21.827068 0,30.153414 8.32601,8.327288 21.82617,8.327288 30.15216,0 8.32699,-8.326346 8.32699,-21.827067 0,-30.153414 -4.19411,-4.192149 -9.94461,-6.448032 -15.87029,-6.225825 z m 9.29106,14.783347 c 3.60001,9.63e-4 6.51813,2.91925 6.51909,6.519398 -8.8e-4,3.600151 -2.91908,6.518419 -6.51909,6.519389 -3.60001,-9.62e-4 -6.51814,-2.919238 -6.51912,-6.519389 8.8e-4,-3.600148 2.91911,-6.518421 6.51912,-6.519398 z M 83.285684,99.335657 56,126.62239 v 9.37765 h 9.377298 l 9.981605,-9.982 v 0.0343 h 9.377278 v -9.37741 h -0.03509 l 0.03509,-0.0343 v 0.0343 h 9.411736 v -6.4761 z"
d="m -42.11553,52.01548 c -5.37556,0.199176 -10.47713,2.42304 -14.28187,6.225825 -8.327002,8.326347 -8.327002,21.827068 0,30.153414 8.32601,8.327288 21.82617,8.327288 30.15216,0 8.32699,-8.326346 8.32699,-21.827067 0,-30.153414 -4.19411,-4.192149 -9.94461,-6.448032 -15.87029,-6.225825 z m 9.29106,14.783347 c 3.60001,9.63e-4 6.51813,2.91925 6.51909,6.519398 -8.8e-4,3.600151 -2.91908,6.518419 -6.51909,6.519389 -3.60001,-9.62e-4 -6.51814,-2.919238 -6.51912,-6.519389 8.8e-4,-3.600148 2.91911,-6.518421 6.51912,-6.519398 z M -76.714316,99.335657 -104,126.62239 v 9.37765 h 9.377298 l 9.981605,-9.982 v 0.0343 h 9.377278 v -9.37741 h -0.03509 l 0.03509,-0.0343 v 0.0343 h 9.411736 v -6.4761 z"
inkscape:connector-curvature="0"
style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:4.42103624;filter:url(#filter1599)" /><path
id="path1536"
d="m 216,56.419812 v 9.377649 l 70.20024,70.203029 h 9.37733 v -9.37765 L 225.3773,56.419812 Z"
style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:1.99999297;filter:url(#filter1631-3)"
d="m 116.53271,54.38132 c -0.79147,0 -1.583,0.30369 -2.18946,0.91015 l -7.29883,7.29883 c -1.21292,1.21293 -1.21292,3.16403 0,4.37695 l 7.29883,7.29883 c 1.21292,1.21292 3.16599,1.21292 4.37891,0 l 7.29687,-7.29883 c 1.21293,-1.21292 1.21293,-3.16403 0,-4.37695 l -7.29687,-7.29883 c -0.60646,-0.60646 -1.39799,-0.91015 -2.18945,-0.91015 z m 3.17187,7.54297 c 1.65686,0 3,1.34314 3,3 0,1.65685 -1.34314,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65686 1.34315,-3 3,-3 z m -19.3291,12.81347 -12.343752,12.34375 v 4.24219 h 4.242188 l 4.515625,-4.51562 v 0.0156 h 4.242189 v -4.24219 h -0.0156 l 0.0156,-0.0156 v 0.0156 h 4.25781 V 79.6518 Z"
id="path1451"
inkscape:connector-curvature="0"
style="display:inline;fill:#ffa726;fill-opacity:1;stroke-width:4.42103624;filter:url(#filter1587)"
sodipodi:nodetypes="ccccccc" /></g></svg>
sodipodi:nodetypes="sssssccccsssssscccccccccccccc"
transform="matrix(2.1916449,0,0,2.1916449,-136.70172,-64.462974)" /></g></svg>

Before

Width:  |  Height:  |  Size: 373 KiB

After

Width:  |  Height:  |  Size: 368 KiB

View File

@@ -30,16 +30,16 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1016"
inkscape:window-height="1043"
id="namedview4"
showgrid="false"
inkscape:zoom="4"
inkscape:cx="-4.5151"
inkscape:cy="29.113264"
inkscape:zoom="2.8284271"
inkscape:cx="-7.8772259"
inkscape:cy="59.023519"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer2"
inkscape:current-layer="layer6"
showguides="true"><inkscape:grid
type="xygrid"
id="grid1474" /></sodipodi:namedview><metadata
@@ -1695,7 +1695,32 @@
y1="84"
x2="108"
y2="192"
gradientUnits="userSpaceOnUse" /></defs><g
gradientUnits="userSpaceOnUse" /><filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1631-3"><feFlood
flood-opacity="0.2"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1621-6" /><feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1623-7" /><feGaussianBlur
in="composite1"
stdDeviation="1"
result="blur"
id="feGaussianBlur1625-5" /><feOffset
dx="-2.41474e-15"
dy="2"
result="offset"
id="feOffset1627-3" /><feComposite
in="SourceGraphic"
in2="offset"
operator="over"
result="composite2"
id="feComposite1629-5" /></filter></defs><g
transform="translate(0,-84)"
style="display:inline"
inkscape:label="Work_Background"
@@ -1882,20 +1907,23 @@
id="g9678-5"
style="display:inline;opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
transform="matrix(0.24545455,0,0,0.24545455,33.627273,414.71818)" /><path
id="path1487"
d="m 36,367.99921 v 4.24227 L 67.757251,404 h 4.242114 v -4.24227 L 40.242113,367.99921 Z"
inkscape:connector-curvature="0"
style="display:inline;fill:#ffa726;fill-opacity:1;stroke-width:1.99999297;filter:url(#filter1631)"
d="m 36,36 v 4.242188 L 67.757812,72 H 72 V 67.757812 L 40.242188,36 Z"
transform="translate(0,332)"
id="path1487"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccc" /><path
style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:1.99999297;filter:url(#filter1631)"
inkscape:connector-curvature="0"
d="m 63.995352,366.00677 c -2.431796,0.0901 -4.739655,1.09614 -6.460849,2.81645 -3.766972,3.76668 -3.766972,9.87415 0,13.64083 3.76653,3.76711 9.87374,3.76711 13.64027,0 3.766972,-3.76668 3.766972,-9.87415 0,-13.64083 -1.89733,-1.89645 -4.498752,-2.91697 -7.179421,-2.81645 z m 4.203094,6.68771 c 1.628576,4.4e-4 2.948686,1.32061 2.949127,2.94925 -4.41e-4,1.62864 -1.320551,2.94881 -2.949127,2.94925 -1.628576,-4.4e-4 -2.948686,-1.32061 -2.949127,-2.94925 4.41e-4,-1.62864 1.320551,-2.94881 2.949127,-2.94925 z M 48.343524,387.41353 36,399.75753 v 4.24227 h 4.242113 l 4.51549,-4.51567 v 0.0156 h 4.242094 v -4.24227 h -0.016 l 0.016,-0.0156 v 0.0156 h 4.257693 v -2.92966 z"
d="m 63.996094,34.005859 c -2.431796,0.0901 -4.739744,1.096097 -6.460938,2.816407 -3.766972,3.76668 -3.766972,9.875898 0,13.642578 3.76653,3.76711 9.872142,3.76711 13.638672,0 3.766972,-3.76668 3.766972,-9.875898 0,-13.642578 -1.89733,-1.89645 -4.497065,-2.916927 -7.177734,-2.816407 z m 4.203125,6.689453 c 1.628576,4.42e-4 2.948778,1.320579 2.949219,2.949219 -4.41e-4,1.62864 -1.320643,2.948779 -2.949219,2.949219 -1.628576,-4.4e-4 -2.948778,-1.320579 -2.949219,-2.949219 4.41e-4,-1.62864 1.320643,-2.948778 2.949219,-2.949219 z M 48.34375,55.414062 36,67.757812 V 72 h 4.242188 l 4.515624,-4.515625 V 67.5 H 49 V 63.257812 H 48.98437 L 49,63.242188 v 0.01562 h 4.257812 v -2.929687 z"
transform="translate(0,332)"
id="path1666"
sodipodi:nodetypes="ccccccccccccccccccccccccc" /></g><g
style="display:inline"
inkscape:label="Work_Light"
id="layer2"
inkscape:groupmode="layer" /><g
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccccccccccccccc" /><path
style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:1.99999297;filter:url(#filter1631-3)"
d="m -15.499022,367.05762 c -0.791464,0 -1.582993,0.30369 -2.189454,0.91015 l -7.298828,7.29883 c -1.212921,1.21293 -1.212921,3.16403 0,4.37695 l 7.298828,7.29883 c 1.212922,1.21292 3.165985,1.21292 4.378907,0 l 7.296875,-7.29883 c 1.212921,-1.21292 1.212921,-3.16403 0,-4.37695 l -7.296875,-7.29883 c -0.606461,-0.60646 -1.397989,-0.91015 -2.189453,-0.91015 z m 3.171875,7.54297 c 1.656854,0 3,1.34314 3,3 0,1.65685 -1.343146,3 -3,3 -1.656854,0 -3,-1.34315 -3,-3 0,-1.65686 1.343146,-3 3,-3 z M -31.656249,387.41406 -44,399.75781 V 404 h 4.242188 l 4.515625,-4.51562 v 0.0156 h 4.242188 v -4.24219 h -0.01563 l 0.01563,-0.0156 v 0.0156 h 4.257812 v -2.92969 z"
id="path1451"
inkscape:connector-curvature="0"
sodipodi:nodetypes="sssssccccsssssscccccccccccccc" /></g><g
inkscape:groupmode="layer"
id="layer7"
inkscape:label="Mask_Circle"

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 70 KiB

View File

@@ -30,16 +30,16 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1016"
inkscape:window-height="1043"
id="namedview4"
showgrid="true"
inkscape:zoom="2.8284271"
inkscape:cx="65.944214"
inkscape:cy="89.892731"
inkscape:cx="-29.161649"
inkscape:cy="90.246284"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="layer5"
inkscape:current-layer="layer4"
showguides="false"><inkscape:grid
id="grid4646"
type="xygrid"
@@ -55,23 +55,7 @@
id="stop1623" /><stop
style="stop-color:#439447;stop-opacity:1"
offset="1"
id="stop1625" /></linearGradient><linearGradient
id="linearGradient6069"
inkscape:collect="always"><stop
id="stop6071"
offset="0"
style="stop-color:#ffffff;stop-opacity:0.1" /><stop
id="stop6073"
offset="1"
style="stop-color:#03a9f4;stop-opacity:0" /></linearGradient><linearGradient
id="linearGradient6008"
inkscape:collect="always"><stop
id="stop6010"
offset="0"
style="stop-color:#000000;stop-opacity:0.206" /><stop
id="stop6012"
offset="1"
style="stop-color:#000000;stop-opacity:0;" /></linearGradient><marker
id="stop1625" /></linearGradient><marker
inkscape:stockid="Arrow1Mstart"
orient="auto"
refY="0.0"
@@ -326,15 +310,7 @@
id="path10446-5"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
transform="scale(0.6,0.6)" /></marker><linearGradient
gradientUnits="userSpaceOnUse"
y2="220"
x2="172"
y1="144"
x1="96"
id="linearGradient6014"
xlink:href="#linearGradient6008"
inkscape:collect="always" /><filter
transform="scale(0.6,0.6)" /></marker><filter
id="filter6016"
inkscape:label="Drop Shadow"
style="color-interpolation-filters:sRGB;"><feFlood
@@ -411,17 +387,7 @@
result="composite2"
operator="over"
in2="offset"
in="SourceGraphic" /></filter><radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0,2,-1.9999999,0,61.97402,28)"
r="76"
fy="20.987013"
fx="20"
cy="20.987013"
cx="20"
id="radialGradient6075"
xlink:href="#linearGradient6069"
inkscape:collect="always" /><filter
in="SourceGraphic" /></filter><filter
id="filter6016-3"
inkscape:label="Drop Shadow"
style="color-interpolation-filters:sRGB"><feFlood
@@ -656,7 +622,32 @@
y1="0"
x2="192"
y2="192"
gradientUnits="userSpaceOnUse" /></defs><g
gradientUnits="userSpaceOnUse" /><filter
style="color-interpolation-filters:sRGB"
inkscape:label="Drop Shadow"
id="filter1631-3"><feFlood
flood-opacity="0.2"
flood-color="rgb(0,0,0)"
result="flood"
id="feFlood1621-6" /><feComposite
in="flood"
in2="SourceGraphic"
operator="in"
result="composite1"
id="feComposite1623-7" /><feGaussianBlur
in="composite1"
stdDeviation="1"
result="blur"
id="feGaussianBlur1625-5" /><feOffset
dx="-2.41474e-15"
dy="2"
result="offset"
id="feOffset1627-3" /><feComposite
in="SourceGraphic"
in2="offset"
operator="over"
result="composite2"
id="feComposite1629-5" /></filter></defs><g
transform="matrix(1.25,0,0,-1.25,0,192)"
inkscape:label="Icon Template"
inkscape:groupmode="layer"
@@ -1348,71 +1339,6 @@
id="path518"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 0,0.001 h 192 v 192 H 0 Z M 0.25,191.75 h 191.5 V 0.25 H 0.25 Z" /></g></g></g></g></g></g></g></g></g><g
style="display:none"
inkscape:label="Example"
id="layer1"
inkscape:groupmode="layer"
transform="translate(0,-48)"><g
transform="matrix(1.25,0,0,-1.25,0,47.000002)"
id="g4665"
style="opacity:1;fill:#ffcd3f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
transform="matrix(1.25,0,0,-1.25,0,49.000002)"
style="opacity:1;fill:#f2a50f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g5976" /><g
style="opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g5960"
transform="matrix(1.25,0,0,-1.25,0,48)" /><g
transform="matrix(1.25,0,0,-1.25,-2.5e-6,47.999997)"
style="opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g5964" /><g
transform="matrix(1.25,0,0,-1.25,-2.5e-6,47.999997)"
id="g5970"
style="opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
id="g9390"
style="opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><g
transform="translate(137,137)"
style="opacity:1;fill:#ffc10f;fill-opacity:0.94117647;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="g9678" /><g
style="filter:url(#filter6016)"
id="g5036"><rect
ry="12"
y="68"
x="20"
height="152"
width="152"
id="rect4960"
style="opacity:1;fill:#03a9f4;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
inkscape:connector-curvature="0"
id="rect5026"
d="m 32,67 c -6.648,0 -12,5.352 -12,12 v 1 c 0,-6.648 5.352,-12 12,-12 h 128 c 6.648,0 12,5.352 12,12 v -1 c 0,-6.648 -5.352,-12 -12,-12 z"
style="opacity:1;fill:#35baf6;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
id="rect5031"
transform="translate(0,48)"
d="m 20,160 v 1 c 0,6.648 5.352,12 12,12 h 128 c 6.648,0 12,-5.352 12,-12 v -1 c 0,6.648 -5.352,12 -12,12 H 32 c -6.648,0 -12,-5.352 -12,-12 z"
style="opacity:1;fill:#0a91ce;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:connector-curvature="0" /></g><path
inkscape:connector-curvature="0"
id="path5438"
d="M 96,103 67.00781,115.00781 55,144 67.00781,172.99219 114.66797,221 H 160 c 6.648,0 12,-5.352 12,-12 v -1 -45.64062 l -47.00781,-47.35157 z"
style="fill:url(#linearGradient6014);fill-opacity:1;stroke:none;stroke-width:2;stroke-opacity:0.6" /><g
style="filter:url(#filter6045)"
id="g6040"><path
inkscape:connector-curvature="0"
id="path5041"
d="m 137,144 a 41,41 0 0 1 -41,41 41,41 0 0 1 -41,-41 41,41 0 0 1 41,-41 41,41 0 0 1 41,41 z"
style="opacity:1;fill:#ffc107;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
id="circle5087"
d="m 96,102 a 41,41 0 0 0 -41,41 41,41 0 0 0 0.02148,0.58398 A 41,41 0 0 1 96,103 41,41 0 0 1 136.97852,143.41602 41,41 0 0 0 137,143 41,41 0 0 0 96,102 Z"
style="opacity:1;fill:#ffcd39;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:connector-curvature="0" /><path
id="circle5092"
d="M 136.97852,144.41602 A 41,41 0 0 1 96,185 41,41 0 0 1 55.021484,144.58398 41,41 0 0 0 55,145 a 41,41 0 0 0 41,41 41,41 0 0 0 41,-41 41,41 0 0 0 -0.0215,-0.58398 z"
style="opacity:1;fill:#f2a508;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:connector-curvature="0" /></g><path
inkscape:connector-curvature="0"
id="rect6059"
d="m 32,67 c -6.648,0 -12,5.352 -12,12 v 1 128 1 c 0,6.648 5.352,12 12,12 h 128 c 6.648,0 12,-5.352 12,-12 V 208 80 79 c 0,-6.648 -5.352,-12 -12,-12 z"
style="opacity:1;fill:url(#radialGradient6075);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g><g
inkscape:groupmode="layer"
id="layer2"
inkscape:label="Explaination"
@@ -1439,6 +1365,8 @@
id="tspan10746"
style="font-size:7.5px;line-height:1.25">for create long shadow </tspan></text>
<text
id="text10775"
y="142.93747"
@@ -1486,6 +1414,8 @@
style="font-size:7.5px;line-height:1.25"
id="tspan11070">shade and shadow values </tspan></text>
<path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart-3)"
d="m 70,134.125 -6.25,6.125 h -80"
@@ -1518,6 +1448,8 @@
id="tspan10830"
style="font-size:7.5px;line-height:1.25">Color: White</tspan></text>
<path
inkscape:connector-curvature="0"
id="path10849"
@@ -1554,6 +1486,8 @@
style="font-size:7.5px;line-height:1.25"
id="tspan11072">shade and shadow values </tspan></text>
<path
style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker10882)"
d="M 128.24166,19.646447 113.72307,19.48273 104.41844,12.235651"
@@ -1644,6 +1578,8 @@
id="tspan10975"
style="font-size:7.5px;line-height:1.25">Location: 100%</tspan></text>
<image
y="-200.52631"
x="-420"
@@ -1731,6 +1667,8 @@
x="316.12024"
y="201.56247">shade and shadow values </tspan></text>
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker11098)"
d="M 76.112622,176 96,196 v 11.75"
@@ -1823,6 +1761,8 @@
y="357.56247"
id="tspan11152">Color: Black</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
@@ -1900,6 +1840,8 @@
id="tspan10975-1"
style="font-size:7.5px;line-height:1.25">Location: 100%</tspan></text>
<path
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)"
d="m 80,-12 24.35355,23.958369 -0.17677,41.743534"
@@ -1913,7 +1855,8 @@
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Extrude Point"
style="display:inline"><path
style="display:none"
sodipodi:insensitive="true"><path
inkscape:connector-curvature="0"
id="path4670"
d="m 192,192 h 4 l -4,4 z"
@@ -1954,6 +1897,12 @@
id="path1717-0" /><path
sodipodi:nodetypes="ccccccccccccccccccccccccc"
id="path1719-9"
d="m 117.88447,52.014993 c -5.37556,0.199176 -10.47713,2.42304 -14.28187,6.225825 -8.327002,8.326347 -8.327002,21.827068 0,30.153414 8.32601,8.327288 21.82617,8.327288 30.15216,0 8.32699,-8.326346 8.32699,-21.827067 0,-30.153414 -4.19411,-4.192149 -9.94461,-6.448032 -15.87029,-6.225825 z m 9.29106,14.783347 c 3.60001,9.63e-4 6.51813,2.91925 6.51909,6.519398 -8.8e-4,3.600151 -2.91908,6.518419 -6.51909,6.519389 -3.60001,-9.62e-4 -6.51814,-2.919238 -6.51912,-6.519389 8.8e-4,-3.600148 2.91911,-6.518421 6.51912,-6.519398 z M 83.285684,99.33517 56,126.6219 v 9.37765 h 9.377298 l 9.981605,-9.982 v 0.0343 h 9.377278 v -9.37741 h -0.03509 l 0.03509,-0.0343 v 0.0343 h 9.411736 v -6.4761 z"
d="m -42.11553,52.014993 c -5.37556,0.199176 -10.47713,2.42304 -14.28187,6.225825 -8.327002,8.326347 -8.327002,21.827068 0,30.153414 8.32601,8.327288 21.82617,8.327288 30.15216,0 8.32699,-8.326346 8.32699,-21.827067 0,-30.153414 -4.19411,-4.192149 -9.94461,-6.448032 -15.87029,-6.225825 z m 9.29106,14.783347 c 3.60001,9.63e-4 6.51813,2.91925 6.51909,6.519398 -8.8e-4,3.600151 -2.91908,6.518419 -6.51909,6.519389 -3.60001,-9.62e-4 -6.51814,-2.919238 -6.51912,-6.519389 8.8e-4,-3.600148 2.91911,-6.518421 6.51912,-6.519398 z M -76.714316,99.33517 -104,126.6219 v 9.37765 h 9.3773 l 9.9816,-9.982 v 0.0343 h 9.377281 v -9.37741 h -0.03509 l 0.03509,-0.0343 v 0.0343 h 9.411736 v -6.4761 z"
inkscape:connector-curvature="0"
style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:4.42103624;filter:url(#filter1599)" /></g></svg>
style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:4.42103624;filter:url(#filter1599)" /><path
style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:1.99999297;filter:url(#filter1631-3)"
d="m 116.53271,54.38132 c -0.79147,0 -1.583,0.30369 -2.18946,0.91015 l -7.29883,7.29883 c -1.21292,1.21293 -1.21292,3.16403 0,4.37695 l 7.29883,7.29883 c 1.21292,1.21292 3.16599,1.21292 4.37891,0 l 7.29687,-7.29883 c 1.21293,-1.21292 1.21293,-3.16403 0,-4.37695 l -7.29687,-7.29883 c -0.60646,-0.60646 -1.39799,-0.91015 -2.18945,-0.91015 z m 3.17187,7.54297 c 1.65686,0 3,1.34314 3,3 0,1.65685 -1.34314,3 -3,3 -1.65685,0 -3,-1.34315 -3,-3 0,-1.65686 1.34315,-3 3,-3 z m -19.3291,12.81347 -12.343752,12.34375 v 4.24219 h 4.242188 l 4.515625,-4.51562 v 0.0156 h 4.242189 v -4.24219 h -0.0156 l 0.0156,-0.0156 v 0.0156 h 4.25781 V 79.6518 Z"
id="path1451"
inkscape:connector-curvature="0"
sodipodi:nodetypes="sssssccccsssssscccccccccccccc"
transform="matrix(2.1916449,0,0,2.1916449,-136.70145,-64.46258)" /></g></svg>

Before

Width:  |  Height:  |  Size: 374 KiB

After

Width:  |  Height:  |  Size: 370 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB