Skip to content

GitLab

Commit f6f11bf6 authored by Daniel Wolf's avatar Daniel Wolf
Browse files

Added new icon (thanks RKBDI) 

Implements #58
parent 3645a922
Pipeline #4209 passed with stage
in 4 minutes and 54 seconds
Hide whitespace changes
Inline Side-by-side
.idea/assetWizardSettings.xml
View file @ f6f11bf6
......@@ -18,6 +18,17 @@
<PersistentState>
<option name="children">
<map>
<entry key="clipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="clipartAsset">
<value>
<PersistentState>
......@@ -46,6 +57,17 @@
<PersistentState>
<option name="children">
<map>
<entry key="foregroundImage">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="foregroundText">
<value>
<PersistentState>
......@@ -73,9 +95,51 @@
</option>
<option name="values">
<map>
<entry key="backgroundAssetType" value="COLOR" />
<entry key="backgroundColor" value="37474f" />
<entry key="foregroundAssetType" value="TEXT" />
<entry key="backgroundImage" value="C:\Users\Daniel\Downloads\BG.png" />
<entry key="foregroundImage" value="C:\Users\Daniel\Downloads\FG.png" />
<entry key="legacyIconShape" value="CIRCLE" />
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="launcherLegacy">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="clipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
</value>
</entry>
<entry key="notification">
<value>
<PersistentState>
<option name="children">
<map>
<entry key="clipArt">
<value>
<PersistentState>
<option name="values">
<map>
<entry key="color" value="000000" />
</map>
</option>
</PersistentState>
</value>
</entry>
</map>
</option>
</PersistentState>
......@@ -103,8 +167,8 @@
<map>
<entry key="assetSourceType" value="FILE" />
<entry key="autoMirrored" value="true" />
<entry key="outputName" value="ic_shield" />
<entry key="sourceFile" value="E:\Dev\fontawesome-pro-5.6.0-desktop\svgs\solid\shield.svg" />
<entry key="outputName" value="ic_thumbs_up" />
<entry key="sourceFile" value="C:\Dev\fontawesome-pro-5.8.1-desktop\svgs\solid\thumbs-up.svg" />
</map>
</option>
</PersistentState>
......
.idea/codeStyles/Project.xml
View file @ f6f11bf6
......@@ -33,30 +33,6 @@
<MarkdownNavigatorCodeStyleSettings>
<option name="RIGHT_MARGIN" value="72" />
</MarkdownNavigatorCodeStyleSettings>
<DBN-PSQL>
<case-options enabled="false">
<option name="KEYWORD_CASE" value="lower" />
<option name="FUNCTION_CASE" value="lower" />
<option name="PARAMETER_CASE" value="lower" />
<option name="DATATYPE_CASE" value="lower" />
<option name="OBJECT_CASE" value="preserve" />
</case-options>
<formatting-settings enabled="false" />
</DBN-PSQL>
<DBN-SQL>
<case-options enabled="false">
<option name="KEYWORD_CASE" value="lower" />
<option name="FUNCTION_CASE" value="lower" />
<option name="PARAMETER_CASE" value="lower" />
<option name="DATATYPE_CASE" value="lower" />
<option name="OBJECT_CASE" value="preserve" />
</case-options>
<formatting-settings enabled="false">
<option name="STATEMENT_SPACING" value="one_line" />
<option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
<option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
</formatting-settings>
</DBN-SQL>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
......
.idea/markdown-navigator.xml 0 → 100644
View file @ f6f11bf6
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MarkdownProjectSettings" wasCopied="false">
<PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true" openRemoteLinks="true" replaceUnicodeEmoji="false" lastLayoutSetsDefault="false">
<PanelProvider>
<provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
</PanelProvider>
</PreviewSettings>
<ParserSettings gitHubSyntaxChange="false" emojiShortcuts="1" emojiImages="0">
<PegdownExtensions>
<option name="ABBREVIATIONS" value="false" />
<option name="ANCHORLINKS" value="true" />
<option name="ASIDE" value="false" />
<option name="ATXHEADERSPACE" value="true" />
<option name="AUTOLINKS" value="false" />
<option name="DEFINITIONS" value="false" />
<option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
<option name="FENCED_CODE_BLOCKS" value="true" />
<option name="FOOTNOTES" value="false" />
<option name="HARDWRAPS" value="false" />
<option name="HTML_DEEP_PARSER" value="false" />
<option name="INSERTED" value="false" />
<option name="QUOTES" value="false" />
<option name="RELAXEDHRULES" value="true" />
<option name="SMARTS" value="false" />
<option name="STRIKETHROUGH" value="true" />
<option name="SUBSCRIPT" value="false" />
<option name="SUPERSCRIPT" value="false" />
<option name="SUPPRESS_HTML_BLOCKS" value="false" />
<option name="SUPPRESS_INLINE_HTML" value="false" />
<option name="TABLES" value="true" />
<option name="TASKLISTITEMS" value="true" />
<option name="TOC" value="false" />
<option name="WIKILINKS" value="false" />
</PegdownExtensions>
<ParserOptions>
<option name="ADMONITION_EXT" value="false" />
<option name="ATTRIBUTES_EXT" value="false" />
<option name="COMMONMARK_LISTS" value="true" />
<option name="DUMMY" value="false" />
<option name="EMOJI_SHORTCUTS" value="true" />
<option name="ENUMERATED_REFERENCES_EXT" value="false" />
<option name="FLEXMARK_FRONT_MATTER" value="false" />
<option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
<option name="GFM_TABLE_RENDERING" value="true" />
<option name="GITBOOK_URL_ENCODING" value="false" />
<option name="GITHUB_LISTS" value="false" />
<option name="GITHUB_WIKI_LINKS" value="false" />
<option name="GITLAB_EXT" value="false" />
<option name="GITLAB_MATH_EXT" value="false" />
<option name="GITLAB_MERMAID_EXT" value="false" />
<option name="HEADER_ID_NON_ASCII_TO_LOWERCASE" value="false" />
<option name="HEADER_ID_NO_DUPED_DASHES" value="false" />
<option name="JEKYLL_FRONT_MATTER" value="false" />
<option name="MACROS_EXT" value="false" />
<option name="NO_TEXT_ATTRIBUTES" value="false" />
<option name="PARSE_HTML_ANCHOR_ID" value="false" />
<option name="PLANTUML_FENCED_CODE" value="false" />
<option name="PUML_FENCED_CODE" value="false" />
<option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
</ParserOptions>
</ParserSettings>
<HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true" embedImages="false" embedHttpImages="false" imageUriSerials="false" addDocTypeHtml="true" noParaTags="false" plantUmlConversion="0" mathConversion="0">
<GeneratorProvider>
<provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
</GeneratorProvider>
<headerTop />
<headerBottom />
<bodyTop />
<bodyBottom />
</HtmlSettings>
<CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssUriSerial="true" isCssTextEnabled="false" isDynamicPageWidth="true">
<StylesheetProvider>
<provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
</StylesheetProvider>
<ScriptProviders />
<cssText />
<cssUriHistory />
</CssSettings>
<AnnotatorSettings targetHasSpaces="true" linkCaseMismatch="true" wikiCaseMismatch="true" wikiLinkHasDashes="true" notUnderWikiHome="true" targetNotWikiPageExt="true" notUnderSourceWikiHome="true" targetNameHasAnchor="true" targetPathHasAnchor="true" wikiLinkHasSlash="true" wikiLinkHasSubdir="true" wikiLinkHasOnlyAnchor="true" linkTargetsWikiHasExt="true" linkTargetsWikiHasBadExt="true" notUnderSameRepo="true" targetNotUnderVcs="false" linkNeedsExt="true" linkHasBadExt="true" linkTargetNeedsExt="true" linkTargetHasBadExt="true" wikiLinkNotInWiki="true" imageTargetNotInRaw="true" repoRelativeAcrossVcsRoots="true" multipleWikiTargetsMatch="true" unresolvedLinkReference="true" linkIsIgnored="true" anchorIsIgnored="true" anchorIsUnresolved="true" anchorLineReferenceIsUnresolved="true" anchorLineReferenceFormat="true" anchorHasDuplicates="true" abbreviationDuplicates="true" abbreviationNotUsed="true" attributeIdDuplicateDefinition="true" attributeIdNotUsed="true" footnoteDuplicateDefinition="true" footnoteUnresolved="true" footnoteDuplicates="true" footnoteNotUsed="true" macroDuplicateDefinition="true" macroUnresolved="true" macroDuplicates="true" macroNotUsed="true" referenceDuplicateDefinition="true" referenceUnresolved="true" referenceDuplicates="true" referenceNotUsed="true" referenceUnresolvedNumericId="true" enumRefDuplicateDefinition="true" enumRefUnresolved="true" enumRefDuplicates="true" enumRefNotUsed="true" enumRefLinkUnresolved="true" enumRefLinkDuplicates="true" simTocUpdateNeeded="true" simTocTitleSpaceNeeded="true" />
<HtmlExportSettings updateOnSave="false" parentDir="" targetDir="" cssDir="css" scriptDir="js" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetPathType="2" targetExt="" useTargetExt="false" noCssNoScripts="false" useElementStyleAttribute="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" linkFormatType="HTTP_ABSOLUTE" />
<LinkMapSettings>
<textMaps />
</LinkMapSettings>
</component>
</project>
\ No newline at end of file
README.md 0 → 100644
View file @ f6f11bf6
Repository for the open-source app [Nebulo](https://play.google.com/store/apps/details?id=com.frostnerd.smokescreen).
Nebulo is a DoH/DoT app.
App icon by [RKBDI](http://dribbble.com/rkbdi).
\ No newline at end of file
app/src/main/ic_launcher-web.png
View replaced file @ 3645a922 View file @ f6f11bf6
app/src/main/ic_launcher-web.png

14.3 KB | W: | H:

app/src/main/ic_launcher-web.png

133 KB | W: | H:

app/src/main/ic_launcher-web.png
app/src/main/ic_launcher-web.png
app/src/main/ic_launcher-web.png
app/src/main/ic_launcher-web.png
  • 2-up
  • Swipe
  • Onion skin
app/src/main/java/com/frostnerd/smokescreen/Globals.kt
View file @ f6f11bf6
......@@ -4,6 +4,7 @@ import android.content.Context
import android.content.DialogInterface
import android.content.pm.PackageManager
import android.graphics.Color
import android.text.Html
import android.text.SpannableString
import android.text.method.LinkMovementMethod
import android.text.util.Linkify
......@@ -32,12 +33,14 @@ import android.widget.TextView
fun showInfoTextDialog(context:Context, title:String, text:String,
positiveButton:Pair<String, (DialogInterface, Int) -> Unit>? = null,
negativeButton:Pair<String, (DialogInterface, Int) -> Unit>? = null): androidx.appcompat.app.AlertDialog {
val stringWithLinks = SpannableString(text)
var stringWithLinks = SpannableString(text)
Linkify.addLinks(stringWithLinks, Linkify.ALL)
val span = Html.fromHtml(stringWithLinks.toString().replace("\n", "<br>"))
val dialogBuilder = androidx.appcompat.app.AlertDialog.Builder(context, context.getPreferences().theme.dialogStyle)
.setTitle(title)
.setMessage(stringWithLinks)
.setMessage(span)
.setNeutralButton(R.string.ok, null)
if(positiveButton != null) dialogBuilder.setPositiveButton(positiveButton.first, positiveButton.second)
if(negativeButton != null) dialogBuilder.setNegativeButton(negativeButton.first, negativeButton.second)
......@@ -45,6 +48,7 @@ fun showInfoTextDialog(context:Context, title:String, text:String,
val dialog = dialogBuilder.show()
val textView = dialog.findViewById<TextView>(android.R.id.message)
textView?.movementMethod = LinkMovementMethod.getInstance()
textView?.linksClickable = true
textView?.setLinkTextColor(Color.parseColor("#64B5F6"))
return dialog
}
......
app/src/main/java/com/frostnerd/smokescreen/activity/MainActivity.kt
View file @ f6f11bf6
......@@ -165,6 +165,16 @@ class MainActivity : NavigationDrawerActivity() {
dialog.show()
false
})
clickableItem(getString(R.string.menu_credits),
iconLeft = getDrawable(R.drawable.ic_thumbs_up),
onLongClick = null,
onSimpleClick = { _, _ , _ ->
println(getString(R.string.dialog_credits_message))
showInfoTextDialog(this@MainActivity,
getString(R.string.dialog_credits_title),
getString(R.string.dialog_credits_message))
false
})
clickableItem(getString(R.string.menu_about),
iconLeft = getDrawable(R.drawable.ic_binoculars),
onLongClick = null,
......
app/src/main/res/drawable/ic_thumbs_up.xml 0 → 100644
View file @ f6f11bf6
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="512" android:viewportWidth="512"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M104,224H24c-13.255,0 -24,10.745 -24,24v240c0,13.255 10.745,24 24,24h80c13.255,0 24,-10.745 24,-24V248c0,-13.255 -10.745,-24 -24,-24zM64,472c-13.255,0 -24,-10.745 -24,-24s10.745,-24 24,-24 24,10.745 24,24 -10.745,24 -24,24zM384,81.452c0,42.416 -25.97,66.208 -33.277,94.548h101.723c33.397,0 59.397,27.746 59.553,58.098 0.084,17.938 -7.546,37.249 -19.439,49.197l-0.11,0.11c9.836,23.337 8.237,56.037 -9.308,79.469 8.681,25.895 -0.069,57.704 -16.382,74.757 4.298,17.598 2.244,32.575 -6.148,44.632C440.202,511.587 389.616,512 346.839,512l-2.845,-0.001c-48.287,-0.017 -87.806,-17.598 -119.56,-31.725 -15.957,-7.099 -36.821,-15.887 -52.651,-16.178 -6.54,-0.12 -11.783,-5.457 -11.783,-11.998v-213.77c0,-3.2 1.282,-6.271 3.558,-8.521 39.614,-39.144 56.648,-80.587 89.117,-113.111 14.804,-14.832 20.188,-37.236 25.393,-58.902C282.515,39.293 291.817,0 312,0c24,0 72,8 72,81.452z"/>
</vector>
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View file @ f6f11bf6
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<background android:drawable="@mipmap/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View file @ f6f11bf6
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<background android:drawable="@mipmap/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment