v1.08

danbrough · Jan 25, 2019 · 0e3fe6f · 0e3fe6f
1 parent 92001c2
commit 0e3fe6f
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,4 @@
 /build
 /captures
 .externalNativeBuild
-/support_res
+/app/release
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,20 +8,33 @@ android {
   compileSdkVersion 28
 
   defaultConfig {
-    applicationId "danbroid.searchviewdemo"
+    applicationId "danbroid.searchview"
     minSdkVersion 14
     targetSdkVersion 28
     versionCode 8
     versionName "v1.08"
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 
+
+
+  signingConfigs {
+    release {
+      storeFile file("/home/dan/.android/keystore_searchviewdemo")
+      storePassword KEYSTORE_PASSWORD
+      keyAlias "demo_searchview"
+      keyPassword KEYSTORE_PASSWORD
+    }
+  }
+
   buildTypes {
     release {
       minifyEnabled false
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+      signingConfig signingConfigs.release
     }
   }
+
 }
 
 project.afterEvaluate {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="danbroid.searchviewdemo">
+  package="danbroid.searchview">
 
   <application
     android:allowBackup="true"
@@ -77,8 +77,8 @@
       android:theme="@style/AppTheme.NoActionBar"></activity>
 
     <provider
-      android:name="danbroid.searchviewdemo.CheeseSuggestionsProvider"
-      android:authorities="danbroid.searchviewdemo.CheeseSuggestionsProvider"
+      android:name=".CheeseSuggestionsProvider"
+      android:authorities="danbroid.searchview.CheeseSuggestionsProvider"
       android:exported="false" />
   </application>
 

diff --git a/...a/danbroid/searchviewdemo/BaseActivity.kt → .../java/danbroid/searchview/BaseActivity.kt b/...a/danbroid/searchviewdemo/BaseActivity.kt → .../java/danbroid/searchview/BaseActivity.kt
@@ -1,4 +1,4 @@
-package danbroid.searchviewdemo
+package danbroid.searchview
 
 import android.app.SearchManager
 import android.content.Context
@@ -12,9 +12,7 @@ import android.view.ViewGroup
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
-import androidx.annotation.StringRes
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.SearchView
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.activity.*
 import java.util.*

diff --git a/...ava/danbroid/searchviewdemo/CheeseData.kt → ...in/java/danbroid/searchview/CheeseData.kt b/...ava/danbroid/searchviewdemo/CheeseData.kt → ...in/java/danbroid/searchview/CheeseData.kt
@@ -1,4 +1,4 @@
-package danbroid.searchviewdemo
+package danbroid.searchview
 
 import android.content.Context
 import android.text.TextUtils

diff --git a/...archviewdemo/CheeseSuggestionsProvider.kt → ...d/searchview/CheeseSuggestionsProvider.kt b/...archviewdemo/CheeseSuggestionsProvider.kt → ...d/searchview/CheeseSuggestionsProvider.kt
@@ -1,4 +1,4 @@
-package danbroid.searchviewdemo
+package danbroid.searchview
 
 import android.content.SearchRecentSuggestionsProvider
 

diff --git a/...ivities/CustomSuggestionLayoutActivity.kt → ...ivities/CustomSuggestionLayoutActivity.kt b/...ivities/CustomSuggestionLayoutActivity.kt → ...ivities/CustomSuggestionLayoutActivity.kt
@@ -1,4 +1,4 @@
-package danbroid.searchviewdemo.activities
+package danbroid.searchview.activities
 
 import android.app.SearchManager
 import android.content.Context
@@ -14,8 +14,8 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.widget.SearchView
 import androidx.cursoradapter.widget.CursorAdapter
-import danbroid.searchviewdemo.BaseActivity
-import danbroid.searchviewdemo.R
+import danbroid.searchview.BaseActivity
+import danbroid.searchview.R
 
 
 class CustomSuggestionLayoutActivity : BaseActivity() {

diff --git a/...ewdemo/activities/DarkDropDownActivity.kt → ...chview/activities/DarkDropDownActivity.kt b/...ewdemo/activities/DarkDropDownActivity.kt → ...chview/activities/DarkDropDownActivity.kt
@@ -1,11 +1,10 @@
-package danbroid.searchviewdemo.activities
+package danbroid.searchview.activities
 
 import android.os.Bundle
-import android.view.KeyEvent
 import android.view.MenuItem
 import android.widget.Toast
 import androidx.appcompat.widget.SearchView
-import danbroid.searchviewdemo.BaseActivity
+import danbroid.searchview.BaseActivity
 
 
 class DarkDropDownActivity : BaseActivity() {

diff --git a/...wdemo/activities/LightDropDownActivity.kt → ...hview/activities/LightDropDownActivity.kt b/...wdemo/activities/LightDropDownActivity.kt → ...hview/activities/LightDropDownActivity.kt
@@ -1,11 +1,10 @@
-package danbroid.searchviewdemo.activities
+package danbroid.searchview.activities
 
 import android.os.Bundle
-import android.view.KeyEvent
 import android.view.MenuItem
 import android.widget.Toast
 import androidx.appcompat.widget.SearchView
-import danbroid.searchviewdemo.BaseActivity
+import danbroid.searchview.BaseActivity
 
 
 private val log by lazy {

diff --git a/...searchviewdemo/activities/MainActivity.kt → ...oid/searchview/activities/MainActivity.kt b/...searchviewdemo/activities/MainActivity.kt → ...oid/searchview/activities/MainActivity.kt
@@ -1,9 +1,9 @@
-package danbroid.searchviewdemo.activities
+package danbroid.searchview.activities
 
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import danbroid.searchviewdemo.BaseActivity
+import danbroid.searchview.BaseActivity
 
 
 class MainActivity : BaseActivity() {

diff --git a/...ewdemo/activities/SearchDialogActivity.kt → ...chview/activities/SearchDialogActivity.kt b/...ewdemo/activities/SearchDialogActivity.kt → ...chview/activities/SearchDialogActivity.kt
@@ -1,9 +1,9 @@
-package danbroid.searchviewdemo.activities
+package danbroid.searchview.activities
 
 import android.os.Bundle
 import android.view.MenuItem
-import danbroid.searchviewdemo.BaseActivity
-import danbroid.searchviewdemo.R
+import danbroid.searchview.BaseActivity
+import danbroid.searchview.R
 
 
 class SearchDialogActivity : BaseActivity() {

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.3.0'
+    classpath 'com.android.tools.build:gradle:3.4.0-beta02'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -17,3 +17,6 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
+
+KEYSTORE_PASSWORD=""
+