Skip to content

Commit 49a69a7

Browse files
author
flashback
committed
set FLAGs for activity change, add tablet ui support
1 parent 9e4d717 commit 49a69a7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+3189
-42
lines changed

‎AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.flashback.calcestv2"
44
android:versionCode="1"
5-
android:versionName="0.0.5" >
5+
android:versionName="0.0.5.3" >
66

77
<uses-sdk
88
android:minSdkVersion="10"

‎bin/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.flashback.calcestv2"
44
android:versionCode="1"
5-
android:versionName="0.0.5" >
5+
android:versionName="0.0.5.3" >
66

77
<uses-sdk
88
android:minSdkVersion="10"

‎bin/CalcESTv2.apk

14.1 KB
Binary file not shown.

‎bin/classes.dex

4.54 KB
Binary file not shown.

‎bin/classes/auswertungen/AuswertungEV.class

0 Bytes
Binary file not shown.

‎bin/classes/com/flashback/calcestv2/CheckboxAuswahlVeranlagung.class

0 Bytes
Binary file not shown.

‎bin/classes/com/flashback/calcestv2/R$layout.class

51 Bytes
Binary file not shown.

‎bin/classes/com/flashback/calcestv2/R$menu.class

0 Bytes
Binary file not shown.

‎bin/classes/com/flashback/calcestv2/R$string.class

35 Bytes
Binary file not shown.

‎bin/classes/com/flashback/calcestv2/R$style.class

0 Bytes
Binary file not shown.

‎bin/classes/com/flashback/calcestv2/SplashScreenActivity.class

0 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/AgBelastungEV$1.class

671 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/AgBelastungEV.class

419 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/GehaltsscheinEV$1.class

855 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/GehaltsscheinEV.class

583 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/StartBildschirmEV$1.class

595 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/StartBildschirmEV.class

314 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/VorsorgeEV$1.class

799 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/VorsorgeEV.class

532 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/WerbungskostenEV$1.class

732 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/WerbungskostenEV.class

475 Bytes
Binary file not shown.

‎bin/classes/zusammenVeranlagung/StartBildschirmZV.class

0 Bytes
Binary file not shown.

‎bin/resources.ap_

12.1 KB
Binary file not shown.

‎gen/com/flashback/calcestv2/R.java

+12-10
Original file line numberDiff line numberDiff line change
@@ -127,16 +127,17 @@ public static final class id {
127127
}
128128
public static final class layout {
129129
public static final int activity_base_credits=0x7f030000;
130-
public static final int activity_base_popup=0x7f030001;
131-
public static final int activity_base_splash_screen=0x7f030002;
132-
public static final int activity_base_veranlagung_chb=0x7f030003;
133-
public static final int activity_ev_agbelastung=0x7f030004;
134-
public static final int activity_ev_auswertung=0x7f030005;
135-
public static final int activity_ev_gehaltsschein=0x7f030006;
136-
public static final int activity_ev_start=0x7f030007;
137-
public static final int activity_ev_vorsorge=0x7f030008;
138-
public static final int activity_ev_werbungskosten=0x7f030009;
139-
public static final int activity_zv_start=0x7f03000a;
130+
public static final int activity_base_fehlermeldung=0x7f030001;
131+
public static final int activity_base_popup=0x7f030002;
132+
public static final int activity_base_splash_screen=0x7f030003;
133+
public static final int activity_base_veranlagung_chb=0x7f030004;
134+
public static final int activity_ev_agbelastung=0x7f030005;
135+
public static final int activity_ev_auswertung=0x7f030006;
136+
public static final int activity_ev_gehaltsschein=0x7f030007;
137+
public static final int activity_ev_start=0x7f030008;
138+
public static final int activity_ev_vorsorge=0x7f030009;
139+
public static final int activity_ev_werbungskosten=0x7f03000a;
140+
public static final int activity_zv_start=0x7f03000b;
140141
}
141142
public static final class menu {
142143
public static final int activity_ev_auswertung=0x7f080000;
@@ -183,6 +184,7 @@ public static final class string {
183184
public static final int personenkreis=0x7f05000b;
184185
public static final int personenkreis2=0x7f05000d;
185186
public static final int pflegeVers=0x7f050015;
187+
public static final int popupFehler=0x7f050040;
186188
public static final int popup_text=0x7f05003e;
187189
public static final int rentenVers=0x7f050014;
188190
public static final int riesterVers=0x7f050020;

‎lint.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<lint>
3-
<issue id="InlinedApi">
3+
<issue id="InlinedApi" severity="ignore">
44
<ignore path="src\auswertungen\AuswertungEV.java" />
55
</issue>
66
</lint>

‎res/layout-sw600dp/activity_base_credits.xml

+194
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/RelativeLayout2"
4+
android:layout_width="match_parent"
5+
android:layout_height="fill_parent"
6+
android:background="@drawable/background_activities_sub" >
7+
8+
<ScrollView
9+
android:id="@+id/scrollView1"
10+
android:layout_width="fill_parent"
11+
android:layout_height="match_parent"
12+
android:layout_centerHorizontal="true"
13+
android:layout_marginTop="60dp" >
14+
15+
<RelativeLayout
16+
android:id="@+id/RelativeLayout1"
17+
android:layout_width="match_parent"
18+
android:layout_height="400dp"
19+
android:background="@drawable/background_activities"
20+
android:orientation="vertical" >
21+
22+
<TextView
23+
android:id="@+id/textView1"
24+
android:layout_width="wrap_content"
25+
android:layout_height="wrap_content"
26+
android:layout_alignParentTop="true"
27+
android:layout_centerHorizontal="true"
28+
android:layout_marginTop="30dp"
29+
android:text="@string/button_credits"
30+
android:textAppearance="?android:attr/textAppearanceMedium"
31+
android:textColor="@color/text_color_lightgrey"/>
32+
33+
<TextView
34+
android:id="@+id/textView2"
35+
android:layout_width="wrap_content"
36+
android:layout_height="wrap_content"
37+
android:layout_alignParentLeft="true"
38+
android:layout_below="@+id/textView1"
39+
android:layout_marginLeft="230dp"
40+
android:layout_marginTop="50dp"
41+
android:text="@string/tvLines"
42+
android:textColor="@color/text_color_lightgrey"
43+
android:textColorHint="@color/text_color_lightgrey"
44+
android:textColorLink="@color/text_color_lightgrey" />
45+
46+
<TextView
47+
android:id="@+id/textView3"
48+
android:layout_width="wrap_content"
49+
android:layout_height="wrap_content"
50+
android:layout_alignLeft="@+id/textView2"
51+
android:layout_below="@+id/textView2"
52+
android:layout_marginTop="23dp"
53+
android:text="@string/tvLines"
54+
android:textColor="@color/text_color_lightgrey"
55+
android:textColorHint="@color/text_color_lightgrey"
56+
android:textColorLink="@color/text_color_lightgrey" />
57+
58+
<TextView
59+
android:id="@+id/textView4"
60+
android:layout_width="wrap_content"
61+
android:layout_height="wrap_content"
62+
android:layout_alignLeft="@+id/textView3"
63+
android:layout_below="@+id/textView3"
64+
android:layout_marginTop="25dp"
65+
android:text="@string/tvLines"
66+
android:textColor="@color/text_color_lightgrey"
67+
android:textColorHint="@color/text_color_lightgrey"
68+
android:textColorLink="@color/text_color_lightgrey" />
69+
70+
<TextView
71+
android:id="@+id/textView5"
72+
android:layout_width="wrap_content"
73+
android:layout_height="wrap_content"
74+
android:layout_alignLeft="@+id/textView4"
75+
android:layout_below="@+id/textView4"
76+
android:layout_marginTop="25dp"
77+
android:text="@string/tvLines"
78+
android:textColor="@color/text_color_lightgrey"
79+
android:textColorHint="@color/text_color_lightgrey"
80+
android:textColorLink="@color/text_color_lightgrey" />
81+
82+
<TextView
83+
android:id="@+id/textView6"
84+
android:layout_width="wrap_content"
85+
android:layout_height="wrap_content"
86+
android:layout_alignLeft="@+id/textView5"
87+
android:layout_below="@+id/textView5"
88+
android:layout_marginTop="25dp"
89+
android:text="@string/tvLines"
90+
android:textColor="@color/text_color_lightgrey"
91+
android:textColorHint="@color/text_color_lightgrey"
92+
android:textColorLink="@color/text_color_lightgrey" />
93+
94+
<TextView
95+
android:id="@+id/textView7"
96+
android:layout_width="wrap_content"
97+
android:layout_height="wrap_content"
98+
android:layout_alignLeft="@+id/textView6"
99+
android:layout_below="@+id/textView6"
100+
android:layout_marginTop="25dp"
101+
android:text="@string/tvLines"
102+
android:textColor="@color/text_color_lightgrey"
103+
android:textColorHint="@color/text_color_lightgrey"
104+
android:textColorLink="@color/text_color_lightgrey" />
105+
106+
<TextView
107+
android:id="@+id/textView8"
108+
android:layout_width="wrap_content"
109+
android:layout_height="wrap_content"
110+
android:layout_alignLeft="@+id/textView7"
111+
android:layout_below="@+id/textView7"
112+
android:layout_marginTop="25dp"
113+
android:text="@string/tvLines"
114+
android:textColor="@color/text_color_lightgrey"
115+
android:textColorHint="@color/text_color_lightgrey"
116+
android:textColorLink="@color/text_color_lightgrey" />
117+
118+
<TextView
119+
android:id="@+id/textView9"
120+
android:layout_width="wrap_content"
121+
android:layout_height="wrap_content"
122+
android:layout_alignLeft="@+id/textView8"
123+
android:layout_below="@+id/textView8"
124+
android:layout_marginTop="25dp"
125+
android:text="@string/tvLines"
126+
android:textColor="@color/text_color_lightgrey"
127+
android:textColorHint="@color/text_color_lightgrey"
128+
android:textColorLink="@color/text_color_lightgrey" />
129+
130+
<TextView
131+
android:id="@+id/textView10"
132+
android:layout_width="wrap_content"
133+
android:layout_height="wrap_content"
134+
android:layout_alignLeft="@+id/textView9"
135+
android:layout_below="@+id/textView9"
136+
android:layout_marginTop="25dp"
137+
android:text="@string/tvLines"
138+
android:textColor="@color/text_color_lightgrey"
139+
android:textColorHint="@color/text_color_lightgrey"
140+
android:textColorLink="@color/text_color_lightgrey" />
141+
142+
<TextView
143+
android:id="@+id/textView11"
144+
android:layout_width="wrap_content"
145+
android:layout_height="wrap_content"
146+
android:layout_alignLeft="@+id/textView10"
147+
android:layout_below="@+id/textView10"
148+
android:layout_marginTop="25dp"
149+
android:text="@string/tvLines"
150+
android:textColor="@color/text_color_lightgrey"
151+
android:textColorHint="@color/text_color_lightgrey"
152+
android:textColorLink="@color/text_color_lightgrey" />
153+
154+
<TextView
155+
android:id="@+id/textView12"
156+
android:layout_width="wrap_content"
157+
android:layout_height="wrap_content"
158+
android:layout_alignLeft="@+id/textView2"
159+
android:layout_below="@+id/textView1"
160+
android:layout_marginTop="15dp"
161+
android:text="@string/tvOpenSoucre"
162+
android:textAppearance="?android:attr/textAppearanceSmall"
163+
android:textColor="@color/text_color_lightgrey"
164+
android:textColorHint="@color/text_color_lightgrey"
165+
android:textColorLink="@color/text_color_lightgrey" />
166+
167+
<TextView
168+
android:id="@+id/textView13"
169+
android:layout_width="wrap_content"
170+
android:layout_height="wrap_content"
171+
android:layout_alignLeft="@+id/textView11"
172+
android:layout_below="@+id/textView11"
173+
android:layout_marginTop="25dp"
174+
android:text="@string/tvLines"
175+
android:textColor="@color/text_color_lightgrey"
176+
android:textColorHint="@color/text_color_lightgrey"
177+
android:textColorLink="@color/text_color_lightgrey" />
178+
179+
</RelativeLayout>
180+
</ScrollView>
181+
182+
<Button
183+
android:id="@+id/btnGoToGehaltsschein"
184+
android:layout_width="fill_parent"
185+
android:layout_height="50dp"
186+
android:layout_alignBottom="@+id/RelativeLayout2"
187+
android:layout_alignParentLeft="true"
188+
android:background="@drawable/background_button_black"
189+
android:gravity="center"
190+
android:onClick="BackToAuswertung"
191+
android:text="@string/btn_back"
192+
android:textColor="@color/text_color_black" />
193+
194+
</RelativeLayout>

‎res/layout-sw600dp/activity_base_splash_screen.xml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:background="@drawable/background_splash_screen"
6+
tools:context=".SplashScreenActivity" >
7+
8+
<TextView
9+
android:id="@+id/textView1"
10+
android:layout_width="wrap_content"
11+
android:layout_height="wrap_content"
12+
android:layout_below="@+id/textView2"
13+
android:layout_centerHorizontal="true"
14+
android:layout_marginTop="48dp"
15+
android:text="@string/splashScreen02"
16+
android:textAppearance="?android:attr/textAppearanceMedium"
17+
android:textColor="#ffffffff" />
18+
19+
<ProgressBar
20+
android:id="@+id/progressBar1"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:layout_below="@+id/textView1"
24+
android:layout_centerHorizontal="true"
25+
android:layout_marginTop="48dp" />
26+
27+
<TextView
28+
android:id="@+id/textView2"
29+
android:layout_width="wrap_content"
30+
android:layout_height="wrap_content"
31+
android:layout_alignParentTop="true"
32+
android:layout_centerHorizontal="true"
33+
android:layout_marginTop="150dp"
34+
android:gravity="center_horizontal"
35+
android:text="@string/splashScreen01"
36+
android:textAppearance="?android:attr/textAppearanceLarge"
37+
android:textColor="#ffffffff" />
38+
39+
</RelativeLayout>

‎res/layout-sw600dp/activity_base_veranlagung_chb.xml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:background="@drawable/background_activities_sub" >
6+
7+
<RelativeLayout
8+
android:id="@+id/RelativeLayout1"
9+
android:layout_width="fill_parent"
10+
android:layout_height="380dp"
11+
android:layout_marginTop="60dp"
12+
android:background="@drawable/background_activities" >
13+
14+
<Button
15+
android:id="@+id/btnEV"
16+
android:layout_width="wrap_content"
17+
android:layout_height="wrap_content"
18+
android:layout_alignParentLeft="true"
19+
android:layout_alignParentTop="true"
20+
android:layout_marginLeft="290dp"
21+
android:layout_marginTop="150dp"
22+
android:background="@drawable/background_button_white"
23+
android:text="@string/veranlagungsArt01"
24+
android:textColor="@color/text_color_white" />
25+
26+
<Button
27+
android:id="@+id/btnZV"
28+
android:layout_width="wrap_content"
29+
android:layout_height="wrap_content"
30+
android:layout_alignBaseline="@+id/btnEV"
31+
android:layout_alignBottom="@+id/btnEV"
32+
android:layout_marginLeft="40dp"
33+
android:layout_toRightOf="@+id/btnEV"
34+
android:background="@drawable/background_button_white"
35+
android:text="@string/veranlagungsArt02"
36+
android:textColor="@color/text_color_white" />
37+
38+
</RelativeLayout>
39+
40+
</ScrollView>

0 commit comments

Comments
 (0)