sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed deprecations

Browse Source
This commit is contained in:
Caesar2011
2018-10-31 00:22:01 +01:00
parent ce0486bd2c
commit 146807b93e
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
View File

@@ -1,8 +1,10 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV;
import android.content.Context; import android.content.Context;
import android.os.Build;
import android.os.Environment; import android.os.Environment;
import android.text.Html; import android.text.Html;
import android.text.Spanned;
import android.util.Pair; import android.util.Pair;
import org.json.JSONArray; import org.json.JSONArray;
@@ -113,7 +115,7 @@ class KVVModuleList extends HTTPService {
} }
String type = site.getJSONObject("props").getString("kvv_coursetype"); String type = site.getJSONObject("props").getString("kvv_coursetype");
String description = site.getString("description"); String description = site.getString("description");
description = String.valueOf(Html.fromHtml(description)); description = String.valueOf(fromHtml(description));
String id = site.getString("id"); String id = site.getString("id");
modules.addModule(semester, lvNumbers, title, lecturers, type, description, id); modules.addModule(semester, lvNumbers, title, lecturers, type, description, id);
} }
@@ -231,7 +233,7 @@ class KVVModuleList extends HTTPService {
String id = site.getString("announcementId"); String id = site.getString("announcementId");
String title = site.getString("title"); String title = site.getString("title");
String text = site.getString("body"); String text = site.getString("body");
text = String.valueOf(Html.fromHtml(text)); text = String.valueOf(fromHtml(text));
String createdBy = site.getString("createdByDisplayName"); String createdBy = site.getString("createdByDisplayName");
long createdOn = site.getLong("createdOn"); long createdOn = site.getLong("createdOn");
@@ -300,7 +302,7 @@ class KVVModuleList extends HTTPService {
String id = site.getString("id"); String id = site.getString("id");
String title = site.getString("title"); String title = site.getString("title");
String instructions = site.getString("instructions"); String instructions = site.getString("instructions");
instructions = String.valueOf(Html.fromHtml(instructions)); instructions = String.valueOf(fromHtml(instructions));
long dueTime = site.getJSONObject("dueTime").getLong("time"); long dueTime = site.getJSONObject("dueTime").getLong("time");
String gradebookItemName = site.optString("gradebookItemName", null); String gradebookItemName = site.optString("gradebookItemName", null);
String gradeScale = site.getString("gradeScale"); String gradeScale = site.getString("gradeScale");
@@ -624,5 +626,14 @@ class KVVModuleList extends HTTPService {
return path; return path;
} }
@SuppressWarnings("deprecation")
public static Spanned fromHtml(String html){
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
return Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY);
} else {
return Html.fromHtml(html);
}
}
} }

3
app/src/main/java/de/sebse/fuplanner/tools/ui/cardview/ExpandableCardView.java
View File

@@ -15,6 +15,7 @@ import android.widget.ImageButton;
import androidx.annotation.LayoutRes; import androidx.annotation.LayoutRes;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.cardview.widget.CardView; import androidx.cardview.widget.CardView;
import androidx.core.content.ContextCompat;
import de.sebse.fuplanner.R; import de.sebse.fuplanner.R;
import de.sebse.fuplanner.tools.UtilsUi; import de.sebse.fuplanner.tools.UtilsUi;
import de.sebse.fuplanner.tools.logging.Logger; import de.sebse.fuplanner.tools.logging.Logger;
@@ -92,7 +93,7 @@ public class ExpandableCardView extends CardView {
private void initView(Context context){ private void initView(Context context){
//Inflating View //Inflating View
imageButton = new ImageButton(context); imageButton = new ImageButton(context);
imageButton.setImageDrawable(getResources().getDrawable(R.drawable.arrow_down)); imageButton.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.arrow_down));
imageButton.setPadding( imageButton.setPadding(
(int) UtilsUi.convertDpToPixels(getContext(), 10), (int) UtilsUi.convertDpToPixels(getContext(), 10),
(int) UtilsUi.convertDpToPixels(getContext(), 10), (int) UtilsUi.convertDpToPixels(getContext(), 10),