• R/O
  • SSH
  • HTTPS

versus: Commit


Commit MetaInfo

Revisão121 (tree)
Hora2016-02-19 14:13:00
Autort-nakamura

Mensagem de Log

不要なファイルを削除。

Mudança Sumário

  • delete: branch/user/nakamura/Formation/res/drawable/list_custom_false.xml
  • delete: branch/user/nakamura/Formation/res/drawable/my_button.xml
  • delete: branch/user/nakamura/Formation/res/drawable/selector_list.xml
  • delete: branch/user/nakamura/Formation/res/drawable/scrollbar_design.xml
  • delete: branch/user/nakamura/Formation/res/drawable/selector_button.xml
  • delete: branch/user/nakamura/Formation/res/drawable/gacha_button.xml
  • delete: branch/user/nakamura/Formation/res/drawable/list_custom_true.xml
  • delete: branch/user/nakamura/Formation/res/layout/membereditor_layout_activity.xml
  • delete: branch/user/nakamura/Formation/res/layout/playresulteditor_layout.xml
  • delete: branch/user/nakamura/Formation/res/layout/teamselect_layout.xml
  • delete: branch/user/nakamura/Formation/res/layout/playpointeditor_layout.xml
  • delete: branch/user/nakamura/Formation/res/layout/main.xml
  • delete: branch/user/nakamura/Formation/res/layout/memberselect_layout.xml
  • delete: branch/user/nakamura/Formation/res/layout/playinfoeditor_layout.xml
  • delete: branch/user/nakamura/Formation/res/layout/teammemberselect_layout.xml
  • delete: branch/user/nakamura/Formation/res/layout/header.xml
  • delete: branch/user/nakamura/Formation/res/layout/teameditor_layout.xml
  • delete: branch/user/nakamura/Formation/res/values/dimen.xml
  • delete: branch/user/nakamura/Formation/res/values/color.xml
  • delete: branch/user/nakamura/Formation/res/values/strings.xml
  • delete: branch/user/nakamura/Formation/res/values/styles.xml

Diff

--- branch/user/nakamura/Formation/res/drawable/list_custom_false.xml (revision 120)
+++ branch/user/nakamura/Formation/res/drawable/list_custom_false.xml (nonexistent)
@@ -1,8 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
3- <gradient
4- android:startColor="@color/uniform_theme_main"
5- android:endColor="@color/uniform_theme_main"/>
6-
7-
8-</shape>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/drawable/my_button.xml (revision 120)
+++ branch/user/nakamura/Formation/res/drawable/my_button.xml (nonexistent)
@@ -1,67 +0,0 @@
1-<?xml version="1.0" encoding="utf-8" ?>
2-<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
4-//押したときの設定
5-<item android:state_pressed="true">
6-<shape android:shape="rectangle">
7-<corners android:radius="5dip" />
8-
9-//グラデーションの指定(gradient)
10-<gradient
11-android:angle="90"
12-android:endColor="#CBF1A2"
13-android:startColor="#9EE33B" />
14-
15-//ボタンのパディング
16-<padding
17-android:top="10dip"
18-android:bottom="10dip"
19-android:left="0dip"
20-android:right="0dip" />
21-
22-//ボタンの線
23-<stroke
24-android:width="3dip"
25-android:color="#80D580" />
26-</shape>
27-</item>
28-
29-//クリックしたときの設定
30-<item android:state_focused="true">
31-<shape android:shape ="rectangle">
32-<corners android:radius="5dip" />
33-<gradient
34-android:angle="90"
35-android:endColor="#CBF1A2"
36-android:startColor="#9EE33B" />
37-<padding
38-android:top="10dip"
39-android:bottom="10dip"
40-android:left="0dip"
41-android:right="0dip" />
42-
43-<stroke
44-android:width="3dip"
45-android:color="#80D580" />
46-</shape>
47-</item>
48-
49-<item>
50-//何も条件がない通常の設定
51-<shape android:shape ="rectangle">
52-<corners android:radius="5dip" />
53-<gradient
54-android:angle="90"
55-android:endColor="#A9E665"
56-android:startColor="#80BF2B" />
57-<padding
58-android:top="10dip"
59-android:bottom="10dip"
60-android:left="0dip"
61-android:right="0dip" />
62-<stroke
63-android:width="3dip"
64-android:color="#339933" />
65-</shape>
66-</item>
67-</selector>
--- branch/user/nakamura/Formation/res/drawable/selector_list.xml (revision 120)
+++ branch/user/nakamura/Formation/res/drawable/selector_list.xml (nonexistent)
@@ -1,33 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
4- <!-- ボタンが押されている -->
5- <!-- フォーカスされている -->
6- <item
7- android:state_focused="true"
8- android:state_pressed="true"
9- android:drawable="@drawable/list_custom_true">
10- </item>
11- <!-- ボタンが押されている -->
12- <!-- フォーカスされていない -->
13- <item
14- android:state_focused="false"
15- android:state_pressed="true"
16- android:drawable="@drawable/list_custom_true">
17- </item>
18- <!-- ボタンが押されていない -->
19- <!-- フォーカスされている -->
20- <item
21- android:state_focused="true"
22- android:state_pressed="false"
23- android:drawable="@drawable/list_custom_false">
24- </item>
25- <!-- ボタンが押されていない -->
26- <!-- フォーカスされていない -->
27- <item
28- android:state_focused="false"
29- android:state_pressed="false"
30- android:drawable="@drawable/list_custom_false">
31- </item>
32-
33-</selector>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/drawable/scrollbar_design.xml (revision 120)
+++ branch/user/nakamura/Formation/res/drawable/scrollbar_design.xml (nonexistent)
@@ -1,10 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
3- <gradient
4- android:startColor="@color/uniform_theme_sub"
5- android:endColor="@color/uniform_theme_sub"
6- android:angle="90"/>
7- <corners
8- android:radius="6dp"/>
9-
10-</shape>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/drawable/selector_button.xml (revision 120)
+++ branch/user/nakamura/Formation/res/drawable/selector_button.xml (nonexistent)
@@ -1,102 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<selector
3- xmlns:android="http://schemas.android.com/apk/res/android">
4-
5-<!-- ボタンが押されている -->
6-<!-- フォーカスされていない -->
7-<item android:state_pressed="true"
8- android:state_focused="false">
9-<layer-list>
10- <item>
11- <shape
12- xmlns:android="http://schemas.android.com/apk/res/android"
13- android:shape="rectangle">
14- <gradient
15- android:angle="90"
16- android:startColor="#A9A9A9"
17- android:endColor="#C0C0C0"
18- android:type="linear"
19- />
20- <corners
21- android:radius="10dip" />
22-
23- </shape>
24- </item>
25-</layer-list>
26-</item>
27-
28-<!-- ボタンが押されていない -->
29-<!-- フォーカスされていない -->
30-<item android:state_pressed="false"
31- android:state_focused="false">
32-<layer-list>
33- <item>
34- <shape
35- xmlns:android="http://schemas.android.com/apk/res/android"
36- android:shape="rectangle">
37- <gradient
38- android:angle="90"
39- android:startColor="#F5F5F5"
40- android:endColor="#A9A9A9"
41- android:type="linear"
42- />
43- <corners
44- android:radius="10dip" />
45- <stroke
46- android:width="2dip"
47- android:color="#C0C0C0"/>
48- </shape>
49- </item>
50-</layer-list>
51-</item>
52-
53-<!-- ボタンが押されている -->
54-<!-- フォーカスされた -->
55-<item android:state_pressed="true"
56- android:state_focused="true">
57-<layer-list>
58- <item>
59- <shape
60- xmlns:android="http://schemas.android.com/apk/res/android"
61- android:shape="rectangle">
62- <gradient
63- android:angle="90"
64- android:startColor="#A9A9A9"
65- android:endColor="#C0C0C0"
66- android:type="linear" />
67- <corners
68- android:radius="10dip" />
69- <stroke
70- android:width="4dip"
71- android:color="#FF0000"/>
72- </shape>
73- </item>
74-</layer-list>
75-</item>
76-
77-<!-- ボタンが押されていない -->
78-<!-- フォーカスされた -->
79-<item android:state_pressed="false"
80- android:state_focused="true">
81-<layer-list>
82- <item>
83- <shape
84- xmlns:android="http://schemas.android.com/apk/res/android"
85- android:shape="rectangle">
86- <gradient
87- android:angle="90"
88- android:startColor="#F5F5F5"
89- android:endColor="#A9A9A9"
90- android:type="linear" />
91- <corners
92- android:radius="10dip" />
93- <stroke
94- android:width="2dip"
95- android:color="#FF6600"/>
96- </shape>
97- </item>
98-</layer-list>
99-</item>
100-
101-</selector>
102-
--- branch/user/nakamura/Formation/res/drawable/gacha_button.xml (revision 120)
+++ branch/user/nakamura/Formation/res/drawable/gacha_button.xml (nonexistent)
@@ -1,78 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
3-
4- <item>
5- <shape>
6- <solid android:color="@android:color/transparent" />
7- </shape>
8- </item>
9- <item
10- android:bottom="8dip"
11- android:left="5dip"
12- android:right="5dip"
13- android:top="5dip">
14- <selector>
15- <item android:state_pressed="true">
16- <shape>
17- <gradient
18- android:angle="90"
19- android:endColor="@color/basic_yellow"
20- android:startColor="@color/basic_orange1" />
21-
22- <corners android:radius="10dip" />
23-
24- <stroke
25- android:width="2dip"
26- android:color="@color/basic_green1" />
27-
28- <padding
29- android:bottom="15dip"
30- android:left="15dip"
31- android:right="15dip"
32- android:top="15dip" />
33- </shape>
34- </item>
35- <item android:state_focused="true">
36- <shape>
37- <gradient
38- android:angle="90"
39- android:endColor="@color/basic_yellow"
40- android:startColor="@color/basic_orange2" />
41-
42- <corners android:radius="10dip" />
43-
44- <stroke
45- android:width="2dip"
46- android:color="@color/basic_green1" />
47-
48- <padding
49- android:bottom="15dip"
50- android:left="15dip"
51- android:right="15dip"
52- android:top="15dip" />
53- </shape>
54- </item>
55- <item>
56- <shape>
57- <gradient
58- android:angle="90"
59- android:endColor="@color/basic_yellow"
60- android:startColor="@color/basic_pink" />
61-
62- <corners android:radius="10dip" />
63-
64- <stroke
65- android:width="2dip"
66- android:color="@color/basic_green1" />
67-
68- <padding
69- android:bottom="15dip"
70- android:left="15dip"
71- android:right="15dip"
72- android:top="15dip" />
73- </shape>
74- </item>
75- </selector>
76- </item>
77-
78-</layer-list>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/drawable/list_custom_true.xml (revision 120)
+++ branch/user/nakamura/Formation/res/drawable/list_custom_true.xml (nonexistent)
@@ -1,7 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
3- <gradient
4- android:startColor="@color/uniform_theme_sub"
5- android:endColor="@color/uniform_theme_sub"/>
6-
7-</shape>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/layout/membereditor_layout_activity.xml (revision 120)
+++ branch/user/nakamura/Formation/res/layout/membereditor_layout_activity.xml (nonexistent)
@@ -1,32 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3- android:layout_width="match_parent"
4- android:layout_height="match_parent"
5- android:background="@color/uniform_theme_main"
6- android:orientation="vertical" >
7-
8- <include layout="@layout/header" />
9- <ListView
10- android:id="@+id/listview"
11- android:layout_width="fill_parent"
12- android:layout_height="0dip"
13- android:layout_weight="1"
14- android:cacheColorHint="@color/clear_color"
15- android:ellipsize="end"
16- android:isScrollContainer="false"
17- android:scrollHorizontally="true"
18- android:listSelector="@drawable/selector_list"
19- android:scrollbarThumbVertical="@drawable/scrollbar_design" />
20-
21- <Button
22- android:id="@+id/member_editor_btn"
23- android:layout_width="match_parent"
24- android:layout_height="0dp"
25- android:layout_marginBottom="@dimen/btn_margin_main"
26- android:layout_marginLeft="@dimen/btn_margin_main"
27- android:layout_marginRight="@dimen/btn_margin_main"
28- android:layout_weight="0.1"
29- android:background="@drawable/selector_button"
30- android:text="@string/member_btn_main" />
31-
32-</LinearLayout>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/layout/playresulteditor_layout.xml (revision 120)
+++ branch/user/nakamura/Formation/res/layout/playresulteditor_layout.xml (nonexistent)
@@ -1,126 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3- android:layout_width="fill_parent"
4- android:layout_height="fill_parent"
5- android:orientation="vertical"
6- android:background="@color/uniform_theme_main" >
7-
8- <include layout="@layout/header"/>
9-
10- <LinearLayout
11- android:layout_width="fill_parent"
12- android:layout_height="0dp"
13- android:layout_weight="0.1"
14- android:layout_marginTop="@dimen/btn_margin_main"
15- android:layout_marginBottom="@dimen/btn_margin_main" >
16- <Button
17- android:id="@+id/team1_btn"
18- android:layout_width="fill_parent"
19- android:layout_height="fill_parent"
20- android:layout_weight="1"
21- android:textColor="@color/red"
22- android:text="@string/team1_btn"
23- android:layout_marginLeft="@dimen/btn_margin_main"
24- android:layout_marginRight="@dimen/btn_margin_main"
25- android:background="@drawable/selector_button" />
26-
27- <TextView
28- android:id="@+id/vs_label1"
29- android:layout_width="wrap_content"
30- android:layout_height="wrap_content"
31- android:textSize="25sp"
32- android:text="@string/vs_label" />
33-
34- <Button
35- android:id="@+id/team2_btn"
36- android:layout_width="fill_parent"
37- android:layout_height="fill_parent"
38- android:layout_weight="1"
39- android:textColor="@color/blue2"
40- android:text="@string/team2_btn"
41- android:layout_marginLeft="@dimen/btn_margin_main"
42- android:layout_marginRight="@dimen/btn_margin_main"
43- android:background="@drawable/selector_button" />
44-
45- </LinearLayout>
46- <LinearLayout
47- android:layout_width="fill_parent"
48- android:layout_height="0dp"
49- android:layout_weight="0.1" >
50- <TextView
51- android:id="@+id/scoreinit_label1"
52- android:layout_width="wrap_content"
53- android:layout_height="fill_parent"
54- android:layout_weight="1"
55- android:gravity="center"
56- android:textSize="25sp"
57- android:textColor="@color/red"
58- android:text="@string/scoreinit_label"
59- android:textAppearance="?android:attr/textAppearanceLarge" />
60-
61- <TextView
62- android:id="@+id/vs_label2"
63- android:layout_width="wrap_content"
64- android:layout_height="wrap_content"
65- android:textSize="25sp"
66- android:text="@string/vs_label" />
67-
68- <TextView
69- android:id="@+id/scoreinit_label2"
70- android:layout_width="wrap_content"
71- android:layout_height="fill_parent"
72- android:layout_weight="1"
73- android:gravity="center"
74- android:textColor="@color/blue2"
75- android:textSize="25sp"
76- android:text="@string/scoreinit_label"
77- android:textAppearance="?android:attr/textAppearanceLarge" />
78- </LinearLayout>
79-
80- <ListView
81- android:id="@+id/listview"
82- android:layout_width="fill_parent"
83- android:layout_height="0dip"
84- android:layout_weight="1" >
85-
86- </ListView>
87-
88- <Button
89- android:id="@+id/copy_btn"
90- android:layout_width="fill_parent"
91- android:layout_height="0dp"
92- android:layout_weight="0.1"
93- android:text="@string/result_copy"
94- android:layout_marginBottom="@dimen/btn_margin_main"
95- android:layout_marginLeft="@dimen/btn_margin_main"
96- android:layout_marginRight="@dimen/btn_margin_main"
97- android:background="@drawable/selector_button" />
98-
99- <LinearLayout
100- android:id="@+id/footer"
101- android:layout_height="0dp"
102- android:layout_width="fill_parent"
103- android:layout_weight="0.1"
104- android:layout_marginBottom="@dimen/btn_margin_main"
105- android:orientation="horizontal">
106-
107- <Button
108- android:id="@+id/ok_btn"
109- android:layout_width="fill_parent"
110- android:layout_height="fill_parent"
111- android:text="@string/ok_label"
112- android:layout_weight="1"
113- android:layout_marginLeft="@dimen/btn_margin_main"
114- android:layout_marginRight="@dimen/btn_margin_main"
115- android:background="@drawable/selector_button" />
116-
117- <Button
118- android:id="@+id/cancel_btn"
119- android:layout_width="fill_parent"
120- android:layout_height="fill_parent"
121- android:layout_weight="1"
122- android:text="@string/cancel_label"
123- android:layout_marginRight="@dimen/btn_margin_main"
124- android:background="@drawable/selector_button" />
125- </LinearLayout>
126- </LinearLayout>
--- branch/user/nakamura/Formation/res/layout/teamselect_layout.xml (revision 120)
+++ branch/user/nakamura/Formation/res/layout/teamselect_layout.xml (nonexistent)
@@ -1,17 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3- android:layout_width="match_parent"
4- android:layout_height="match_parent"
5- android:background="@color/uniform_theme_main"
6- android:orientation="vertical" >
7-
8- <include layout="@layout/header"/>
9-
10- <ListView
11- android:id="@+id/listview"
12- android:layout_width="fill_parent"
13- android:layout_height="fill_parent"
14- android:ellipsize="end"
15- android:scrollHorizontally="true" />
16-
17-</LinearLayout>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/layout/playpointeditor_layout.xml (revision 120)
+++ branch/user/nakamura/Formation/res/layout/playpointeditor_layout.xml (nonexistent)
@@ -1,72 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3- android:layout_width="fill_parent"
4- android:layout_height="fill_parent"
5- android:orientation="vertical"
6- android:background="@color/uniform_theme_main" >
7-
8- <include layout="@layout/header"/>
9-
10- <LinearLayout
11- android:layout_width="fill_parent"
12- android:layout_height="0dp"
13- android:layout_weight="0.1"
14- android:layout_marginTop="@dimen/btn_margin_main"
15- android:layout_marginBottom="@dimen/btn_margin_main" >
16-
17- <Button
18- android:id="@+id/scorer_btn"
19- android:layout_width="fill_parent"
20- android:layout_height="fill_parent"
21- android:layout_weight="1"
22- android:text="@string/scorer_label"
23- android:layout_marginLeft="@dimen/btn_margin_main"
24- android:layout_marginRight="@dimen/btn_margin_main"
25- android:background="@drawable/selector_button" />
26-
27-
28- <Button
29- android:id="@+id/assist_btn"
30- android:layout_width="fill_parent"
31- android:layout_height="fill_parent"
32- android:layout_weight="1"
33- android:text="@string/assist_label"
34- android:layout_marginRight="@dimen/btn_margin_main"
35- android:background="@drawable/selector_button" />
36- </LinearLayout>
37-
38- <LinearLayout
39- android:layout_width="fill_parent"
40- android:layout_height="0dip"
41- android:layout_weight="1"
42- android:orientation="vertical" >
43- </LinearLayout>
44-
45- <LinearLayout
46- android:id="@+id/footer"
47- android:layout_height="0dp"
48- android:layout_width="fill_parent"
49- android:layout_weight="0.1"
50- android:layout_marginBottom="@dimen/btn_margin_main"
51- android:orientation="horizontal">
52- <Button
53- android:id="@+id/ok_btn"
54- android:layout_width="fill_parent"
55- android:layout_height="fill_parent"
56- android:layout_weight="1"
57- android:text="@string/ok_label"
58- android:layout_marginLeft="@dimen/btn_margin_main"
59- android:layout_marginRight="@dimen/btn_margin_main"
60- android:background="@drawable/selector_button" />
61-
62- <Button
63- android:id="@+id/cancel_btn"
64- android:layout_width="fill_parent"
65- android:layout_height="fill_parent"
66- android:layout_weight="1"
67- android:text="@string/cancel_label"
68- android:layout_marginRight="@dimen/btn_margin_main"
69- android:background="@drawable/selector_button" />
70-
71- </LinearLayout>
72-</LinearLayout>
--- branch/user/nakamura/Formation/res/layout/main.xml (revision 120)
+++ branch/user/nakamura/Formation/res/layout/main.xml (nonexistent)
@@ -1,86 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3- android:layout_width="match_parent"
4- android:layout_height="match_parent"
5- android:background="@color/uniform_theme_main"
6- android:orientation="vertical" >
7-
8- <!-- <TextView
9- android:layout_width="fill_parent"
10- android:layout_height="wrap_content"
11- android:text="@string/hello" /> -->
12- <!-- タイトルのレイアウト -->
13- <LinearLayout
14- android:id="@+id/header_group"
15- android:layout_width="match_parent"
16- android:layout_height="0dp"
17- android:layout_weight="5"
18- android:orientation="vertical" >
19-
20- <include layout="@layout/header"/>
21- <!-- タイトル(GACHAPIN) -->
22-<!--
23- <TextView
24- android:id="@+id/textView1"
25- android:layout_width="match_parent"
26- android:layout_height="match_parent"
27- android:gravity="center"
28- android:text="@string/title_main"
29- android:textColor="@color/white"
30- android:textSize="@dimen/title_text_size" />
31--->
32- <ListView
33- android:id="@+id/listview"
34- android:layout_width="fill_parent"
35- android:layout_height="fill_parent"
36- android:ellipsize="end"
37- android:isScrollContainer="false"
38- android:scrollHorizontally="true" />
39- </LinearLayout>
40-
41- <!-- ボタンのレイアウト -->
42- <LinearLayout
43- android:id="@+id/button_group"
44- android:layout_width="fill_parent"
45- android:layout_height="0dp"
46- android:orientation="vertical"
47- android:layout_weight="2" >
48-
49- <!-- 試合開始ボタン -->
50- <Button
51- android:id="@+id/play_info_editor_btn"
52- android:layout_width="match_parent"
53- android:layout_height="0dp"
54- android:layout_marginBottom="@dimen/btn_margin_main"
55- android:layout_marginLeft="@dimen/btn_margin_main"
56- android:layout_marginRight="@dimen/btn_margin_main"
57- android:layout_weight="1"
58- android:background="@drawable/selector_button"
59- android:text="@string/match_btn_main" />
60-
61- <!-- チーム編集ボタン -->
62- <Button
63- android:id="@+id/team_editor_btn"
64- android:layout_width="match_parent"
65- android:layout_height="0dp"
66- android:layout_marginBottom="@dimen/btn_margin_main"
67- android:layout_marginLeft="@dimen/btn_margin_main"
68- android:layout_marginRight="@dimen/btn_margin_main"
69- android:layout_weight="1"
70- android:background="@drawable/selector_button"
71- android:text="@string/team_btn_main" />
72-
73- <!-- メンバー編集ボタン -->
74- <Button
75- android:id="@+id/member_editor_btn"
76- android:layout_width="match_parent"
77- android:layout_height="0dp"
78- android:layout_marginBottom="@dimen/btn_margin_main"
79- android:layout_marginLeft="@dimen/btn_margin_main"
80- android:layout_marginRight="@dimen/btn_margin_main"
81- android:layout_weight="1"
82- android:background="@drawable/selector_button"
83- android:text="@string/member_btn_main" />
84- </LinearLayout>
85-
86-</LinearLayout>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/layout/memberselect_layout.xml (revision 120)
+++ branch/user/nakamura/Formation/res/layout/memberselect_layout.xml (nonexistent)
@@ -1,45 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3- android:layout_width="fill_parent"
4- android:layout_height="fill_parent"
5- android:background="@color/uniform_theme_main"
6- android:orientation="vertical" >
7-
8- <include layout="@layout/header"/>
9-
10- <ListView
11- android:id="@+id/listview"
12- android:layout_width="fill_parent"
13- android:layout_height="0dip"
14- android:layout_weight="1"
15- android:layout_above="@+id/ok_btn"
16- android:ellipsize="end"
17- android:scrollHorizontally="true" />
18-
19- <LinearLayout
20- android:layout_height="0dp"
21- android:layout_width="fill_parent"
22- android:layout_weight="0.1"
23- android:layout_marginBottom="@dimen/btn_margin_main"
24- android:orientation="horizontal">
25- <Button
26- android:id="@+id/ok_btn"
27- android:layout_width="fill_parent"
28- android:layout_height="fill_parent"
29- android:layout_weight="1"
30- android:text="@string/ok_label"
31- android:layout_marginLeft="@dimen/btn_margin_main"
32- android:layout_marginRight="@dimen/btn_margin_main"
33- android:background="@drawable/selector_button" />
34-
35- <Button
36- android:id="@+id/cancel_btn"
37- android:layout_width="fill_parent"
38- android:layout_height="fill_parent"
39- android:layout_weight="1"
40- android:text="@string/cancel_label"
41- android:layout_marginRight="@dimen/btn_margin_main"
42- android:background="@drawable/selector_button" />
43-
44- </LinearLayout>
45-</LinearLayout>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/layout/playinfoeditor_layout.xml (revision 120)
+++ branch/user/nakamura/Formation/res/layout/playinfoeditor_layout.xml (nonexistent)
@@ -1,85 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3- android:layout_width="match_parent"
4- android:layout_height="match_parent"
5- android:background="@color/uniform_theme_main"
6- android:orientation="vertical" >
7-
8- <include layout="@layout/header"/>
9-
10- <LinearLayout
11- android:layout_width="fill_parent"
12- android:layout_height="0dp"
13- android:layout_weight="0.1"
14- android:layout_marginTop="@dimen/btn_margin_main"
15- android:layout_marginBottom="@dimen/btn_margin_main" >
16- <Button
17- android:id="@+id/date_btn"
18- android:layout_width="fill_parent"
19- android:layout_height="fill_parent"
20- android:text="@string/date_btn"
21- android:layout_marginLeft="@dimen/btn_margin_main"
22- android:layout_marginRight="@dimen/btn_margin_main"
23- android:background="@drawable/selector_button" />
24- </LinearLayout>
25-
26- <LinearLayout
27- android:layout_width="fill_parent"
28- android:layout_height="0dp"
29- android:layout_weight="0.1"
30- android:layout_marginBottom="@dimen/btn_margin_main" >
31- <Button
32- android:id="@+id/team1_btn"
33- android:layout_width="fill_parent"
34- android:layout_height="fill_parent"
35- android:layout_weight="1"
36- android:text="@string/team1_btn"
37- android:layout_marginLeft="@dimen/btn_margin_main"
38- android:layout_marginRight="@dimen/btn_margin_main"
39- android:background="@drawable/selector_button" />
40-
41- <Button
42- android:id="@+id/team2_btn"
43- android:layout_width="fill_parent"
44- android:layout_height="fill_parent"
45- android:layout_weight="1"
46- android:text="@string/team2_btn"
47- android:layout_marginRight="@dimen/btn_margin_main"
48- android:background="@drawable/selector_button" />
49- </LinearLayout>
50-
51- <LinearLayout
52- android:layout_width="fill_parent"
53- android:layout_height="0dip"
54- android:layout_weight="1"
55- android:orientation="vertical" >
56- </LinearLayout>
57-
58- <LinearLayout
59- android:id="@+id/footer"
60- android:layout_height="0dp"
61- android:layout_width="fill_parent"
62- android:layout_weight="0.1"
63- android:layout_marginBottom="@dimen/btn_margin_main"
64- android:orientation="horizontal">
65- <Button
66- android:id="@+id/ok_btn"
67- android:layout_width="fill_parent"
68- android:layout_height="fill_parent"
69- android:layout_weight="1"
70- android:text="@string/ok_label"
71- android:layout_marginLeft="@dimen/btn_margin_main"
72- android:layout_marginRight="@dimen/btn_margin_main"
73- android:background="@drawable/selector_button" />
74-
75- <Button
76- android:id="@+id/cancel_btn"
77- android:layout_width="fill_parent"
78- android:layout_height="fill_parent"
79- android:layout_weight="1"
80- android:text="@string/cancel_label"
81- android:layout_marginRight="@dimen/btn_margin_main"
82- android:background="@drawable/selector_button" />
83-
84- </LinearLayout>
85-</LinearLayout>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/layout/teammemberselect_layout.xml (revision 120)
+++ branch/user/nakamura/Formation/res/layout/teammemberselect_layout.xml (nonexistent)
@@ -1,8 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3- android:layout_width="match_parent"
4- android:layout_height="match_parent"
5- android:orientation="vertical" >
6-
7-
8-</LinearLayout>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/layout/header.xml (revision 120)
+++ branch/user/nakamura/Formation/res/layout/header.xml (nonexistent)
@@ -1,15 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3- android:layout_width="match_parent"
4- android:layout_height="@dimen/header_height"
5- android:background="@color/uniform_theme_sub" >
6-
7- <TextView
8- android:id="@+id/header_title"
9- android:layout_width="wrap_content"
10- android:layout_height="wrap_content"
11- android:textSize="@dimen/header_text_size"
12- android:layout_centerInParent="true"
13- android:textColor="@android:color/black" />
14-
15-</RelativeLayout>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/layout/teameditor_layout.xml (revision 120)
+++ branch/user/nakamura/Formation/res/layout/teameditor_layout.xml (nonexistent)
@@ -1,62 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3- android:layout_width="fill_parent"
4- android:layout_height="fill_parent"
5- android:background="@color/uniform_theme_main"
6- android:orientation="vertical" >
7-
8- <include layout="@layout/header"/>
9- <EditText
10- android:id="@+id/teamname_et"
11- android:layout_width="fill_parent"
12- android:layout_height="wrap_content"
13- android:inputType="textPersonName"
14- android:hint="@string/teamname_hint" />
15-
16- <ListView
17- android:id="@+id/listview"
18- android:layout_width="fill_parent"
19- android:layout_height="0dip"
20- android:layout_weight="1"
21- android:ellipsize="end"
22- android:isScrollContainer="false"
23- android:scrollHorizontally="true" />
24-
25- <Button
26- android:id="@+id/add_btn"
27- android:layout_width="fill_parent"
28- android:layout_height="0dp"
29- android:layout_weight="0.1"
30- android:text="@string/memberadd_label"
31- android:layout_marginBottom="@dimen/btn_margin_main"
32- android:layout_marginLeft="@dimen/btn_margin_main"
33- android:layout_marginRight="@dimen/btn_margin_main"
34- android:background="@drawable/selector_button" />
35-
36- <LinearLayout
37- android:layout_height="0dp"
38- android:layout_weight="0.1"
39- android:layout_width="fill_parent"
40- android:layout_marginBottom="@dimen/btn_margin_main"
41- android:orientation="horizontal">
42- <Button
43- android:id="@+id/ok_btn"
44- android:layout_width="fill_parent"
45- android:layout_height="fill_parent"
46- android:layout_weight="1"
47- android:text="@string/edit_complete"
48- android:layout_marginLeft="@dimen/btn_margin_main"
49- android:layout_marginRight="@dimen/btn_margin_main"
50- android:background="@drawable/selector_button" />
51-
52- <Button
53- android:id="@+id/cancel_btn"
54- android:layout_width="fill_parent"
55- android:layout_height="fill_parent"
56- android:layout_weight="1"
57- android:text="@string/cancel_label"
58- android:layout_marginRight="@dimen/btn_margin_main"
59- android:background="@drawable/selector_button" />
60-
61- </LinearLayout>
62-</LinearLayout>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/values/dimen.xml (revision 120)
+++ branch/user/nakamura/Formation/res/values/dimen.xml (nonexistent)
@@ -1,11 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<resources>
3-
4- <!-- メイン画面 -->
5- <dimen name="btn_margin_main">10dp</dimen>
6- <dimen name="title_text_size">54sp</dimen>
7-
8- <!-- ヘッダ -->
9- <dimen name="header_text_size">30sp</dimen>
10- <dimen name="header_height">50dp</dimen>
11-</resources>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/values/color.xml (revision 120)
+++ branch/user/nakamura/Formation/res/values/color.xml (nonexistent)
@@ -1,22 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<resources>
3-
4- <color name="red">#FF0000</color>
5- <color name="red2">#E60012</color>
6- <color name="blue">#0000FF</color>
7- <color name="blue2">#00A0E9</color>
8- <color name="white">#FFFFFF</color>
9- <color name="black">#000000</color>
10- <color name="green">#00FF00</color>
11- <color name="uniform_theme_sub">#8bcdfd</color>
12- <color name="uniform_theme_main">#7b233b</color>
13- <color name="clear_color">#00000000</color>
14- <color name="basic_green1">#6fb843</color>
15- <color name="basic_green2">#a0ca38</color>
16- <color name="basic_orange1">#99eca14f</color>
17- <color name="basic_orange2">#66eca14f</color>
18- <color name="basic_yellow">#f8f000</color>
19- <color name="basic_pink">#f19dbe</color>
20- <color name="cyan">#00FFFF</color>
21-
22-</resources>
\ No newline at end of file
--- branch/user/nakamura/Formation/res/values/strings.xml (revision 120)
+++ branch/user/nakamura/Formation/res/values/strings.xml (nonexistent)
@@ -1,64 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<resources>
3-
4- <string name="hello">Hello World, VersusActivity!</string>
5- <string name="app_name">Versus</string>
6-
7- <string name="add_btn">メンバー追加</string>
8-
9- <string name="teamname_hint">チーム名</string>
10-
11- <string name="memberadd_label">メンバー選択</string>
12- <string name="ok_label">OK</string>
13- <string name="cancel_label">キャンセル</string>
14- <string name="vs_label">対</string>
15- <string name="scoreinit_label">0</string>
16- <string name="scorer_label">得点者</string>
17- <string name="assist_label">アシスト</string>
18-
19- <string name="add">追加</string>
20- <string name="edit">編集</string>
21-
22- <!-- メイン画面 -->
23- <string name="match_btn_main">試合開始</string>
24- <string name="team_btn_main">チーム編集</string>
25- <string name="member_btn_main">メンバー編集</string>
26- <string name="title_main">GACHAPIN</string>
27- <string name="header_main">メイン画面</string>
28-
29- <!-- メンバー編集画面 -->
30- <string name="header_member_edit">メンバー編集画面</string>
31-
32- <!-- チーム編集画面 -->
33- <string name="header_team_editor">チーム編集画面</string>
34- <string name="edit_complete">編集完了</string>
35- <string name="error_member_add">チーム名を入力してください</string>
36-
37- <!-- メンバー選択画面 -->
38- <string name="header_member_select">メンバー選択画面</string>
39- <string name="header_score_select">得点者選択画面</string>
40- <string name="header_assist_select">アシスト選択画面</string>
41-
42- <!-- 試合結果編集画面 -->
43- <string name="header_play_result_editor">試合結果編集画面</string>
44- <string name="date_btn">試合日</string>
45- <string name="team1_btn">チーム1</string>
46- <string name="team2_btn">チーム2</string>
47- <string name="date_error">試合日を入力してください。</string>
48- <string name="team_error">チームを入力してください。</string>
49- <string name="result_copy">結果をコピー</string>
50- <string name="result_copy_complete">結果をコピーしました</string>
51-
52- <!-- チーム選択画面 -->
53- <string name="header_team_select">チーム選択画面</string>
54-
55- <!-- 試合結果表示画面 -->
56- <string name="header_play_result">試合結果表示画面</string>
57-
58- <!-- 得点詳細入力画面 -->
59- <string name="header_play_point_edit">得点詳細入力画面</string>
60- <string name="score">得点者</string>
61- <string name="assist">アシスト</string>
62- <string name="player_unknown">不明</string>
63-
64-</resources>
--- branch/user/nakamura/Formation/res/values/styles.xml (revision 120)
+++ branch/user/nakamura/Formation/res/values/styles.xml (nonexistent)
@@ -1,26 +0,0 @@
1-<?xml version="1.0" encoding="utf-8"?>
2-<resources>
3-
4- <style name="GreenAlertDialogStyle">
5- <item name="android:fullBright">@android:color/transparent</item>
6- <item name="android:fullDark">@android:color/transparent</item>
7- <item name="android:topBright">@color/basic_green1</item>
8- <item name="android:topDark">@color/basic_green1</item>
9- <item name="android:centerBright">@color/basic_green2</item>
10- <item name="android:centerDark">@color/basic_green2</item>
11- <item name="android:centerMedium">@color/basic_green2</item>
12- <item name="android:bottomBright">@color/basic_yellow</item>
13- <item name="android:bottomDark">@color/basic_yellow</item>
14- <item name="android:bottomMedium">@color/basic_yellow</item>
15- </style>
16-
17- <style name="GachaButton" parent="@android:style/Widget.Button">
18- <item name="android:background">@drawable/gacha_button</item>
19- </style>
20-
21- <style name="GreenDialog" parent="@android:style/Theme.Dialog">
22- <item name="android:alertDialogStyle">@style/GreenAlertDialogStyle</item>
23- <item name="android:buttonStyle">@style/GachaButton</item>
24- </style>
25-
26-</resources>
\ No newline at end of file
Show on old repository browser