diff --git a/README.md b/README.md index 2226059..7cbb4bf 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Get your DHBW curriculum directly on your homescreen. Installation: - +Download the latest release from [here](https://tea.filefighter.de/qvalentin/Rapla2Kustom/releases) Get KWLP or KWGT: @@ -22,145 +22,27 @@ This example will show you how to setup the curriculum with KWGT, for KWLP the p 1. Add a widget of KWGT to you launchers homescreen. 2. Click on this widget to go to KWGT. 3. Click on create to start editing the widget. -4. Paste the following text into the app to get the component for showing the curriculum. +4. Add a text object. +5. Click on it and on the text value (where the current time is for now.) +6. Paste the following text into the app, replacing `$df(hh:mm)$` -
-The code to copy and paste -

- ``` -##KUSTOMCLIP## -{ - "clip_version": 1, - "clip_cut": [], - "clip_modules": [ - { - "internal_type": "KomponentModule", - "globals_list": { - "testc": { - "index": 1, - "type": "COLOR", - "title": "testc", - "description": "", - "global_formula": "", - "value": "#FFFFFFFF" - }, - "namec": { - "index": 2, - "type": "COLOR", - "title": "namec", - "global_formula": "$br(colorconsistency, background)$", - "value": "#FF9CB596" - }, - "datec": { - "index": 3, - "type": "COLOR", - "title": "datec", - "description": "", - "global_formula": "", - "value": "#FFC7C7C7" - }, - "backgrou": { - "index": 4, - "type": "COLOR", - "title": "backgrou", - "global_formula": "$ce(br(colorconsistency, foreground),alpha,70)$", - "value": "#80000000" - }, - "pastdays": { - "index": 5, - "type": "TEXT", - "title": "pastDays", - "description": "for regex", - "global_formula": "", - "value": "$fl(1, 5, \"i + 1\", \"df(dd/MM, r + i + d)\" , \"| \")$" - } - }, - "internal_toggles": { - "config_visible": 10 - }, - "internal_formulas": { - "config_visible": "$if((mi(artist) \u003d \"\" | mi(state) !\u003d PLAYING) \u0026 br(qvalentin, rapla-active) \u003d \"True\", ALWAYS, NEVER)$" - }, - "position_anchor": "TOP", - "viewgroup_items": [ - { - "internal_globals": { - "paint_color": "backgrou" - }, - "internal_toggles": { - "paint_color": 100, - "shape_width": 10, - "shape_height": 10 - }, - "internal_type": "ShapeModule", - "shape_height": 1080.0, - "shape_width": 720.0, - "shape_type": "RECT", - "position_anchor": "TOP", - "internal_formulas": { - "shape_width": "$si(rwidth)$", - "shape_height": "$si(rheight)$" - } - }, - { - "internal_type": "TextModule", - "position_anchor": "TOP", - "text_expression": "$tc(reg,tc(reg,br(qvalentin, rapla),df(dd/MM/yyyy),\"[u]\"+df(dd/MM/yyyy)+\"[/u]\"),\"\\[c\u003d.*c\\].*(\"+gv(pastDays)+\").*\\n\",\"\")$", - "text_size": 25.0, - "paint_color": "#FFAEAEAE", - "text_size_type": "FIXED_WIDTH", - "text_width": 720.0, - "internal_toggles": { - "text_width": 10 - }, - "internal_formulas": { - "text_width": "$si(rwidth)$" - } - }, - { - "internal_type": "FontIconModule", - "icon_icon": "update", - "position_anchor": "TOPRIGHT", - "internal_events": [ - { - "type": "SINGLE_TAP", - "action": "LAUNCH_ACTIVITY", - "intent": "intent:#Intent;component\u003dde.qvalentin.rapla2kustom/.ToKserviceStarter;S.org.kustom.intent.label\u003dRapla2Kustom;end" - } - ] - }, - { - "internal_type": "FontIconModule", - "icon_icon": "web", - "position_anchor": "TOPRIGHT", - "internal_events": [ - { - "type": "SINGLE_TAP", - "action": "OPEN_LINK", - "url": "https://rapla.dhbw-karlsruhe.de/rapla?page\u003dcalendar\u0026user\u003dbraun\u0026file\u003dTINF19B2\u0026day\u003d5\u0026month\u003d2\u0026year\u003d2020\u0026today\u003dHeute" - } - ], - "position_padding_top": 125.0 - } - ] - } - ] -} -##KUSTOMCLIP## +$tc(reg,tc(reg,br(qvalentin, rapla),df(dd/MM/yyyy),"[u]"+df(dd/MM/yyyy)+"[/u]"),"\[c=.*c\].*("+fl(1, 5, "i + 1", "df(dd/MM, r + i + d)" , "| ")+").*\n","")$ ``` -

-
-5. Save the widget. + +7. You can style the text and the background whoever you like. + +8. Save the widget. -6. Go to the Rapla2Kustom app -7. Change the "Force a refresh" toggle to true. -8. Click on "Sync now". -9. The info shoud be shown on the widget now. -11. Adjust the courses you want to ignore (who likes BWL anyway?) by adding them to the comma seperated list. -10. When everything is working you can set "Force a refresh" to false again. +8. Go to the Rapla2Kustom app +9. Change the "Force a refresh" toggle to true. +10. Click on "Sync now". +11. The info shoud be shown on the widget now. +12. Adjust the courses you want to ignore (who likes BWL anyway?) by adding them to the comma seperated list. +13. When everything is working you can set "Force a refresh" to false again. + diff --git a/app/src/main/java/de/qvalentin/rapla2kustom/SettingsActivity.java b/app/src/main/java/de/qvalentin/rapla2kustom/SettingsActivity.java index 98cbb08..c6f412e 100644 --- a/app/src/main/java/de/qvalentin/rapla2kustom/SettingsActivity.java +++ b/app/src/main/java/de/qvalentin/rapla2kustom/SettingsActivity.java @@ -35,6 +35,8 @@ public class SettingsActivity extends AppCompatActivity { } + + public static class SettingsFragment extends PreferenceFragmentCompat { @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 06a67cd..7530c4b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,7 +12,6 @@ - Update Update Ical Updated Ical diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index ddae89e..5eabb26 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -43,7 +43,7 @@ app:key="kustom_code" app:title="@string/kustom_code" app:useSimpleSummaryProvider="true" - app:defaultValue="$tc(reg,tc(reg,br(qvalentin, rapla),df(dd/MM/yyyy),"[u]"+df(dd/MM/yyyy)+"[/u]"),"\[c=.*c\].*("+gv(pastDays)+").*\n","")$" + app:defaultValue="$tc(reg,tc(reg,br(qvalentin, rapla),df(dd/MM/yyyy),"[u]"+df(dd/MM/yyyy)+"[/u]"),"\[c=.*c\].*("+fl(1, 5, "i + 1", "df(dd/MM, r + i + d)" , "| ")+").*\n","")$" /> diff --git a/build.gradle b/build.gradle index 4e23125..a99eefa 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:4.2.0" + classpath 'com.android.tools.build:gradle:7.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4b6b799..6330b93 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sun Aug 15 10:39:07 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME