Skip to content

Commit 84f3345

Browse files
author
Gregor Santner
committed
Updated to v1.0.4
1 parent 854593c commit 84f3345

17 files changed

+105
-87
lines changed

Diff for: ‎AndroidManifest.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="de.live.gdev.timetracker"
4-
android:versionCode="5"
5-
android:versionName="1.03" >
4+
android:versionCode="6"
5+
android:versionName="1.04" >
66

77
<uses-sdk
88
android:minSdkVersion="9"
9-
android:targetSdkVersion="18" />
9+
android:targetSdkVersion="21" />
1010

1111
<uses-permission android:name="android.permission.INTERNET" />
1212

Diff for: ‎README.md

+20-18
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
## General
55
Android app created and maintained by Gregor Santner, 2014
6-
Latest modification: 12. Sept 2014 (v1.03a_git12092014)
6+
Latest modification: 21. Dec 2014 (v1.04)
77
License: **GPLv3**
88

99

@@ -13,6 +13,17 @@ License: **GPLv3**
1313
* [Google Play](https://play.google.com/store/apps/details?id=de.live.gdev.timetracker)
1414
* [Release archive](https://github.com/de-live-gdev/kimai-android/releases)
1515

16+
## English description
17+
App for the time managment application Kimai.
18+
This app makes mobile tracking and logging into your kimai existing installation easier.
19+
You have to enter the URL, username, and password of your installation, if you want to be auto logged in after application start check the appropiate box.
20+
21+
Additonally you can switch between 3 profiles. Each of them has his own dataset.
22+
23+
Normally you have to open your browser, go to favourites, click your kimai page, input data. Now you only have to do the last step every time you want to add entries.
24+
25+
This app was developed under non commercial purposes.
26+
Actually there are no, and there will never be advertisments.
1627

1728
## Deutsche Beschreibung
1829
Android-App für die Zeitmanagment Anwendung Kimai.
@@ -21,23 +32,11 @@ In den Einstellungen muss die URL, der Benutzername und das Passwort eingetragen
2132

2233
Es kann dabei zwischen drei Profilen ausgewählt werden, von denen jedes einen eigenen Datensatz besitzt.
2334

24-
Da es immer sehr umständlich ist extra den Browser öffnen zu müssen, die Seite zu laden, Daten eingeben und dann endlich eine Eintragung zu machen beschleunigt die App eine Eintragung.
35+
Da es immer sehr umständlich ist extra den Browser öffnen zu müssen, die Seite zu laden, Daten eingeben und dann endlich eine Eintragung zu machen, beschleunigt die App eine Eintragung.
2536

2637
Diese App wurde in keiner kommerzieller Absicht entwickelt.
2738
Es wird derzeit und in Zukunft keine Werbung eingeblendet.
2839

29-
## English description
30-
App for the time managment application Kimai.
31-
This app makes mobile tracking and logging into your kimai existing installation easier.
32-
You have to enter the URL, username, and password of your installation, if you want to be auto logged in after application start check the appropiate box.
33-
34-
Additonally you can switch between 3 profiles. Each of them has his own dataset.
35-
36-
Normally you have to open your browser, go to favourites, click your kimai page, input data. Now you only have to do the last step every time you want to add entries.
37-
38-
This app was developed under non commercial purposes.
39-
There is no, and there will be no advertisments.
40-
4140
## Releases
4241

4342
<table>
@@ -65,6 +64,10 @@ There is no, and there will be no advertisments.
6564
<td>v1.03</td>
6665
<td>18. Jul 2014</td>
6766
</tr>
67+
<tr>
68+
<td>v1.04</td>
69+
<td>21. Dec 2014</td>
70+
</tr>
6871
</table>
6972

7073
## Privacy
@@ -73,9 +76,8 @@ Any other data than your entered data won't be collected or stored on your devic
7376

7477
## Screenshots
7578

76-
![Kimai app screen](https://raw.githubusercontent.com/de-live-gdev/kimai-android/master/apk-screens/1.03/MainP3.png "App screen")
77-
![Kimai settings screen](https://raw.githubusercontent.com/de-live-gdev/kimai-android/master/apk-screens/1.03/SettP1_EN.png "Settings screen")
78-
![Kimai settings screen2](https://raw.githubusercontent.com/de-live-gdev/kimai-android/master/apk-screens/1.03/SettP2_EN.png "Settings screen")
79-
![Kimai info screen](https://raw.githubusercontent.com/de-live-gdev/kimai-android/master/apk-screens/1.03/InfoP_EN.png "Info screen")
79+
![Kimai main screen](https://raw.githubusercontent.com/de-live-gdev/kimai-android/master/apk-screens/1.03/MainP3.png "Main screen")
80+
![Kimai settings screen](https://raw.githubusercontent.com/de-live-gdev/kimai-android/master/apk-screens/1.04/SettP1_DE.png "Settings screen")
81+
![Kimai info screen](https://raw.githubusercontent.com/de-live-gdev/kimai-android/master/apk-screens/1.04/InfoP_EN.png "Info screen")
8082

8183

Diff for: ‎apk-screens/1.04/InfoP_DE.png

25.3 KB
Loading

Diff for: ‎apk-screens/1.04/InfoP_EN.png

25.3 KB
Loading

Diff for: ‎apk-screens/1.04/SettP1_DE.png

47.5 KB
Loading

Diff for: ‎apk-screens/1.04/SettP1_EN.png

67 KB
Loading

Diff for: ‎apk-screens/1.04/TimeTracker_v1.04_git211214.apk

264 KB
Binary file not shown.

Diff for: ‎project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-19
14+
target=android-21

Diff for: ‎res/drawable-mdpi/save_ico.png

1.86 KB
Loading

Diff for: ‎res/layout/activity_info.xml

+14-14
Original file line numberDiff line numberDiff line change
@@ -9,59 +9,59 @@
99
tools:context=".InfoActivity" >
1010

1111
<TextView
12-
android:id="@+id/textView_Kimai_Info_Str"
12+
android:id="@+id/TextView_AndroidAppString"
1313
android:layout_width="fill_parent"
1414
android:layout_height="wrap_content"
1515
android:layout_alignParentTop="true"
1616
android:layout_centerHorizontal="true"
1717
android:layout_marginTop="24dp"
18-
android:background="#FFFF00"
18+
android:background="#22FF22"
1919
android:gravity="center"
20-
android:text="@string/info_tv_devs_str"
20+
android:text="Android App"
2121
android:textAppearance="?android:attr/textAppearanceLarge" />
2222

2323
<Button
2424
android:id="@+id/button_kimai_browse"
2525
android:layout_width="wrap_content"
2626
android:layout_height="wrap_content"
27-
android:layout_below="@+id/textView_Kimai_Info_Str"
27+
android:layout_below="@+id/TextView_AndroidAppString"
2828
android:layout_centerHorizontal="true"
2929
android:layout_marginTop="10dp"
30-
android:onClick="onKimaiClick"
31-
android:text="http://www.kimai.org/" />
30+
android:onClick="onAndroidAppClick"
31+
android:text="@string/created_by" />
3232

3333
<TextView
34-
android:id="@+id/TextView_AndroidAppString"
34+
android:id="@+id/textView_Kimai_Info_Str"
3535
android:layout_width="fill_parent"
3636
android:layout_height="wrap_content"
3737
android:layout_below="@+id/button_kimai_browse"
3838
android:layout_centerHorizontal="true"
3939
android:layout_marginTop="60dp"
40-
android:background="#FFFF00"
40+
android:background="#22FF22"
4141
android:gravity="center"
42-
android:text="Android App"
42+
android:text="@string/info_tv_devs_str"
4343
android:textAppearance="?android:attr/textAppearanceLarge" />
4444

4545
<Button
4646
android:id="@+id/button_DevContact"
4747
android:layout_width="wrap_content"
4848
android:layout_height="wrap_content"
49-
android:layout_below="@+id/TextView_AndroidAppString"
49+
android:layout_below="@+id/textView_Kimai_Info_Str"
5050
android:layout_centerHorizontal="true"
5151
android:layout_marginTop="10dp"
52-
android:onClick="onAndroidAppClick"
53-
android:text="@string/created_by" />
52+
android:onClick="onKimaiClick"
53+
android:text="kimai.org" />
5454

5555
<Button
5656
android:id="@+id/textView_Version"
5757
android:layout_width="fill_parent"
5858
android:layout_height="wrap_content"
5959
android:layout_alignParentBottom="true"
6060
android:layout_centerHorizontal="true"
61-
android:background="#DDDDEE"
61+
android:background="#AADDCC"
6262
android:gravity="center"
6363
android:onClick="onVersionClicked"
64-
android:text="App Version \nvA.b"
64+
android:text="App Version vA.b"
6565
android:textAppearance="?android:attr/textAppearanceLarge" />
6666

6767
</RelativeLayout>

Diff for: ‎res/layout/activity_settings.xml

+1-17
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,7 @@
1414

1515
<RelativeLayout
1616
android:layout_width="match_parent"
17-
android:layout_height="700dp"
18-
android:paddingBottom="@dimen/activity_vertical_margin"
19-
android:paddingLeft="@dimen/activity_horizontal_margin"
20-
android:paddingRight="@dimen/activity_horizontal_margin"
21-
android:paddingTop="@dimen/activity_vertical_margin" >
22-
23-
<TextView
24-
android:id="@+id/textviewTT_Text"
25-
android:layout_width="wrap_content"
26-
android:layout_height="wrap_content"
27-
android:layout_alignParentTop="true"
28-
android:layout_centerHorizontal="true"
29-
android:text="@string/time_tracker_settings_tv"
30-
android:textAppearance="?android:attr/textAppearanceLarge" />
17+
android:layout_height="540dp" >
3118

3219
<EditText
3320
android:id="@+id/editTextKimaiPath"
@@ -44,8 +31,6 @@
4431
android:layout_width="wrap_content"
4532
android:layout_height="wrap_content"
4633
android:layout_alignLeft="@+id/editTextKimaiPath"
47-
android:layout_below="@+id/textviewTT_Text"
48-
android:layout_marginTop="42dp"
4934
android:text="@string/path_to_kimai_tv_str"
5035
android:textAppearance="?android:attr/textAppearanceMedium" />
5136

@@ -175,7 +160,6 @@
175160
android:id="@+id/buttonSaveSettings"
176161
android:layout_width="wrap_content"
177162
android:layout_height="wrap_content"
178-
android:layout_marginTop="8dp"
179163
android:layout_below="@+id/radioProfiles"
180164
android:layout_centerHorizontal="true"
181165
android:onClick="onSaveButtonClicked"

Diff for: ‎res/menu/settings.xml

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2-
3-
</menu>
2+
3+
<item
4+
android:id="@+id/action_saveprofile"
5+
android:orderInCategory="1"
6+
android:showAsAction="ifRoom"
7+
android:icon="@drawable/save_ico"
8+
android:title="@string/save_str"/>
9+
10+
</menu>

Diff for: ‎res/values-de/strings.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<string name="action_info">Über</string>
1111
<string name="shared_pref">de.live.gdev.timetracker</string>
1212

13-
<string name="ssl_webview_error_str"> <![CDATA[<h1> SSL Zertifikat ung&uumlltig </h1> <br> Es k&oumlnnen in den Einstelllungen alle Zertifikate akzeptiert werden!]]></string>
13+
<string name="ssl_webview_error_str"> <![CDATA[<font size="38"><center><h1> SSL Zertifikat ung&uumlltig </h1></center></font><font size="25"><br> Es gibt in den Einstellungen eine Option, die es erlaubt alle Zertifikate zu akzeptieren!<br><br><b>Achtung:</b> Das Ignorieren von Zertifikats-Fehlern stellt ein Sicherheitsrisiko dar.</font>]]></string>
1414
<string name="ssl_toast_error">SSL Zertifikat nicht akzeptiert</string>
15-
<string name="no_valid_path"> <![CDATA[<h1> Kein g&uumlltiger Pfad </h1> <br> Bitte Daten in den Einstelllungen angeben!]]></string>
15+
<string name="no_valid_path"> <![CDATA[<font size="38"><center><h1> Ung&uumlltiger Pfad </h1></center></font> <font size="25"><br> Bitte die Login-Daten in den Einstellungen bearbeiten!</font>]]></string>
1616

1717
<string name="username_tv_str">Login:</string>
1818
<string name="path_to_kimai_tv_str">Pfad zu Kimai:</string>
@@ -22,13 +22,13 @@
2222
<string name="save_str">Profil speichern</string>
2323
<string name="time_tracker_settings_tv">Time Tracker\nEinstellungen</string>
2424
<string name="standard_filename">Dateiname:</string>
25-
<string name="save_settings_succ">Einstellungen erfolgreich gespeichert</string>
25+
<string name="save_settings_succ">Profil gespeichert</string>
2626
<string name="profileSelection_str">Profil Auswahl</string>
2727
<string name="profileDefault">Standard</string>
2828
<string name="profile2">Profil 2</string>
2929
<string name="profile3">Profil 3</string>
3030

31-
<string name="info_tv_devs_str">Kimai Entwickler</string>
31+
<string name="info_tv_devs_str">Kimai Homepage</string>
3232
<string name="created_by">entwickelt von Gregor Santner</string>
3333

3434

Diff for: ‎res/values/strings.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<string name="action_info">About</string>
1111
<string name="shared_pref">de.live.gdev.timetracker</string>
1212

13-
<string name="no_valid_path"><![CDATA[<h1> No valid path </h1> <br> Please check your settings!]]></string>
14-
<string name="ssl_webview_error_str"><![CDATA[<h1> Invalid SSL certificate </h1> <br> There is a setting for accecpting all SSL certificates]]></string>
13+
<string name="no_valid_path"><![CDATA[<font size="38"><center><h1> No valid path </h1></center></font> <font size="25"><br> Please check your settings!</font>]]></string>
14+
<string name="ssl_webview_error_str"><![CDATA[<font size="38"><center><h1> Invalid SSL certificate </h1></center></font><font size="25"> <br> There is a option for accecpting all SSL certificates.<br><br><b> Caution:</b> Ignoring certificate errors is a security risk!</font>]]></string>
1515
<string name="ssl_toast_error">SSL certificate not accepted</string>
1616

1717
<string name="username_tv_str">Username:</string>
@@ -20,15 +20,15 @@
2020
<string name="auto_login_str">Enable auto-login</string>
2121
<string name="ssl_cert_accept">Accept all SSL certificates</string>
2222
<string name="save_str">Save profile</string>
23-
<string name="save_settings_succ">Settings saved successfully</string>
23+
<string name="save_settings_succ">Profile saved</string>
2424
<string name="time_tracker_settings_tv">Time Tracker Settings</string>
2525
<string name="standard_filename">Filename:</string>
2626
<string name="profileSelection_str">Profile Selection</string>
2727
<string name="profileDefault">Default</string>
2828
<string name="profile2">Profile 2</string>
2929
<string name="profile3">Profile 3</string>
3030

31-
<string name="info_tv_devs_str">Kimai Developers</string>
31+
<string name="info_tv_devs_str">Kimai Homepage</string>
3232
<string name="created_by">created by Gregor Santner</string>
3333

3434
</resources>

Diff for: ‎src/de/live/gdev/timetracker/InfoActivity.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import android.os.Bundle;
99
import android.view.View;
1010
import android.widget.Button;
11-
import android.widget.TextView;
1211

1312
@SuppressWarnings("deprecation")
1413
public class InfoActivity extends Activity {
@@ -27,7 +26,7 @@ protected void onCreate(Bundle savedInstanceState) {
2726

2827
try {
2928
PackageInfo info = manager.getPackageInfo(this.getPackageName(), 0);
30-
this.verionField.setText("App Version \nv" + info.versionName);
29+
this.verionField.setText("App Version v" + info.versionName);
3130
} catch (Exception e) {
3231
}
3332
}

Diff for: ‎src/de/live/gdev/timetracker/MainActivity.java

+19-22
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@
66
import android.app.Activity;
77
import android.content.Intent;
88
import android.content.SharedPreferences;
9-
import android.content.res.Configuration;
10-
import android.media.audiofx.BassBoost.Settings;
119
import android.net.Uri;
1210
import android.net.http.SslError;
1311
import android.os.Bundle;
14-
import android.util.Log;
1512
import android.view.Menu;
1613
import android.view.MenuItem;
1714
import android.webkit.SslErrorHandler;
@@ -43,7 +40,7 @@ public void onCreate(Bundle savedInstanceState)
4340
super.onCreate(savedInstanceState);
4441
setContentView(R.layout.activity_main);
4542
this.webView = (WebView) findViewById(R.id.webView1);
46-
this.pref = this.getSharedPreferences(this.getString(R.string.shared_pref), MODE_PRIVATE);
43+
this.pref = this.getSharedPreferences(this.getString(R.string.shared_pref), MODE_PRIVATE);
4744

4845
this.webView.setWebViewClient(new WebViewClient() {
4946
public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError error)
@@ -61,15 +58,15 @@ public void onReceivedSslError (WebView view, SslErrorHandler handler, SslError
6158
});
6259

6360
this.webView.setWebChromeClient(new WebChromeClient());
64-
61+
6562
WebSettings settings = this.webView.getSettings();
6663
settings.setJavaScriptEnabled(true);
6764
settings.setDatabaseEnabled(true);
6865
settings.setDomStorageEnabled(true);
6966
settings.setBuiltInZoomControls(true);
70-
settings.setSupportZoom(true);
71-
settings.setLoadWithOverviewMode(true);
72-
settings.setUseWideViewPort(true);
67+
settings.setSupportZoom(true);
68+
settings.setLoadWithOverviewMode(true);
69+
settings.setUseWideViewPort(true);
7370

7471
this.reload(false);
7572
}
@@ -108,6 +105,20 @@ public void reload(boolean forced)
108105
}
109106
}
110107

108+
@Override
109+
protected void onActivityResult(int requestCode, int resultCode, Intent data)
110+
{
111+
switch(requestCode)
112+
{
113+
case SETTINGS_ACTIVITY_ID:
114+
{
115+
this.reload(false);
116+
}break;
117+
}
118+
119+
super.onActivityResult(requestCode, resultCode, data);
120+
}
121+
111122
@Override
112123
public boolean onOptionsItemSelected(MenuItem item)
113124
{
@@ -132,20 +143,6 @@ public boolean onOptionsItemSelected(MenuItem item)
132143
return super.onOptionsItemSelected(item);
133144
}
134145

135-
@Override
136-
protected void onActivityResult(int requestCode, int resultCode, Intent data)
137-
{
138-
switch(requestCode)
139-
{
140-
case SETTINGS_ACTIVITY_ID:
141-
{
142-
this.reload(false);
143-
}break;
144-
}
145-
146-
super.onActivityResult(requestCode, resultCode, data);
147-
}
148-
149146
@Override
150147
public boolean onCreateOptionsMenu(Menu menu)
151148
{

0 commit comments

Comments
 (0)