Skip to content

Commit

Permalink
update readme
Browse files Browse the repository at this point in the history
fix strings
  • Loading branch information
newhinton committed Dec 13, 2023
1 parent baad078 commit 3517243
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 32 deletions.
19 changes: 11 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Timed Silence - Dont let your phone rattle you!
[![license: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://github.com/newhinton/timed-silence/blob/master/LICENSE) [![Latest Downloads](https://img.shields.io/github/downloads/newhinton/timed-silence/latest/total
)](https://github.com/newhinton/timed-silence/releases) [![GitHub release](https://img.shields.io/github/v/release/newhinton/timed-silence?include_prereleases)](https://github.com/newhinton/timed-silence/releases/latest)
[![Documentation](https://img.shields.io/badge/Documentation-roundsync.com-4aad4e)](https://roundsync.com) [![supportive flags](https://img.shields.io/badge/support-🇺🇦_🏳️‍⚧_🏳️‍🌈-4aad4e)](https://roundsync.com)
[![supportive flags](https://img.shields.io/badge/support-🇺🇦_🏳️‍⚧_🏳️‍🌈-4aad4e)](https://roundsync.com)

[![Android Lint](https://github.com/newhinton/timed-silence/actions/workflows/lint.yml/badge.svg)](https://github.com/newhinton/timed-silence/actions/workflows/lint.yml)
-----------
Expand All @@ -16,13 +16,16 @@ Screenshots
<table>
<tr style="border:none">
<td style="border:none">
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="360vh" />
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="180vh" />
</td>
<td style="border:none">
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="360vh" />
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.png" width="180vh" />
</td>
<td style="border:none">
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="360vh" />
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="180vh" />
</td>
<td style="border:none">
<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="180vh" />
</td>
</tr>
</table>
Expand Down Expand Up @@ -75,12 +78,12 @@ Donations
If you like my work, either this app or in general, you are more than welcome to leave a donation.
It helps me to dedicate time to further improve my apps!

[Paypal](https://www.paypal.com/paypalme/felixnuesse)
Other ways are available too, check the sidebar for the donations-section.
[Paypal](https://www.paypal.com/paypalme/felixnuesse) | [Liberapay](https://liberapay.com/newhinton) | [Github Sponsor](https://github.com/sponsors/newhinton)


License
About this app
-----------------
### About this app
### License
This app is released under the terms of the [GPLv3 license](https://github.com/newhinton/timed-silence/blob/master/LICENSE).

### Libraries
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/de/felixnuesse/timedsilence/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import de.felixnuesse.timedsilence.IntroActivity.Companion.INTRO_PREFERENCES
import de.felixnuesse.timedsilence.databinding.ActivityMainBinding
import de.felixnuesse.timedsilence.fragments.CalendarFragment
import de.felixnuesse.timedsilence.fragments.KeywordFragment
import de.felixnuesse.timedsilence.fragments.TimeFragment
import de.felixnuesse.timedsilence.fragments.ScheduleFragment
import de.felixnuesse.timedsilence.fragments.WifiConnectedFragment
import de.felixnuesse.timedsilence.fragments.graph.GraphFragment
import de.felixnuesse.timedsilence.handler.*
Expand Down Expand Up @@ -364,11 +364,11 @@ class MainActivity : AppCompatActivity(), TimerInterface {

when (position) {
0 -> return GraphFragment()
1 -> return TimeFragment()
1 -> return ScheduleFragment()
2 -> return CalendarFragment()
3 -> return KeywordFragment()
4 -> return WifiConnectedFragment()
else -> return TimeFragment()
else -> return ScheduleFragment()
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,16 @@ package de.felixnuesse.timedsilence.dialogs

import android.app.Dialog
import android.content.Context
import android.content.res.Configuration
import android.graphics.drawable.InsetDrawable
import android.os.Bundle
import android.text.format.DateFormat
import android.util.Log
import android.view.View
import android.view.Window
import android.view.WindowManager
import android.view.inputmethod.InputMethodManager
import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.content.res.AppCompatResources
import de.felixnuesse.timedsilence.R
import de.felixnuesse.timedsilence.databinding.DialogScheduleBinding
import de.felixnuesse.timedsilence.fragments.TimeFragment
import de.felixnuesse.timedsilence.fragments.ScheduleFragment
import de.felixnuesse.timedsilence.handler.volume.VolumeState.Companion.TIME_SETTING_LOUD
import de.felixnuesse.timedsilence.handler.volume.VolumeState.Companion.TIME_SETTING_SILENT
import de.felixnuesse.timedsilence.handler.volume.VolumeState.Companion.TIME_SETTING_VIBRATE
Expand Down Expand Up @@ -59,15 +55,15 @@ class ScheduleDialog(context: Context) : Dialog(context, R.style.AlertDialogCust
private const val TAG = "ScheduleDialog"
}

private var timeFragment: TimeFragment? = null
private var scheduleFragment: ScheduleFragment? = null
private var scheduleListHolder: ScheduleListAdapter? = null
private var createNewSchedule: Boolean = true
private var existingSchedule: ScheduleObject? = null

private lateinit var binding: DialogScheduleBinding

constructor(context: Context, timeFragment: TimeFragment) : this(context) {
this.timeFragment = timeFragment
constructor(context: Context, scheduleFragment: ScheduleFragment) : this(context) {
this.scheduleFragment = scheduleFragment
createNewSchedule = true
}

Expand Down Expand Up @@ -163,7 +159,7 @@ class ScheduleDialog(context: Context) : Dialog(context, R.style.AlertDialogCust
binding.scheduleDialogDaysSaturday.isChecked,
binding.scheduleDialogDaysSunday.isChecked
)
timeFragment?.saveSchedule(context, so)
scheduleFragment?.saveSchedule(context, so)
} else {
val so = ScheduleObject(
binding.scheduleTitleTextfield.text.toString(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import android.view.View
import android.view.ViewGroup
import android.content.Context
import androidx.recyclerview.widget.RecyclerView
import de.felixnuesse.timedsilence.databinding.FragmentTimeBinding
import de.felixnuesse.timedsilence.databinding.FragmentSchedulesBinding
import de.felixnuesse.timedsilence.dialogs.ScheduleDialog
import de.felixnuesse.timedsilence.model.data.ScheduleObject
import de.felixnuesse.timedsilence.model.database.DatabaseHandler
import de.felixnuesse.timedsilence.ui.ScheduleListAdapter
import de.felixnuesse.timedsilence.ui.custom.NestedRecyclerManager


class TimeFragment : Fragment() {
class ScheduleFragment : Fragment() {

companion object {
private const val TAG = "TimeFragment"
Expand All @@ -24,15 +24,15 @@ class TimeFragment : Fragment() {
private lateinit var viewAdapter: RecyclerView.Adapter<*>
private lateinit var viewManager: RecyclerView.LayoutManager

private var _binding: FragmentTimeBinding? = null
private var _binding: FragmentSchedulesBinding? = null
private val binding get() = _binding!!


override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View {
_binding = FragmentTimeBinding.inflate(inflater, container, false)
_binding = FragmentSchedulesBinding.inflate(inflater, container, false)
return binding.root
}

Expand Down
5 changes: 0 additions & 5 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@
android:icon="@drawable/icon_key"
android:text="@string/main_tab_keyword" />

<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:icon="@drawable/icon_wifi"
android:text="@string/main_tab_wifi_connected" />
</com.google.android.material.tabs.TabLayout>
</com.google.android.material.appbar.AppBarLayout>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
android:layout_height="wrap_content">

<TextView
android:id="@+id/label_time_fragment"
android:id="@+id/label_schedule_fragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
Expand All @@ -34,7 +34,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/label_time_fragment" />
app:layout_constraintTop_toBottomOf="@+id/label_schedule_fragment" />

<androidx.cardview.widget.CardView
android:id="@+id/button_time_fragment"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<string name="GrantCalendarPermissionAccess">Grant!</string>
<string name="GrantCalendarPermissionAccessDescription">This app makes use of the local calendar. To greatly enhance the use of this app, please allow access to your calendars!</string>
<string name="ignore_all_day">Ignore All Day Events</string>
<string name="fragment_title_schedules">Time Entries</string>
<string name="fragment_title_schedules">Schedules</string>
<string name="fragment_title_wifi">Wifi Entries</string>
<string name="fragment_title_keywords">Keyword Entries</string>
<string name="fragment_title_calendar">Calendar Entries</string>
Expand Down
Binary file modified fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 3517243

Please sign in to comment.