Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Closing tickets for v0.1.1 Release. #149

Merged
merged 6 commits into from
Mar 9, 2015
Merged

Closing tickets for v0.1.1 Release. #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dfb5eb3
removed zipcode request, and replaced with blocking location services
thequbit Mar 5, 2015
7ce802f
closes #139 (submit button) and #107 (notification dismiss)
thequbit Mar 6, 2015
f809f96
added stub for spanish strings. closes #140 (includes app version)
thequbit Mar 6, 2015
0ff03cd
closses #141 (adjust checkin frequency)
thequbit Mar 6, 2015
6b14a4e
some cleanup
thequbit Mar 6, 2015
c2e73b2
adjusted how story page looked, and displayed loading text
thequbit Mar 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ android {
// this system allows for 100 major versions and 1000 minor and patch versions
// and ensures there is no collision.
versionCode 1000
versionName "0.1.0"
versionName "0.1.1"
}
buildTypes {
release {
Expand All @@ -35,6 +35,7 @@ android {
}
debug {
buildConfigField "String", "BASE_URL", "\"http://yellr.mycodespace.net\""
debuggable true
}
}

Expand All @@ -59,4 +60,6 @@ dependencies {
compile files('libs/httpclient-cache-4.3.6.jar')
compile files('libs/httpcore-4.3.3.jar')
compile files('libs/httpmime-4.3.6.jar')
//compile 'com.google.android.gms:play-services:6.5.87'
//compile 'com.google.android.gms:play-services-maps:6.5.87'
}
152 changes: 76 additions & 76 deletions app/manifest-merger-release-report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,159 +42,159 @@ ADDED from AndroidManifest.xml:12:5
android:name
ADDED from AndroidManifest.xml:12:22
uses-feature#android.hardware.camera
ADDED from AndroidManifest.xml:15:5
ADDED from AndroidManifest.xml:18:5
android:required
ADDED from AndroidManifest.xml:17:9
ADDED from AndroidManifest.xml:20:9
android:name
ADDED from AndroidManifest.xml:16:9
ADDED from AndroidManifest.xml:19:9
application
ADDED from AndroidManifest.xml:19:5
ADDED from AndroidManifest.xml:22:5
MERGED from com.android.support:appcompat-v7:21.0.3:16:5
MERGED from com.android.support:support-v4:21.0.3:16:5
android:label
ADDED from AndroidManifest.xml:22:9
ADDED from AndroidManifest.xml:25:9
android:allowBackup
ADDED from AndroidManifest.xml:20:9
ADDED from AndroidManifest.xml:23:9
android:icon
ADDED from AndroidManifest.xml:21:9
ADDED from AndroidManifest.xml:24:9
android:theme
ADDED from AndroidManifest.xml:23:9
ADDED from AndroidManifest.xml:26:9
activity#yellr.net.yellr_android.activities.SplashActivity
ADDED from AndroidManifest.xml:24:9
ADDED from AndroidManifest.xml:27:9
android:label
ADDED from AndroidManifest.xml:27:13
ADDED from AndroidManifest.xml:30:13
android:configChanges
ADDED from AndroidManifest.xml:26:13
ADDED from AndroidManifest.xml:29:13
android:theme
ADDED from AndroidManifest.xml:28:13
ADDED from AndroidManifest.xml:31:13
android:name
ADDED from AndroidManifest.xml:25:13
ADDED from AndroidManifest.xml:28:13
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:29:13
ADDED from AndroidManifest.xml:32:13
action#android.intent.action.MAIN
ADDED from AndroidManifest.xml:30:17
ADDED from AndroidManifest.xml:33:17
android:name
ADDED from AndroidManifest.xml:30:25
ADDED from AndroidManifest.xml:33:25
category#android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:32:17
ADDED from AndroidManifest.xml:35:17
android:name
ADDED from AndroidManifest.xml:32:27
ADDED from AndroidManifest.xml:35:27
activity#yellr.net.yellr_android.activities.HomeActivity
ADDED from AndroidManifest.xml:35:9
ADDED from AndroidManifest.xml:38:9
android:label
ADDED from AndroidManifest.xml:38:13
ADDED from AndroidManifest.xml:41:13
android:configChanges
ADDED from AndroidManifest.xml:37:13
ADDED from AndroidManifest.xml:40:13
android:theme
ADDED from AndroidManifest.xml:39:13
ADDED from AndroidManifest.xml:42:13
android:name
ADDED from AndroidManifest.xml:36:13
ADDED from AndroidManifest.xml:39:13
activity#yellr.net.yellr_android.activities.PostActivity
ADDED from AndroidManifest.xml:41:9
ADDED from AndroidManifest.xml:44:9
android:label
ADDED from AndroidManifest.xml:44:13
ADDED from AndroidManifest.xml:47:13
android:configChanges
ADDED from AndroidManifest.xml:43:13
ADDED from AndroidManifest.xml:46:13
android:parentActivityName
ADDED from AndroidManifest.xml:45:13
ADDED from AndroidManifest.xml:48:13
android:name
ADDED from AndroidManifest.xml:42:13
ADDED from AndroidManifest.xml:45:13
meta-data#android.support.PARENT_ACTIVITY
ADDED from AndroidManifest.xml:46:13
ADDED from AndroidManifest.xml:49:13
android:name
ADDED from AndroidManifest.xml:47:17
ADDED from AndroidManifest.xml:50:17
android:value
ADDED from AndroidManifest.xml:48:17
ADDED from AndroidManifest.xml:51:17
activity#yellr.net.yellr_android.activities.ViewStoryActivity
ADDED from AndroidManifest.xml:50:9
ADDED from AndroidManifest.xml:53:9
android:label
ADDED from AndroidManifest.xml:53:13
ADDED from AndroidManifest.xml:56:13
android:configChanges
ADDED from AndroidManifest.xml:52:13
ADDED from AndroidManifest.xml:55:13
android:parentActivityName
ADDED from AndroidManifest.xml:54:13
ADDED from AndroidManifest.xml:57:13
android:name
ADDED from AndroidManifest.xml:51:13
ADDED from AndroidManifest.xml:54:13
activity#yellr.net.yellr_android.activities.ProfileActivity
ADDED from AndroidManifest.xml:59:9
ADDED from AndroidManifest.xml:62:9
android:label
ADDED from AndroidManifest.xml:61:13
ADDED from AndroidManifest.xml:64:13
android:parentActivityName
ADDED from AndroidManifest.xml:62:13
ADDED from AndroidManifest.xml:65:13
android:name
ADDED from AndroidManifest.xml:60:13
ADDED from AndroidManifest.xml:63:13
activity#yellr.net.yellr_android.activities.LocationActivity
ADDED from AndroidManifest.xml:67:9
ADDED from AndroidManifest.xml:70:9
android:label
ADDED from AndroidManifest.xml:69:13
ADDED from AndroidManifest.xml:72:13
android:parentActivityName
ADDED from AndroidManifest.xml:70:13
ADDED from AndroidManifest.xml:73:13
android:name
ADDED from AndroidManifest.xml:68:13
ADDED from AndroidManifest.xml:71:13
service#yellr.net.yellr_android.intent_services.assignments.AssignmentsIntentService
ADDED from AndroidManifest.xml:74:9
ADDED from AndroidManifest.xml:77:9
android:exported
ADDED from AndroidManifest.xml:76:13
ADDED from AndroidManifest.xml:79:13
android:name
ADDED from AndroidManifest.xml:75:13
ADDED from AndroidManifest.xml:78:13
service#yellr.net.yellr_android.intent_services.stories.StoriesIntentService
ADDED from AndroidManifest.xml:79:9
ADDED from AndroidManifest.xml:82:9
android:exported
ADDED from AndroidManifest.xml:81:13
ADDED from AndroidManifest.xml:84:13
android:name
ADDED from AndroidManifest.xml:80:13
ADDED from AndroidManifest.xml:83:13
service#yellr.net.yellr_android.intent_services.publish_post.PublishPostIntentService
ADDED from AndroidManifest.xml:84:9
ADDED from AndroidManifest.xml:87:9
android:exported
ADDED from AndroidManifest.xml:86:13
ADDED from AndroidManifest.xml:89:13
android:name
ADDED from AndroidManifest.xml:85:13
ADDED from AndroidManifest.xml:88:13
activity#yellr.net.yellr_android.activities.NotificationsActivity
ADDED from AndroidManifest.xml:89:9
ADDED from AndroidManifest.xml:92:9
android:label
ADDED from AndroidManifest.xml:91:13
ADDED from AndroidManifest.xml:94:13
android:name
ADDED from AndroidManifest.xml:90:13
ADDED from AndroidManifest.xml:93:13
service#yellr.net.yellr_android.intent_services.notifications.NotificationsIntentService
ADDED from AndroidManifest.xml:94:9
ADDED from AndroidManifest.xml:97:9
android:exported
ADDED from AndroidManifest.xml:96:13
ADDED from AndroidManifest.xml:99:13
android:name
ADDED from AndroidManifest.xml:95:13
ADDED from AndroidManifest.xml:98:13
service#yellr.net.yellr_android.intent_services.messages.MessagesIntentService
ADDED from AndroidManifest.xml:99:9
ADDED from AndroidManifest.xml:102:9
android:exported
ADDED from AndroidManifest.xml:101:13
ADDED from AndroidManifest.xml:104:13
android:name
ADDED from AndroidManifest.xml:100:13
ADDED from AndroidManifest.xml:103:13
service#yellr.net.yellr_android.intent_services.profile.ProfileIntentService
ADDED from AndroidManifest.xml:104:9
ADDED from AndroidManifest.xml:107:9
android:exported
ADDED from AndroidManifest.xml:106:13
ADDED from AndroidManifest.xml:109:13
android:name
ADDED from AndroidManifest.xml:105:13
ADDED from AndroidManifest.xml:108:13
service#yellr.net.yellr_android.intent_services.verify_user.VerifyUserIntentService
ADDED from AndroidManifest.xml:109:9
ADDED from AndroidManifest.xml:112:9
android:exported
ADDED from AndroidManifest.xml:111:13
ADDED from AndroidManifest.xml:114:13
android:name
ADDED from AndroidManifest.xml:110:13
ADDED from AndroidManifest.xml:113:13
receiver#yellr.net.yellr_android.receivers.CheckHttpReceiver
ADDED from AndroidManifest.xml:114:9
ADDED from AndroidManifest.xml:117:9
android:name
ADDED from AndroidManifest.xml:114:19
ADDED from AndroidManifest.xml:117:19
service#yellr.net.yellr_android.intent_services.data.DataIntentService
ADDED from AndroidManifest.xml:117:9
ADDED from AndroidManifest.xml:120:9
android:exported
ADDED from AndroidManifest.xml:119:13
ADDED from AndroidManifest.xml:122:13
android:name
ADDED from AndroidManifest.xml:118:13
ADDED from AndroidManifest.xml:121:13
service#yellr.net.yellr_android.intent_services.zipcode.ZipcodeIntentService
ADDED from AndroidManifest.xml:122:9
ADDED from AndroidManifest.xml:125:9
android:exported
ADDED from AndroidManifest.xml:124:13
ADDED from AndroidManifest.xml:127:13
android:name
ADDED from AndroidManifest.xml:123:13
ADDED from AndroidManifest.xml:126:13
uses-sdk
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
MERGED from com.android.support:appcompat-v7:21.0.3:15:5
Expand Down
11 changes: 7 additions & 4 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

<!--<meta-data android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />-->

<!-- Hardware Features -->
<uses-feature
android:name="android.hardware.camera"
Expand All @@ -20,7 +23,7 @@
android:allowBackup="true"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:theme="@style/Theme.Yellr" >
android:theme="@style/Theme.Yellr">
<activity
android:name=".activities.SplashActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
Expand All @@ -41,7 +44,7 @@
<activity
android:name=".activities.PostActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/title_activity_post"
android:label="@string/activity_post_title"
android:parentActivityName=".activities.HomeActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
Expand All @@ -58,15 +61,15 @@
</activity>
<activity
android:name=".activities.ProfileActivity"
android:label="@string/title_activity_profile"
android:label="@string/activity_profile_title"
android:parentActivityName=".activities.HomeActivity" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.HomeActivity" />
</activity>
<activity
android:name=".activities.LocationActivity"
android:label="@string/title_activity_location"
android:label="@string/activity_location_title"
android:parentActivityName=".activities.SplashActivity" >
android:noHistory="true">
</activity>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/yellr/net/yellr_android/activities/HomeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class HomeActivity extends ActionBarActivity implements ActionBar.TabList
*/
ViewPager mViewPager;

static int CHECK_FOR_NEW_DATA_INTERVAL = 15 * 60 * 1000; // 15 minutes ( 96 times a day )
static int CHECK_FOR_NEW_DATA_INTERVAL = 5 * 60 * 1000; // 5 minutes ( 288 times a day )

private PendingIntent checkHttpPendingIntent;
private AlarmManager checkHttpManager;
Expand Down Expand Up @@ -248,9 +248,9 @@ public CharSequence getPageTitle(int position) {
Locale l = Locale.getDefault();
switch (position) {
case 0:
return getString(R.string.title_fragment_assignments).toUpperCase(l);
return getString(R.string.fragment_assignments_title).toUpperCase(l);
case 1:
return getString(R.string.title_fragment_stories).toUpperCase(l);
return getString(R.string.fragment_stories_title).toUpperCase(l);
}
return null;
}
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/yellr/net/yellr_android/activities/PostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,15 @@ public class PostActivity extends ActionBarActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

//setTheme();

// Setup the action bar
final ActionBar actionBar = getSupportActionBar();
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
actionBar.setDisplayHomeAsUpEnabled(true);
//actionBar.hide();
//actionBar.setDisplayShowHomeEnabled(false);
//actionBar.setDisplayShowTitleEnabled(false);

setContentView(R.layout.activity_post);
if (savedInstanceState == null) {
Expand Down
Loading