Merge pull request #55 from marbat87/master

Lowered minSdk to API 9
spacecowboy · Sep 30, 2015 · e73f636 · e73f636
2 parents dfef9b0 + 45f2641
commit e73f636
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -25,7 +25,7 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 9
         targetSdkVersion 23
         versionCode Integer.parseInt(project.VERSION_CODE)
         versionName project.VERSION_NAME

diff --git a/library/src/main/res/layout/nnf_filepicker_listitem_checkable.xml b/library/src/main/res/layout/nnf_filepicker_listitem_checkable.xml
@@ -21,7 +21,7 @@
     android:id="@+id/nnf_item_container"
     android:layout_width="match_parent"
     android:layout_height="?android:listPreferredItemHeight"
-    android:background="?android:selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:focusable="true"
     android:minHeight="?android:listPreferredItemHeight"
     android:nextFocusLeft="@+id/nnf_button_cancel"

diff --git a/library/src/main/res/layout/nnf_filepicker_listitem_dir.xml b/library/src/main/res/layout/nnf_filepicker_listitem_dir.xml
@@ -21,7 +21,7 @@
     android:id="@+id/nnf_item_container"
     android:layout_width="match_parent"
     android:layout_height="?android:listPreferredItemHeight"
-    android:background="?android:selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:focusable="true"
     android:minHeight="?android:listPreferredItemHeight"
     android:nextFocusLeft="@+id/nnf_button_cancel"

diff --git a/library/src/main/res/layout/nnf_fragment_filepicker.xml b/library/src/main/res/layout/nnf_fragment_filepicker.xml
@@ -60,15 +60,15 @@
 
             <Button
                 android:id="@+id/nnf_button_cancel"
-                style="?android:attr/borderlessButtonStyle"
+                style="?attr/borderlessButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="48dp"
                 android:layout_weight="1"
                 android:text="@android:string/cancel" />
 
             <Button
                 android:id="@+id/nnf_button_ok"
-                style="?android:attr/borderlessButtonStyle"
+                style="?attr/borderlessButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="48dp"
                 android:layout_weight="1"

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -27,7 +27,7 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 9
         targetSdkVersion 23
         versionCode Integer.parseInt(project.VERSION_CODE)
         versionName project.VERSION_NAME

diff --git a/sample/src/main/java/com/nononsenseapps/filepicker/sample/ftp/FtpPickerFragment.java b/sample/src/main/java/com/nononsenseapps/filepicker/sample/ftp/FtpPickerFragment.java
@@ -91,9 +91,9 @@ public void onCreate(Bundle b) {
         Bundle args = getArguments();
         this.server = args.getString(KEY_FTP_SERVER);
         this.port = args.getInt(KEY_FTP_PORT);
-        this.username = args.getString(KEY_FTP_USERNAME, "anonymous");
-        this.password = args.getString(KEY_FTP_PASSWORD, "anonymous");
-        this.rootDir = args.getString(KEY_FTP_ROOTDIR, "/");
+        this.username = args.getString(KEY_FTP_USERNAME) != null ? args.getString(KEY_FTP_USERNAME) : "anonymous";
+        this.password = args.getString(KEY_FTP_PASSWORD) != null ? args.getString(KEY_FTP_PASSWORD) : "anonymous";
+        this.rootDir = args.getString(KEY_FTP_ROOTDIR) != null ? args.getString(KEY_FTP_ROOTDIR) : "/";
     }
 
     /**

diff --git a/sample/src/main/res/layout/activity_no_nonsense_file_picker.xml b/sample/src/main/res/layout/activity_no_nonsense_file_picker.xml
@@ -114,7 +114,7 @@
 
             <Button
                 android:id="@+id/button_sd"
-                style="?android:attr/borderlessButtonStyle"
+                style="?attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="64dp"
                 android:layout_gravity="center"
@@ -125,7 +125,7 @@
 
             <Button
                 android:id="@+id/button_image"
-                style="?android:attr/borderlessButtonStyle"
+                style="?attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="64dp"
                 android:layout_gravity="center"
@@ -136,7 +136,7 @@
 
             <Button
                 android:id="@+id/button_ftp"
-                style="?android:attr/borderlessButtonStyle"
+                style="?attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="64dp"
                 android:layout_gravity="center"
@@ -147,7 +147,7 @@
 
             <Button
                 android:id="@+id/button_dropbox"
-                style="?android:attr/borderlessButtonStyle"
+                style="?attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="64dp"
                 android:layout_gravity="center"

diff --git a/sample/src/main/res/layout/listitem_image.xml b/sample/src/main/res/layout/listitem_image.xml
@@ -21,7 +21,7 @@
     android:id="@+id/nnf_item_container"
     android:layout_width="match_parent"
     android:layout_height="?android:listPreferredItemHeight"
-    android:background="?android:selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:focusable="true"
     android:minHeight="?android:listPreferredItemHeight"
     android:nextFocusLeft="@+id/nnf_button_cancel"

diff --git a/sample/src/main/res/layout/listitem_image_checkable.xml b/sample/src/main/res/layout/listitem_image_checkable.xml
@@ -21,7 +21,7 @@
     android:id="@+id/nnf_item_container"
     android:layout_width="match_parent"
     android:layout_height="?android:listPreferredItemHeight"
-    android:background="?android:selectableItemBackground"
+    android:background="?selectableItemBackground"
     android:focusable="true"
     android:minHeight="?android:listPreferredItemHeight"
     android:nextFocusLeft="@+id/nnf_button_cancel"