Release 1.3.0

Author: opt05

.gitignore

@@ -5,7 +5,7 @@ build/
 # Local configuration file (sdk path, etc)
 local.properties
 release.properties
-android_keystore.jks
+*.jks
 
 # Gradle generated files
 .gradle/

.idea/gradle.xml

@@ -10,11 +10,15 @@ Licensed under the MIT License. For complete licensing information see [LICENSE.
 * v1.1.2
 
 ### Build Tools ###
+<<<<<<< HEAD
 * JDK 1.8
 * Android Studio 2.1.2 (Gradle 2.1.0)
 * Android build tools 24.0.1
+=======
+* Android Studio 3.0.1 (Gradle 3.4.1)
+>>>>>>> develop
 * Android support library 24.1.1
-* Android 4.1 (API 16) or above (built against 7.0/API 23)
+* Android 4.0 (API 14) or above (built against 8.1/API 27)
 * Built on a Windows PC, but should be OS agnostic
 
 ### Bugs and Features ###

.idea/kotlinc.xml

@@ -1,20 +1,26 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt' //For Kotlin Annotation Processing with libraries (i.e. data binding)
 
-android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+kotlin {
+    experimental {
+        coroutines 'enable'
+    }
+}
 
+android {
+    compileSdkVersion 27
     dataBinding {
         enabled = true
     }
 
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
         applicationId "com.cwlarson.deviceid"
-        minSdkVersion 16
-        targetSdkVersion 25
-        versionCode 9
-        versionName "1.2.0"
+        minSdkVersion 14
+        targetSdkVersion 27
+        versionCode 10
+        versionName "1.3.0"
     }
 
     signingConfigs {
@@ -31,18 +37,40 @@ android {
     }
     buildTypes {
         release {
+            postprocessing {
+                removeUnusedCode true
+                removeUnusedResources false
+                obfuscate true
+                optimizeCode true
+                proguardFile 'proguard-rules.pro'
+            }
             signingConfig signingConfigs.release
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
 
+ext.support_library_version = '27.0.2'
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "com.android.support:appcompat-v7:$support_library_version"
+    implementation "com.android.support:recyclerview-v7:$support_library_version"
+    implementation "com.android.support:design:$support_library_version"
+    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0-beta4'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    //Kotlin coroutines experimental libraries (for DiffUtilAdapter)
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.21"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.21"
+    //Data Binding support for Kotlin
+    kapt "com.android.databinding:compiler:3.0.1"
+    // ViewModel and LiveData
+    implementation "android.arch.lifecycle:extensions:1.0.0"
+    kapt "android.arch.lifecycle:compiler:1.0.0"
+    // Room
+    implementation "android.arch.persistence.room:runtime:1.0.0"
+    kapt "android.arch.persistence.room:compiler:1.0.0"
+    //Debug bridge for Android applications, enabling the powerful Chrome Developer Tools
+    debugImplementation "com.facebook.stetho:stetho:1.5.0"
+    //LeakCanary
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
 }

README.md

@@ -0,0 +1,22 @@
+package com.cwlarson.deviceid;
+
+import android.app.Application;
+
+import com.facebook.stetho.Stetho;
+import com.squareup.leakcanary.LeakCanary;
+
+public class MyApplication extends Application {
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    if (LeakCanary.isInAnalyzerProcess(this)) {
+      // This process is dedicated to LeakCanary for heap analysis.
+      // You should not init your app in this process.
+      return;
+    }
+    LeakCanary.install(this);
+    // Normal app init code...
+    Stetho.initializeWithDefaults(this);
+  }
+}

app/build.gradle

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.cwlarson.deviceid">
+          xmlns:tools="http://schemas.android.com/tools"
+          package="com.cwlarson.deviceid">
 
     <!-- To read IMEI & Voicemail number -->
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -13,36 +13,41 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
 
     <application
+        android:name=".MyApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:resizeableActivity="true"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:targetApi="n">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/AppTheme.SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
+            <!-- enable the search dialog to send searches to SearchableActivity -->
+            <meta-data android:name="android.app.default_searchable"
+                       android:value=".SearchActivity" />
             <meta-data
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
-        <activity
-            android:name=".SearchActivity"
-            android:label="@string/title_activity_search"
-            android:parentActivityName=".MainActivity"
-            tools:ignore="UnusedAttribute">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.cwlarson.deviceid.MainActivity" />
+        <activity android:name=".SearchActivity"
+                  android:parentActivityName=".MainActivity"
+                  android:launchMode="singleTop">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+            <!-- SearchView for MainActivity -->
+            <meta-data android:name="android.app.searchable"
+                       android:resource="@xml/searchable_items"/>
         </activity>
     </application>
 

app/src/androidTest/java/com/cwlarson/deviceid/ApplicationTest.java

@@ -1,85 +1,61 @@
 package com.cwlarson.deviceid;
 
-import android.content.Intent;
+import android.app.SearchManager;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.databinding.DataBindingUtil;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.design.widget.AppBarLayout;
-import android.support.v4.view.MotionEventCompat;
+import android.support.v7.widget.SearchView;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 
+import com.cwlarson.deviceid.database.AppDatabase;
 import com.cwlarson.deviceid.databinding.ActivityMainBinding;
 import com.cwlarson.deviceid.util.TabsViewPagerAdapter;
 
 
-public class MainActivity extends PermissionsActivity implements AppBarLayout.OnOffsetChangedListener {
+public class MainActivity extends PermissionsActivity {
     @SuppressWarnings({"FieldCanBeLocal", "unused"})
     private final String TAG = MainActivity.class.getSimpleName();
     private TabsViewPagerAdapter mAdapter;
-    private ActivityMainBinding binding;
-    private int index = 0;
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        final int action = MotionEventCompat.getActionMasked(ev);
-        switch(action){
-            case MotionEvent.ACTION_DOWN:
-            case MotionEvent.ACTION_UP:
-            case MotionEvent.ACTION_CANCEL:
-                TabFragment tabFragment = mAdapter.getFragment(binding.viewpager.getCurrentItem());
-                if(tabFragment!=null) {
-                    if(index==0)
-                        tabFragment.setSwipeToRefreshEnabled(true);
-                    else
-                        tabFragment.setSwipeToRefreshEnabled(false);
-                }
-        }
-
-        return super.dispatchTouchEvent(ev);
-    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        setTheme(R.style.AppTheme); //Removes splash screen
+        setTheme(R.style.AppTheme_MainTheme); //Removes splash screen
         super.onCreate(savedInstanceState);
-        binding = DataBindingUtil.setContentView(this,R.layout.activity_main);
+        ActivityMainBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_main);
+        setSupportActionBar(binding.myToolbar);
 
         // Get the ViewPager and set it's PagerAdapter so that it can display items
         mAdapter = new TabsViewPagerAdapter(getSupportFragmentManager(), this);
         binding.viewpager.setAdapter(mAdapter);
         binding.viewpager.setOffscreenPageLimit(mAdapter.getCount()); //Prevent reloading of views on tab switching
         // Give the TabLayout the ViewPager
         binding.tabs.setupWithViewPager(binding.viewpager);
-        setSupportActionBar(binding.myToolbar);
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.base_menu, menu);
+        inflater.inflate(R.menu.search_menu, menu);
         // Get checkable menu item value
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         menu.findItem(R.id.action_hide_unables).setChecked(sharedPreferences.getBoolean("hide_unables",false));
-        return true;
-    }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-        binding.myToolbarLayout.addOnOffsetChangedListener(this);
+        // Associate searchable configuration with the SearchView
+        SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE);
+        SearchView searchView = (SearchView) menu.findItem(R.id.search).getActionView();
+        if(searchManager!=null)
+            searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
+        return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case R.id.action_search:
-                Intent intent = new Intent(this,SearchActivity.class);
-                startActivity(intent);
-                return true;
             case R.id.action_hide_unables:
                 item.setChecked(!item.isChecked());
                 SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
@@ -94,20 +70,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
     }
 
-    @Override
-    protected void onStop() {
-        binding.myToolbarLayout.removeOnOffsetChangedListener(this);
-        super.onStop();
-    }
-
     @Override
     protected void onDestroy() {
         mAdapter.destroy();
+        AppDatabase.destroyInstance();
         super.onDestroy();
     }
-
-    @Override
-    public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-        index=verticalOffset;
-    }
 }