Permalink
Browse files

added gitignore and fixed some strings

  • Loading branch information...
1 parent 30a28bf commit b23857924b114ba1ab39a10abd46b815783dd11b @ChristopheVersieux committed Jul 14, 2012
View
18 .gitignore
@@ -0,0 +1,18 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+Private.java
View
BIN bin/GooglePlusStream.apk
Binary file not shown.
View
BIN bin/classes.dex
Binary file not shown.
View
BIN bin/classes/com/WazaBe/GooglePlusStream/Private.class
Binary file not shown.
View
BIN bin/classes/com/WazaBe/GooglePlusStream/R$id.class
Binary file not shown.
View
BIN bin/classes/com/WazaBe/GooglePlusStream/R$integer.class
Binary file not shown.
View
BIN bin/classes/com/WazaBe/GooglePlusStream/R$layout.class
Binary file not shown.
View
BIN bin/classes/com/WazaBe/GooglePlusStream/R$string.class
Binary file not shown.
View
BIN bin/classes/com/WazaBe/GooglePlusStream/R$style.class
Binary file not shown.
View
BIN bin/classes/com/WazaBe/GooglePlusStream/R$styleable.class
Binary file not shown.
View
BIN bin/classes/com/WazaBe/GooglePlusStream/R.class
Binary file not shown.
View
BIN bin/classes/com/WazaBe/GooglePlusStream/SocialStreamFragment$StreamRowViewBinder.class
Binary file not shown.
View
BIN bin/classes/com/WazaBe/GooglePlusStream/SocialStreamFragment.class
Binary file not shown.
View
BIN bin/classes/com/actionbarsherlock/R$id.class
Binary file not shown.
View
BIN bin/classes/com/actionbarsherlock/R$integer.class
Binary file not shown.
View
BIN bin/classes/com/actionbarsherlock/R$layout.class
Binary file not shown.
View
BIN bin/classes/com/actionbarsherlock/R$string.class
Binary file not shown.
View
BIN bin/classes/com/actionbarsherlock/R$style.class
Binary file not shown.
View
BIN bin/classes/com/actionbarsherlock/R$styleable.class
Binary file not shown.
View
BIN bin/classes/com/actionbarsherlock/R.class
Binary file not shown.
View
BIN bin/resources.ap_
Binary file not shown.
View
6 gen/com/WazaBe/GooglePlusStream/R.java
@@ -888,7 +888,6 @@ is along the minor axis (that is the screen is portrait). This may
public static final int disableHome=0x7f040009;
public static final int homeAsUp=0x7f040006;
public static final int listMode=0x7f040002;
- public static final int menu_settings=0x7f040038;
public static final int normal=0x7f040001;
public static final int root_container=0x7f040027;
public static final int showCustom=0x7f040008;
@@ -945,9 +944,6 @@ is along the minor axis (that is the screen is portrait). This may
public static final int sherlock_spinner_dropdown_item=0x7f030018;
public static final int sherlock_spinner_item=0x7f030019;
}
- public static final class menu {
- public static final int activity_main=0x7f0b0000;
- }
public static final class string {
/** Content description for the action bar "home" affordance. [CHAR LIMIT=NONE]
*/
@@ -980,8 +976,10 @@ is along the minor axis (that is the screen is portrait). This may
*/
public static final int abs__shareactionprovider_share_with_application=0x7f090009;
public static final int app_name=0x7f09000a;
+ public static final int empty_social_stream=0x7f09000e;
public static final int hello_world=0x7f09000b;
public static final int menu_settings=0x7f09000c;
+ public static final int stream_originally_shared=0x7f09000f;
public static final int title_activity_main=0x7f09000d;
}
public static final class style {
View
6 gen/com/actionbarsherlock/R.java
@@ -888,7 +888,6 @@ is along the minor axis (that is the screen is portrait). This may
public static final int disableHome=0x7f040009;
public static final int homeAsUp=0x7f040006;
public static final int listMode=0x7f040002;
- public static final int menu_settings=0x7f040038;
public static final int normal=0x7f040001;
public static final int root_container=0x7f040027;
public static final int showCustom=0x7f040008;
@@ -945,9 +944,6 @@ is along the minor axis (that is the screen is portrait). This may
public static final int sherlock_spinner_dropdown_item=0x7f030018;
public static final int sherlock_spinner_item=0x7f030019;
}
- public static final class menu {
- public static final int activity_main=0x7f0b0000;
- }
public static final class string {
/** Content description for the action bar "home" affordance. [CHAR LIMIT=NONE]
*/
@@ -980,8 +976,10 @@ is along the minor axis (that is the screen is portrait). This may
*/
public static final int abs__shareactionprovider_share_with_application=0x7f090009;
public static final int app_name=0x7f09000a;
+ public static final int empty_social_stream=0x7f09000e;
public static final int hello_world=0x7f09000b;
public static final int menu_settings=0x7f09000c;
+ public static final int stream_originally_shared=0x7f09000f;
public static final int title_activity_main=0x7f09000d;
}
public static final class style {
View
2 res/values/strings.xml
@@ -4,5 +4,7 @@
<string name="hello_world">Hello world!</string>
<string name="menu_settings">Settings</string>
<string name="title_activity_main">SocialStreamFragment</string>
+ <string name="empty_social_stream">No posts found.</string>
+ <string name="stream_originally_shared">%s originally shared this post</string>
</resources>
View
2 src/com/WazaBe/GooglePlusStream/Private.java
@@ -1,5 +1,5 @@
package com.WazaBe.GooglePlusStream;
public class Private {
- public static String API_KEY = "your_api_key";
+ public static String API_KEY = "insert_your_api_key";
}
View
4 src/com/WazaBe/GooglePlusStream/SocialStreamFragment.java
@@ -159,7 +159,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
- setEmptyText("getString(R.string.empty_social_stream)");
+ setEmptyText(getString(R.string.empty_social_stream));
// In support library r8, calling initLoader for a fragment in a FragmentPagerAdapter
// in the fragment's onCreate may cause the same LoaderManager to be dealt to multiple
@@ -723,7 +723,7 @@ private static void bindActivityView(
// Set original author.
if (activity.getObject().getActor() != null) {
views.originalAuthor.setVisibility(View.VISIBLE);
- views.originalAuthor.setText("res.getString(R.string.stream_originally_shared,activity.getObject().getActor().getDisplayName())");
+ views.originalAuthor.setText(res.getString(R.string.stream_originally_shared,activity.getObject().getActor().getDisplayName()));
views.reshareLine.setVisibility(View.VISIBLE);
views.reshareSpacer.setVisibility(View.INVISIBLE);

0 comments on commit b238579

Please sign in to comment.