LongWeekend · rsharrott · Apr 22, 2026 · Apr 22, 2026 · Apr 22, 2026 · Apr 22, 2026
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "jFlash/Classes/External/FMDB"]
 	path = jFlash/Classes/External/FMDB
-	url = http://github.com/ccgus/fmdb.git
+	url = https://github.com/ccgus/fmdb.git
 [submodule "jFlash/Server/lweflash/lib/gaesessions"]
 	path = jFlash/Server/lweflash/lib/gaesessions
 	url = https://github.com/dound/gae-sessions.git
@@ -9,22 +9,22 @@
 	url = git@github.com:LongWeekend/Long-Weekend-Dev-Tools.git
 [submodule "jFlash/Classes/External/asi-http-request"]
 	path = jFlash/Classes/External/asi-http-request
-	url = git://github.com/pokeb/asi-http-request.git
+	url = https://github.com/pokeb/asi-http-request.git
 [submodule "jFlash/Classes/External/janrain"]
 	path = jFlash/Classes/External/janrain
 	url = git@github.com:LongWeekend/engage.iphone.git
 [submodule "jFlash/Classes/External/DSActivityView"]
 	path = jFlash/Classes/External/DSActivityView
-	url = git@github.com:rsharrott/DSActivityView.git
+	url = https://github.com/dominik-hadl/DSActivityView.git
 [submodule "jFlash/Classes/External/TTTAttributedLabel"]
 	path = jFlash/Classes/External/TTTAttributedLabel
-	url = git@github.com:LongWeekend/TTTAttributedLabel.git
+	url = https://github.com/TTTAttributedLabel/TTTAttributedLabel.git
 [submodule "jFlash/Classes/External/LWEGradientButton"]
 	path = jFlash/Classes/External/LWEGradientButton
 	url = git@github.com:LongWeekend/LWEGradientButton.git
 [submodule "jFlash/Classes/External/MBProgressHUD"]
 	path = jFlash/Classes/External/MBProgressHUD
-	url = git://github.com/matej/MBProgressHUD.git
+	url = https://github.com/jdg/MBProgressHUD.git
 [submodule "jFlash/Classes/External/jump.ios"]
 	path = jFlash/Classes/External/jump.ios
-	url = git@github.com:janrain/jump.ios.git
+	url = https://github.com/janrain/jump.ios.git
diff --git a/jFlash/Assets/CFlash/help/algorithm@2x.html b/jFlash/Assets/CFlash/help/algorithm@2x.html
@@ -25,7 +25,6 @@
     You can also choose to exclude learned words from study using the "Hide Learned Cards" switch.
   </p>
 
-  <img src="screenshot-difficulty@2x.jpg" width="235"/>
   <p>
     If this sounds confusing, don't worry! There are presets for <em><strong>easy, medium &amp; hard</strong></em>
     so you don't have to worry about the math (worry about Chinese *grin*).

diff --git a/jFlash/Assets/CFlash/help/browse@2x.html b/jFlash/Assets/CFlash/help/browse@2x.html
@@ -13,9 +13,8 @@
   Tap the <strong>Settings</strong> icon, and then tap <strong>Study Mode</strong> to switch between the two.
   </p>
 
-  <img src="screenshot-card-browse-buttons@2x.jpg" border="0"  width="235" class="screenshot"/>
   <p>Once in Browse Mode, you can move backwards &amp; forwards through the set by tapping the <strong>Last</strong> &amp; <strong>Next</strong> buttons.
-    Using the <strong>Actions</strong> button, you can add the card to other sets (including your starred words), tweet the word, or report a correction.
+    Using the <strong>Actions</strong> button, you can add the card to other sets (including your starred words), share the card, or report a correction.
   </p>
   </div>
 </div>

diff --git a/jFlash/Assets/CFlash/help/corrections@2x.html b/jFlash/Assets/CFlash/help/corrections@2x.html
@@ -7,7 +7,7 @@
 
 <div>
   <img src="corrections@2x.png" border="0" title="Corrections" width="300" class="title"/>
-  <p>If you find things you believe are incorrect, please us know. It's quick &amp; easy!</p>
+  <p>If you find things you believe are incorrect, please let us know. It's quick &amp; easy!</p>
   <p>Tap the <strong>Actions</strong> button on the <strong>Practice</strong> screen.  Tap <strong>Fix Card</strong>.</p>
 
  <img src="screenshot-fix-card@2x.png" border="0"  width="235" class="screenshot"/>

diff --git a/jFlash/Assets/CFlash/help/integration@2x.html b/jFlash/Assets/CFlash/help/integration@2x.html
@@ -9,7 +9,7 @@
   <img src="integrating-with-jflash@2x.png" border="0" title="Learning Algorithm" width="300" class="title"/>
   <p>
     How does it work? Simply follow a link: <pre>cflash://CHINESE_WORD</pre> to open cFlash from another app and launch
-    a search. ie: <pre>cflash://中国語</pre> will launch jflash and search for 中国語.  Ask your other favorite apps to include this functionality as
+    a search. ie: <pre>cflash://中国語</pre> will launch cflash and search for 中国語.  Ask your other favorite apps to include this functionality as
     well and let's build the perfect environment for learning, reviewing and retaining Chinese!
   </p>
 </div>

diff --git a/jFlash/Assets/CFlash/help/practice@2x.html b/jFlash/Assets/CFlash/help/practice@2x.html
@@ -11,9 +11,8 @@
   Once the meaning is revealed, you can indicate whether you got it <strong>right</strong> or <strong>wrong</strong>. 
   If you know the word already, or simply don't like it, you can press <strong>bury it</strong> - the card will immediately become <strong>Learned</strong>.
   </p>
-  <p>Using the <strong>Actions</strong> button, you can add the card to other sets (including your starred words), tweet the word, or report a correction.</p>
+  <p>Using the <strong>Actions</strong> button, you can add the card to other sets (including your starred words), share the card, or report a correction.</p>
 
-  <img src="screenshot-card-buttons@2x.png"  width="235" class="screenshot" />
   <p>
   The first time you get a card right, it moves from <strong>Studying</strong> to <strong>Right 1x</strong>.
   Each time you get it right, it will be promoted to a higher level.

diff --git a/jFlash/Assets/CFlash/help/welcome@2x.html b/jFlash/Assets/CFlash/help/welcome@2x.html
@@ -24,9 +24,6 @@
     <a href="http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id=486531735&onlyLatestVersion=true&pageNumber=0&sortOrdering=1&type=Purple+Software" onclick="document.location='http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id=486531735&onlyLatestVersion=true&pageNumber=0&sortOrdering=1&type=Purple+Software'">
       <img src="rate-us-btn@2x.png" border="0" title="Like It? Rate Us?" width="250" />
     </a>
-    <div align="center" style="margin-bottom:7px;">
-      <a href="http://twitter.com/long_weekend">Follow us on Twitter!</a> 
-    </div>
 </div>
 
 </body>

diff --git a/jFlash/Assets/JFlash/help/algorithm@2x.html b/jFlash/Assets/JFlash/help/algorithm@2x.html
@@ -25,7 +25,6 @@
     You can also choose to exclude learned words from study using the "Hide Learned Cards" switch.
   </p>
 
-  <img src="screenshot-difficulty@2x.jpg" width="235"/>
   <p>
     If this sounds confusing, don't worry! There are presets for <em><strong>easy, medium &amp; hard</strong></em>
     so you don't have to worry about the math (worry about Japanese *grin*).

diff --git a/jFlash/Assets/JFlash/help/browse@2x.html b/jFlash/Assets/JFlash/help/browse@2x.html
@@ -13,9 +13,8 @@
   Tap the <strong>Settings</strong> icon, and then tap <strong>Study Mode</strong> to switch between the two.
   </p>
 
-  <img src="screenshot-card-browse-buttons@2x.jpg" border="0"  width="235" class="screenshot"/>
   <p>Once in Browse Mode, you can move backwards &amp; forwards through the set by tapping the <strong>Last</strong> &amp; <strong>Next</strong> buttons.
-    Using the <strong>Actions</strong> button, you can add the card to other sets (including your starred words), tweet the word, or report a correction.
+    Using the <strong>Actions</strong> button, you can add the card to other sets (including your starred words), share the card, or report a correction.
   </p>
   </div>
 </div>

diff --git a/jFlash/Assets/JFlash/help/corrections@2x.html b/jFlash/Assets/JFlash/help/corrections@2x.html
@@ -7,7 +7,7 @@
 
 <div>
   <img src="corrections@2x.png" border="0" title="Corrections" width="300" class="title"/>
-  <p>If you find things you believe are incorrect, please us know. It's quick &amp; easy!</p>
+  <p>If you find things you believe are incorrect, please let us know. It's quick &amp; easy!</p>
   <p>Tap the <strong>Actions</strong> button on the <strong>Practice</strong> screen.  Tap <strong>Fix Card</strong>.</p>
 
  <img src="screenshot-fix-card@2x.png" border="0"  width="235" class="screenshot"/>

diff --git a/jFlash/Assets/JFlash/help/practice@2x.html b/jFlash/Assets/JFlash/help/practice@2x.html
@@ -11,9 +11,8 @@
   Once the meaning is revealed, you can indicate whether you got it <strong>right</strong> or <strong>wrong</strong>. 
   If you know the word already, or simply don't like it, you can press <strong>bury it</strong> - the card will immediately become <strong>Learned</strong>.
   </p>
-  <p>Using the <strong>Actions</strong> button, you can add the card to other sets (including your starred words), tweet the word, or report a correction.</p>
+  <p>Using the <strong>Actions</strong> button, you can add the card to other sets (including your starred words), share the card, or report a correction.</p>
 
-  <img src="screenshot-card-buttons@2x.png"  width="235" class="screenshot" />
   <p>
   The first time you get a card right, it moves from <strong>Studying</strong> to <strong>Right 1x</strong>.
   Each time you get it right, it will be promoted to a higher level.

diff --git a/jFlash/Assets/JFlash/help/welcome@2x.html b/jFlash/Assets/JFlash/help/welcome@2x.html
@@ -19,17 +19,13 @@
     <p>We have a new and improved dictionary, 50,000+ example sentences and a feedback
       mechanism for reporting data corrections. You can even set the difficulty level for large sets.</p>
 
-    <p>We have cross-referenced example sentences with readings, so you can discover new words, and Twitter integration, so you can share cool new words with your friends.</p>
+    <p>We have cross-referenced example sentences with readings so you can discover new words and share them with friends.</p>
 
     <p>We hope you enjoy <strong>Japanese Flash</strong>!</p>
 
     <a href="http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id=367216357&onlyLatestVersion=true&pageNumber=0&sortOrdering=1&type=Purple+Software" onclick="document.location='http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewContentsUserReviews?id=367216357&onlyLatestVersion=true&pageNumber=0&sortOrdering=1&type=Purple+Software'">
       <img src="rate-us-btn@2x.png" border="0" title="Like It? Rate Us?" width="250" />
     </a>
-
-    <div align="center" style="margin-bottom:7px;">
-      <a href="http://twitter.com/long_weekend">Follow us on Twitter!</a> 
-    </div>
 </div>
 
 </body>

diff --git a/jFlash/Classes/AppSpecific/ActionBarViewController.h b/jFlash/Classes/AppSpecific/ActionBarViewController.h
@@ -13,11 +13,6 @@
 #import <MessageUI/MessageUI.h>
 #import "StudyViewProtocols.h"
 
-#define SVC_ACTION_ADDTOSET_BUTTON 1
-#define SVC_ACTION_ADDTOFAV_BUTTON 0
-#define SVC_ACTION_REPORT_BUTTON 2
-#define SVC_ACTION_SHARE_BUTTON 3
-
 @class ActionBarViewController;
 
 @protocol ActionBarViewControllerDelegate <NSObject>
@@ -34,16 +29,14 @@
 - (BOOL)actionBarShouldReveal:(ActionBarViewController*)avc;
 @end
 
-@interface ActionBarViewController : UIViewController <UIActionSheetDelegate,
-                                                       UIAlertViewDelegate,
-                                                       MFMailComposeViewControllerDelegate,
+@interface ActionBarViewController : UIViewController <MFMailComposeViewControllerDelegate,
                                                        StudyViewSubcontrollerProtocol>
 
-- (NSString *)getTweetWord;
-
 // action sheet
 - (IBAction)showCardActionSheet;
 
+- (void)distributeButtonsEvenly;
+
 @property (assign) IBOutlet id<ActionBarViewControllerDelegate> delegate;
 
 @property (nonatomic, retain) Card *currentCard;