Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
using roboguice now.
  • Loading branch information
mariotaku committed Apr 11, 2012
1 parent e6fb43d commit 3339bbb
Show file tree
Hide file tree
Showing 37 changed files with 480 additions and 158 deletions.
53 changes: 46 additions & 7 deletions AndroidManifest.xml
Expand Up @@ -39,7 +39,7 @@
android:name=".app.TwidereApplication"
android:icon="@drawable/ic_launcher_twidere"
android:label="@string/app_name"
android:theme="@style/Theme.Holo.Light.DarkActionBar">
android:theme="@style/Theme.Twidere.Light">
<activity
android:name=".activity.LoginActivity"
android:label="@string/login_to_twitter"
Expand All @@ -52,8 +52,7 @@
</activity>
<activity
android:name=".activity.HomeActivity"
android:label="@string/app_name"
android:theme="@style/Theme.Holo.Light.DarkActionBar.ViewPagerIndicator">
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

Expand All @@ -65,20 +64,40 @@
android:label="@string/compose"
android:uiOptions="splitActionBarWhenNarrow"
android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name=".activity.GlobalSettingsActivity"
android:label="@string/global_settings"
android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name=".activity.AuthorizationActivity"
android:label="@string/login_to_twitter">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name=".activity.EditAPIActivity"
android:label="@string/edit_api"
android:theme="@style/Theme.Holo.Light.Dialog">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>

<provider
Expand All @@ -95,21 +114,41 @@
</service>

<activity
android:name=".activity.SelectAccountsActivity"
android:label="@string/select_accounts"
android:theme="@style/Theme.Holo.Light.Dialog.NoSherlock">
android:name=".activity.SelectAccountActivity"
android:label="@string/select_account"
android:theme="@style/Theme.Twidere.Light.Dialog">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name=".activity.ViewImageActivity"
android:name=".activity.ViewerActivity"
android:label="@string/view_image">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name=".activity.ViewMapActivity"
android:label="@string/view_map">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<activity
android:name=".activity.AboutActivity"
android:label="@string/about">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
</application>

Expand Down
Binary file added libs/guice-3.0-no_aop.jar
Binary file not shown.
Binary file added libs/javax.inject-1.jar
Binary file not shown.
Binary file added libs/roboguice-2.0b4.jar
Binary file not shown.
Binary file added libs/roboguice-sherlock-1.0.jar
Binary file not shown.
Binary file added res/drawable-xhdpi/ic_list_gap.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed res/drawable-xhdpi/list_gap.png
Binary file not shown.
2 changes: 1 addition & 1 deletion res/drawable/bg_list_gap.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:src="@drawable/list_gap"
android:src="@drawable/ic_list_gap"
android:tileMode="repeat"/>
8 changes: 4 additions & 4 deletions res/layout/compose.xml
Expand Up @@ -32,21 +32,21 @@
android:src="@drawable/ic_menu_send"/>

<ImageButton
android:id="@+id/select_accounts"
android:id="@+id/select_account"
android:layout_width="64dip"
android:layout_height="64dip"
android:layout_alignParentRight="true"
android:layout_below="@+id/send"
android:contentDescription="@string/select_accounts"
android:contentDescription="@string/select_account"
android:src="@drawable/ic_menu_accounts"/>

<TextView
android:id="@+id/text_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/select_accounts"
android:layout_alignLeft="@+id/select_account"
android:layout_alignParentRight="true"
android:layout_below="@+id/select_accounts"
android:layout_below="@+id/select_account"
android:gravity="center"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"/>
Expand Down
2 changes: 1 addition & 1 deletion res/layout/tweet_list_item.xml
Expand Up @@ -65,7 +65,7 @@
android:layout_centerInParent="true"
android:text="@string/tap_to_load_more"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#808080"
android:textColor="?android:attr/textColorSecondary"
android:textStyle="bold"
android:visibility="gone"/>

Expand Down
5 changes: 4 additions & 1 deletion res/values-zh-rCN/strings.xml
Expand Up @@ -30,7 +30,7 @@
<string name="error_bad_address">错误:错误的地址,你可能输入了无效的API地址。</string>
<string name="error_no_permission">错误:你没有权限访问twitter,应用程序的密钥可能是无效的。</string>
<string name="error_unknown_error">错误:未知错误,这很可能是个bug。</string>
<string name="select_accounts">选择帐号</string>
<string name="select_account">选择帐号</string>
<string name="username">用户名</string>
<string name="password">密码</string>
<string name="label_tweetstore_provider">Twidere 数据库提供商</string>
Expand Down Expand Up @@ -74,5 +74,8 @@
<string name="clear_cache_summary">清除储存的个人资料图片缓存。</string>
<string name="clear_databases">清除数据库</string>
<string name="clear_databases_summary">清除数据库中的所有推文,个人资料和信息等。请不用担心,你的帐号登录信息不会丢失。</string>
<string name="look_and_feel">观感</string>
<string name="dark_theme">使用暗色主题</string>
<string name="dark_theme_summary">使用暗色主题,重启 Twidere 以完全生效。</string>

</resources>
5 changes: 4 additions & 1 deletion res/values/strings.xml
Expand Up @@ -37,7 +37,7 @@
<string name="error_bad_address">Error: Bad address, you may entered an invalid API address.</string>
<string name="error_no_permission">Error: You have no permission to access twitter, the application key may invalid.</string>
<string name="error_unknown_error">Error: Unknown error, this is probably a bug.</string>
<string name="select_accounts">Select accounts</string>
<string name="select_account">Select account</string>
<string name="username">Username</string>
<string name="password">Password</string>
<string name="label_tweetstore_provider">Twidere database provider</string>
Expand Down Expand Up @@ -84,5 +84,8 @@
<string name="clear_cache_summary">Clear stored profile image cache.</string>
<string name="clear_databases">Clear databases</string>
<string name="clear_databases_summary">Clear all tweets, user profiles, messages in databases. Don\'t worry, your accounts credentials won\'t loss.</string>
<string name="look_and_feel">Look and feel</string>
<string name="dark_theme">Use dark theme</string>
<string name="dark_theme_summary">Use dark theme, restart Twidere to take effect.</string>

</resources>
18 changes: 16 additions & 2 deletions res/values/themes.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Theme.Holo.Light.DarkActionBar.ViewPagerIndicator">
<style name="Theme.Twidere" parent="Theme.Holo">
<item name="vpiCirclePageIndicatorStyle">@style/Widget.CirclePageIndicator</item>
<item name="vpiTitlePageIndicatorStyle">@style/Widget.TitlePageIndicator</item>
<item name="vpiTabPageIndicatorStyle">@style/Widget.TabPageIndicator</item>
Expand All @@ -10,7 +10,21 @@
<item name="vpiVerticalTabTextStyle">@style/Widget.TabPageIndicator.Text</item>
</style>

<style name="Theme.Holo.Light.Dialog.NoSherlock" parent="@style/Theme.Holo.Light.Dialog">
<style name="Theme.Twidere.Light" parent="Theme.Holo.Light.DarkActionBar">
<item name="vpiCirclePageIndicatorStyle">@style/Widget.CirclePageIndicator</item>
<item name="vpiTitlePageIndicatorStyle">@style/Widget.TitlePageIndicator</item>
<item name="vpiTabPageIndicatorStyle">@style/Widget.TabPageIndicator</item>
<item name="vpiVerticalTabPageIndicatorStyle">@style/Widget.TabPageIndicator.Vertical</item>
<item name="vpiTabTextStyle">@style/Widget.TabPageIndicator.Text</item>
<item name="vpiVerticalTabTextStyle">@style/Widget.TabPageIndicator.Text</item>
</style>

<style name="Theme.Twidere.Dialog" parent="Theme.Holo.Dialog">
<item name="windowActionBar">false</item>
<item name="android:windowNoTitle">false</item>
</style>

<style name="Theme.Twidere.Light.Dialog" parent="Theme.Holo.Light.Dialog">
<item name="windowActionBar">false</item>
<item name="android:windowNoTitle">false</item>
</style>
Expand Down
11 changes: 10 additions & 1 deletion res/xml/global_settings.xml
Expand Up @@ -3,6 +3,15 @@
android:key="global_settings"
android:title="@string/global_settings">

<PreferenceCategory
android:key="cat_lookNfeel"
android:title="@string/look_and_feel">
<CheckBoxPreference
android:defaultValue="false"
android:key="dark_theme"
android:summary="@string/dark_theme_summary"
android:title="@string/dark_theme"/>
</PreferenceCategory>
<PreferenceCategory
android:key="cat_storage"
android:title="@string/storage">
Expand All @@ -27,7 +36,7 @@
android:key="cat_api"
android:title="@string/api">
<CheckBoxPreference
android:defaultValue="true"
android:defaultValue="false"
android:key="gzip_compressing"
android:summary="@string/gzip_compressing_summary"
android:title="@string/gzip_compressing"/>
Expand Down
5 changes: 5 additions & 0 deletions src/org/mariotaku/twidere/Constants.java
Expand Up @@ -34,6 +34,11 @@ public interface Constants {

public static final String INTENT_KEY_REFRESH_ALL = "refresh_all";

public static final String PREFERENCE_NAME = "preference";

public static final String PREFERENCE_KEY_ITEM_LIMIT = "item_limit";
public static final String PREFERENCE_KEY_DARK_THEME = "dark_theme";

public static final int MENU_HOME = android.R.id.home;
public static final int MENU_ADD_LOCATION = R.id.add_location;
public static final int MENU_LOCATION = R.id.location;
Expand Down
4 changes: 1 addition & 3 deletions src/org/mariotaku/twidere/activity/AboutActivity.java
@@ -1,7 +1,5 @@
package org.mariotaku.twidere.activity;

import com.actionbarsherlock.app.SherlockFragmentActivity;

public class AboutActivity extends SherlockFragmentActivity {
public class AboutActivity extends BaseActivity {

}
Expand Up @@ -16,7 +16,6 @@

package org.mariotaku.twidere.activity;

import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;

import android.content.Intent;
Expand All @@ -28,7 +27,7 @@

import com.actionbarsherlock.view.Window;

public class AuthorizationActivity extends WebViewActivity implements Constants {
public class AuthorizationActivity extends WebViewActivity {

private Uri authUrl;

Expand Down
25 changes: 25 additions & 0 deletions src/org/mariotaku/twidere/activity/BaseActivity.java
@@ -0,0 +1,25 @@
package org.mariotaku.twidere.activity;

import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;

import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;

import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockFragmentActivity;

public class BaseActivity extends RoboSherlockFragmentActivity implements Constants {

@Override
public void onCreate(Bundle savedInstanceState) {
setTheme();
super.onCreate(savedInstanceState);
}

public void setTheme() {
SharedPreferences preferences = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
setTheme(preferences.getBoolean(PREFERENCE_KEY_DARK_THEME, false) ? R.style.Theme_Twidere
: R.style.Theme_Twidere_Light);
}
}
25 changes: 25 additions & 0 deletions src/org/mariotaku/twidere/activity/BaseDialogActivity.java
@@ -0,0 +1,25 @@
package org.mariotaku.twidere.activity;

import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;

import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;

import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockFragmentActivity;

public class BaseDialogActivity extends RoboSherlockFragmentActivity implements Constants {

@Override
public void onCreate(Bundle savedInstanceState) {
setTheme();
super.onCreate(savedInstanceState);
}

public void setTheme() {
SharedPreferences preferences = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
setTheme(preferences.getBoolean(PREFERENCE_KEY_DARK_THEME, false) ? R.style.Theme_Holo_Dialog
: R.style.Theme_Holo_Light_Dialog);
}
}
25 changes: 25 additions & 0 deletions src/org/mariotaku/twidere/activity/BasePreferenceActivity.java
@@ -0,0 +1,25 @@
package org.mariotaku.twidere.activity;

import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;

import android.content.Context;
import android.content.SharedPreferences;
import android.os.Bundle;

import com.actionbarsherlock.app.SherlockPreferenceActivity;

public class BasePreferenceActivity extends SherlockPreferenceActivity implements Constants {

@Override
public void onCreate(Bundle savedInstanceState) {
setTheme();
super.onCreate(savedInstanceState);
}

public void setTheme() {
SharedPreferences preferences = getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
setTheme(preferences.getBoolean(PREFERENCE_KEY_DARK_THEME, false) ? R.style.Theme_Twidere
: R.style.Theme_Twidere_Light);
}
}

0 comments on commit 3339bbb

Please sign in to comment.