diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8a63664..dac5619 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/Theme.App"> diff --git a/app/src/main/assets/Shabnam-Light-FD.ttf b/app/src/main/assets/Shabnam-Light-FD.ttf deleted file mode 100644 index 38cd346..0000000 Binary files a/app/src/main/assets/Shabnam-Light-FD.ttf and /dev/null differ diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..55c35b1 Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/ir/hamsaa/MainActivity.java b/app/src/main/java/ir/hamsaa/MainActivity.java index e4a8397..37fcb63 100644 --- a/app/src/main/java/ir/hamsaa/MainActivity.java +++ b/app/src/main/java/ir/hamsaa/MainActivity.java @@ -1,8 +1,6 @@ package ir.hamsaa; -import android.graphics.Color; -import android.graphics.Typeface; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -10,19 +8,16 @@ import androidx.appcompat.app.AppCompatActivity; -import ir.hamsaa.persiandatepicker.Listener; import ir.hamsaa.persiandatepicker.PersianDatePickerDialog; import ir.hamsaa.persiandatepicker.api.PersianPickerDate; import ir.hamsaa.persiandatepicker.api.PersianPickerListener; import ir.hamsaa.persiandatepicker.date.PersianDateImpl; -import ir.hamsaa.persiandatepicker.util.PersianCalendar; public class MainActivity extends AppCompatActivity { - private PersianDatePickerDialog picker; - private static final String TAG = "MainActivity"; + private PersianDatePickerDialog picker; @Override protected void onCreate(Bundle savedInstanceState) { @@ -33,19 +28,19 @@ protected void onCreate(Bundle savedInstanceState) { public void showCalendar(View v) { - Typeface typeface = Typeface.createFromAsset(getAssets(), "Shabnam-Light-FD.ttf"); +// Typeface typeface = Typeface.createFromAsset(getAssets(), "Shabnam-Light-FD.ttf"); picker = new PersianDatePickerDialog(this) - .setPositiveButtonString("باشه") + .setPositiveButtonString("انتخاب") .setNegativeButton("بیخیال") .setTodayButton("امروز") .setTodayButtonVisible(true) .setMinYear(1300) - .setAllButtonsTextSize(12) +// .setAllButtonsTextSize(12) .setMaxYear(1500) .setInitDate(1370, 3, 13) - .setActionTextColor(Color.GRAY) - .setTypeFace(typeface) +// .setActionTextColor(Color.GRAY) +// .setTypeFace(typeface) // .setShowDayPicker(false) .setTitleType(PersianDatePickerDialog.DAY_MONTH_YEAR) .setShowInBottomSheet(true) @@ -69,41 +64,5 @@ public void onDismissed() { picker.show(); } - public void showCalendarInDarkMode(View v) { - Typeface typeface = Typeface.createFromAsset(getAssets(), "Shabnam-Light-FD.ttf"); - - PersianCalendar initDate = new PersianCalendar(); - initDate.setPersianDate(1370, 3, 13); - - picker = new PersianDatePickerDialog(this) - .setPositiveButtonString("باشه") - .setNegativeButton("بیخیال") - .setTodayButton("امروز") - .setTodayButtonVisible(true) - .setMinYear(1300) - .setMaxYear(PersianDatePickerDialog.THIS_YEAR) - .setInitDate(initDate) - .setTypeFace(typeface) - .setBackgroundColor(Color.BLACK) - .setTitleColor(Color.WHITE) - .setActionTextColor(Color.RED) - .setPickerBackgroundDrawable(R.drawable.darkmode_bg) - .setTitleType(PersianDatePickerDialog.MONTH_YEAR) - .setShowDayPicker(false) - - .setCancelable(false) - .setListener(new Listener() { - @Override - public void onDateSelected(PersianCalendar persianCalendar) { - Toast.makeText(MainActivity.this, persianCalendar.getPersianYear() + "/" + persianCalendar.getPersianMonth() + "/" + persianCalendar.getPersianDay(), Toast.LENGTH_SHORT).show(); - } - - @Override - public void onDismissed() { - - } - }); - picker.show(); - } } diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..da1dcd9 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/darkmode_bg.xml b/app/src/main/res/drawable/darkmode_bg.xml deleted file mode 100644 index 9ecd698..0000000 --- a/app/src/main/res/drawable/darkmode_bg.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..ca3826a --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 97328c2..a8e42ef 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,10 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:paddingBottom="@dimen/activity_vertical_margin" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" + android:gravity="center" tools:context="ir.hamsaa.MainActivity">