diff --git a/src/.idea/.name b/src/.idea/.name
deleted file mode 100644
index b3405b3..0000000
--- a/src/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-My Application
\ No newline at end of file
diff --git a/src/app/src/main/AndroidManifest.xml b/src/app/src/main/AndroidManifest.xml
deleted file mode 100644
index ed8e68d..0000000
--- a/src/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/src/main/java/com/showme/myapplication/MainActivity.java b/src/app/src/main/java/com/showme/myapplication/MainActivity.java
deleted file mode 100644
index 8df5d92..0000000
--- a/src/app/src/main/java/com/showme/myapplication/MainActivity.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.showme.myapplication;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.annotation.SuppressLint;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.widget.TextView;
-
-import com.idealist.calendarview.CalendarAttr;
-import com.idealist.calendarview.CalendarDay;
-import com.idealist.calendarview.CalendarPager;
-import com.idealist.calendarview.CalendarUtils;
-import com.idealist.calendarview.CalendarView;
-import com.idealist.calendarview.CalendarViewAdapter;
-import com.idealist.calendarview.State;
-import com.idealist.calendarview.interf.OnSelectDateListener;
-
-import java.util.TimeZone;
-
-public class MainActivity extends AppCompatActivity {
-
- private TextView tvMonth;
- private TextView tvYear;
-
- private CalendarDay currentDay;
-
- private CalendarView currentView;
-
- private CalendarPager pager;
-
- private CalendarViewAdapter viewAdapter;
-
- private CalendarAttr attr;
-
- private OnSelectDateListener onSelectDateListener;
-
- private CalendarView.OnCalendarClickListener clickListener;
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
-
- TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
- DisplayMetrics dm = new DisplayMetrics();
- getWindowManager().getDefaultDisplay().getRealMetrics(dm);
- int height = dm.heightPixels;
- State.setDefaultItemHeightFull((height - 42 - 3*State.DEFAULT_ITEM_HEIGHT) / 6);
-
- initCalendar();
-
- attr = new CalendarAttr();
- attr.setCalendarType(State.VIEW_MONTH);
- attr.setScrollLevel(State.LEVEL_MEDIUM);
-
- initListener();
- viewAdapter = new CalendarViewAdapter(this, attr, onSelectDateListener,
- clickListener);
- initPager();
- }
-
- private void initCalendar() {
- tvMonth = findViewById(R.id.custom_month_view);
- tvYear = findViewById(R.id.custom_year_view);
- currentDay = CalendarUtils.getCurrDay();
- updateCalendar();
- }
-
- private void initPager() {
- pager = findViewById(R.id.custom_vp);
- pager.setAttr(attr);
- pager.setAdapter(viewAdapter);
-
- pager.setmOnPageChangeListener(new CalendarPager.OnPageChangeListener() {
-
- @Override
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
- }
-
- @Override
- public void onPageSelected(int position) {
- currentView = viewAdapter.getViews().get(position % 3);
- currentDay = currentView.getSeedDay();
- updateCalendar();
- }
-
- @Override
- public void onPageScrollStateChanged(int state) {
- }
- });
- }
-
- private void initListener() {
- onSelectDateListener = offset -> pager.selectOtherMonth(offset);
- clickListener = new CalendarView.OnCalendarClickListener() {
- @Override
- public void OnClick(CalendarDay day) {
-// updateSchedule(day);
- }
-
- @Override
- public void OnLongClick(CalendarDay day) {
-
- }
- };
- }
-
- @SuppressLint("SetTextI18n")
- private void updateCalendar() {
- tvMonth.setText(currentDay.getMonth() + "");
- tvYear.setText(currentDay.getYear() + "");
- }
-
-}
\ No newline at end of file
diff --git a/src/app/src/main/res/layout/activity_main.xml b/src/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 6bc8ba7..0000000
--- a/src/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml
deleted file mode 100644
index 3de1a39..0000000
--- a/src/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
- My Application
-
\ No newline at end of file
diff --git a/src/settings.gradle b/src/settings.gradle
deleted file mode 100644
index 26cb0a3..0000000
--- a/src/settings.gradle
+++ /dev/null
@@ -1,4 +0,0 @@
-include ':DataBase'
-include ':app'
-rootProject.name = "My Application"
-include ':CalendarView'
diff --git a/src/.gitignore b/src/showme/.gitignore
similarity index 100%
rename from src/.gitignore
rename to src/showme/.gitignore
diff --git a/src/.idea/.gitignore b/src/showme/.idea/.gitignore
similarity index 100%
rename from src/.idea/.gitignore
rename to src/showme/.idea/.gitignore
diff --git a/src/.idea/compiler.xml b/src/showme/.idea/compiler.xml
similarity index 100%
rename from src/.idea/compiler.xml
rename to src/showme/.idea/compiler.xml
diff --git a/src/.idea/gradle.xml b/src/showme/.idea/gradle.xml
similarity index 88%
rename from src/.idea/gradle.xml
rename to src/showme/.idea/gradle.xml
index e9d2c33..8d5774d 100644
--- a/src/.idea/gradle.xml
+++ b/src/showme/.idea/gradle.xml
@@ -12,7 +12,8 @@
-
+
+
diff --git a/src/.idea/jarRepositories.xml b/src/showme/.idea/jarRepositories.xml
similarity index 69%
rename from src/.idea/jarRepositories.xml
rename to src/showme/.idea/jarRepositories.xml
index a5f05cd..1e6c41e 100644
--- a/src/.idea/jarRepositories.xml
+++ b/src/showme/.idea/jarRepositories.xml
@@ -21,5 +21,15 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/.idea/misc.xml b/src/showme/.idea/misc.xml
similarity index 100%
rename from src/.idea/misc.xml
rename to src/showme/.idea/misc.xml
diff --git a/src/showme/.idea/runConfigurations.xml b/src/showme/.idea/runConfigurations.xml
new file mode 100644
index 0000000..797acea
--- /dev/null
+++ b/src/showme/.idea/runConfigurations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/.idea/vcs.xml b/src/showme/.idea/vcs.xml
similarity index 63%
rename from src/.idea/vcs.xml
rename to src/showme/.idea/vcs.xml
index 6c0b863..b2bdec2 100644
--- a/src/.idea/vcs.xml
+++ b/src/showme/.idea/vcs.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/src/CalendarView/.gitignore b/src/showme/CalendarView/.gitignore
similarity index 100%
rename from src/CalendarView/.gitignore
rename to src/showme/CalendarView/.gitignore
diff --git a/src/CalendarView/build.gradle b/src/showme/CalendarView/build.gradle
similarity index 78%
rename from src/CalendarView/build.gradle
rename to src/showme/CalendarView/build.gradle
index e92336c..62276fd 100644
--- a/src/CalendarView/build.gradle
+++ b/src/showme/CalendarView/build.gradle
@@ -1,13 +1,14 @@
+
plugins {
id 'com.android.library'
}
android {
compileSdkVersion 30
- buildToolsVersion "30.0.3"
+ buildToolsVersion "30.0.2"
defaultConfig {
- minSdkVersion 29
+ minSdkVersion 16
targetSdkVersion 30
versionCode 1
versionName "1.0"
@@ -30,10 +31,10 @@ android {
dependencies {
- implementation 'androidx.appcompat:appcompat:1.3.0'
- implementation 'com.google.android.material:material:1.3.0'
- implementation project(path: ':DataBase')
+ implementation 'androidx.appcompat:appcompat:1.2.0'
+ implementation 'com.google.android.material:material:1.2.1'
+ implementation project(path: ':Database')
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-}
\ No newline at end of file
+}
diff --git a/src/CalendarView/consumer-rules.pro b/src/showme/CalendarView/consumer-rules.pro
similarity index 100%
rename from src/CalendarView/consumer-rules.pro
rename to src/showme/CalendarView/consumer-rules.pro
diff --git a/src/CalendarView/proguard-rules.pro b/src/showme/CalendarView/proguard-rules.pro
similarity index 100%
rename from src/CalendarView/proguard-rules.pro
rename to src/showme/CalendarView/proguard-rules.pro
diff --git a/src/showme/CalendarView/src/androidTest/java/com/diary/calendarview/ExampleInstrumentedTest.java b/src/showme/CalendarView/src/androidTest/java/com/diary/calendarview/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..b6a7847
--- /dev/null
+++ b/src/showme/CalendarView/src/androidTest/java/com/diary/calendarview/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.diary.calendarview;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see Testing documentation
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+ @Test
+ public void useAppContext() {
+ // Context of the app under test.
+ Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+ assertEquals("com.diary.calendarview.test", appContext.getPackageName());
+ }
+}
\ No newline at end of file
diff --git a/src/CalendarView/src/androidTest/java/com/idealist/calendarview/ExampleInstrumentedTest.java b/src/showme/CalendarView/src/androidTest/java/com/idealist/calendarview/ExampleInstrumentedTest.java
similarity index 100%
rename from src/CalendarView/src/androidTest/java/com/idealist/calendarview/ExampleInstrumentedTest.java
rename to src/showme/CalendarView/src/androidTest/java/com/idealist/calendarview/ExampleInstrumentedTest.java
diff --git a/src/CalendarView/src/main/AndroidManifest.xml b/src/showme/CalendarView/src/main/AndroidManifest.xml
similarity index 100%
rename from src/CalendarView/src/main/AndroidManifest.xml
rename to src/showme/CalendarView/src/main/AndroidManifest.xml
diff --git a/src/CalendarView/src/main/java/com/idealist/calendarview/CalendarAttr.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarAttr.java
similarity index 99%
rename from src/CalendarView/src/main/java/com/idealist/calendarview/CalendarAttr.java
rename to src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarAttr.java
index f8f9e04..d38df74 100644
--- a/src/CalendarView/src/main/java/com/idealist/calendarview/CalendarAttr.java
+++ b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarAttr.java
@@ -1,5 +1,6 @@
package com.idealist.calendarview;
+
public class CalendarAttr {
static int RecTop;
diff --git a/src/CalendarView/src/main/java/com/idealist/calendarview/CalendarDay.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarDay.java
similarity index 100%
rename from src/CalendarView/src/main/java/com/idealist/calendarview/CalendarDay.java
rename to src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarDay.java
diff --git a/src/CalendarView/src/main/java/com/idealist/calendarview/CalendarPager.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarPager.java
similarity index 99%
rename from src/CalendarView/src/main/java/com/idealist/calendarview/CalendarPager.java
rename to src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarPager.java
index 7e8d41a..755215f 100644
--- a/src/CalendarView/src/main/java/com/idealist/calendarview/CalendarPager.java
+++ b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarPager.java
@@ -133,7 +133,7 @@ public class CalendarPager extends ViewPager {
/**
* 月视图到周视图可向上滑动距离距离
- *a
+ *
* @return 距离
*/
public int getTopMovableDistance() {
diff --git a/src/CalendarView/src/main/java/com/idealist/calendarview/CalendarPagerBehavior.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarPagerBehavior.java
similarity index 100%
rename from src/CalendarView/src/main/java/com/idealist/calendarview/CalendarPagerBehavior.java
rename to src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarPagerBehavior.java
diff --git a/src/CalendarView/src/main/java/com/idealist/calendarview/CalendarUtils.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarUtils.java
similarity index 98%
rename from src/CalendarView/src/main/java/com/idealist/calendarview/CalendarUtils.java
rename to src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarUtils.java
index 338e02b..c3e849d 100644
--- a/src/CalendarView/src/main/java/com/idealist/calendarview/CalendarUtils.java
+++ b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarUtils.java
@@ -15,7 +15,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.widget.RecyclerView;
-import com.showme.database.utils.ScheduleSQLUtils;
+import com.diary.database.utils.ScheduleSQLUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -132,9 +132,9 @@ public class CalendarUtils {
if (date.equals(CalendarViewAdapter.loadSelectedDate())) {
date.setSelectState(State.DAY_SELECT);
}
-// if (ScheduleSQLUtils.isScheduleMarked(date.toString())) {
-// date.setMarkSchedule(true);
-// }
+ if (ScheduleSQLUtils.isScheduleMarked(date.toString())) {
+ date.setMarkSchedule(true);
+ }
}
return dates;
}
diff --git a/src/CalendarView/src/main/java/com/idealist/calendarview/CalendarView.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarView.java
similarity index 100%
rename from src/CalendarView/src/main/java/com/idealist/calendarview/CalendarView.java
rename to src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarView.java
diff --git a/src/CalendarView/src/main/java/com/idealist/calendarview/CalendarViewAdapter.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarViewAdapter.java
similarity index 100%
rename from src/CalendarView/src/main/java/com/idealist/calendarview/CalendarViewAdapter.java
rename to src/showme/CalendarView/src/main/java/com/idealist/calendarview/CalendarViewAdapter.java
diff --git a/src/showme/CalendarView/src/main/java/com/idealist/calendarview/RecyclerViewAdapter.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/RecyclerViewAdapter.java
new file mode 100644
index 0000000..ad12a9a
--- /dev/null
+++ b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/RecyclerViewAdapter.java
@@ -0,0 +1,66 @@
+package com.idealist.calendarview;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.diary.database.utils.ScheduleSQLUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RecyclerViewAdapter extends RecyclerView.Adapter implements
+ View.OnClickListener{
+ private List mDatabase;
+
+ private OnItemClickListener onItemClickListener = null;
+
+ public RecyclerViewAdapter(List mDatabase) {
+ super();
+ this.mDatabase = mDatabase;
+ }
+
+ @NonNull
+ @Override
+ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = View.inflate(parent.getContext(), R.layout.schedule_item, null);
+ view.setOnClickListener(this);
+ return new RecyclerViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
+ if (!(holder instanceof RecyclerViewHolder))
+ return;
+ holder.itemView.setTag(position);
+ String text = mDatabase.get(position);
+ ((RecyclerViewHolder) holder).timeTextView.setText(ScheduleSQLUtils.extractScheduleTime(text));
+ ((RecyclerViewHolder) holder).titleTextView.setText(ScheduleSQLUtils.extractScheduleName(text));
+ }
+
+ @Override
+ public int getItemCount() {
+ return mDatabase.size();
+ }
+
+ @Override
+ public void onClick(View v) {
+ if (onItemClickListener != null) {
+ onItemClickListener.onItemClick(v, (int) v.getTag());
+ }
+ }
+
+ public void setmDatabase(List mDatabase) {
+ this.mDatabase = mDatabase;
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.onItemClickListener = onItemClickListener;
+ }
+
+ public interface OnItemClickListener {
+ void onItemClick(View view, int position);
+ }
+}
diff --git a/src/showme/CalendarView/src/main/java/com/idealist/calendarview/RecyclerViewBehavior.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/RecyclerViewBehavior.java
new file mode 100644
index 0000000..33349a2
--- /dev/null
+++ b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/RecyclerViewBehavior.java
@@ -0,0 +1,141 @@
+package com.idealist.calendarview;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
+
+import static android.content.ContentValues.TAG;
+
+public class RecyclerViewBehavior extends CoordinatorLayout.Behavior {
+
+ private int initOffset = -1;
+ private int minOffset = -1;
+ private int bottomOffset = -1;
+ private Context context;
+ private boolean initiated = false;
+ boolean hidingTop = false;
+ boolean showingTop = false;
+
+ public RecyclerViewBehavior(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ this.context = context;
+ }
+
+ @Override
+ public boolean onLayoutChild(@NonNull CoordinatorLayout parent, @NonNull RecyclerView child, int layoutDirection) {
+ parent.onLayoutChild(child, layoutDirection);
+ CalendarPager calendarPager = getCalendarPager(parent);
+ initMinOffsetAndInitOffset(parent, child, calendarPager);
+ return true;
+ }
+
+ private void initMinOffsetAndInitOffset(CoordinatorLayout parent, RecyclerView child, CalendarPager pager) {
+ if (pager.getBottom() > 0 && initOffset == -1) {
+ initOffset = pager.getMeasuredHeight();
+ CalendarAttr.setRecTop(initOffset);
+ }
+ if (pager.getBottom() > 0 && bottomOffset == -1) {
+ bottomOffset = State.DEFAULT_ITEM_HEIGHT_FULL * 6;
+ }
+ if (!initiated) {
+ initOffset = pager.getMeasuredHeight();
+ CalendarAttr.setRecTop(initOffset);
+ initiated = true;
+ }
+ child.offsetTopAndBottom(CalendarAttr.getRecTop());
+ minOffset = getCalendarPager(parent).getItemHeight();
+ }
+
+ @Override
+ public boolean onStartNestedScroll(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView child, @NonNull View directTargetChild, @NonNull View target, int axes, int type) {
+ return (axes & ViewCompat.SCROLL_AXIS_VERTICAL) != 0;
+ }
+
+ @Override
+ public void onNestedPreScroll(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView child, @NonNull View target, int dx, int dy, @NonNull int[] consumed, int type) {
+ super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type);
+ child.setVerticalScrollBarEnabled(true);
+
+ CalendarPager pager = (CalendarPager) coordinatorLayout.getChildAt(0);
+ if (pager.getPageScrollState() != ViewPager.SCROLL_STATE_IDLE) {
+ consumed[1] = dy;
+ Log.w("ldf", "onNestedPreScroll: MonthPager dragging");
+ Toast.makeText(context, "loading month data", Toast.LENGTH_SHORT).show();
+ return;
+ }
+
+ // 上滑,正在隐藏顶部的日历
+ hidingTop = dy > 0;
+ // 下滑,正在展示顶部的日历
+ showingTop = dy < 0 && !target.canScrollVertically(-1);
+ Log.i("recycleBehavior", "hidingTop: " + hidingTop + " showingTop: " + showingTop);
+ if (hidingTop || showingTop) {
+ if (pager.getScrollLevel() == State.LEVEL_TOP) {
+ consumed[1] = CalendarUtils.scroll(child, dy,
+ State.DEFAULT_ITEM_HEIGHT,
+ State.DEFAULT_ITEM_HEIGHT * 6 + 10);
+ } else if (pager.getScrollLevel() == State.LEVEL_MEDIUM) {
+ consumed[1] = CalendarUtils.scroll(child, dy,
+ State.DEFAULT_ITEM_HEIGHT,
+ State.DEFAULT_ITEM_HEIGHT_FULL * 6);
+ }
+ CalendarAttr.setRecTop(child.getTop());
+ }
+ }
+
+ @Override
+ public void onStopNestedScroll(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView child, @NonNull View target, int type) {
+ super.onStopNestedScroll(coordinatorLayout, child, target, type);
+ CalendarPager pager = (CalendarPager) getCalendarPager(coordinatorLayout);
+ CalendarViewAdapter adapter = (CalendarViewAdapter) pager.getAdapter();
+
+ if (pager.getScrollLevel() == State.LEVEL_TOP) {
+ if (CalendarAttr.getRecTop() - minOffset > CalendarUtils.getTouchSlop(context) && showingTop
+ && CalendarAttr.getRecTop() < initOffset + 110) {
+ pager.setScrollLevel(State.LEVEL_MEDIUM);
+ adapter.changeCalendarType(State.VIEW_MONTH);
+ CalendarUtils.scrollTo(coordinatorLayout, child, getCalendarPager(coordinatorLayout).getViewHeight(), 500);
+ CalendarUtils.forceStopRecyclerViewScroll(child);
+ } else {
+ CalendarUtils.scrollTo(coordinatorLayout, child, getCalendarPager(coordinatorLayout).getItemHeight(), 150);
+ }
+ } else if (pager.getScrollLevel() == State.LEVEL_MEDIUM) {
+ if (initOffset - CalendarAttr.getRecTop() > CalendarUtils.getTouchSlop(context) && hidingTop) {
+ pager.setScrollLevel(State.LEVEL_TOP);
+ adapter.changeCalendarType(State.VIEW_WEEK);
+ CalendarUtils.scrollTo(coordinatorLayout, child, getCalendarPager(coordinatorLayout).getItemHeight(), 500);
+ CalendarUtils.forceStopRecyclerViewScroll(child);
+ } else if (CalendarAttr.getRecTop() - initOffset > CalendarUtils.getTouchSlop(context) && showingTop) {
+ pager.setScrollLevel(State.LEVEL_BOTTOM);
+ adapter.changeCalendarType(State.VIEW_FULL);
+ CalendarUtils.scrollTo(coordinatorLayout, child, getCalendarPager(coordinatorLayout).getViewHeight(), 500);
+ CalendarUtils.forceStopRecyclerViewScroll(child);
+ } else {
+ CalendarUtils.scrollTo(coordinatorLayout, child, getCalendarPager(coordinatorLayout).getViewHeight(), 150);
+ }
+ }
+ }
+
+ @Override
+ public boolean onNestedFling(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView child, @NonNull View target, float velocityX, float velocityY, boolean consumed) {
+ return super.onNestedFling(coordinatorLayout, child, target, velocityX, velocityY, consumed);
+ }
+
+ @Override
+ public boolean onNestedPreFling(@NonNull CoordinatorLayout coordinatorLayout, @NonNull RecyclerView child, @NonNull View target, float velocityX, float velocityY) {
+ return super.onNestedPreFling(coordinatorLayout, child, target, velocityX, velocityY);
+ }
+
+ private CalendarPager getCalendarPager(CoordinatorLayout parent) {
+ return (CalendarPager) parent.getChildAt(0);
+ }
+
+}
diff --git a/src/showme/CalendarView/src/main/java/com/idealist/calendarview/RecyclerViewHolder.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/RecyclerViewHolder.java
new file mode 100644
index 0000000..32578e0
--- /dev/null
+++ b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/RecyclerViewHolder.java
@@ -0,0 +1,20 @@
+package com.idealist.calendarview;
+
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class RecyclerViewHolder extends RecyclerView.ViewHolder {
+ public TextView timeTextView;
+ public TextView titleTextView;
+
+ public RecyclerViewHolder(@NonNull View itemView) {
+ super(itemView);
+ timeTextView = itemView.findViewById(R.id.schedule_time);
+ titleTextView = itemView.findViewById(R.id.schedule_title);
+ }
+
+
+}
diff --git a/src/showme/CalendarView/src/main/java/com/idealist/calendarview/SpaceItemDecoration.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/SpaceItemDecoration.java
new file mode 100644
index 0000000..0288465
--- /dev/null
+++ b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/SpaceItemDecoration.java
@@ -0,0 +1,30 @@
+package com.idealist.calendarview;
+
+import android.graphics.Rect;
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.HashMap;
+
+public class SpaceItemDecoration extends RecyclerView.ItemDecoration {
+ private int mSpace;
+
+ public SpaceItemDecoration(int mSpace) {
+ this.mSpace = mSpace;
+ }
+
+
+ @Override
+ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+ super.getItemOffsets(outRect, view, parent, state);
+ outRect.left = mSpace;
+ outRect.right = mSpace;
+ outRect.bottom = mSpace;
+ if (parent.getChildAdapterPosition(view) == 0) {
+ outRect.top = mSpace;
+ }
+
+ }
+}
+
diff --git a/src/CalendarView/src/main/java/com/idealist/calendarview/State.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/State.java
similarity index 100%
rename from src/CalendarView/src/main/java/com/idealist/calendarview/State.java
rename to src/showme/CalendarView/src/main/java/com/idealist/calendarview/State.java
diff --git a/src/CalendarView/src/main/java/com/idealist/calendarview/interf/OnSelectDateListener.java b/src/showme/CalendarView/src/main/java/com/idealist/calendarview/interf/OnSelectDateListener.java
similarity index 100%
rename from src/CalendarView/src/main/java/com/idealist/calendarview/interf/OnSelectDateListener.java
rename to src/showme/CalendarView/src/main/java/com/idealist/calendarview/interf/OnSelectDateListener.java
diff --git a/src/showme/CalendarView/src/main/res/drawable/schedule_border.xml b/src/showme/CalendarView/src/main/res/drawable/schedule_border.xml
new file mode 100644
index 0000000..4a90bbf
--- /dev/null
+++ b/src/showme/CalendarView/src/main/res/drawable/schedule_border.xml
@@ -0,0 +1,15 @@
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/src/showme/CalendarView/src/main/res/layout/schedule_item.xml b/src/showme/CalendarView/src/main/res/layout/schedule_item.xml
new file mode 100644
index 0000000..6c22ca7
--- /dev/null
+++ b/src/showme/CalendarView/src/main/res/layout/schedule_item.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/showme/CalendarView/src/main/res/values/attrs.xml b/src/showme/CalendarView/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..4f19cca
--- /dev/null
+++ b/src/showme/CalendarView/src/main/res/values/attrs.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/showme/CalendarView/src/main/res/values/styles.xml b/src/showme/CalendarView/src/main/res/values/styles.xml
new file mode 100644
index 0000000..e46357e
--- /dev/null
+++ b/src/showme/CalendarView/src/main/res/values/styles.xml
@@ -0,0 +1,11 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/app/src/test/java/com/showme/myapplication/ExampleUnitTest.java b/src/showme/CalendarView/src/test/java/com/diary/calendarview/ExampleUnitTest.java
similarity index 90%
rename from src/app/src/test/java/com/showme/myapplication/ExampleUnitTest.java
rename to src/showme/CalendarView/src/test/java/com/diary/calendarview/ExampleUnitTest.java
index 6265cbc..4ede098 100644
--- a/src/app/src/test/java/com/showme/myapplication/ExampleUnitTest.java
+++ b/src/showme/CalendarView/src/test/java/com/diary/calendarview/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.showme.myapplication;
+package com.diary.calendarview;
import org.junit.Test;
diff --git a/src/CalendarView/src/test/java/com/idealist/calendarview/ExampleUnitTest.java b/src/showme/CalendarView/src/test/java/com/idealist/calendarview/ExampleUnitTest.java
similarity index 100%
rename from src/CalendarView/src/test/java/com/idealist/calendarview/ExampleUnitTest.java
rename to src/showme/CalendarView/src/test/java/com/idealist/calendarview/ExampleUnitTest.java
diff --git a/src/DataBase/.gitignore b/src/showme/Database/.gitignore
similarity index 100%
rename from src/DataBase/.gitignore
rename to src/showme/Database/.gitignore
diff --git a/src/DataBase/build.gradle b/src/showme/Database/build.gradle
similarity index 94%
rename from src/DataBase/build.gradle
rename to src/showme/Database/build.gradle
index 59a44e2..afa82f5 100644
--- a/src/DataBase/build.gradle
+++ b/src/showme/Database/build.gradle
@@ -4,10 +4,10 @@ plugins {
android {
compileSdkVersion 30
- buildToolsVersion "30.0.3"
+ buildToolsVersion "30.0.2"
defaultConfig {
- minSdkVersion 29
+ minSdkVersion 17
targetSdkVersion 30
versionCode 1
versionName "1.0"
diff --git a/src/DataBase/consumer-rules.pro b/src/showme/Database/consumer-rules.pro
similarity index 100%
rename from src/DataBase/consumer-rules.pro
rename to src/showme/Database/consumer-rules.pro
diff --git a/src/DataBase/proguard-rules.pro b/src/showme/Database/proguard-rules.pro
similarity index 100%
rename from src/DataBase/proguard-rules.pro
rename to src/showme/Database/proguard-rules.pro
diff --git a/src/DataBase/src/androidTest/java/com/showme/database/ExampleInstrumentedTest.java b/src/showme/Database/src/androidTest/java/com/diary/database/ExampleInstrumentedTest.java
similarity index 85%
rename from src/DataBase/src/androidTest/java/com/showme/database/ExampleInstrumentedTest.java
rename to src/showme/Database/src/androidTest/java/com/diary/database/ExampleInstrumentedTest.java
index bae200b..9aaf669 100644
--- a/src/DataBase/src/androidTest/java/com/showme/database/ExampleInstrumentedTest.java
+++ b/src/showme/Database/src/androidTest/java/com/diary/database/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.showme.database;
+package com.diary.database;
import android.content.Context;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
- assertEquals("com.showme.database.test", appContext.getPackageName());
+ assertEquals("com.diary.database.test", appContext.getPackageName());
}
}
\ No newline at end of file
diff --git a/src/DataBase/src/main/AndroidManifest.xml b/src/showme/Database/src/main/AndroidManifest.xml
similarity index 70%
rename from src/DataBase/src/main/AndroidManifest.xml
rename to src/showme/Database/src/main/AndroidManifest.xml
index 00f3ade..8120da9 100644
--- a/src/DataBase/src/main/AndroidManifest.xml
+++ b/src/showme/Database/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
+ package="com.diary.database">
\ No newline at end of file
diff --git a/src/DataBase/src/main/java/com/showme/database/DatabaseHelper/CourseSQLHelper.java b/src/showme/Database/src/main/java/com/diary/database/DatabaseHelper/CourseSQLHelper.java
similarity index 95%
rename from src/DataBase/src/main/java/com/showme/database/DatabaseHelper/CourseSQLHelper.java
rename to src/showme/Database/src/main/java/com/diary/database/DatabaseHelper/CourseSQLHelper.java
index 0cb3208..5d919fe 100644
--- a/src/DataBase/src/main/java/com/showme/database/DatabaseHelper/CourseSQLHelper.java
+++ b/src/showme/Database/src/main/java/com/diary/database/DatabaseHelper/CourseSQLHelper.java
@@ -1,4 +1,4 @@
-package com.showme.database.DatabaseHelper;
+package com.diary.database.DatabaseHelper;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
diff --git a/src/DataBase/src/main/java/com/showme/database/DatabaseHelper/ScheduleSQLHelper.java b/src/showme/Database/src/main/java/com/diary/database/DatabaseHelper/ScheduleSQLHelper.java
similarity index 97%
rename from src/DataBase/src/main/java/com/showme/database/DatabaseHelper/ScheduleSQLHelper.java
rename to src/showme/Database/src/main/java/com/diary/database/DatabaseHelper/ScheduleSQLHelper.java
index 5675034..0d848a9 100644
--- a/src/DataBase/src/main/java/com/showme/database/DatabaseHelper/ScheduleSQLHelper.java
+++ b/src/showme/Database/src/main/java/com/diary/database/DatabaseHelper/ScheduleSQLHelper.java
@@ -1,4 +1,4 @@
-package com.showme.database.DatabaseHelper;
+package com.diary.database.DatabaseHelper;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
diff --git a/src/DataBase/src/main/java/com/showme/database/MySQLiteDatabase.java b/src/showme/Database/src/main/java/com/diary/database/MySQLiteDatabase.java
similarity index 80%
rename from src/DataBase/src/main/java/com/showme/database/MySQLiteDatabase.java
rename to src/showme/Database/src/main/java/com/diary/database/MySQLiteDatabase.java
index 449c661..ceb6ab7 100644
--- a/src/DataBase/src/main/java/com/showme/database/MySQLiteDatabase.java
+++ b/src/showme/Database/src/main/java/com/diary/database/MySQLiteDatabase.java
@@ -1,7 +1,9 @@
-package com.showme.database;
+package com.diary.database;
import android.database.sqlite.SQLiteDatabase;
+import java.util.List;
+
public class MySQLiteDatabase {
public static SQLiteDatabase scheduleSQL;
diff --git a/src/DataBase/src/main/java/com/showme/database/utils/CourseSQLUtils.java b/src/showme/Database/src/main/java/com/diary/database/utils/CourseSQLUtils.java
similarity index 66%
rename from src/DataBase/src/main/java/com/showme/database/utils/CourseSQLUtils.java
rename to src/showme/Database/src/main/java/com/diary/database/utils/CourseSQLUtils.java
index 2dbedd6..94456e6 100644
--- a/src/DataBase/src/main/java/com/showme/database/utils/CourseSQLUtils.java
+++ b/src/showme/Database/src/main/java/com/diary/database/utils/CourseSQLUtils.java
@@ -1,8 +1,8 @@
-package com.showme.database.utils;
+package com.diary.database.utils;
import android.database.sqlite.SQLiteDatabase;
-import com.showme.database.MySQLiteDatabase;
+import com.diary.database.MySQLiteDatabase;
public class CourseSQLUtils {
private static SQLiteDatabase courseSQL = MySQLiteDatabase.courseSQL;
diff --git a/src/DataBase/src/main/java/com/showme/database/utils/ScheduleSQLUtils.java b/src/showme/Database/src/main/java/com/diary/database/utils/ScheduleSQLUtils.java
similarity index 96%
rename from src/DataBase/src/main/java/com/showme/database/utils/ScheduleSQLUtils.java
rename to src/showme/Database/src/main/java/com/diary/database/utils/ScheduleSQLUtils.java
index 1be1168..a38fd51 100644
--- a/src/DataBase/src/main/java/com/showme/database/utils/ScheduleSQLUtils.java
+++ b/src/showme/Database/src/main/java/com/diary/database/utils/ScheduleSQLUtils.java
@@ -1,9 +1,9 @@
-package com.showme.database.utils;
+package com.diary.database.utils;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
-import com.showme.database.MySQLiteDatabase;
+import com.diary.database.MySQLiteDatabase;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/DataBase/src/test/java/com/showme/database/ExampleUnitTest.java b/src/showme/Database/src/test/java/com/diary/database/ExampleUnitTest.java
similarity index 92%
rename from src/DataBase/src/test/java/com/showme/database/ExampleUnitTest.java
rename to src/showme/Database/src/test/java/com/diary/database/ExampleUnitTest.java
index c1baaf0..9ebe0f6 100644
--- a/src/DataBase/src/test/java/com/showme/database/ExampleUnitTest.java
+++ b/src/showme/Database/src/test/java/com/diary/database/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.showme.database;
+package com.diary.database;
import org.junit.Test;
diff --git a/src/app/.gitignore b/src/showme/app/.gitignore
similarity index 100%
rename from src/app/.gitignore
rename to src/showme/app/.gitignore
diff --git a/src/app/build.gradle b/src/showme/app/build.gradle
similarity index 72%
rename from src/app/build.gradle
rename to src/showme/app/build.gradle
index 54865af..9c36d95 100644
--- a/src/app/build.gradle
+++ b/src/showme/app/build.gradle
@@ -7,8 +7,8 @@ android {
buildToolsVersion "30.0.2"
defaultConfig {
- applicationId "com.showme.myapplication"
- minSdkVersion 29
+ applicationId "com.diary.showme"
+ minSdkVersion 17
targetSdkVersion 30
versionCode 1
versionName "1.0"
@@ -33,8 +33,13 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+ implementation 'cc.trity.floatingactionbutton:library:1.0.0'
+ implementation 'org.greenrobot:eventbus:3.0.0'
+ implementation 'com.chanven.lib:cptr:1.1.0'
+ implementation 'com.jakewharton:butterknife:8.0.1'
+ implementation project(path: ':Database')
+ annotationProcessor 'com.jakewharton:butterknife-compiler:8.0.1'
implementation project(path: ':CalendarView')
- implementation project(path: ':DataBase')
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/src/app/proguard-rules.pro b/src/showme/app/proguard-rules.pro
similarity index 100%
rename from src/app/proguard-rules.pro
rename to src/showme/app/proguard-rules.pro
diff --git a/src/showme/app/release/app-release.apk b/src/showme/app/release/app-release.apk
new file mode 100644
index 0000000..7f55e6d
Binary files /dev/null and b/src/showme/app/release/app-release.apk differ
diff --git a/src/showme/app/release/output-metadata.json b/src/showme/app/release/output-metadata.json
new file mode 100644
index 0000000..1accf42
--- /dev/null
+++ b/src/showme/app/release/output-metadata.json
@@ -0,0 +1,18 @@
+{
+ "version": 2,
+ "artifactType": {
+ "type": "APK",
+ "kind": "Directory"
+ },
+ "applicationId": "com.diary.showme",
+ "variantName": "processReleaseResources",
+ "elements": [
+ {
+ "type": "SINGLE",
+ "filters": [],
+ "versionCode": 1,
+ "versionName": "1.0",
+ "outputFile": "app-release.apk"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/app/src/androidTest/java/com/showme/myapplication/ExampleInstrumentedTest.java b/src/showme/app/src/androidTest/java/com/diary/showme/ExampleInstrumentedTest.java
similarity index 85%
rename from src/app/src/androidTest/java/com/showme/myapplication/ExampleInstrumentedTest.java
rename to src/showme/app/src/androidTest/java/com/diary/showme/ExampleInstrumentedTest.java
index ab01978..8a600ac 100644
--- a/src/app/src/androidTest/java/com/showme/myapplication/ExampleInstrumentedTest.java
+++ b/src/showme/app/src/androidTest/java/com/diary/showme/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.showme.myapplication;
+package com.diary.showme;
import android.content.Context;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
- assertEquals("com.showme.myapplication", appContext.getPackageName());
+ assertEquals("com.diary.showme", appContext.getPackageName());
}
}
\ No newline at end of file
diff --git a/src/showme/app/src/main/AndroidManifest.xml b/src/showme/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..2b620fa
--- /dev/null
+++ b/src/showme/app/src/main/AndroidManifest.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/src/main/java/com/showme/myapplication/Course/AddCourseActivity.java b/src/showme/app/src/main/java/com/diary/showme/Course/AddCourseActivity.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/Course/AddCourseActivity.java
rename to src/showme/app/src/main/java/com/diary/showme/Course/AddCourseActivity.java
diff --git a/src/app/src/main/java/com/showme/myapplication/Course/Course.java b/src/showme/app/src/main/java/com/diary/showme/Course/Course.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/Course/Course.java
rename to src/showme/app/src/main/java/com/diary/showme/Course/Course.java
diff --git a/src/app/src/main/java/com/showme/myapplication/Course/CourseActivity.java b/src/showme/app/src/main/java/com/diary/showme/Course/CourseActivity.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/Course/CourseActivity.java
rename to src/showme/app/src/main/java/com/diary/showme/Course/CourseActivity.java
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
new file mode 100644
index 0000000..d5395a5
--- /dev/null
+++ b/src/showme/app/src/main/java/com/diary/showme/MainActivity.java
@@ -0,0 +1,220 @@
+package com.diary.showme;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.content.Intent;
+import android.database.sqlite.SQLiteDatabase;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.diary.database.DatabaseHelper.CourseSQLHelper;
+import com.diary.database.DatabaseHelper.ScheduleSQLHelper;
+import com.diary.database.MySQLiteDatabase;
+import com.diary.database.utils.ScheduleSQLUtils;
+import com.diary.showme.Course.CourseActivity;
+import com.diary.showme.Schedule.AddScheduleActivity;
+import com.diary.showme.Schedule.EditScheduleActivity;
+import com.diary.showme.diary.ui.DiaryActivity;
+import com.idealist.calendarview.CalendarAttr;
+import com.idealist.calendarview.CalendarDay;
+import com.idealist.calendarview.CalendarPager;
+import com.idealist.calendarview.CalendarUtils;
+import com.idealist.calendarview.CalendarView;
+import com.idealist.calendarview.CalendarViewAdapter;
+import com.idealist.calendarview.RecyclerViewAdapter;
+import com.idealist.calendarview.SpaceItemDecoration;
+import com.idealist.calendarview.State;
+import com.idealist.calendarview.interf.OnSelectDateListener;
+
+import java.util.List;
+import java.util.TimeZone;
+
+import cc.trity.floatingactionbutton.FloatingActionButton;
+
+public class MainActivity extends AppCompatActivity {
+
+ private TextView tvMonth;
+ private TextView tvYear;
+
+ private CalendarDay currentDay;
+
+ private CalendarView currentView;
+
+ private CalendarPager pager;
+
+ private RecyclerView schedule;
+
+ private CalendarViewAdapter viewAdapter;
+
+ private CalendarAttr attr;
+
+ private OnSelectDateListener onSelectDateListener;
+
+ private CalendarView.OnCalendarClickListener clickListener;
+
+ private FloatingActionButton scheduleFAB, courseFAB, diaryFAB, zoneFAB;
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
+ DisplayMetrics dm = new DisplayMetrics();
+ getWindowManager().getDefaultDisplay().getRealMetrics(dm);
+ int height = dm.heightPixels;
+ State.setDefaultItemHeightFull((height - 42 - 3*State.DEFAULT_ITEM_HEIGHT) / 6);
+
+ initSQL();
+ initCalendar();
+ initFAB();
+ initCourseB();
+ initDiaryB();
+
+ attr = new CalendarAttr();
+ attr.setCalendarType(State.VIEW_MONTH);
+ attr.setScrollLevel(State.LEVEL_MEDIUM);
+
+ initListener();
+
+ viewAdapter = new CalendarViewAdapter(this, attr, onSelectDateListener,
+ clickListener);
+ initPager();
+ initSchedule();
+ }
+
+ private void initSQL() {
+ ScheduleSQLHelper myScheduleSQLHelper = new ScheduleSQLHelper(this);
+ SQLiteDatabase scheduleSQL = myScheduleSQLHelper.getWritableDatabase();
+ CourseSQLHelper myCourseSQLHelper = new CourseSQLHelper(this);
+ SQLiteDatabase courseSQL = myCourseSQLHelper.getWritableDatabase();
+
+ MySQLiteDatabase.scheduleSQL = scheduleSQL;
+ MySQLiteDatabase.courseSQL = courseSQL;
+ }
+
+ private void initFAB() {
+ scheduleFAB = findViewById(R.id.add_schedule);
+ scheduleFAB.setOnClickListener(v -> {
+ Toast.makeText(getApplicationContext(), viewAdapter.getSelectDay().toString(), Toast.LENGTH_SHORT).show();
+ Intent intent = new Intent(MainActivity.this, AddScheduleActivity.class);
+ intent.putExtra("date", viewAdapter.getSelectDay().toString());
+ startActivityForResult(intent, 0);
+ });
+ }
+
+ private void initCourseB() {
+ courseFAB = findViewById(R.id.course_entry);
+ courseFAB.setOnClickListener(v -> {
+ Intent intent = new Intent(MainActivity.this, CourseActivity.class);
+ startActivity(intent);
+ });
+ }
+
+ private void initDiaryB() {
+ diaryFAB = findViewById(R.id.diary_entry);
+ diaryFAB.setOnClickListener(v -> {
+ Intent intent = new Intent(MainActivity.this, DiaryActivity.class);
+ startActivity(intent);
+ });
+ }
+
+
+ private void initCalendar() {
+ tvMonth = findViewById(R.id.custom_month_view);
+ tvYear = findViewById(R.id.custom_year_view);
+ currentDay = CalendarUtils.getCurrDay();
+ updateCalendar();
+ }
+
+ private void initPager() {
+ pager = findViewById(R.id.custom_vp);
+ pager.setAttr(attr);
+ pager.setAdapter(viewAdapter);
+
+ pager.setmOnPageChangeListener(new CalendarPager.OnPageChangeListener() {
+
+ @Override
+ public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+ }
+
+ @Override
+ public void onPageSelected(int position) {
+ currentView = viewAdapter.getViews().get(position % 3);
+ currentDay = currentView.getSeedDay();
+ updateCalendar();
+ }
+
+ @Override
+ public void onPageScrollStateChanged(int state) {
+ }
+ });
+ }
+
+ private void initListener() {
+ onSelectDateListener = offset -> pager.selectOtherMonth(offset);
+ clickListener = new CalendarView.OnCalendarClickListener() {
+ @Override
+ public void OnClick(CalendarDay day) {
+ updateSchedule(day);
+ }
+
+ @Override
+ public void OnLongClick(CalendarDay day) {
+
+ }
+ };
+ }
+
+ private void initSchedule() {
+
+ schedule = findViewById(R.id.list_item);
+ List mData = ScheduleSQLUtils.queryByDate(currentDay.toString());
+
+ RecyclerViewAdapter adapter = new RecyclerViewAdapter(mData);
+ adapter.setOnItemClickListener((view, position) -> {
+ Intent intent = new Intent(MainActivity.this, EditScheduleActivity.class);
+ intent.putExtra("date", viewAdapter.getSelectDay().toString());
+ String name = ((TextView) view.findViewById(R.id.schedule_title)).getText().toString();
+ intent.putExtra("scheduleName", name);
+ startActivityForResult(intent, 0);
+ });
+ schedule.setAdapter(adapter);
+
+ LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+ schedule.setLayoutManager(layoutManager);
+ schedule.addItemDecoration(new SpaceItemDecoration(30));
+ }
+
+
+ @SuppressLint("SetTextI18n")
+ private void updateCalendar() {
+ tvMonth.setText(currentDay.getMonth() + "");
+ tvYear.setText(currentDay.getYear() + "");
+ }
+
+ private void updateSchedule(CalendarDay day) {
+ ScheduleSQLUtils.queryByDate(day.toString());
+ List mData = ScheduleSQLUtils.queryByDate(day.toString());
+ RecyclerViewAdapter adapter = (RecyclerViewAdapter) schedule.getAdapter();
+ adapter.setmDatabase(mData);
+ adapter.notifyDataSetChanged();
+ }
+
+ @Override
+ protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == 0 && resultCode == Activity.RESULT_OK) {
+ updateSchedule(viewAdapter.getSelectDay());
+ viewAdapter.updateViewScheduleChange();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/src/main/java/com/showme/myapplication/Schedule/AddScheduleActivity.java b/src/showme/app/src/main/java/com/diary/showme/Schedule/AddScheduleActivity.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/Schedule/AddScheduleActivity.java
rename to src/showme/app/src/main/java/com/diary/showme/Schedule/AddScheduleActivity.java
diff --git a/src/app/src/main/java/com/showme/myapplication/Schedule/EditScheduleActivity.java b/src/showme/app/src/main/java/com/diary/showme/Schedule/EditScheduleActivity.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/Schedule/EditScheduleActivity.java
rename to src/showme/app/src/main/java/com/diary/showme/Schedule/EditScheduleActivity.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/bean/DiaryBean.java b/src/showme/app/src/main/java/com/diary/showme/diary/bean/DiaryBean.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/bean/DiaryBean.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/bean/DiaryBean.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/db/DiaryDatabaseHelper.java b/src/showme/app/src/main/java/com/diary/showme/diary/db/DiaryDatabaseHelper.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/db/DiaryDatabaseHelper.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/db/DiaryDatabaseHelper.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/event/StartUpdateDiaryEvent.java b/src/showme/app/src/main/java/com/diary/showme/diary/event/StartUpdateDiaryEvent.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/event/StartUpdateDiaryEvent.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/event/StartUpdateDiaryEvent.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/ui/AddDiaryActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/AddDiaryActivity.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/ui/AddDiaryActivity.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/ui/AddDiaryActivity.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/ui/DiaryActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/DiaryActivity.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/ui/DiaryActivity.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/ui/DiaryActivity.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/ui/DiaryAdapter.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/DiaryAdapter.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/ui/DiaryAdapter.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/ui/DiaryAdapter.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/ui/UpdateDiaryActivity.java b/src/showme/app/src/main/java/com/diary/showme/diary/ui/UpdateDiaryActivity.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/ui/UpdateDiaryActivity.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/ui/UpdateDiaryActivity.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/utils/AppManager.java b/src/showme/app/src/main/java/com/diary/showme/diary/utils/AppManager.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/utils/AppManager.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/utils/AppManager.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/utils/GetDate.java b/src/showme/app/src/main/java/com/diary/showme/diary/utils/GetDate.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/utils/GetDate.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/utils/GetDate.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/utils/SpHelper.java b/src/showme/app/src/main/java/com/diary/showme/diary/utils/SpHelper.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/utils/SpHelper.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/utils/SpHelper.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/utils/StatusBarCompat.java b/src/showme/app/src/main/java/com/diary/showme/diary/utils/StatusBarCompat.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/utils/StatusBarCompat.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/utils/StatusBarCompat.java
diff --git a/src/app/src/main/java/com/showme/myapplication/diary/widget/LinedEditText.java b/src/showme/app/src/main/java/com/diary/showme/diary/widget/LinedEditText.java
similarity index 100%
rename from src/app/src/main/java/com/showme/myapplication/diary/widget/LinedEditText.java
rename to src/showme/app/src/main/java/com/diary/showme/diary/widget/LinedEditText.java
diff --git a/src/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/src/showme/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from src/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
rename to src/showme/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/src/app/src/main/res/drawable/add.png b/src/showme/app/src/main/res/drawable/add.png
similarity index 100%
rename from src/app/src/main/res/drawable/add.png
rename to src/showme/app/src/main/res/drawable/add.png
diff --git a/src/app/src/main/res/drawable/back_new.png b/src/showme/app/src/main/res/drawable/back_new.png
similarity index 100%
rename from src/app/src/main/res/drawable/back_new.png
rename to src/showme/app/src/main/res/drawable/back_new.png
diff --git a/src/app/src/main/res/drawable/bg.jpg b/src/showme/app/src/main/res/drawable/bg.jpg
similarity index 100%
rename from src/app/src/main/res/drawable/bg.jpg
rename to src/showme/app/src/main/res/drawable/bg.jpg
diff --git a/src/app/src/main/res/drawable/circle.png b/src/showme/app/src/main/res/drawable/circle.png
similarity index 100%
rename from src/app/src/main/res/drawable/circle.png
rename to src/showme/app/src/main/res/drawable/circle.png
diff --git a/src/app/src/main/res/drawable/circle_orange.png b/src/showme/app/src/main/res/drawable/circle_orange.png
similarity index 100%
rename from src/app/src/main/res/drawable/circle_orange.png
rename to src/showme/app/src/main/res/drawable/circle_orange.png
diff --git a/src/app/src/main/res/drawable/course.jpg b/src/showme/app/src/main/res/drawable/course.jpg
similarity index 100%
rename from src/app/src/main/res/drawable/course.jpg
rename to src/showme/app/src/main/res/drawable/course.jpg
diff --git a/src/app/src/main/res/drawable/delete.png b/src/showme/app/src/main/res/drawable/delete.png
similarity index 100%
rename from src/app/src/main/res/drawable/delete.png
rename to src/showme/app/src/main/res/drawable/delete.png
diff --git a/src/app/src/main/res/drawable/delete_new.png b/src/showme/app/src/main/res/drawable/delete_new.png
similarity index 100%
rename from src/app/src/main/res/drawable/delete_new.png
rename to src/showme/app/src/main/res/drawable/delete_new.png
diff --git a/src/app/src/main/res/drawable/diary.jpg b/src/showme/app/src/main/res/drawable/diary.jpg
similarity index 100%
rename from src/app/src/main/res/drawable/diary.jpg
rename to src/showme/app/src/main/res/drawable/diary.jpg
diff --git a/src/app/src/main/res/drawable/edit.png b/src/showme/app/src/main/res/drawable/edit.png
similarity index 100%
rename from src/app/src/main/res/drawable/edit.png
rename to src/showme/app/src/main/res/drawable/edit.png
diff --git a/src/app/src/main/res/drawable/ic_arrow_back_black_24dp.png b/src/showme/app/src/main/res/drawable/ic_arrow_back_black_24dp.png
similarity index 100%
rename from src/app/src/main/res/drawable/ic_arrow_back_black_24dp.png
rename to src/showme/app/src/main/res/drawable/ic_arrow_back_black_24dp.png
diff --git a/src/app/src/main/res/drawable/ic_baseline_add_24.xml b/src/showme/app/src/main/res/drawable/ic_baseline_add_24.xml
similarity index 100%
rename from src/app/src/main/res/drawable/ic_baseline_add_24.xml
rename to src/showme/app/src/main/res/drawable/ic_baseline_add_24.xml
diff --git a/src/app/src/main/res/drawable/ic_launcher_background.xml b/src/showme/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from src/app/src/main/res/drawable/ic_launcher_background.xml
rename to src/showme/app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/src/app/src/main/res/drawable/linear_style.xml b/src/showme/app/src/main/res/drawable/linear_style.xml
similarity index 100%
rename from src/app/src/main/res/drawable/linear_style.xml
rename to src/showme/app/src/main/res/drawable/linear_style.xml
diff --git a/src/app/src/main/res/drawable/menu.png b/src/showme/app/src/main/res/drawable/menu.png
similarity index 100%
rename from src/app/src/main/res/drawable/menu.png
rename to src/showme/app/src/main/res/drawable/menu.png
diff --git a/src/app/src/main/res/drawable/pause.png b/src/showme/app/src/main/res/drawable/pause.png
similarity index 100%
rename from src/app/src/main/res/drawable/pause.png
rename to src/showme/app/src/main/res/drawable/pause.png
diff --git a/src/app/src/main/res/drawable/picture.jpg b/src/showme/app/src/main/res/drawable/picture.jpg
similarity index 100%
rename from src/app/src/main/res/drawable/picture.jpg
rename to src/showme/app/src/main/res/drawable/picture.jpg
diff --git a/src/app/src/main/res/drawable/play.png b/src/showme/app/src/main/res/drawable/play.png
similarity index 100%
rename from src/app/src/main/res/drawable/play.png
rename to src/showme/app/src/main/res/drawable/play.png
diff --git a/src/app/src/main/res/drawable/save.png b/src/showme/app/src/main/res/drawable/save.png
similarity index 100%
rename from src/app/src/main/res/drawable/save.png
rename to src/showme/app/src/main/res/drawable/save.png
diff --git a/src/app/src/main/res/drawable/save_new.png b/src/showme/app/src/main/res/drawable/save_new.png
similarity index 100%
rename from src/app/src/main/res/drawable/save_new.png
rename to src/showme/app/src/main/res/drawable/save_new.png
diff --git a/src/app/src/main/res/drawable/schedule.jpg b/src/showme/app/src/main/res/drawable/schedule.jpg
similarity index 100%
rename from src/app/src/main/res/drawable/schedule.jpg
rename to src/showme/app/src/main/res/drawable/schedule.jpg
diff --git a/src/app/src/main/res/drawable/shape_add_diary_title.xml b/src/showme/app/src/main/res/drawable/shape_add_diary_title.xml
similarity index 100%
rename from src/app/src/main/res/drawable/shape_add_diary_title.xml
rename to src/showme/app/src/main/res/drawable/shape_add_diary_title.xml
diff --git a/src/app/src/main/res/drawable/stop.png b/src/showme/app/src/main/res/drawable/stop.png
similarity index 100%
rename from src/app/src/main/res/drawable/stop.png
rename to src/showme/app/src/main/res/drawable/stop.png
diff --git a/src/showme/app/src/main/res/drawable/zone.jpg b/src/showme/app/src/main/res/drawable/zone.jpg
new file mode 100644
index 0000000..9ba699d
Binary files /dev/null and b/src/showme/app/src/main/res/drawable/zone.jpg differ
diff --git a/src/app/src/main/res/layout/activity_add_course.xml b/src/showme/app/src/main/res/layout/activity_add_course.xml
similarity index 100%
rename from src/app/src/main/res/layout/activity_add_course.xml
rename to src/showme/app/src/main/res/layout/activity_add_course.xml
diff --git a/src/app/src/main/res/layout/activity_add_diary.xml b/src/showme/app/src/main/res/layout/activity_add_diary.xml
similarity index 100%
rename from src/app/src/main/res/layout/activity_add_diary.xml
rename to src/showme/app/src/main/res/layout/activity_add_diary.xml
diff --git a/src/showme/app/src/main/res/layout/activity_add_zone.xml b/src/showme/app/src/main/res/layout/activity_add_zone.xml
new file mode 100644
index 0000000..5f19b3a
--- /dev/null
+++ b/src/showme/app/src/main/res/layout/activity_add_zone.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/src/main/res/layout/activity_course.xml b/src/showme/app/src/main/res/layout/activity_course.xml
similarity index 100%
rename from src/app/src/main/res/layout/activity_course.xml
rename to src/showme/app/src/main/res/layout/activity_course.xml
diff --git a/src/app/src/main/res/layout/activity_diary.xml b/src/showme/app/src/main/res/layout/activity_diary.xml
similarity index 100%
rename from src/app/src/main/res/layout/activity_diary.xml
rename to src/showme/app/src/main/res/layout/activity_diary.xml
diff --git a/src/showme/app/src/main/res/layout/activity_main.xml b/src/showme/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..8187e7d
--- /dev/null
+++ b/src/showme/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,134 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/src/main/res/layout/activity_schedule_add.xml b/src/showme/app/src/main/res/layout/activity_schedule_add.xml
similarity index 100%
rename from src/app/src/main/res/layout/activity_schedule_add.xml
rename to src/showme/app/src/main/res/layout/activity_schedule_add.xml
diff --git a/src/showme/app/src/main/res/layout/activity_schedule_edit.xml b/src/showme/app/src/main/res/layout/activity_schedule_edit.xml
new file mode 100644
index 0000000..d664e1d
--- /dev/null
+++ b/src/showme/app/src/main/res/layout/activity_schedule_edit.xml
@@ -0,0 +1,131 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/src/main/res/layout/activity_update_diary.xml b/src/showme/app/src/main/res/layout/activity_update_diary.xml
similarity index 100%
rename from src/app/src/main/res/layout/activity_update_diary.xml
rename to src/showme/app/src/main/res/layout/activity_update_diary.xml
diff --git a/src/showme/app/src/main/res/layout/activity_zone.xml b/src/showme/app/src/main/res/layout/activity_zone.xml
new file mode 100644
index 0000000..3fe8be8
--- /dev/null
+++ b/src/showme/app/src/main/res/layout/activity_zone.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/src/main/res/layout/course_card.xml b/src/showme/app/src/main/res/layout/course_card.xml
similarity index 100%
rename from src/app/src/main/res/layout/course_card.xml
rename to src/showme/app/src/main/res/layout/course_card.xml
diff --git a/src/app/src/main/res/layout/course_left_view.xml b/src/showme/app/src/main/res/layout/course_left_view.xml
similarity index 100%
rename from src/app/src/main/res/layout/course_left_view.xml
rename to src/showme/app/src/main/res/layout/course_left_view.xml
diff --git a/src/app/src/main/res/layout/item_rv_diary.xml b/src/showme/app/src/main/res/layout/item_rv_diary.xml
similarity index 100%
rename from src/app/src/main/res/layout/item_rv_diary.xml
rename to src/showme/app/src/main/res/layout/item_rv_diary.xml
diff --git a/src/app/src/main/res/layout/part_common_title.xml b/src/showme/app/src/main/res/layout/part_common_title.xml
similarity index 100%
rename from src/app/src/main/res/layout/part_common_title.xml
rename to src/showme/app/src/main/res/layout/part_common_title.xml
diff --git a/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/src/showme/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from src/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to src/showme/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/src/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/src/showme/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
similarity index 100%
rename from src/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to src/showme/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/src/app/src/main/res/mipmap-hdpi/ic_launcher.png b/src/showme/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from src/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to src/showme/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/src/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/src/showme/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from src/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to src/showme/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/src/app/src/main/res/mipmap-mdpi/ic_launcher.png b/src/showme/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from src/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to src/showme/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/src/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/src/showme/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from src/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to src/showme/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/src/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/src/showme/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from src/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to src/showme/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/src/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/src/showme/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from src/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to src/showme/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/src/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/src/showme/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from src/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to src/showme/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/src/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/src/showme/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from src/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to src/showme/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_add_contact_holo_light.jpeg b/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_add_contact_holo_light.jpeg
new file mode 100644
index 0000000..6e7de36
Binary files /dev/null and b/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_add_contact_holo_light.jpeg differ
diff --git a/src/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from src/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to src/showme/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/src/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from src/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to src/showme/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_record_play.png b/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_record_play.png
new file mode 100644
index 0000000..da2d36d
Binary files /dev/null and b/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_record_play.png differ
diff --git a/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_record_stop.png b/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_record_stop.png
new file mode 100644
index 0000000..57f0d03
Binary files /dev/null and b/src/showme/app/src/main/res/mipmap-xxxhdpi/ic_record_stop.png differ
diff --git a/src/showme/app/src/main/res/mipmap-xxxhdpi/record_go_back2.png b/src/showme/app/src/main/res/mipmap-xxxhdpi/record_go_back2.png
new file mode 100644
index 0000000..fe0b0b6
Binary files /dev/null and b/src/showme/app/src/main/res/mipmap-xxxhdpi/record_go_back2.png differ
diff --git a/src/showme/app/src/main/res/mipmap-xxxhdpi/video_avatar_02.jpg b/src/showme/app/src/main/res/mipmap-xxxhdpi/video_avatar_02.jpg
new file mode 100644
index 0000000..1b4c203
Binary files /dev/null and b/src/showme/app/src/main/res/mipmap-xxxhdpi/video_avatar_02.jpg differ
diff --git a/src/showme/app/src/main/res/mipmap-xxxhdpi/video_avatar_03.png b/src/showme/app/src/main/res/mipmap-xxxhdpi/video_avatar_03.png
new file mode 100644
index 0000000..accc232
Binary files /dev/null and b/src/showme/app/src/main/res/mipmap-xxxhdpi/video_avatar_03.png differ
diff --git a/src/showme/app/src/main/res/mipmap-xxxhdpi/video_avatar_04.png b/src/showme/app/src/main/res/mipmap-xxxhdpi/video_avatar_04.png
new file mode 100644
index 0000000..8163875
Binary files /dev/null and b/src/showme/app/src/main/res/mipmap-xxxhdpi/video_avatar_04.png differ
diff --git a/src/app/src/main/res/values-night/themes.xml b/src/showme/app/src/main/res/values-night/themes.xml
similarity index 87%
rename from src/app/src/main/res/values-night/themes.xml
rename to src/showme/app/src/main/res/values-night/themes.xml
index 203e219..d7bcb53 100644
--- a/src/app/src/main/res/values-night/themes.xml
+++ b/src/showme/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
-