Skip to content

Commit

Permalink
- added option for follow the system in theme chooser
Browse files Browse the repository at this point in the history 
- added icon to reset-Dialog
- landscape-mode

- Changed a margin in the changelog. Now it is easier to read
- Changed the texts of the About page. A little more text but also a little cleared up
- The logo reduced by 50dp in height and width
- greater +1 Button on the Startpage
- changed color of the +1 Button
- unused fonts
  • Loading branch information
@amarradi
amarradi committed Jul 14, 2022
1 parent 5e72ab2 commit bbd6375
Show file tree
Hide file tree
Showing 10 changed files with 384 additions and 49 deletions.
14 changes: 13 additions & 1 deletion app/src/main/java/com/git/amarradi/palatschinkencounter/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import android.view.MenuInflater;
import android.view.MenuItem;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;

Expand All @@ -34,7 +35,9 @@ public class MainActivity extends AppCompatActivity implements SharedPreferences
private boolean safedNightMode;

@SuppressLint("DefaultLocale")
ImageView imageViewShare;

@SuppressLint("DefaultLocale")
@Override
protected void onCreate(Bundle savedInstanceState) {

Expand All @@ -49,7 +52,16 @@ protected void onCreate(Bundle savedInstanceState) {

Button counterTextButton = findViewById(R.id.counter_text_button);
counterTextButton.setTypeface(getResources().getFont(R.font.opensans_bold));
/*
imageViewShare = findViewById(R.id.share);
imageViewShare.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Toast.makeText(MainActivity.this, "share now", Toast.LENGTH_SHORT).show();
}
});
*/
textView = findViewById(R.id.textview);
TextView textView_start = findViewById(R.id.tv_startpage);
textView.setTypeface(typeface);
Expand All @@ -72,7 +84,7 @@ protected void onCreate(Bundle savedInstanceState) {

counterTextButton.setOnClickListener(v -> {
counter++;
textView.setText(format("%d", counter));
textView.setText(String.format("%d", counter));
save_data();
});
load_data();
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/drawable/ic_baseline_share_24.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
<vector android:height="24dp"
android:tint="@color/md_theme_dark_onPrimary"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
Expand Down
122 changes: 122 additions & 0 deletions app/src/main/res/layout-land/activity_about.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:scrollbars="vertical">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal|center_vertical"
android:orientation="vertical">

<TextView
android:id="@+id/tvAppName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:padding="5dp"
android:text="@string/app_name"
android:textAppearance="?android:attr/textAppearanceLarge" />

<TextView
android:id="@+id/tvVersion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:padding="5dp"
android:text="@string/version"
android:textAppearance="?android:attr/textAppearanceMedium" />

<ImageView
android:id="@+id/imageView"
android:layout_width="100dp"
android:layout_height="150dp"
android:layout_margin="10dp"
android:contentDescription="@string/image"
android:src="@drawable/logo_psc_512_transparent" />
<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_margin="5dp"
android:background="?android:attr/listDivider" />

<TextView
android:id="@+id/intention"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/intention"
android:gravity="center"
android:padding="5dp"
android:textAppearance="?android:attr/textAppearanceMedium"/>

<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_margin="5dp"
android:background="?android:attr/listDivider" />

<TextView
android:id="@+id/tv_decision"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:padding="5dp"
android:text="@string/really_important"
android:textAppearance="?android:attr/textAppearanceMedium" />

<TextView
android:id="@+id/tv_bibleverse"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:padding="5dp"
android:text="@string/bibleverse"
android:textAppearance="?android:attr/textAppearanceMedium" />

<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_margin="5dp"
android:background="?android:attr/listDivider" />

<TextView
android:id="@+id/tvhavefun"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/havefun"
android:textColor="@color/md_theme_light_secondaryContainer"
android:textAppearance="?android:attr/textAppearanceLarge" />

<View
android:layout_width="match_parent"
android:layout_height="2dp"
android:layout_margin="5dp"
android:background="?android:attr/listDivider" />


<TextView
android:id="@+id/resethowto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:gravity="center"
android:text="@string/resethowto"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/itsos"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="10dp"
android:gravity="center"
android:text="@string/itsos"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
</ScrollView>
40 changes: 40 additions & 0 deletions app/src/main/res/layout-land/activity_changelog.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:scrollbars="vertical">

<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:context=".ChangelogActivity" android:layout_gravity="center">


<TextView
android:id="@+id/tvChangeloghead"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/change"
android:textAppearance="?android:attr/textAppearanceLarge"
app:layout_constraintEnd_toEndOf="parent"
android:gravity="center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/etChangelog"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:autofillHints="@string/change"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:gravity="start|top" />

</LinearLayout>

</ScrollView>
66 changes: 66 additions & 0 deletions app/src/main/res/layout-land/activity_main.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
tools:context=".MainActivity">
<TextView
android:id="@+id/tv_startpage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginStart="32dp"
android:layout_marginTop="64dp"
android:text="@string/textviewComplain"
android:textAppearance="?android:attr/textAppearanceMedium" />

<TextView
android:id="@+id/textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

android:layout_alignParentTop="true"
android:layout_marginStart="72dp"
android:layout_marginTop="59dp"
android:layout_toEndOf="@+id/tv_startpage"
android:text="@string/txViewCounterState"
android:textAppearance="?android:attr/textAppearanceLarge" />

<ImageView

android:id="@+id/image_startpage"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_below="@+id/tv_startpage"


android:layout_centerVertical="true"
android:layout_marginStart="41dp"
android:layout_marginTop="99dp"
android:contentDescription="@string/image"
app:srcCompat="@drawable/logo_psc_512_transparent" />

<Button

android:id="@+id/counter_text_button"
android:layout_width="75dp"
android:layout_height="75dp"
android:layout_alignParentStart="true"

android:layout_alignParentBottom="true"
android:layout_marginStart="265dp"
android:layout_marginBottom="58dp"

android:background="@drawable/counter_plus_btn_bg_shape"
android:fontFamily="@font/opensans_extrabold"

android:text="@string/btnCounter"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/md_theme_light_onPrimary" />


</RelativeLayout>
62 changes: 62 additions & 0 deletions app/src/main/res/layout-land/activity_recipe.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:overScrollMode="always">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="8dp"
android:text="@string/txt_recipe_entry_txt"
android:textAppearance="?android:attr/textAppearanceLarge" />

<TextView
android:id="@+id/textView3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="8dp"
android:text="@string/pancake_ingredients"
android:textAppearance="?android:attr/textAppearanceLarge" />

<androidx.recyclerview.widget.RecyclerView

android:id="@+id/recyclerView_ingredients"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<TextView
android:id="@+id/textView4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="8dp"
android:text="@string/pancake_preparation"
android:textAppearance="?android:attr/textAppearanceLarge" />

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/RecyclerView_preparation"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
android:scrollbarAlwaysDrawVerticalTrack="false"
app:layout_constraintTop_toBottomOf="@+id/textView4" />

<TextView
android:id="@+id/textViewThanks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/thanks"
android:textAppearance="?android:attr/textAppearanceLarge" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
6 changes: 6 additions & 0 deletions app/src/main/res/layout-land/fragment_settings.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/activity_settings"

android:layout_width="match_parent"
android:layout_height="match_parent" />
37 changes: 37 additions & 0 deletions app/src/main/res/layout-land/recycler_view_row.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content">

<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="2dp"
app:layout_constraintBottom_toBottomOf="parent"

app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView

android:id="@+id/CVtextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:paddingStart="8dp"
android:paddingEnd="0dp"
android:paddingBottom="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
Loading

0 comments on commit bbd6375

Please sign in to comment.