diff --git a/src/showme/app/src/main/java/com/diary/showme/MainActivity.java b/src/showme/app/src/main/java/com/diary/showme/MainActivity.java index f8cbe06..974e8ed 100644 --- a/src/showme/app/src/main/java/com/diary/showme/MainActivity.java +++ b/src/showme/app/src/main/java/com/diary/showme/MainActivity.java @@ -90,7 +90,7 @@ public class MainActivity extends AppCompatActivity { viewAdapter = new CalendarViewAdapter(this, attr, onSelectDateListener, clickListener); initPager(); -// initSchedule(); + initSchedule(); } private void initSQL() { diff --git a/src/showme/app/src/main/java/com/diary/showme/diary/ui/AddDiaryActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/AddDiaryActivity.java index cd8be34..b0b8218 100644 --- a/src/showme/app/src/main/java/com/diary/showme/diary/ui/AddDiaryActivity.java +++ b/src/showme/app/src/main/java/com/diary/showme/diary/ui/AddDiaryActivity.java @@ -497,6 +497,6 @@ public class AddDiaryActivity extends AppCompatActivity { @Override public void onBackPressed() { super.onBackPressed(); -// DiaryActivity.startActivity(this); + DiaryActivity.startActivity(this); } } \ No newline at end of file diff --git a/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java index 6bb6f30..637cc3d 100644 --- a/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java +++ b/src/showme/app/src/main/java/com/diary/showme/diary/ui/CardActivity.java @@ -18,6 +18,7 @@ import com.diary.showme.Course.AddCourseActivity; import com.diary.showme.Course.Course; import com.diary.showme.Course.CourseActivity; import com.diary.showme.R; +import com.diary.showme.diary.utils.AppManager; public class CardActivity extends AppCompatActivity { @@ -33,6 +34,7 @@ public class CardActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.card); + AppManager.getAppManager().addActivity(this); card1 = findViewById(R.id.card1); card2 = findViewById(R.id.card2); card3 = findViewById(R.id.card3); @@ -63,7 +65,7 @@ public class CardActivity extends AppCompatActivity { @Override public void onBackPressed() { + AppManager.getAppManager().findActivity(CardActivity.class); super.onBackPressed(); - } } diff --git a/src/showme/app/src/main/java/com/diary/showme/diary/ui/UpdateDiaryActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/UpdateDiaryActivity.java index 3e77f63..1e1688a 100644 --- a/src/showme/app/src/main/java/com/diary/showme/diary/ui/UpdateDiaryActivity.java +++ b/src/showme/app/src/main/java/com/diary/showme/diary/ui/UpdateDiaryActivity.java @@ -491,6 +491,6 @@ public class UpdateDiaryActivity extends AppCompatActivity { @Override public void onBackPressed() { super.onBackPressed(); -// DiaryActivity.startActivity(this); + DiaryActivity.startActivity(this); } } \ No newline at end of file