convert Settings from activity to fragment (#212)

Author: VREMSoftwareDevelopment

app/build.gradle

@@ -16,27 +16,41 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-apply plugin: 'com.android.application'
-apply plugin: 'jacoco-android'
+apply plugin: "com.android.application"
+apply plugin: "jacoco-android"
+
+ext {
+    supportVersion = "28.0.0"
+    lang3Version = "3.8.1"
+    collections4Version = "4.2"
+    graphviewVersion = "4.2.2"
+    powermockVersion = "1.7.4"
+    robolectricVersion = "4.0"
+    junitVersion = "4.12"
+    junitToolboxVersion = "2.4"
+    shadowsVersion ="3.4-rc2"
+    espressoVersion = "3.0.2"
+    testVersion = "1.0.2"
+}
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.vrem.wifianalyzer"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode
         versionName
-        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt')
+            proguardFiles getDefaultProguardFile("proguard-android.txt")
             signingConfig
         }
         debug {
@@ -63,84 +77,90 @@ android {
     }
 
     lintOptions {
-        disable 'GoogleAppIndexingWarning'
+        disable "GoogleAppIndexingWarning"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 jacoco {
-    toolVersion = '0.8.2'
+    toolVersion = "0.8.2"
 }
 
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
 }
 
 jacocoAndroidUnitTestReport {
-    excludes += ['**/com/jjoe64/*']
+    excludes += ["**/com/jjoe64/*"]
     html.enabled true
     xml.enabled true
     csv.enabled false
 }
 
-if (project.hasProperty('keyAlias')) {
-    def propertiesFile = file('../../keystores/androidkeystore.properties')
+if (project.hasProperty("keyAlias")) {
+    def propertiesFile = file("../../keystores/androidkeystore.properties")
     Properties properties = readProperties(propertiesFile)
 
     System.out.println(">>> Signing Config " + properties)
-    android.buildTypes.release.signingConfig.keyAlias = properties['key_alias'].toString()
-    android.buildTypes.release.signingConfig.keyPassword = properties['key_password'].toString()
-    android.buildTypes.release.signingConfig.storeFile = file(properties['store_filename'].toString())
-    android.buildTypes.release.signingConfig.storePassword = properties['store_password'].toString()
+    android.buildTypes.release.signingConfig.keyAlias = properties["key_alias"].toString()
+    android.buildTypes.release.signingConfig.keyPassword = properties["key_password"].toString()
+    android.buildTypes.release.signingConfig.storeFile = file(properties["store_filename"].toString())
+    android.buildTypes.release.signingConfig.storePassword = properties["store_password"].toString()
 }
 
 dependencies {
     // Compile Build Dependencies
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:support-media-compat:28.0.0'
-    implementation 'org.apache.commons:commons-lang3:3.8.1'
-    implementation 'org.apache.commons:commons-collections4:4.2'
-    implementation 'com.jjoe64:graphview:4.2.2'
+    implementation fileTree(include: ["*.jar"], dir: "libs")
+    implementation "com.android.support:design:$supportVersion"
+    implementation "com.android.support:preference-v7:$supportVersion"
+    implementation "com.android.support:support-v4:$supportVersion"
+    implementation "com.android.support:support-media-compat:$supportVersion"
+    implementation "org.apache.commons:commons-lang3:$lang3Version"
+    implementation "org.apache.commons:commons-collections4:$collections4Version"
+    implementation "com.jjoe64:graphview:$graphviewVersion"
     // Unit Test Dependencies
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.powermock:powermock-module-junit4:1.7.4'
-    testImplementation 'org.powermock:powermock-api-mockito2:1.7.4'
-    testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
-    testImplementation 'org.robolectric:robolectric:4.0'
-    testImplementation 'org.robolectric:shadows-support-v4:3.4-rc2'
+    testImplementation "junit:junit:$junitVersion"
+    testImplementation "org.powermock:powermock-module-junit4:$powermockVersion"
+    testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion"
+    testImplementation "com.googlecode.junit-toolbox:junit-toolbox:$junitToolboxVersion"
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation "org.robolectric:shadows-support-v4:$shadowsVersion"
     // Android Test Dependencies
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
+    androidTestImplementation "com.android.support.test:runner:$testVersion"
+    androidTestImplementation "com.android.support.test:rules:$testVersion"
 }
 
 updateVersion()
 
 def updateVersion() {
-    def propertiesFile = file('build.properties')
+    def propertiesFile = file("build.properties")
     Properties properties = readProperties(propertiesFile)
 
-    def versionMajor = properties['version_major'].toString().toInteger()
-    def versionMinor = properties['version_minor'].toString().toInteger()
-    def versionPatch = properties['version_patch'].toString().toInteger()
-    def versionBuild = properties['version_build'].toString().toInteger()
-    def versionStore = properties['version_store'].toString().toInteger()
+    def versionMajor = properties["version_major"].toString().toInteger()
+    def versionMinor = properties["version_minor"].toString().toInteger()
+    def versionPatch = properties["version_patch"].toString().toInteger()
+    def versionBuild = properties["version_build"].toString().toInteger()
+    def versionStore = properties["version_store"].toString().toInteger()
 
     if (isReleaseTask()) {
         System.out.println(">>> Building Release...")
         versionPatch++
         versionStore++
         versionBuild = 0
-        properties['version_patch'] = versionPatch.toString()
-        properties['version_store'] = versionStore.toString()
-        properties['version_build'] = versionBuild.toString()
+        properties["version_patch"] = versionPatch.toString()
+        properties["version_store"] = versionStore.toString()
+        properties["version_build"] = versionBuild.toString()
         writeProperties(propertiesFile, properties)
     }
     if (isCompileTask()) {
         System.out.println(">>> Compiling Source...")
         versionBuild++
-        properties['version_build'] = versionBuild.toString()
+        properties["version_build"] = versionBuild.toString()
         writeProperties(propertiesFile, properties)
     }
 
@@ -150,20 +170,20 @@ def updateVersion() {
         versionName = versionName + ".${versionBuild}"
         applicationId = applicationId + android.buildTypes.debug.applicationIdSuffix
     }
-    System.out.println(">>> " + project.parent.name + " " + versionName + " (" + versionStore + ") '" + applicationId + "'")
+    System.out.println(">>> " + project.parent.name + " " + versionName + " (" + versionStore + ") " + applicationId)
     android.defaultConfig.versionCode = versionStore
     android.defaultConfig.versionName = versionName
 }
 
 def isCompileTask() {
     def tasks = gradle.getStartParameter().getTaskNames()
-    return ':app:generateDebugSources' in tasks || ':app:generateReleaseSources' in tasks ||
-            'generateDebugSources' in tasks || 'generateReleaseSources' in tasks
+    return ":app:generateDebugSources" in tasks || ":app:generateReleaseSources" in tasks ||
+            "generateDebugSources" in tasks || "generateReleaseSources" in tasks
 }
 
 def isReleaseTask() {
     def tasks = gradle.getStartParameter().getTaskNames()
-    return ':app:assembleRelease' in tasks || 'assembleRelease' in tasks
+    return ":app:assembleRelease" in tasks || "assembleRelease" in tasks
 }
 
 static Properties readProperties(propertiesFile) {

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Thu Nov 01 16:42:17 EDT 2018
+#Sun Nov 04 09:02:16 EST 2018
 version_minor=0
-version_build=8
+version_build=9
 version_patch=1
-version_major=2
 version_store=42
+version_major=2

app/src/main/AndroidManifest.xml

@@ -59,15 +59,6 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".settings.SettingActivity"
-            android:label="@string/action_settings"
-            android:launchMode="singleTask"
-            android:parentActivityName=".MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.vrem.wifianalyzer.MainActivity"/>
-        </activity>
     </application>
 
 </manifest>

app/src/main/java/com/vrem/wifianalyzer/navigation/items/ActivityItem.java

@@ -21,7 +21,7 @@
 import android.view.View;
 
 import com.vrem.wifianalyzer.about.AboutFragment;
-import com.vrem.wifianalyzer.settings.SettingActivity;
+import com.vrem.wifianalyzer.settings.SettingsFragment;
 import com.vrem.wifianalyzer.vendor.VendorFragment;
 import com.vrem.wifianalyzer.wifi.accesspoint.AccessPointsFragment;
 import com.vrem.wifianalyzer.wifi.channelavailable.ChannelAvailableFragment;
@@ -37,7 +37,7 @@ public class NavigationItemFactory {
     public static final NavigationItem EXPORT = new ExportItem();
     public static final NavigationItem CHANNEL_AVAILABLE = new FragmentItem(new ChannelAvailableFragment(), false);
     public static final NavigationItem VENDORS = new FragmentItem(new VendorFragment(), false, View.GONE);
-    public static final NavigationItem SETTINGS = new ActivityItem(SettingActivity.class);
+    public static final NavigationItem SETTINGS = new FragmentItem(new SettingsFragment(), false, View.GONE);
     public static final NavigationItem ABOUT = new FragmentItem(new AboutFragment(), false, View.GONE);
 
     private NavigationItemFactory() {

app/src/main/java/com/vrem/wifianalyzer/navigation/items/NavigationItemFactory.java

@@ -19,8 +19,8 @@
 package com.vrem.wifianalyzer.settings;
 
 import android.content.Context;
-import android.preference.ListPreference;
 import android.support.annotation.NonNull;
+import android.support.v7.preference.ListPreference;
 import android.util.AttributeSet;
 
 import org.apache.commons.collections4.CollectionUtils;

app/src/main/java/com/vrem/wifianalyzer/settings/CustomPreference.java

@@ -21,8 +21,8 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
+import android.support.v7.preference.PreferenceManager;
 
 import com.vrem.wifianalyzer.R;
 
@@ -36,7 +36,7 @@ public Repository(@NonNull Context context) {
     }
 
     void initializeDefaultValues() {
-        PreferenceManager.setDefaultValues(context, R.xml.preferences, false);
+        PreferenceManager.setDefaultValues(context, R.xml.settings, false);
     }
 
     void registerOnSharedPreferenceChangeListener(OnSharedPreferenceChangeListener onSharedPreferenceChangeListener) {
@@ -80,10 +80,6 @@ boolean getBoolean(int key, boolean defaultValue) {
         }
     }
 
-    int getResourceInteger(int key) {
-        return context.getResources().getInteger(key);
-    }
-
     boolean getResourceBoolean(int key) {
         return context.getResources().getBoolean(key);
     }