Skip to content

Commit 9e4d717

Browse files
author
flashback
committed
ui rework implement popup
1 parent 63d8b6f commit 9e4d717

Some content is hidden

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

43 files changed

+1086
-822
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.4.3" >
5+
android:versionName="0.0.5" >
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.4.3" >
5+
android:versionName="0.0.5" >
66

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

‎bin/CalcESTv2.apk

2.36 KB
Binary file not shown.

‎bin/classes.dex

2.64 KB
Binary file not shown.

‎bin/classes/auswertungen/AuswertungEV.class

909 Bytes
Binary file not shown.

‎bin/classes/auswertungen/AuswertungsdateiEV.class

84 Bytes
Binary file not shown.

‎bin/classes/berechnungEV/BerechneEV.class

609 Bytes
Binary file not shown.

‎bin/classes/berechnungEV/Summe.class

607 Bytes
Binary file not shown.

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

0 Bytes
Binary file not shown.

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

44 Bytes
Binary file not shown.

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

0 Bytes
Binary file not shown.

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

0 Bytes
Binary file not shown.

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

71 Bytes
Binary file not shown.

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

43 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

-2 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.class

0 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/GehaltsscheinEV.class

0 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/StartBildschirmEV.class

0 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/VorsorgeEV.class

0 Bytes
Binary file not shown.

‎bin/classes/einzelVeranlagung/WerbungskostenEV.class

0 Bytes
Binary file not shown.

‎bin/classes/zusammenVeranlagung/StartBildschirmZV.class

0 Bytes
Binary file not shown.

‎bin/resources.ap_

1.41 KB
Binary file not shown.

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

+123-133
Large diffs are not rendered by default.

‎lint.xml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<lint>
3+
<issue id="InlinedApi">
4+
<ignore path="src\auswertungen\AuswertungEV.java" />
5+
</issue>
6+
</lint>

‎res/drawable/background_activities.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
33
<gradient
44
android:startColor="#CC0B0B61"
5-
android:centerColor="#FF0040FF"
6-
android:endColor="#DE2E2EFE"
5+
android:endColor="#FF0040FF"
76
android:angle="270" />
87
<padding
98
android:left="20dp"

‎res/layout/activity_base_credits.xml

+80-24
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/RelativeLayout2"
34
android:layout_width="match_parent"
4-
android:layout_height="match_parent"
5-
android:background="@drawable/background_activities_sub">
5+
android:layout_height="fill_parent"
6+
android:background="@drawable/background_activities_sub" >
67

7-
<RelativeLayout
8-
android:id="@+id/RelativeLayout1"
9-
android:layout_width="match_parent"
10-
android:layout_height="524dp"
11-
android:background="@drawable/background_activities">
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" >
1214

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+
1322
<TextView
1423
android:id="@+id/textView1"
1524
android:layout_width="wrap_content"
@@ -19,7 +28,7 @@
1928
android:layout_marginTop="30dp"
2029
android:text="@string/button_credits"
2130
android:textAppearance="?android:attr/textAppearanceMedium"
22-
android:textColor="@color/text_color_black" />
31+
android:textColor="@color/text_color_lightgrey"/>
2332

2433
<TextView
2534
android:id="@+id/textView2"
@@ -30,7 +39,9 @@
3039
android:layout_marginLeft="35dp"
3140
android:layout_marginTop="50dp"
3241
android:text="@string/tvLines"
33-
android:textColor="@color/text_color_black" />
42+
android:textColor="@color/text_color_lightgrey"
43+
android:textColorHint="@color/text_color_lightgrey"
44+
android:textColorLink="@color/text_color_lightgrey" />
3445

3546
<TextView
3647
android:id="@+id/textView3"
@@ -40,7 +51,9 @@
4051
android:layout_below="@+id/textView2"
4152
android:layout_marginTop="23dp"
4253
android:text="@string/tvLines"
43-
android:textColor="@color/text_color_black" />
54+
android:textColor="@color/text_color_lightgrey"
55+
android:textColorHint="@color/text_color_lightgrey"
56+
android:textColorLink="@color/text_color_lightgrey" />
4457

4558
<TextView
4659
android:id="@+id/textView4"
@@ -50,7 +63,9 @@
5063
android:layout_below="@+id/textView3"
5164
android:layout_marginTop="25dp"
5265
android:text="@string/tvLines"
53-
android:textColor="@color/text_color_black" />
66+
android:textColor="@color/text_color_lightgrey"
67+
android:textColorHint="@color/text_color_lightgrey"
68+
android:textColorLink="@color/text_color_lightgrey" />
5469

5570
<TextView
5671
android:id="@+id/textView5"
@@ -60,7 +75,9 @@
6075
android:layout_below="@+id/textView4"
6176
android:layout_marginTop="25dp"
6277
android:text="@string/tvLines"
63-
android:textColor="@color/text_color_black" />
78+
android:textColor="@color/text_color_lightgrey"
79+
android:textColorHint="@color/text_color_lightgrey"
80+
android:textColorLink="@color/text_color_lightgrey" />
6481

6582
<TextView
6683
android:id="@+id/textView6"
@@ -70,7 +87,9 @@
7087
android:layout_below="@+id/textView5"
7188
android:layout_marginTop="25dp"
7289
android:text="@string/tvLines"
73-
android:textColor="@color/text_color_black" />
90+
android:textColor="@color/text_color_lightgrey"
91+
android:textColorHint="@color/text_color_lightgrey"
92+
android:textColorLink="@color/text_color_lightgrey" />
7493

7594
<TextView
7695
android:id="@+id/textView7"
@@ -79,8 +98,10 @@
7998
android:layout_alignLeft="@+id/textView6"
8099
android:layout_below="@+id/textView6"
81100
android:layout_marginTop="25dp"
82-
android:text="@string/tvLines"
83-
android:textColor="@color/text_color_black" />
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" />
84105

85106
<TextView
86107
android:id="@+id/textView8"
@@ -90,7 +111,9 @@
90111
android:layout_below="@+id/textView7"
91112
android:layout_marginTop="25dp"
92113
android:text="@string/tvLines"
93-
android:textColor="@color/text_color_black" />
114+
android:textColor="@color/text_color_lightgrey"
115+
android:textColorHint="@color/text_color_lightgrey"
116+
android:textColorLink="@color/text_color_lightgrey" />
94117

95118
<TextView
96119
android:id="@+id/textView9"
@@ -100,7 +123,9 @@
100123
android:layout_below="@+id/textView8"
101124
android:layout_marginTop="25dp"
102125
android:text="@string/tvLines"
103-
android:textColor="@color/text_color_black" />
126+
android:textColor="@color/text_color_lightgrey"
127+
android:textColorHint="@color/text_color_lightgrey"
128+
android:textColorLink="@color/text_color_lightgrey" />
104129

105130
<TextView
106131
android:id="@+id/textView10"
@@ -110,7 +135,9 @@
110135
android:layout_below="@+id/textView9"
111136
android:layout_marginTop="25dp"
112137
android:text="@string/tvLines"
113-
android:textColor="@color/text_color_black" />
138+
android:textColor="@color/text_color_lightgrey"
139+
android:textColorHint="@color/text_color_lightgrey"
140+
android:textColorLink="@color/text_color_lightgrey" />
114141

115142
<TextView
116143
android:id="@+id/textView11"
@@ -120,7 +147,9 @@
120147
android:layout_below="@+id/textView10"
121148
android:layout_marginTop="25dp"
122149
android:text="@string/tvLines"
123-
android:textColor="@color/text_color_black" />
150+
android:textColor="@color/text_color_lightgrey"
151+
android:textColorHint="@color/text_color_lightgrey"
152+
android:textColorLink="@color/text_color_lightgrey" />
124153

125154
<TextView
126155
android:id="@+id/textView12"
@@ -131,8 +160,35 @@
131160
android:layout_marginTop="15dp"
132161
android:text="@string/tvOpenSoucre"
133162
android:textAppearance="?android:attr/textAppearanceSmall"
134-
android:textColor="@color/text_color_black" />
135-
136-
</RelativeLayout>
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" />
137178

138-
</ScrollView>
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/activity_base_popup.xml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:orientation="vertical"
4+
android:padding="10dip"
5+
android:layout_width="fill_parent"
6+
android:layout_height="wrap_content"
7+
android:background="@drawable/background_activities_sub">
8+
9+
<TextView
10+
android:layout_width="fill_parent"
11+
android:layout_height="wrap_content"
12+
android:layout_marginTop="10dip"
13+
android:gravity="center"
14+
android:text="@string/popup_text" />
15+
16+
<Button
17+
android:id="@+id/buttonPopUp"
18+
style="?android:attr/buttonStyleSmall"
19+
android:layout_width="fill_parent"
20+
android:layout_height="wrap_content"
21+
android:layout_marginTop="10dp"
22+
android:background="@drawable/background_button_black"
23+
android:gravity="center"
24+
android:onClick="ClosePopUp"
25+
android:text="@string/btn_back"
26+
android:textColor="@color/text_color_black" />
27+
28+
</LinearLayout>

‎res/layout/activity_base_veranlagung_chb.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
55
android:background="@drawable/background_activities_sub" >
6-
6+
77
<RelativeLayout
88
android:id="@+id/RelativeLayout1"
99
android:layout_width="fill_parent"
10-
android:layout_height="400dp"
11-
android:layout_marginTop="70dp"
10+
android:layout_height="420dp"
11+
android:layout_marginTop="60dp"
1212
android:background="@drawable/background_activities" >
1313

1414
<Button
@@ -17,7 +17,7 @@
1717
android:layout_height="wrap_content"
1818
android:layout_below="@+id/btnEV"
1919
android:layout_centerHorizontal="true"
20-
android:layout_marginTop="27dp"
20+
android:layout_marginTop="30dp"
2121
android:background="@drawable/background_button_white"
2222
android:text="@string/veranlagungsArt02"
2323
android:textColor="@color/text_color_white" />

0 commit comments

Comments
 (0)