Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/deploymentTargetDropDown.xml
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we don't need this change to be merged, right? can you remove it from the PR?

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 5 additions & 20 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 2 additions & 46 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions .idea/modules.xml

This file was deleted.

1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ dependencies {
implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'androidx.exifinterface:exifinterface:1.3.3'
implementation 'com.pes.materialcolorpicker:library:1.2.2'
implementation 'com.github.widemouth-dz:wmrichtexteditor:2.0.4'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this still active? in https://github.com/widemouth-dz/ I don't see a repository wmrichtexteditor...

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also it looks that you didn't include this library in the list of used libraries in the about dialog.


implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation "androidx.lifecycle:lifecycle-viewmodel:2.5.1"
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".ui.main.RedPacketActivity"
android:exported="true"/>
<activity android:name=".ui.generic.EditActivity"
android:label="@string/activity_title_edit_new"
android:windowSoftInputMode="stateVisible"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.acra.data.StringFormat;

import de.rampro.activitydiary.helpers.GraphicsHelper;
import de.rampro.activitydiary.model.conditions.SPUtils;

public class ActivityDiaryApplication extends Application {

Expand All @@ -37,7 +38,7 @@ public class ActivityDiaryApplication extends Application {
public void onCreate() {
super.onCreate();
ActivityDiaryApplication.context = getApplicationContext();

SPUtils.init(this);
/* now do some init stuff */
String colors[] = context.getResources().getStringArray(R.array.activityColorPalette);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,18 @@ public class DiaryActivity{
private String mName;
private int mId;
private int mColor;

private String mTag;
public DiaryActivity(int id, String name, int color){
mId = id;
mName = name;
mColor = color;

}
public DiaryActivity(int id, String name, int color,String tag){
mId = id;
mName = name;
mColor = color;
mTag=tag;
}

public String getName(){
Expand Down Expand Up @@ -56,4 +63,12 @@ public String toString(){
public int hashCode(){
return mId;
}

public String getmTag() {
return mTag;
}

public void setmTag(String mTag) {
this.mTag = mTag;
}
}
Loading