diff --git a/MinimalBible/AndroidManifest.xml b/MinimalBible/AndroidManifest.xml index a8f2208..0a13f2b 100644 --- a/MinimalBible/AndroidManifest.xml +++ b/MinimalBible/AndroidManifest.xml @@ -26,6 +26,10 @@ android:name="org.bspeice.minimalbible.activities.downloader.DownloaderActivity" android:label="@string/title_activity_downloader" > + + diff --git a/MinimalBible/bin/AndroidManifest.xml b/MinimalBible/bin/AndroidManifest.xml index a8f2208..0a13f2b 100644 --- a/MinimalBible/bin/AndroidManifest.xml +++ b/MinimalBible/bin/AndroidManifest.xml @@ -26,6 +26,10 @@ android:name="org.bspeice.minimalbible.activities.downloader.DownloaderActivity" android:label="@string/title_activity_downloader" > + + diff --git a/MinimalBible/bin/MinimalBible.apk b/MinimalBible/bin/MinimalBible.apk index 0a2fea6..f215923 100644 Binary files a/MinimalBible/bin/MinimalBible.apk and b/MinimalBible/bin/MinimalBible.apk differ diff --git a/MinimalBible/bin/R.txt b/MinimalBible/bin/R.txt index 6d5c27c..e79045d 100644 --- a/MinimalBible/bin/R.txt +++ b/MinimalBible/bin/R.txt @@ -241,11 +241,11 @@ int id action_bar_subtitle 0x7f050023 int id action_bar_title 0x7f050022 int id action_context_bar 0x7f05001d int id action_downloads 0x7f050043 -int id action_example 0x7f050042 +int id action_example 0x7f050041 int id action_menu_divider 0x7f050016 int id action_menu_presenter 0x7f050017 int id action_mode_close_button 0x7f050024 -int id action_settings 0x7f050041 +int id action_settings 0x7f050042 int id activity_chooser_view_content 0x7f050025 int id always 0x7f05000b int id beginning 0x7f050011 @@ -325,13 +325,15 @@ int layout abc_popup_menu_item_layout 0x7f030014 int layout abc_search_dropdown_item_icons_2line 0x7f030015 int layout abc_search_view 0x7f030016 int layout activity_bible_viewer 0x7f030017 -int layout activity_downloader 0x7f030018 -int layout fragment_main 0x7f030019 -int layout fragment_navigation_drawer 0x7f03001a -int layout support_simple_spinner_dropdown_item 0x7f03001b -int menu downloader 0x7f0c0000 -int menu global 0x7f0c0001 -int menu main 0x7f0c0002 +int layout activity_download 0x7f030018 +int layout fragment_download 0x7f030019 +int layout fragment_main 0x7f03001a +int layout fragment_navigation_drawer 0x7f03001b +int layout support_simple_spinner_dropdown_item 0x7f03001c +int menu download 0x7f0c0000 +int menu downloader 0x7f0c0001 +int menu global 0x7f0c0002 +int menu main 0x7f0c0003 int string abc_action_bar_home_description 0x7f0a0001 int string abc_action_bar_up_description 0x7f0a0002 int string abc_action_menu_overflow_description 0x7f0a0003 @@ -351,6 +353,7 @@ int string app_name 0x7f0a000d int string hello_world 0x7f0a0016 int string navigation_drawer_close 0x7f0a0012 int string navigation_drawer_open 0x7f0a0011 +int string title_activity_download 0x7f0a0017 int string title_activity_downloader 0x7f0a0015 int string title_section1 0x7f0a000e int string title_section2 0x7f0a000f diff --git a/MinimalBible/bin/classes.dex b/MinimalBible/bin/classes.dex index 94f9162..6692ee9 100644 Binary files a/MinimalBible/bin/classes.dex and b/MinimalBible/bin/classes.dex differ diff --git a/MinimalBible/bin/jarlist.cache b/MinimalBible/bin/jarlist.cache index f4bba68..761caf8 100644 --- a/MinimalBible/bin/jarlist.cache +++ b/MinimalBible/bin/jarlist.cache @@ -1,5 +1,5 @@ # cache for current jar dependency. DO NOT EDIT. # format is # Encoding is UTF-8 -1397601216283 627582 cb6883d96005bc85b3e868f204507ea5b4fa9bbf C:\Users\bspeice\git\MinimalBible\MinimalBible\libs\android-support-v4.jar -1397601220438 627582 cb6883d96005bc85b3e868f204507ea5b4fa9bbf C:\Users\bspeice\git\MinimalBible\appcompat_v7\libs\android-support-v4.jar +1397660355169 627582 cb6883d96005bc85b3e868f204507ea5b4fa9bbf C:\Users\bspeice\git\MinimalBible\MinimalBible\libs\android-support-v4.jar +1397660356920 627582 cb6883d96005bc85b3e868f204507ea5b4fa9bbf C:\Users\bspeice\git\MinimalBible\appcompat_v7\libs\android-support-v4.jar diff --git a/MinimalBible/bin/resources.ap_ b/MinimalBible/bin/resources.ap_ index 9b6edb9..31caf97 100644 Binary files a/MinimalBible/bin/resources.ap_ and b/MinimalBible/bin/resources.ap_ differ diff --git a/MinimalBible/res/layout/activity_download.xml b/MinimalBible/res/layout/activity_download.xml new file mode 100644 index 0000000..8ed55dd --- /dev/null +++ b/MinimalBible/res/layout/activity_download.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + diff --git a/MinimalBible/res/layout/activity_downloader.xml b/MinimalBible/res/layout/fragment_download.xml similarity index 65% rename from MinimalBible/res/layout/activity_downloader.xml rename to MinimalBible/res/layout/fragment_download.xml index 019353e..7dc1a6a 100644 --- a/MinimalBible/res/layout/activity_downloader.xml +++ b/MinimalBible/res/layout/fragment_download.xml @@ -6,6 +6,11 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" - tools:context=".DownloaderActivity" > + tools:context="org.bspeice.minimalbible.DownloadActivity$PlaceholderFragment" > + + diff --git a/MinimalBible/res/layout/fragment_navigation_drawer.xml b/MinimalBible/res/layout/fragment_navigation_drawer.xml index 276cc6b..09dce8f 100644 --- a/MinimalBible/res/layout/fragment_navigation_drawer.xml +++ b/MinimalBible/res/layout/fragment_navigation_drawer.xml @@ -1,10 +1,11 @@ - + + diff --git a/MinimalBible/res/menu/download.xml b/MinimalBible/res/menu/download.xml new file mode 100644 index 0000000..2959a22 --- /dev/null +++ b/MinimalBible/res/menu/download.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/MinimalBible/res/menu/global.xml b/MinimalBible/res/menu/global.xml index 725e6b7..9e8236e 100644 --- a/MinimalBible/res/menu/global.xml +++ b/MinimalBible/res/menu/global.xml @@ -1,10 +1,10 @@ - - - - - + + + + + diff --git a/MinimalBible/res/values/strings.xml b/MinimalBible/res/values/strings.xml index d418461..d51784e 100644 --- a/MinimalBible/res/values/strings.xml +++ b/MinimalBible/res/values/strings.xml @@ -11,5 +11,6 @@ Settings Downloads Hello world! + DownloadActivity diff --git a/MinimalBible/src/org/bspeice/minimalbible/BibleViewer.java b/MinimalBible/src/org/bspeice/minimalbible/BibleViewer.java index 4f2ac67..4a8312f 100644 --- a/MinimalBible/src/org/bspeice/minimalbible/BibleViewer.java +++ b/MinimalBible/src/org/bspeice/minimalbible/BibleViewer.java @@ -1,13 +1,10 @@ package org.bspeice.minimalbible; import org.bspeice.minimalbible.activities.NavigationDrawerFragment; -import org.bspeice.minimalbible.activities.downloader.DownloaderActivity; - -import com.readystatesoftware.systembartint.SystemBarTintManager; +import org.bspeice.minimalbible.activities.downloader.DownloadActivity; import android.app.Activity; import android.content.Intent; -import android.graphics.Color; import android.os.Build; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -22,6 +19,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import com.readystatesoftware.systembartint.SystemBarTintManager; + public class BibleViewer extends ActionBarActivity implements NavigationDrawerFragment.NavigationDrawerCallbacks { @@ -111,7 +110,7 @@ public class BibleViewer extends ActionBarActivity implements if (id == R.id.action_settings) { return true; } else if (id == R.id.action_downloads) { - startActivity(new Intent(this, DownloaderActivity.class)); + startActivity(new Intent(this, DownloadActivity.class)); } return super.onOptionsItemSelected(item); } diff --git a/MinimalBible/src/org/bspeice/minimalbible/MinimalBibleConstants.java b/MinimalBible/src/org/bspeice/minimalbible/MinimalBibleConstants.java index 3513fad..1fbdb3e 100644 --- a/MinimalBible/src/org/bspeice/minimalbible/MinimalBibleConstants.java +++ b/MinimalBible/src/org/bspeice/minimalbible/MinimalBibleConstants.java @@ -3,5 +3,8 @@ package org.bspeice.minimalbible; public class MinimalBibleConstants { public static final String DOWNLOAD_PREFS_FILE = "DOWNLOADER_PREFERENCES"; + + public static final String KEY_DOWNLOAD_ENABLED = "HAS_ENABLED_DOWNLOAD"; + public static final String KEY_PERM_DISABLE_DOWNLOAD = "PERMANENTLY_DISABLE_DOWNLOAD"; } diff --git a/MinimalBible/src/org/bspeice/minimalbible/activities/NavigationDrawerFragment.java b/MinimalBible/src/org/bspeice/minimalbible/activities/NavigationDrawerFragment.java index 048dd7a..dbfd404 100644 --- a/MinimalBible/src/org/bspeice/minimalbible/activities/NavigationDrawerFragment.java +++ b/MinimalBible/src/org/bspeice/minimalbible/activities/NavigationDrawerFragment.java @@ -1,28 +1,19 @@ package org.bspeice.minimalbible.activities; import org.bspeice.minimalbible.R; -import org.bspeice.minimalbible.R.drawable; -import org.bspeice.minimalbible.R.id; -import org.bspeice.minimalbible.R.layout; -import org.bspeice.minimalbible.R.menu; -import org.bspeice.minimalbible.R.string; -import org.bspeice.minimalbible.activities.downloader.DownloaderActivity; -import com.readystatesoftware.systembartint.SystemBarTintManager; - -import android.support.v7.app.ActionBarActivity; import android.app.Activity; -import android.support.v7.app.ActionBar; -import android.support.v4.app.Fragment; -import android.support.v4.app.ActionBarDrawerToggle; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; +import android.support.v4.app.ActionBarDrawerToggle; +import android.support.v4.app.Fragment; +import android.support.v4.view.GravityCompat; +import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBar; +import android.support.v7.app.ActionBarActivity; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -34,6 +25,8 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.Toast; +import com.readystatesoftware.systembartint.SystemBarTintManager; + /** * Fragment used for managing interactions for and presentation of a navigation * drawer. See the