Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

色々と変えました #6

Merged
merged 1 commit into from
Nov 7, 2011
Merged

色々と変えました #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file modified bin/Liability2011-for-android.apk
View file
Open in desktop
Binary file not shown.
Binary file modified bin/classes.dex
View file
Open in desktop
Binary file not shown.
Binary file modified bin/resources.ap_
View file
Open in desktop
Binary file not shown.
63 changes: 35 additions & 28 deletions gen/com/teres/Liability2011/R.java
View file
Open in desktop
Expand Up @@ -17,6 +17,8 @@ public static final class color {
public static final int black=0x7f040001;
public static final int dashboard_text_color=0x7f040006;
public static final int depth_green=0x7f040002;
public static final int tab_background=0x7f040007;
public static final int tab_textcolor=0x7f040008;
public static final int white=0x7f040000;
}
public static final class drawable {
Expand All @@ -27,42 +29,47 @@ public static final class drawable {
public static final int remind_manager=0x7f020004;
}
public static final class id {
public static final int IndexButton=0x7f070007;
public static final int MapButton=0x7f070008;
public static final int TimeTableButton=0x7f070009;
public static final int Up_dataButton=0x7f070006;
public static final int actionbar_compat=0x7f070000;
public static final int aozora_list=0x7f070012;
public static final int event_description=0x7f070010;
public static final int event_time=0x7f07000e;
public static final int event_title=0x7f07000f;
public static final int first_tab=0x7f070011;
public static final int imageView1=0x7f070005;
public static final int index_description=0x7f070004;
public static final int index_listview=0x7f070001;
public static final int index_time_or_place=0x7f070002;
public static final int index_title=0x7f070003;
public static final int secont_tab=0x7f070013;
public static final int third_tab=0x7f070014;
public static final int timetable_listview=0x7f07000c;
public static final int title=0x7f07000d;
public static final int toolbar=0x7f07000a;
public static final int toolbar_text=0x7f07000b;
public static final int IndexButton=0x7f070008;
public static final int MapButton=0x7f070009;
public static final int TimeTableButton=0x7f07000a;
public static final int Up_dataButton=0x7f070007;
public static final int actionbar_compat=0x7f070001;
public static final int aozora_list=0x7f070013;
public static final int event_description=0x7f070011;
public static final int event_time=0x7f07000f;
public static final int event_title=0x7f070010;
public static final int first_tab=0x7f070012;
public static final int imageView1=0x7f070006;
public static final int index_description=0x7f070005;
public static final int index_listview=0x7f070002;
public static final int index_time_or_place=0x7f070003;
public static final int index_title=0x7f070004;
public static final int secont_tab=0x7f070014;
public static final int tab_text=0x7f070000;
public static final int third_tab=0x7f070015;
public static final int timetable_listview=0x7f07000d;
public static final int title=0x7f07000e;
public static final int toolbar=0x7f07000b;
public static final int toolbar_text=0x7f07000c;
}
public static final class layout {
public static final int index=0x7f030000;
public static final int index_list=0x7f030001;
public static final int main=0x7f030002;
public static final int timetable=0x7f030003;
public static final int timetable_and_index_low=0x7f030004;
public static final int timetable_list=0x7f030005;
public static final int timetable_tablayout=0x7f030006;
public static final int custom_tab_widget=0x7f030000;
public static final int index=0x7f030001;
public static final int index_list=0x7f030002;
public static final int main=0x7f030003;
public static final int timetable=0x7f030004;
public static final int timetable_and_index_low=0x7f030005;
public static final int timetable_list=0x7f030006;
public static final int timetable_tablayout=0x7f030007;
}
public static final class string {
public static final int app_name=0x7f050001;
public static final int first_day=0x7f050002;
public static final int hello=0x7f050000;
public static final int json=0x7f050003;
public static final int stage1=0x7f050004;
public static final int stage2=0x7f050005;
public static final int stage3=0x7f050006;
}
public static final class style {
public static final int DashboardButton=0x7f060000;
Expand Down
9 changes: 9 additions & 0 deletions res/color/tab_background.xml
View file
Open in desktop
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">

<item android:state_selected="true"><color android:color="@color/background_color" />
</item>
<item android:state_selected="false"><color android:color="@color/depth_green" />
</item>

</selector>
5 changes: 5 additions & 0 deletions res/color/tab_textcolor.xml
View file
Open in desktop
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_selected="true" android:color="@color/black"/>
<item android:state_selected="false" android:color="@color/white" />
</selector>
2 changes: 1 addition & 1 deletion res/values/color.xml
View file
Open in desktop
Expand Up @@ -2,5 +2,5 @@
<resources>
<color name="white">#ffffff</color>
<color name="black">#000000</color>
<color name="depth_green">#008000</color>
<color name="depth_green">#00cc66</color>
</resources>
3 changes: 3 additions & 0 deletions res/values/strings.xml
View file
Open in desktop
Expand Up @@ -4,4 +4,7 @@
<string name="app_name">Liability2011-for-android</string>
<string name="first_day">19</string>
<string name="json">CHOFUFES_JSON</string>
<string name="stage1">青空劇場</string>
<string name="stage2">C棟前ステージ</string>
<string name="stage3">その他</string>
</resources>
2 changes: 1 addition & 1 deletion src/com/teres/Liability2011/index/IndexesActivity.java
View file
Open in desktop
Expand Up @@ -94,7 +94,7 @@ public int compare(TimeTable arg0, TimeTable arg1) {
});
for(TimeTable timeTable : timeTableList){
String date = setTime(timeTable);
String stage = Stage.getStage(timeTable.getField());
String stage = getString(Stage.getStage(timeTable.getField()));
indexList.add(new Index(date + "@" + stage, timeTable.getTitle(), timeTable.getDescription()));
}
}
Expand Down
12 changes: 7 additions & 5 deletions src/com/teres/Liability2011/index/Stage.java
View file
Open in desktop
@@ -1,19 +1,21 @@
package com.teres.Liability2011.index;

import com.teres.Liability2011.R;

public class Stage {
//private static final String TAG = Stage.class.getSimpleName();
//場所番号と催事場の対応表のクラスです。

public static String getStage(int field){
public static int getStage(int field){
switch(field){
case 1:
return "青空劇場";
return R.string.stage1;
case 2:
return "C棟前ステージ";
return R.string.stage2;
case 3:
return "その他";
return R.string.stage3;
default:
return null;
return 0;
}
}
}
78 changes: 56 additions & 22 deletions src/com/teres/Liability2011/timetable/TimeTableTabActivity.java
View file
Open in desktop
Expand Up @@ -7,10 +7,16 @@
import jp.teres.numa08.chofufesdata.ChofufesData;
import jp.teres.numa08.chofufesdata.TimeTable;
import android.app.TabActivity;
import android.content.Context;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
import android.widget.ListView;
import android.widget.TabHost;
import android.widget.TabHost.TabSpec;
import android.widget.TextView;
import android.widget.Toast;

import com.teres.Liability2011.LoadJson;
import com.teres.Liability2011.R;
Expand All @@ -29,6 +35,20 @@ public void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.timetable_tablayout);
// リソースを取得する。
getMyResources();

// タブの設定
TabHost tabHost = getTabHost();
addTabs(tabHost);
// JSONからの読み込み
ChofufesData chofufesData;
try {
chofufesData = LoadJson.loadByJson(this.Sjson);
setContent(chofufesData, tabHost);
} catch (Exception e) {
// TODO Auto-generated catch block
Toast.makeText(this, "データを読み込めません", Toast.LENGTH_SHORT).show();
this.finish();
}
}

private void getMyResources() {
Expand All @@ -37,25 +57,6 @@ private void getMyResources() {
this.Sjson = getIntent().getStringExtra(getString(R.string.json));
}

@Override
protected void onStart() {
// TODO Auto-generated method stub
super.onStart();
// タブの設定
TabHost tabHost = getTabHost();
addTabs(tabHost);
// JSONからの読み込み
ChofufesData chofufesData = LoadJson.loadByJson(this.Sjson);

/*
* //テスト用 ChofufesData chofufesData = null; try { //chofufesData =
* loadDataByJson(); chofufesData = LoadJson.loadByJson(getAssets()); }
* catch (Exception e) { // TODO Auto-generated catch block
* e.printStackTrace(); }
*/
setContent(chofufesData, tabHost);
}

private void setContent(ChofufesData chofufesData, TabHost tabHost) {
// TODO Auto-generated method stub
setTab(chofufesData, R.id.aozora_list, 1);
Expand Down Expand Up @@ -112,14 +113,47 @@ private void setTab(ChofufesData chofufesData, int id, int field) {

private void addTabs(TabHost tabHost) {
// TODO Auto-generated method stub
TabSpec firstTab = tabHost.newTabSpec("FirstTab").setIndicator("青空劇場")
TabSpec firstTab = tabHost.newTabSpec("FirstTab").setIndicator(new CustomTabContentView(this, getString(R.string.stage1), CustomTabContentView.LEFT))
.setContent(R.id.first_tab);
tabHost.addTab(firstTab);
TabSpec secontTab = tabHost.newTabSpec("SecondTab")
.setIndicator("secondTab").setContent(R.id.secont_tab);
.setIndicator(new CustomTabContentView(this, getString(R.string.stage2), CustomTabContentView.CENTER)).setContent(R.id.secont_tab);
tabHost.addTab(secontTab);
TabSpec thirdTab = tabHost.newTabSpec("ThirdTab")
.setIndicator("thirdTab").setContent(R.id.third_tab);
.setIndicator(new CustomTabContentView(this, getString(R.string.stage3), CustomTabContentView.RIGHT)).setContent(R.id.third_tab);
tabHost.addTab(thirdTab);
}

public class CustomTabContentView extends FrameLayout{
LayoutInflater inflater = (LayoutInflater) getApplicationContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);

final static int NONE = 0;
final static int CENTER = 1;
final static int LEFT = 2;
final static int RIGHT = 3;

public CustomTabContentView(Context context, String title){
this(context, title, CENTER);
}

public CustomTabContentView(Context context, String title, int position){
super(context);
View view = inflater.inflate(R.layout.custom_tab_widget, this);
((TextView) view.findViewById(R.id.tab_text)).setText(title);

switch(position){
case LEFT:
setPadding(0, 0, 2, 0);
break;
case RIGHT:
setPadding(2, 0, 0, 0);
break;
case CENTER:
setPadding(2, 0, 2, 0);
break;
default:
break;
}
}
}
}