Permalink
Browse files

Removed ability to modify app to be a donate version or not; we're sp…

…litting off to have a separate 'donation version'
  • Loading branch information...
konklone committed Jan 5, 2011
1 parent 4fb7c2c commit 13ba8ecb0de03e6d919d3cff65716bc8db5b76ea
Showing with 4 additions and 35 deletions.
  1. +1 −24 publish.txt
  2. +1 −2 src/campyre/android/Login.java
  3. +1 −2 src/campyre/android/RoomList.java
  4. +1 −7 src/campyre/android/Utils.java
View
@@ -5,27 +5,4 @@
3) Export campyre.apk
-4) Convert the code to donate
-
- * In Utils:
- - change ASK_DONATE constant to false
- - change SHORTCUT_ICON constant to append "_donate"
-
- * Refactor -> Rename the package to append ".donate"
-
- * Edit the AndroidManifest.xml
- - package name to append ".donate"
- - application market_name to append "_donate"
- - icon name of app to append "_donate"
- - icon name of shortcut alias to append "_donate"
- - Save, regenerate R
-
- * Re-import in the main activities to fix errors
-
-5) Export campyre-donate.apk
-
-6) Convert it back to regular
-
- * Refactor -> Rename the package to remove ".donate"
- * Rename the package in AndroidManifest.xml to regenerate R
- * Reset the rest with git
+4) Tag in version control
@@ -130,8 +130,7 @@ public void onClick(View v) {
public boolean onCreateOptionsMenu(Menu menu) {
boolean result = super.onCreateOptionsMenu(menu);
- if (Utils.ASK_DONATE)
- menu.add(0, MENU_DONATE, 0, R.string.menu_donate).setIcon(R.drawable.ic_menu_market);
+ menu.add(0, MENU_DONATE, 0, R.string.menu_donate).setIcon(R.drawable.ic_menu_market);
menu.add(1, MENU_FEEDBACK, 1, R.string.menu_feedback).setIcon(R.drawable.ic_menu_send);
menu.add(2, MENU_ABOUT, 2, R.string.menu_about).setIcon(android.R.drawable.ic_menu_help);
@@ -160,8 +160,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
menu.add(0, MENU_SETTINGS, 0, R.string.menu_settings).setIcon(android.R.drawable.ic_menu_preferences);
menu.add(1, MENU_CLEAR, 1, R.string.menu_logout).setIcon(android.R.drawable.ic_menu_close_clear_cancel);
- if (Utils.ASK_DONATE)
- menu.add(2, MENU_DONATE, 2, R.string.menu_donate).setIcon(R.drawable.ic_menu_market);
+ menu.add(2, MENU_DONATE, 2, R.string.menu_donate).setIcon(R.drawable.ic_menu_market);
menu.add(3, MENU_FEEDBACK, 3, R.string.menu_feedback).setIcon(R.drawable.ic_menu_send);
menu.add(4, MENU_ABOUT, 4, R.string.menu_about).setIcon(android.R.drawable.ic_menu_help);
@@ -37,12 +37,6 @@
public class Utils {
public static final int ABOUT = 0;
- // change this to false for the donate version
- public static final boolean ASK_DONATE = true;
-
- // change this to icon_donate for the donate version
- public static final int SHORTCUT_ICON = R.drawable.icon;
-
public static void alert(Context context, String message) {
Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
}
@@ -94,7 +88,7 @@ public static Intent donateIntent(Context context) {
public static Intent shortcutIntent(Context context, Room room) {
return new Intent()
- .putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, Intent.ShortcutIconResource.fromContext(context, Utils.SHORTCUT_ICON))
+ .putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, Intent.ShortcutIconResource.fromContext(context, R.drawable.icon))
.putExtra(Intent.EXTRA_SHORTCUT_INTENT, roomIntent(room))
.putExtra(Intent.EXTRA_SHORTCUT_NAME, room.name);
}

0 comments on commit 13ba8ec

Please sign in to comment.