diff --git a/.gitignore b/.gitignore index 31f01ae..4061124 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /build /captures .idea +keystore.properties diff --git a/app/build.gradle b/app/build.gradle index 3146d24..1ec50e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,16 @@ repositories { maven { url 'https://maven.fabric.io/public' } } +// Create a variable called keystorePropertiesFile, and initialize it to your +// keystore.properties file, in the rootProject folder. +def keystorePropertiesFile = rootProject.file("keystore.properties") + +// Initialize a new Properties() object called keystoreProperties. +def keystoreProperties = new Properties() + +// Load your keystore.properties file into the keystoreProperties object. +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + android { compileSdkVersion 21 buildToolsVersion "23.0.3" @@ -28,10 +38,21 @@ android { versionCode 1 versionName "1.0" } + + signingConfigs { + config { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile file(keystoreProperties['storeFile']) + storePassword keystoreProperties['storePassword'] + } + } + buildTypes { release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.config } } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index f253a1f..0351089 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -15,3 +15,7 @@ #-keepclassmembers class fqcn.of.javascript.interface.for.webview { # public *; #} + +-keepattributes Signature +-keepattributes InnerClasses +-dontwarn ch.qos.logback.core.net.* \ No newline at end of file diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java index 5de5ee8..49a3ac7 100644 --- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java +++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/MainActivity.java @@ -130,6 +130,8 @@ public class MainActivity extends ActionBarActivity { if (sharedPrefs.getBoolean(FIRST_TIME_LAUNCH, true)) { Toast.makeText(this, "To interact with any list itemm press long the item. When thgre is no results" + ", please, click refresh in the menu", Toast.LENGTH_LONG).show(); + Toast.makeText(this, "To change panoramio / wiki search views swipe left or right", + Toast.LENGTH_LONG).show(); SharedPreferences.Editor editor = sharedPrefs.edit(); editor.putBoolean(FIRST_TIME_LAUNCH, false); editor.commit();