Archived
Improved the look of cards, removed redundant code
This commit is contained in:
Deniz Düzgören
Generated
-29
@@ -1,29 +0,0 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<code_scheme name="Project" version="173">
|
||||
<Objective-C-extensions>
|
||||
<file>
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
|
||||
</file>
|
||||
<class>
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
|
||||
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
|
||||
</class>
|
||||
<extensions>
|
||||
<pair source="cpp" header="h" fileNamingConvention="NONE" />
|
||||
<pair source="c" header="h" fileNamingConvention="NONE" />
|
||||
</extensions>
|
||||
</Objective-C-extensions>
|
||||
</code_scheme>
|
||||
</component>
|
||||
@@ -206,342 +206,6 @@ public class CardAdapter extends RecyclerView.Adapter<CardAdapter.CardViewHolder
|
||||
holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), colour));
|
||||
holder.mCourse.setTextColor(ContextCompat.getColor(holder.mCourse.getContext(), colour));
|
||||
}
|
||||
|
||||
// String colorChecker = holder.mCourse.getText().toString().toLowerCase();
|
||||
// if (colorChecker.contains("deu") || colorChecker.contains("dep") || colorChecker.contains("daz")) {
|
||||
// if (prefs.getInt("colGerman", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGerman", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGerman", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("mat") || colorChecker.contains("map")) {
|
||||
// if (prefs.getInt("colMaths", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMaths", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMaths", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("eng") || colorChecker.contains("enp") || colorChecker.contains("ena")) {
|
||||
// if (prefs.getInt("colEnglish", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colEnglish", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colEnglish", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("spo") || colorChecker.contains("spp") || colorChecker.contains("spth")) {
|
||||
// if (prefs.getInt("colPhysEd", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysEd", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysEd", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("pol") || colorChecker.contains("pop")) {
|
||||
// if (prefs.getInt("colPolitics", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPolitics", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPolitics", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("dar") || colorChecker.contains("dap")) {
|
||||
// if (prefs.getInt("colTheatre", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTheatre", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTheatre", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("phy") || colorChecker.contains("php")) {
|
||||
// if (prefs.getInt("colPhysics", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysics", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhysics", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("bio") || colorChecker.contains("bip") || colorChecker.contains("nw")) {
|
||||
// if (prefs.getInt("colBiology", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colBiology", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colBiology", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("che") || colorChecker.contains("chp")) {
|
||||
// if (prefs.getInt("colChemistry", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChemistry", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChemistry", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("phi") || colorChecker.contains("psp")) {
|
||||
// if (prefs.getInt("colPhilosophy", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhilosophy", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colPhilosophy", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("laa") || colorChecker.contains("laf") || colorChecker.contains("lat")) {
|
||||
// if (prefs.getInt("colLatin", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colLatin", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colLatin", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("spa") || colorChecker.contains("spf")) {
|
||||
// if (prefs.getInt("colSpanish", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colSpanish", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colSpanish", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("fra") || colorChecker.contains("frf") || colorChecker.contains("frz")) {
|
||||
// if (prefs.getInt("colFrench", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colFrench", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colFrench", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("inf")) {
|
||||
// if (prefs.getInt("colCompSci", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colCompSci", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colCompSci", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("ges")) {
|
||||
// if (prefs.getInt("colHistory", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colHistory", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colHistory", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("rel")) {
|
||||
// if (prefs.getInt("colReligion", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colReligion", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colReligion", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("geg") || colorChecker.contains("wuk")) {
|
||||
// if (prefs.getInt("colGeography", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGeography", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGeography", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("kun")) {
|
||||
// if (prefs.getInt("colArts", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colArts", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colArts", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("mus")) {
|
||||
// if (prefs.getInt("colMusic", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMusic", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colMusic", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("tue")) {
|
||||
// if (prefs.getInt("colTurkish", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTurkish", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colTurkish", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("chi")) {
|
||||
// if (prefs.getInt("colChinese", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChinese", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colChinese", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("gll")) {
|
||||
// if (prefs.getInt("colGLL", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGLL", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colGLL", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("wat")) {
|
||||
// if (prefs.getInt("colWAT", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWAT", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWAT", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("för")) {
|
||||
// if (prefs.getInt("colForder", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colForder", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colForder", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else if (colorChecker.contains("wp") || colorChecker.contains("met")) {
|
||||
// if (prefs.getInt("colWP", 0) != 0) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWP", 0)));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), prefs.getInt("colWP", 0)));
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
// } else {
|
||||
// if (prefs.getInt("themeInt", 0) == 1) {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lightgrey));
|
||||
// } else {
|
||||
// holder.mImageView.getDrawable().setTint(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// holder.mCourse.setTextColor(ContextCompat.getColor(holder.mImageView.getContext(), R.color.lessdark));
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.denizd.substitutionplan;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.ActivityNotFoundException;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
@@ -77,6 +78,7 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
|
||||
final EditText txtName = getView().findViewById(R.id.txtName);
|
||||
final Switch greeting = getView().findViewById(R.id.switchDisableGreeting);
|
||||
final Switch darkmode = getView().findViewById(R.id.switchDark);
|
||||
final Switch showinfo = getView().findViewById(R.id.switchHideInfo);
|
||||
final LinearLayout customiseColours = getView().findViewById(R.id.btnCustomiseColours);
|
||||
|
||||
final EditText txtClasses = getView().findViewById(R.id.txtClasses);
|
||||
@@ -195,6 +197,24 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
|
||||
}
|
||||
});
|
||||
|
||||
if (prefs.getBoolean("showinfotab", true)) {
|
||||
showinfo.setChecked(true);
|
||||
} else {
|
||||
showinfo.setChecked(false);
|
||||
}
|
||||
|
||||
showinfo.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
|
||||
@Override
|
||||
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
|
||||
if (isChecked) {
|
||||
edit.putBoolean("showinfotab", true);
|
||||
} else if (!isChecked) {
|
||||
edit.putBoolean("showinfotab", false);
|
||||
}
|
||||
edit.apply();
|
||||
}
|
||||
});
|
||||
|
||||
final String[] coursesNoLang = {"German", "English", "French", "Spanish", "Latin", "Turkish", "Chinese", "Arts", "Music", "Theatre",
|
||||
"Geography", "History", "Politics", "Philosophy", "Religion",
|
||||
"Maths", "Biology", "Chemistry", "Physics", "CompSci",
|
||||
@@ -214,7 +234,7 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
|
||||
R.drawable.ic_chinese, R.drawable.ic_arts, R.drawable.ic_music, R.drawable.ic_drama,
|
||||
R.drawable.ic_geography, R.drawable.ic_history, R.drawable.ic_politics, R.drawable.ic_philosophy,
|
||||
R.drawable.ic_religion,
|
||||
R.drawable.ic_maths, R.drawable.ic_physics, R.drawable.ic_biology, R.drawable.ic_chemistry,
|
||||
R.drawable.ic_maths, R.drawable.ic_biology, R.drawable.ic_chemistry, R.drawable.ic_physics,
|
||||
R.drawable.ic_compsci,
|
||||
R.drawable.ic_pe, R.drawable.ic_gll, R.drawable.ic_wat, R.drawable.ic_help, R.drawable.ic_pencil};
|
||||
customiseColours.setOnClickListener(new View.OnClickListener() {
|
||||
@@ -295,197 +315,6 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
|
||||
}
|
||||
|
||||
colourPickerDialog.show();
|
||||
|
||||
// MaterialButton red = picker.findViewById(R.id.colourRed);
|
||||
// MaterialButton pink = picker.findViewById(R.id.colourPink);
|
||||
// MaterialButton purple = picker.findViewById(R.id.colourPurple);
|
||||
// MaterialButton deeppurple = picker.findViewById(R.id.colourDeepPurple);
|
||||
// MaterialButton lavender = picker.findViewById(R.id.colourLavender);
|
||||
// MaterialButton indigo = picker.findViewById(R.id.colourIndigo);
|
||||
// MaterialButton blue = picker.findViewById(R.id.colourBlue);
|
||||
// MaterialButton lightblue = picker.findViewById(R.id.colourLightBlue);
|
||||
// MaterialButton teal = picker.findViewById(R.id.colourTeal);
|
||||
// MaterialButton green = picker.findViewById(R.id.colourGreen);
|
||||
// MaterialButton yellow = picker.findViewById(R.id.colourYellow);
|
||||
// MaterialButton orange = picker.findViewById(R.id.colourOrange);
|
||||
// MaterialButton neonred = picker.findViewById(R.id.colourNeonRed);
|
||||
// MaterialButton neonpink = picker.findViewById(R.id.colourNeonPink);
|
||||
// MaterialButton neonpurple = picker.findViewById(R.id.colourNeonPurple);
|
||||
// MaterialButton neondeeppurple = picker.findViewById(R.id.colourNeonDeepPurple);
|
||||
// MaterialButton neonblue = picker.findViewById(R.id.colourNeonBlue);
|
||||
// MaterialButton neongreen = picker.findViewById(R.id.colourNeonGreen);
|
||||
// MaterialButton neonyellow = picker.findViewById(R.id.colourNeonYellow);
|
||||
// MaterialButton neonorange = picker.findViewById(R.id.colourNeonOrange);
|
||||
// MaterialButton nocolour = picker.findViewById(R.id.colourNone);
|
||||
//
|
||||
// red.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.red);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// pink.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.pink);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// purple.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.purple);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// deeppurple.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.deeppurple);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// lavender.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.lavender);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// indigo.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.indigo);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// blue.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.blue);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// lightblue.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.lightblue);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// teal.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.teal);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// green.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.green);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// yellow.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.yellow);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// orange.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.orange);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// neonred.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.neonred);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// neonpink.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.neonpink);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// neonpurple.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.neonpurple);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// neondeeppurple.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.neondeeppurple);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// neonblue.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.neonblue);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// neongreen.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.neongreen);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// neonyellow.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.neonyellow);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// neonorange.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, R.color.neonorange);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
// nocolour.setOnClickListener(new View.OnClickListener() {
|
||||
// @Override
|
||||
// public void onClick(View v) {
|
||||
// edit.putInt("col" + titleNoLang, 0);
|
||||
// edit.apply();
|
||||
// dialog.dismiss();
|
||||
// }
|
||||
// });
|
||||
}
|
||||
});
|
||||
emptyLayout.addView(item);
|
||||
@@ -670,7 +499,12 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
|
||||
website.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
customTabsIntent.launchUrl(getContext(), Uri.parse("http://307.joomla.schule.bremen.de"));
|
||||
|
||||
try {
|
||||
customTabsIntent.launchUrl(getContext(), Uri.parse("http://307.joomla.schule.bremen.de"));
|
||||
} catch (ActivityNotFoundException e) {
|
||||
Toast.makeText(getContext(), getString(R.string.chromecompatible), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -808,9 +642,13 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
|
||||
if (cs > 0) {
|
||||
cs--;
|
||||
} else {
|
||||
Toast.makeText(getContext(), getString(R.string.donttell), Toast.LENGTH_LONG).show();
|
||||
cs = 7;
|
||||
customTabsIntent.launchUrl(getContext(), Uri.parse("http://www.flussufer.de/gerd/person.htm"));
|
||||
try {
|
||||
cs = 7;
|
||||
customTabsIntent.launchUrl(getContext(), Uri.parse("http://www.flussufer.de/gerd/person.htm"));
|
||||
Toast.makeText(getContext(), getString(R.string.donttell), Toast.LENGTH_LONG).show();
|
||||
} catch (ActivityNotFoundException e) {
|
||||
Toast.makeText(getContext(), getString(R.string.chromecompatible), Toast.LENGTH_LONG).show();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -896,14 +734,16 @@ public class FragmentSettings extends Fragment implements View.OnClickListener {
|
||||
break;
|
||||
}
|
||||
case "2018-04-20":
|
||||
Toast.makeText(getActivity(), getEmojiByUnicode(0x1F494),
|
||||
Toast.LENGTH_LONG).show();
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.youtube.com/watch?v=ynHYW1iTcq0")); // FTL
|
||||
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
intent.setPackage("com.google.android.youtube");
|
||||
startActivity(intent);
|
||||
|
||||
try {
|
||||
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.youtube.com/watch?v=u8tdT5pAE34")); // SOS
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
intent.setPackage("com.google.android.youtube");
|
||||
startActivity(intent);
|
||||
Toast.makeText(getActivity(), getEmojiByUnicode(0x1F494),
|
||||
Toast.LENGTH_LONG).show();
|
||||
} catch (ActivityNotFoundException e) {
|
||||
Toast.makeText(getActivity(), R.string.noyoutube, Toast.LENGTH_LONG).show();
|
||||
}
|
||||
break;
|
||||
case "Q1 Matchmaker": {
|
||||
final Random gen = new Random();
|
||||
|
||||
@@ -2,7 +2,6 @@ package com.denizd.substitutionplan;
|
||||
|
||||
import android.app.ActivityManager;
|
||||
import android.app.AlertDialog;
|
||||
import android.app.SearchManager;
|
||||
import android.app.job.JobInfo;
|
||||
import android.app.job.JobScheduler;
|
||||
import android.content.ComponentName;
|
||||
@@ -28,6 +27,7 @@ import com.jaredrummler.android.device.DeviceName;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.coordinatorlayout.widget.CoordinatorLayout;
|
||||
import androidx.core.widget.NestedScrollView;
|
||||
import androidx.fragment.app.Fragment;
|
||||
import androidx.core.content.ContextCompat;
|
||||
|
||||
@@ -36,13 +36,13 @@ import android.view.View;
|
||||
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import androidx.recyclerview.widget.RecyclerView;
|
||||
|
||||
import android.view.MenuItem;
|
||||
import android.view.Window;
|
||||
import android.view.WindowManager;
|
||||
import android.view.animation.Animation;
|
||||
import android.view.animation.AnimationUtils;
|
||||
import android.widget.Button;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
|
||||
@@ -82,6 +82,8 @@ public class MainActivity extends AppCompatActivity {
|
||||
finish();
|
||||
}
|
||||
|
||||
final Context context = this;
|
||||
|
||||
edit.putInt("launchDev", prefs.getInt("launchDev", 0) + 1);
|
||||
edit.apply();
|
||||
|
||||
@@ -109,6 +111,10 @@ public class MainActivity extends AppCompatActivity {
|
||||
final BottomNavigationView bottomNav = findViewById(R.id.bottom_nav);
|
||||
final Chip chip = findViewById(R.id.chip);
|
||||
|
||||
if (!prefs.getBoolean("showinfotab", true)) {
|
||||
bottomNav.getMenu().removeItem(R.id.openinfopanel);
|
||||
}
|
||||
|
||||
final CoordinatorLayout fragmentContainer = findViewById(R.id.fragment_container);
|
||||
fragmentContainer.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
@@ -123,6 +129,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
public void onStateChanged(@NonNull View bottomSheet, int newState) {
|
||||
if (bottomSheetBehaviour.getState() == BottomSheetBehavior.STATE_EXPANDED) { // 2 = expanded, 4 = collapsed
|
||||
bottomSheetCloser.setVisibility(View.VISIBLE);
|
||||
|
||||
}
|
||||
if (bottomSheetBehaviour.getState() == BottomSheetBehavior.STATE_COLLAPSED) { // 2 = expanded, 4 = collapsed
|
||||
bottomSheetCloser.setVisibility(View.GONE);
|
||||
@@ -153,8 +160,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
}
|
||||
|
||||
final Context context = this;
|
||||
|
||||
// TODO Huawei dialog
|
||||
|
||||
if (prefs.getBoolean("huaweiDeviceDialog", true)) {
|
||||
@@ -268,7 +273,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
final Animation animationOut = AnimationUtils.loadAnimation(getApplicationContext(), R.anim.chip_slide_out);
|
||||
final Random generator = new Random();
|
||||
Resources res = getResources();
|
||||
String greetings[] = res.getStringArray(R.array.greeting8_array);
|
||||
String[] greetings = res.getStringArray(R.array.greeting8_array);
|
||||
Calendar rightNow = Calendar.getInstance();
|
||||
int currentHour = rightNow.get(Calendar.HOUR_OF_DAY);
|
||||
|
||||
@@ -397,24 +402,51 @@ public class MainActivity extends AppCompatActivity {
|
||||
@Override
|
||||
public boolean onNavigationItemSelected(MenuItem item) {
|
||||
Fragment fragment = null;
|
||||
boolean switcher = false;
|
||||
|
||||
switch (item.getItemId()) {
|
||||
case R.id.plan:
|
||||
fragment = new FragmentPlan();
|
||||
toolbarTxt.setText(getString(R.string.app_name));
|
||||
if (getCurrentFragment().toString().contains("FragmentPlan")) {
|
||||
final RecyclerView recyclerView = findViewById(R.id.linearRecycler);
|
||||
recyclerView.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
recyclerView.smoothScrollToPosition(0);
|
||||
appbarlayout.setExpanded(true);
|
||||
bottomSheetBehaviour.setState(BottomSheetBehavior.STATE_COLLAPSED);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
fragment = new FragmentPlan();
|
||||
toolbarTxt.setText(getString(R.string.app_name));
|
||||
switcher = true;
|
||||
}
|
||||
break;
|
||||
case R.id.personal:
|
||||
fragment = new FragmentPersonal();
|
||||
if (!prefs.getString("username", "").isEmpty()) {
|
||||
if (Character.toString(prefs.getString("username", "").charAt(prefs.getString("username", "").length() - 1)).toLowerCase().equals("s")
|
||||
|| Character.toString(prefs.getString("username", "").charAt(prefs.getString("username", "").length() - 1)).toLowerCase().equals("x")
|
||||
|| Character.toString(prefs.getString("username", "").charAt(prefs.getString("username", "").length() - 1)).toLowerCase().equals("z")) {
|
||||
toolbarTxt.setText(prefs.getString("username", "") + getString(R.string.nosplan));
|
||||
} else {
|
||||
toolbarTxt.setText(prefs.getString("username", "") + getString(R.string.splan));
|
||||
}
|
||||
if (getCurrentFragment().toString().contains("FragmentPersonal")) {
|
||||
final RecyclerView recyclerView = findViewById(R.id.linearRecycler);
|
||||
recyclerView.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
recyclerView.smoothScrollToPosition(0);
|
||||
appbarlayout.setExpanded(true);
|
||||
bottomSheetBehaviour.setState(BottomSheetBehavior.STATE_COLLAPSED);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
toolbarTxt.setText(getString(R.string.personalplan));
|
||||
fragment = new FragmentPersonal();
|
||||
if (!prefs.getString("username", "").isEmpty()) {
|
||||
if (Character.toString(prefs.getString("username", "").charAt(prefs.getString("username", "").length() - 1)).toLowerCase().equals("s")
|
||||
|| Character.toString(prefs.getString("username", "").charAt(prefs.getString("username", "").length() - 1)).toLowerCase().equals("x")
|
||||
|| Character.toString(prefs.getString("username", "").charAt(prefs.getString("username", "").length() - 1)).toLowerCase().equals("z")) {
|
||||
toolbarTxt.setText(prefs.getString("username", "") + getString(R.string.nosplan));
|
||||
} else {
|
||||
toolbarTxt.setText(prefs.getString("username", "") + getString(R.string.splan));
|
||||
}
|
||||
} else {
|
||||
toolbarTxt.setText(getString(R.string.personalplan));
|
||||
}
|
||||
switcher = true;
|
||||
}
|
||||
break;
|
||||
// case R.id.search:
|
||||
@@ -422,22 +454,65 @@ public class MainActivity extends AppCompatActivity {
|
||||
// toolbarTxt.setText(getString(R.string.search));
|
||||
// break;
|
||||
case R.id.menu:
|
||||
fragment = new FragmentFood();
|
||||
toolbarTxt.setText(getString(R.string.foodmenu));
|
||||
if (getCurrentFragment().toString().contains("FragmentFood")) {
|
||||
final RecyclerView recyclerView = findViewById(R.id.linear_food);
|
||||
recyclerView.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
recyclerView.smoothScrollToPosition(0);
|
||||
appbarlayout.setExpanded(true);
|
||||
bottomSheetBehaviour.setState(BottomSheetBehavior.STATE_COLLAPSED);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
fragment = new FragmentFood();
|
||||
toolbarTxt.setText(getString(R.string.foodmenu));
|
||||
switcher = true;
|
||||
}
|
||||
break;
|
||||
case R.id.settings:
|
||||
fragment = new FragmentSettings();
|
||||
toolbarTxt.setText(getString(R.string.settings));
|
||||
if (getCurrentFragment().toString().contains("FragmentSettings")) {
|
||||
final NestedScrollView nsv = findViewById(R.id.nsvsettings);
|
||||
nsv.post(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
// recyclerView.fling(0);
|
||||
nsv.smoothScrollTo(0, 0);
|
||||
appbarlayout.setExpanded(true);
|
||||
bottomSheetBehaviour.setState(BottomSheetBehavior.STATE_COLLAPSED);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
fragment = new FragmentSettings();
|
||||
toolbarTxt.setText(getString(R.string.settings));
|
||||
switcher = true;
|
||||
}
|
||||
break;
|
||||
case R.id.openinfopanel:
|
||||
if (bottomSheetBehaviour.getState() == BottomSheetBehavior.STATE_COLLAPSED) {
|
||||
bottomSheetBehaviour.setState(BottomSheetBehavior.STATE_EXPANDED);
|
||||
break;
|
||||
} else if (bottomSheetBehaviour.getState() == BottomSheetBehavior.STATE_EXPANDED) {
|
||||
bottomSheetBehaviour.setState(BottomSheetBehavior.STATE_COLLAPSED);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (switcher) {
|
||||
appbarlayout.setExpanded(true);
|
||||
bottomSheetBehaviour.setState(BottomSheetBehavior.STATE_COLLAPSED);
|
||||
return loadFragment(fragment);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
appbarlayout.setExpanded(true);
|
||||
bottomSheetBehaviour.setState(BottomSheetBehavior.STATE_COLLAPSED);
|
||||
return loadFragment(fragment);
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
private Fragment getCurrentFragment() {
|
||||
return getSupportFragmentManager().findFragmentById(R.id.fragment_container);
|
||||
}
|
||||
|
||||
private boolean loadFragment(Fragment fragment) {
|
||||
if (fragment != null) {
|
||||
getSupportFragmentManager()
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
<vector android:height="24dp" android:viewportHeight="330"
|
||||
android:viewportWidth="330" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#FF000000" android:pathData="M165,0C74.019,0 0,74.02 0,165.001C0,255.982 74.019,330 165,330s165,-74.018 165,-164.999C330,74.02 255.981,0 165,0zM165,300c-74.44,0 -135,-60.56 -135,-134.999C30,90.562 90.56,30 165,30s135,60.562 135,135.001C300,239.44 239.439,300 165,300z"/>
|
||||
<path android:fillColor="#FF000000" android:pathData="M164.998,70c-11.026,0 -19.996,8.976 -19.996,20.009c0,11.023 8.97,19.991 19.996,19.991c11.026,0 19.996,-8.968 19.996,-19.991C184.994,78.976 176.024,70 164.998,70z"/>
|
||||
<path android:fillColor="#FF000000" android:pathData="M165,140c-8.284,0 -15,6.716 -15,15v90c0,8.284 6.716,15 15,15c8.284,0 15,-6.716 15,-15v-90C180,146.716 173.284,140 165,140z"/>
|
||||
</vector>
|
||||
@@ -19,10 +19,10 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:background="?attr/colorBackground"
|
||||
app:layout_scrollFlags="scroll|enterAlwaysCollapsed"
|
||||
app:popupTheme="@style/AppThemeLight.PopupOverlay"
|
||||
app:titleTextColor="?attr/colorAccent"
|
||||
app:contentInsetStart="0dp">
|
||||
app:contentInsetStart="0dp"
|
||||
app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
@@ -89,7 +89,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="56dp"
|
||||
android:layout_marginBottom="0dp"
|
||||
app:elevation="0px"
|
||||
app:elevation="0dp"
|
||||
app:itemIconTint="@color/bottom_nav_color_avhblue"
|
||||
app:itemTextColor="@color/bottom_nav_color_avhblue"
|
||||
app:layout_anchor="@+id/bottom_sheet"
|
||||
|
||||
@@ -15,25 +15,29 @@
|
||||
android:id="@+id/colourRed"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/red"/>
|
||||
android:backgroundTint="@color/red"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourPink"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/pink"/>
|
||||
android:backgroundTint="@color/pink"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourPurple"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/purple"/>
|
||||
android:backgroundTint="@color/purple"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourDeepPurple"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/deeppurple"/>
|
||||
android:backgroundTint="@color/deeppurple"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
</TableRow>
|
||||
|
||||
@@ -45,25 +49,29 @@
|
||||
android:id="@+id/colourLavender"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/lavender"/>
|
||||
android:backgroundTint="@color/lavender"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourIndigo"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/indigo"/>
|
||||
android:backgroundTint="@color/indigo"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourBlue"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/blue"/>
|
||||
android:backgroundTint="@color/blue"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourLightBlue"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/lightblue"/>
|
||||
android:backgroundTint="@color/lightblue"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
</TableRow>
|
||||
|
||||
@@ -75,25 +83,29 @@
|
||||
android:id="@+id/colourTeal"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/teal"/>
|
||||
android:backgroundTint="@color/teal"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourGreen"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/green"/>
|
||||
android:backgroundTint="@color/green"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourYellow"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/yellow"/>
|
||||
android:backgroundTint="@color/yellow"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourOrange"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/orange"/>
|
||||
android:backgroundTint="@color/orange"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
</TableRow>
|
||||
|
||||
@@ -112,25 +124,29 @@
|
||||
android:id="@+id/colourNeonRed"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/neonred"/>
|
||||
android:backgroundTint="@color/neonred"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourNeonPink"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/neonpink"/>
|
||||
android:backgroundTint="@color/neonpink"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourNeonPurple"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/neonpurple"/>
|
||||
android:backgroundTint="@color/neonpurple"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourNeonDeepPurple"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/neondeeppurple"/>
|
||||
android:backgroundTint="@color/neondeeppurple"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
</TableRow>
|
||||
|
||||
@@ -142,25 +158,29 @@
|
||||
android:id="@+id/colourNeonBlue"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/neonblue"/>
|
||||
android:backgroundTint="@color/neonblue"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourNeonGreen"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/neongreen"/>
|
||||
android:backgroundTint="@color/neongreen"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourNeonYellow"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/neonyellow"/>
|
||||
android:backgroundTint="@color/neonyellow"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/colourNeonOrange"
|
||||
android:layout_margin="8dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@color/neonorange"/>
|
||||
android:backgroundTint="@color/neonorange"
|
||||
app:cornerRadius="16dp"/>
|
||||
|
||||
</TableRow>
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
android:background="?attr/colorBackground">
|
||||
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:id="@+id/nsvsettings"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:fillViewport="true">
|
||||
@@ -129,6 +130,40 @@
|
||||
app:layout_constraintStart_toStartOf="@+id/txtDark"
|
||||
app:layout_constraintTop_toTopOf="@+id/txtDark" />
|
||||
|
||||
<!-- a-->
|
||||
<TextView
|
||||
android:id="@+id/txtHideInfo"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:text="@string/showinfo"
|
||||
android:textColor="?attr/colorText"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintStart_toStartOf="@+id/txtRestart"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtRestart" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtHideInfo2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/swipeindependent"
|
||||
android:textColor="?attr/colorHint"
|
||||
android:textSize="12sp"
|
||||
app:layout_constraintStart_toStartOf="@+id/txtHideInfo"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtHideInfo" />
|
||||
|
||||
<Switch
|
||||
android:id="@+id/switchHideInfo"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:gravity="end|center"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/txtHideInfo2"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="@+id/txtHideInfo"
|
||||
app:layout_constraintTop_toTopOf="@+id/txtHideInfo" />
|
||||
<!-- a-->
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtCustomiseColours1"
|
||||
android:layout_width="wrap_content"
|
||||
@@ -137,8 +172,8 @@
|
||||
android:text="@string/customisecolor1"
|
||||
android:textColor="?attr/colorText"
|
||||
android:textSize="14sp"
|
||||
app:layout_constraintStart_toStartOf="@+id/txtRestart"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtRestart" />
|
||||
app:layout_constraintStart_toStartOf="@+id/txtHideInfo2"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtHideInfo2" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtCustomiseColours2"
|
||||
@@ -164,7 +199,7 @@
|
||||
app:layout_constraintBottom_toTopOf="@+id/txtFilter"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtRestart" />
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtHideInfo2" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtFilter"
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:backgroundTint="?attr/colorBackgroundCard"
|
||||
app:cardCornerRadius="4dp"
|
||||
app:cardCornerRadius="8dp"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_marginTop="1dp"
|
||||
android:layout_marginBottom="1dp"
|
||||
app:cardElevation="1dp">
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_marginBottom="3dp"
|
||||
app:cardElevation="2dp">
|
||||
|
||||
<!--app:cardUseCompatPadding="true"-->
|
||||
|
||||
|
||||
@@ -6,11 +6,11 @@
|
||||
app:cardCornerRadius="4dp"
|
||||
android:clickable="true"
|
||||
android:focusable="true"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_marginTop="1dp"
|
||||
android:layout_marginBottom="1dp"
|
||||
app:cardElevation="1dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_marginBottom="3dp"
|
||||
app:cardElevation="2dp"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<LinearLayout
|
||||
|
||||
@@ -21,10 +21,14 @@
|
||||
android:icon="@drawable/ic_tomato"
|
||||
android:title="@string/menu"
|
||||
android:enabled="true"/>
|
||||
<item
|
||||
android:id="@+id/openinfopanel"
|
||||
android:icon="@drawable/ic_information"
|
||||
android:title=""
|
||||
android:enabled="true"/>
|
||||
<item
|
||||
android:id="@+id/settings"
|
||||
android:icon="@drawable/ic_cogwheel"
|
||||
android:title="@string/settings"
|
||||
android:enabled="true"/>
|
||||
|
||||
</menu>
|
||||
@@ -124,4 +124,8 @@
|
||||
<string name="allcolourscleared">Farben für alle Kurse wurden gelöscht</string>
|
||||
<string name="clearcolour">Farbe löschen</string>
|
||||
<string name="finish">Fertigstellen</string>
|
||||
<string name="chromecompatible">Kein Chrome-kompatibler Browser gefunden</string>
|
||||
<string name="noyoutube">YouTube-App nicht gefunden</string>
|
||||
<string name="swipeindependent">Unabhängig von Wischgeste</string>
|
||||
<string name="showinfo">Zeige Info-Tab in Navigationsleisete</string>
|
||||
</resources>
|
||||
@@ -141,6 +141,12 @@
|
||||
<string name="allcolourscleared">Colours for all courses have been cleared</string>
|
||||
<string name="finish">Finish</string>
|
||||
|
||||
<string name="chromecompatible">No Chrome-compatible browser found</string>
|
||||
<string name="noyoutube">YouTube app not found</string>
|
||||
|
||||
<string name="showinfo">Show info tab in navigation bar</string>
|
||||
<string name="swipeindependent">Independent of swipe gesture</string>
|
||||
|
||||
|
||||
<!--<string name="avhblue">AvH-Blue</string>-->
|
||||
<!--<string name="rosered">AvH-Blue</string>-->
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
<item name="colorPrimaryDark">#1B1B1B</item>
|
||||
<item name="colorAccent">#448aff</item>
|
||||
<item name="colorBackground">#1B1B1B</item>
|
||||
<item name="colorBackgroundCard">#1B1B1B</item>
|
||||
<item name="colorBackgroundCard">#212121</item>
|
||||
<item name="colorText">#e0e0e0</item>
|
||||
<item name="colorHintLight">#e0e0e0</item>
|
||||
<item name="colorHint">#9e9e9e</item>
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@ buildscript {
|
||||
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.3.2'
|
||||
classpath 'com.android.tools.build:gradle:3.5.0-alpha13'
|
||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
#Sun Mar 17 18:33:17 CET 2019
|
||||
#Mon May 06 17:16:56 CEST 2019
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-rc-1-all.zip
|
||||
|
||||
Reference in New Issue
Block a user