OpenSangokushi commit ML
sango****@lists*****
2011年 2月 5日 (土) 03:20:43 JST
Google Mobile/Open Romance of the Three Kingdoms"GoogleAndroid"
ForkRevision: 482
http://sourceforge.jp/projects/sangokushi/svn/view?view=rev&revision=482
Author: akifumi3
Date: 2011-02-05 03:20:43 +0900 (Sat, 05 Feb 2011)
Log Message:
-----------
オープニング時のTwitter認証のみ外したものをTrunkに反映。
戦闘画面のTwitterエリアは残しています。
Modified Paths:
--------------
branches/OpenSangokushi_without_twitter/res/layout/opening.xml
trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Opening.java
Property Changed:
----------------
trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Opening.java
Modified: branches/OpenSangokushi_without_twitter/res/layout/opening.xml
===================================================================
--- branches/OpenSangokushi_without_twitter/res/layout/opening.xml 2011-02-04 17:29:00 UTC (rev 481)
+++ branches/OpenSangokushi_without_twitter/res/layout/opening.xml 2011-02-04 18:20:43 UTC (rev 482)
@@ -15,5 +15,4 @@
android:textColor="@color/solid_white"
android:layout_marginTop="330dp" android:text="@string/start_button" android:background="#00000000"></Button>
-
</LinearLayout>
\ No newline at end of file
Modified: trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Opening.java
===================================================================
--- trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Opening.java 2011-02-04 17:29:00 UTC (rev 481)
+++ trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Opening.java 2011-02-04 18:20:43 UTC (rev 482)
@@ -185,8 +185,12 @@
//スタートボタンは認証終了まで非表示
mStartButton = (Button)findViewById(R.id.start_button);
//mStartButton.setEnabled(false);
+
+ //2011.2.3
+ //akifumi3
+ //一旦Twitter認証を外します。
+ /*
mTwitterButton = (Button)findViewById(R.id.twitter_button);
-
mLobbyButton = (Button)findViewById(R.id.lobby_button);
mLobbyButton.setOnClickListener(new OnClickListener() {
@Override
@@ -194,6 +198,7 @@
startLobby();
}
});
+ */
//保存している情報によって遷移を決定
int startBtnTitle = R.string.title_start;
@@ -219,6 +224,10 @@
Toast.makeText(this, "ようこそ" + mPlayer.getUserName() + "様", Toast.LENGTH_LONG).show();
}
+
+ //2011.2.3
+ //akifumi3
+ /*
//Twitter認証チェック
//Opening画面表示中にTwitterの認証情報を確認させる
mOperator = new TwitterOperator(this);
@@ -232,6 +241,7 @@
}else{
mTwitterButton.setEnabled(false);
}
+ */
}
@Override
Property changes on: trunk/OpenSangokushi/src/jp/or/cute/sangokushi/Opening.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/OpenSangokushi_without_twitter/src/jp/or/cute/sangokushi/Opening.java:477-481