Skip to content

Commit

Permalink
Some minor improvements & bump version
Browse files Browse the repository at this point in the history
Signed-off-by: starry69 <[email protected]>
  • Loading branch information
starry-shivam committed Jul 26, 2022
1 parent 3d460f4 commit 420faeb
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 42 deletions.
4 changes: 2 additions & 2 deletions .idea/deploymentTargetDropDown.xml

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

4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
applicationId "com.starry.greenstash"
minSdk 24
targetSdk 32
versionCode 6
versionName "1.5"
versionCode 7
versionName "1.6"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
javaCompileOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ class HomeFragment : Fragment(), ClickListenerIF {
savedInstanceState: Bundle?
): View {
setHasOptionsMenu(true)
sharedViewModel = ViewModelProvider(requireActivity()).get(SharedViewModel::class.java)
sharedViewModel = ViewModelProvider(requireActivity())[SharedViewModel::class.java]
_binding = FragmentHomeBinding.inflate(inflater, container, false)
return binding.root

Expand Down Expand Up @@ -317,9 +317,8 @@ class HomeFragment : Fragment(), ClickListenerIF {
requireContext().getString(R.string.item_not_found),
Snackbar.LENGTH_SHORT
).show()
} else {
adapter.updateItemsList(filteredList)
}
adapter.updateItemsList(filteredList)
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ import com.starry.greenstash.databinding.FragmentAboutBinding

class AboutFragment : Fragment() {

// social links
private val telegramURL = "https://t.me/starryboi"
private val githubURL = "https://github.com/starry69"
private val twitterURL = "https://twitter.com/starry_shivam"

// layout binding.
private lateinit var binding: FragmentAboutBinding

override fun onCreateView(
Expand All @@ -51,25 +57,13 @@ class AboutFragment : Fragment() {

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
binding.telegramButton.setOnClickListener { openTG() }
binding.githubButton.setOnClickListener { openGH() }
binding.twitterButton.setOnClickListener { openTW() }
}

private fun openTG() {
val uri: Uri = Uri.parse("https://t.me/starryboi")
val intent = Intent(Intent.ACTION_VIEW, uri)
startActivity(intent)
}

private fun openGH() {
val uri: Uri = Uri.parse("https://github.com/starry69")
val intent = Intent(Intent.ACTION_VIEW, uri)
startActivity(intent)
binding.telegramButton.setOnClickListener { startUrlActivity(telegramURL) }
binding.githubButton.setOnClickListener { startUrlActivity(githubURL) }
binding.twitterButton.setOnClickListener { startUrlActivity(twitterURL) }
}

private fun openTW() {
val uri: Uri = Uri.parse("https://twitter.com/starry_shivam")
private fun startUrlActivity(url: String) {
val uri: Uri = Uri.parse(url)
val intent = Intent(Intent.ACTION_VIEW, uri)
startActivity(intent)
}
Expand Down
15 changes: 7 additions & 8 deletions app/src/main/res/layout/fragment_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
android:id="@+id/twitterButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:backgroundTint="@android:color/transparent"
android:padding="12dp"
android:background="@drawable/round_image_button"
android:src="@drawable/ic_icon_twitter_30"
tools:ignore="ContentDescription" />

Expand All @@ -54,17 +54,17 @@
android:id="@+id/githubButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:backgroundTint="@android:color/transparent"
android:padding="12dp"
android:background="@drawable/round_image_button"
android:src="@drawable/ic_icon_github_30"
tools:ignore="ContentDescription" />

<ImageButton
android:id="@+id/telegramButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2dp"
android:backgroundTint="@android:color/transparent"
android:padding="12dp"
android:background="@drawable/round_image_button"
android:src="@drawable/ic_icon_telegram_30"
tools:ignore="ContentDescription" />

Expand All @@ -81,7 +81,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|center_vertical|bottom"
android:layout_marginBottom="10dp"
android:text="Version 1.5"
android:text="Version 1.6"
android:textStyle="bold"
tools:ignore="HardcodedText" />

Expand All @@ -92,7 +92,6 @@
android:layout_gravity="center_horizontal|center_vertical|bottom"
android:layout_marginBottom="29dp"
android:text="Copyright (c) 2022 Stɑrry Shivɑm "
android:textStyle="italic"
tools:ignore="HardcodedText" />


Expand Down
13 changes: 6 additions & 7 deletions app/src/main/res/layout/fragment_input.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ SOFTWARE. -->
app:startIconDrawable="@drawable/ic_baseline_tag_faces_24">

<com.google.android.material.textfield.TextInputEditText
android:layout_width="360dp"
android:layout_width="325dp"
android:layout_height="68dp"
android:hint="@string/input_text_title"
android:importantForAutofill="no"
Expand All @@ -117,7 +117,7 @@ SOFTWARE. -->
app:startIconDrawable="@drawable/ic_money_bag">

<com.google.android.material.textfield.TextInputEditText
android:layout_width="360dp"
android:layout_width="325dp"
android:layout_height="68dp"
android:hint="@string/input_text_amount"
android:importantForAutofill="no"
Expand Down Expand Up @@ -152,7 +152,7 @@ SOFTWARE. -->
app:startIconDrawable="@drawable/ic_baseline_date_range_24">

<com.google.android.material.textfield.TextInputEditText
android:layout_width="360dp"
android:layout_width="325dp"
android:layout_height="68dp"
android:focusable="false"
android:hint="@string/input_deadline"
Expand All @@ -164,7 +164,7 @@ SOFTWARE. -->

<Button
android:id="@+id/inputSaveButton"
android:layout_width="360dp"
android:layout_width="325dp"
android:layout_height="68dp"
android:layout_marginTop="24dp"
android:background="@drawable/round_button"
Expand All @@ -181,12 +181,11 @@ SOFTWARE. -->
android:id="@+id/quoteText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="30dp"
android:paddingStart="42dp"
android:paddingTop="35dp"
android:paddingEnd="30dp"
android:paddingEnd="42dp"
android:paddingBottom="35dp"
android:text="@string/input_page_quote"
android:textStyle="italic"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-night/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- Primary brand color. -->
<item name="colorPrimary">@color/color_primary_dark</item>
<item name="colorOnPrimary">@color/black</item>
<item name="colorSecondary">@color/color_secondary</item>
<item name="colorSecondary">@color/color_secondary_dark</item>
<item name="colorSurface">@color/dark_gray</item>
<item name="colorOnPrimaryContainer">@color/white</item>
<item name="backgroundColor">@color/black</item>
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- primary and secondary colors -->
<color name="color_primary_light">#388E3C</color>
<color name="color_primary_dark">#C8E6C9</color>
<color name="color_secondary">#4CAF50</color>
<color name="color_secondary_light">#0F9315</color>
<color name="color_secondary_dark">#B5D6B7</color>
<!-- Other view specific colors -->
<color name="card_bg_light">#E8F1E8</color>
<color name="transaction_row_night">#C8E6C9</color>
<color name="white">#FFFFFFFF</color>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- Primary brand color. -->
<item name="colorPrimary">@color/color_primary_light</item>
<item name="colorOnPrimary">@color/white</item>
<item name="colorSecondary">@color/color_secondary</item>
<item name="colorSecondary">@color/color_secondary_light</item>
<item name="colorSurface">@color/card_bg_light</item>
<item name="colorOnPrimaryContainer">@color/black</item>
<item name="backgroundColor">@color/white</item>
Expand Down
3 changes: 3 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/7.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Fixed a security related bug where one could bypass the biometric lock by tapping outside the area.
- Added Spanish translations.
- Some minor UI/UX Improvements.

0 comments on commit 420faeb

Please sign in to comment.