Compare commits
7 Commits
7bdcb7e3fb
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
442ef70b8d | ||
|
|
ec3a95fc2d | ||
|
|
b07cd27fce | ||
|
|
39c037a9ab | ||
|
|
f6956349e0 | ||
|
|
a41bd9cbb3 | ||
|
|
0db1e78cd4 |
@@ -23,6 +23,7 @@ android {
|
|||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
isMinifyEnabled = false
|
isMinifyEnabled = false
|
||||||
|
isDebuggable = false
|
||||||
proguardFiles(
|
proguardFiles(
|
||||||
getDefaultProguardFile("proguard-android-optimize.txt"),
|
getDefaultProguardFile("proguard-android-optimize.txt"),
|
||||||
"proguard-rules.pro"
|
"proguard-rules.pro"
|
||||||
|
|||||||
@@ -83,7 +83,7 @@ fun AboutContent(activity: ComponentActivity){
|
|||||||
{
|
{
|
||||||
AboutTextElement("This Product is published under the\nGNU General Public License\nVersion 3, 29 June 2007", 16.dp)
|
AboutTextElement("This Product is published under the\nGNU General Public License\nVersion 3, 29 June 2007", 16.dp)
|
||||||
AboutTextElement("Developed by:\n- Paul Posch\n- Matthias Meyer\n- Jakub Szarko\n- Emilian Bührer", 32.dp)
|
AboutTextElement("Developed by:\n- Paul Posch\n- Matthias Meyer\n- Jakub Szarko\n- Emilian Bührer", 32.dp)
|
||||||
AboutTextElement("Fun Facts:\nThis app consists of 2.873 lines of code\nThe repository is 413KB big\nThe development took about 3 month", 64.dp) //TODO: Update before launch
|
AboutTextElement("Fun Facts:\nThis app consists of 4.189 lines of code\nThe repository is 768KB big\nThe development took about 3 months", 64.dp)
|
||||||
|
|
||||||
Spacer(modifier = Modifier.height(32.dp))
|
Spacer(modifier = Modifier.height(32.dp))
|
||||||
Divider()
|
Divider()
|
||||||
@@ -98,7 +98,7 @@ fun AboutContent(activity: ComponentActivity){
|
|||||||
) {
|
) {
|
||||||
Row {
|
Row {
|
||||||
Text(
|
Text(
|
||||||
text = "Unterstütze die Entwickler",
|
text = "Support the Devs",
|
||||||
style = MaterialTheme.typography.bodySmall,
|
style = MaterialTheme.typography.bodySmall,
|
||||||
color = MaterialTheme.colorScheme.onBackground,
|
color = MaterialTheme.colorScheme.onBackground,
|
||||||
modifier = Modifier.padding(16.dp)
|
modifier = Modifier.padding(16.dp)
|
||||||
|
|||||||
@@ -127,7 +127,19 @@ private fun decompressGZIPAndDecodeBase64(compressedData: String): String {
|
|||||||
private fun downloadImagesTask(jsonResponse: JSONObject, mainDir : File) : Int {
|
private fun downloadImagesTask(jsonResponse: JSONObject, mainDir : File) : Int {
|
||||||
clearFolder(mainDir)
|
clearFolder(mainDir)
|
||||||
|
|
||||||
val jsonDaysObject = jsonResponse.getJSONArray("ResultMenuItems").getJSONObject(0).getJSONArray("Childs").getJSONObject(0).getJSONObject("Root").getJSONArray("Childs")
|
var jsonDaysObject = jsonResponse.getJSONArray("ResultMenuItems")
|
||||||
|
for (i in 0 until jsonDaysObject.length()) {
|
||||||
|
if (jsonDaysObject.getJSONObject(i).get("Index") == 0) {
|
||||||
|
jsonDaysObject = jsonDaysObject.getJSONObject(i).getJSONArray("Childs")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (i in 0 until jsonDaysObject.length()) {
|
||||||
|
if (jsonDaysObject.getJSONObject(i).get("Index") == 0) {
|
||||||
|
jsonDaysObject = jsonDaysObject.getJSONObject(i).getJSONObject("Root").getJSONArray("Childs")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (d in 0 until jsonDaysObject.length()) {
|
for (d in 0 until jsonDaysObject.length()) {
|
||||||
val jsonDayObject = jsonDaysObject.getJSONObject(d)
|
val jsonDayObject = jsonDaysObject.getJSONObject(d)
|
||||||
|
|||||||
@@ -105,8 +105,8 @@ fun SettingsContent(activity: ComponentActivity) {
|
|||||||
Setting(text = "Stundenplan", sharedPreferences, editor)
|
Setting(text = "Stundenplan", sharedPreferences, editor)
|
||||||
Setting(text = "Noten", sharedPreferences, editor)
|
Setting(text = "Noten", sharedPreferences, editor)
|
||||||
Setting(text = "Periodensystem", sharedPreferences, editor)
|
Setting(text = "Periodensystem", sharedPreferences, editor)
|
||||||
Setting(text = "Mebis", sharedPreferences, editor)
|
|
||||||
Setting(text = "DSBmobile", sharedPreferences, editor)
|
Setting(text = "DSBmobile", sharedPreferences, editor)
|
||||||
|
Setting(text = "Mebis", sharedPreferences, editor)
|
||||||
Spacer(modifier = Modifier.height(16.dp))
|
Spacer(modifier = Modifier.height(16.dp))
|
||||||
|
|
||||||
Divider()
|
Divider()
|
||||||
|
|||||||
@@ -623,7 +623,6 @@ fun TimeTableSetupContent(activity: ComponentActivity, loadedLessons: List<Lesso
|
|||||||
}
|
}
|
||||||
startActivity(activity, intent, null)
|
startActivity(activity, intent, null)
|
||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
modifier = Modifier
|
modifier = Modifier
|
||||||
.padding(5.dp)
|
.padding(5.dp)
|
||||||
|
|||||||
@@ -8,9 +8,9 @@ val Black80 = Color(0xFF333333)
|
|||||||
val Black70 = Color(0xFF4B4B4B)
|
val Black70 = Color(0xFF4B4B4B)
|
||||||
|
|
||||||
val White100 = Color(0xFFFFFFFF)
|
val White100 = Color(0xFFFFFFFF)
|
||||||
val White90 = Color(0xFFEBEBEB)
|
val White90 = Color(0xFFFAFAFA)
|
||||||
val White80 = Color(0xFFD3D3D3)
|
val White80 = Color(0xFFD3D3D3)
|
||||||
val White70 = Color(0xFFBBBBBB)
|
val White70 = Color(0xFFAFAFAF)
|
||||||
|
|
||||||
|
|
||||||
val TextOnColouredButton = Color(0xFF121212)
|
val TextOnColouredButton = Color(0xFF121212)
|
||||||
|
|||||||
Reference in New Issue
Block a user