some translations in germany,

little gui improvments notificatoion
sealor · Jul 30, 2023 · ebda471 · ebda471
1 parent 07885e2
commit ebda471
Show file tree

Hide file tree

Showing 14 changed files with 80 additions and 31 deletions.
diff --git a/app/src/main/java/de/ubuntix/android/birthdayreminder/BirthdayEditor.java b/app/src/main/java/de/ubuntix/android/birthdayreminder/BirthdayEditor.java
@@ -53,6 +53,9 @@ protected void onCreate(Bundle savedInstanceState) {
 		this.name = (TextView) findViewById(R.id.editor_name);
 		this.list = (ListView) findViewById(R.id.editor_list);
 
+		name.setTextColor(getResources().getColor(R.color.white));
+
+
 		// check if contact id is valid
 		this.db = new Database(getContentResolver());
 		int contactId = getIntent().getIntExtra(CONTACT_ID, NO_CONTACT_ID);

diff --git a/app/src/main/java/de/ubuntix/android/birthdayreminder/BirthdayReminder.java b/app/src/main/java/de/ubuntix/android/birthdayreminder/BirthdayReminder.java
@@ -7,6 +7,7 @@
 import android.app.NotificationManager;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
@@ -52,7 +53,6 @@ public class BirthdayReminder extends ListActivity {
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		createNotificationChannel();
-		getListView().setFastScrollEnabled(true);
 
 
 
@@ -111,6 +111,7 @@ protected void onResume() {
 
 	@Override
 	public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults);
 		if (requestCode == PERMISSIONS_REQUEST_READ_CONTACTS) {
 			if (isContactsPermissionGranted()) {
 				updateView();
@@ -122,17 +123,19 @@ public void onRequestPermissionsResult(int requestCode, String[] permissions, in
 
 	private void updateView() {
 		// create new list adapter
-		Log.d("updateView", "true");
-		MultiListAdapter listAdapter = new MultiListAdapter();
 
+		MultiListAdapter listAdapter = new MultiListAdapter();
 		List<ListAdapter> adapterList = listAdapter.getListAdapters();
 
+
+
 		// load birthday and contact information
 		List<Contact> contacts = this.db.getAllContacts();
 		List<BirthContact> birthContacts = BirthContactHelper.createBirthContactList(contacts);
 
 		// group all contacts by known and unknown birthday
 		SortedSet<BirthContact> knownBirthdays = new TreeSet<BirthContact>(new BirthContactBirthdayComparator());
+
 		SortedSet<BirthContact> unknownBirthdays = new TreeSet<BirthContact>(new BirthContactNameComparator());
 
 		for (BirthContact birthContact : birthContacts) {
@@ -156,22 +159,28 @@ private void updateView() {
 
 				currentBirthContactAdapter = new BirthContactAdapter(this);
 				adapterList.add(new CategoryAdapter(this, monthStrs[currentMonth]));
+
+
 				adapterList.add(currentBirthContactAdapter);
 			}
 
 			currentBirthContactAdapter.add(birthContact);
+
+
 		}
 
 		adapterList.add(new CategoryAdapter(this, getResources().getString(R.string.unknownBirthdays)));
+
 		adapterList.add(new BirthContactAdapter(this, unknownBirthdays));
 
+
 		setListAdapter(listAdapter);
 	}
 
+	@SuppressLint("ResourceAsColor")
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		BirthContact birthContact = (BirthContact) l.getAdapter().getItem(position);
-
 		Intent editorIntent = new Intent(this, BirthdayEditor.class);
 		editorIntent.putExtra(BirthdayEditor.CONTACT_ID, birthContact.getContact().getId());
 		startActivity(editorIntent);
@@ -201,4 +210,5 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
 		return super.onOptionsItemSelected(item);
 	}
+
 }
diff --git a/app/src/main/java/de/ubuntix/android/birthdayreminder/PreferenceWindow.java b/app/src/main/java/de/ubuntix/android/birthdayreminder/PreferenceWindow.java
@@ -4,6 +4,9 @@
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+
+import androidx.preference.Preference;
+
 import de.ubuntix.android.birthdayreminder.database.Preferences;
 import de.ubuntix.android.birthdayreminder.service.BirthdayBroadcastReceiver;
 
@@ -19,6 +22,7 @@ public class PreferenceWindow extends PreferenceActivity implements OnSharedPref
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		addPreferencesFromResource(R.xml.preferences);
+
 	}
 
 	@Override

diff --git a/app/src/main/java/de/ubuntix/android/birthdayreminder/service/BirthdayBroadcastReceiver.java b/app/src/main/java/de/ubuntix/android/birthdayreminder/service/BirthdayBroadcastReceiver.java
@@ -161,7 +161,7 @@ private void notifyBirthdays(Context context) {
 			builder.setWhen(System.currentTimeMillis());
 			builder.setContentTitle(titleText);
 			builder.setColorized(true);
-			builder.setColor(res.getColor(R.color.br_blue_notification));
+			builder.setColor(res.getColor(R.color.blue));
 			builder.setCategory(Notification.CATEGORY_REMINDER);
 			builder.setPriority(Notification.PRIORITY_HIGH);
 			builder.setVisibility(Notification.VISIBILITY_PUBLIC);

diff --git a/app/src/main/java/de/ubuntix/android/birthdayreminder/view/adapter/CategoryAdapter.java b/app/src/main/java/de/ubuntix/android/birthdayreminder/view/adapter/CategoryAdapter.java
@@ -1,12 +1,17 @@
 package de.ubuntix.android.birthdayreminder.view.adapter;
 
+
+
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
+import de.ubuntix.android.birthdayreminder.R;
+
 public class CategoryAdapter extends BaseAdapter {
 
 	private final String name;
@@ -36,6 +41,7 @@ public long getItemId(int position) {
 		return position;
 	}
 
+	@SuppressLint("ResourceAsColor")
 	@Override
 	public View getView(int position, View convertView, ViewGroup parent) {
 		TextView categoryView;
@@ -44,7 +50,6 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		} else {
 			categoryView = (TextView) convertView;
 		}
-
 		categoryView.setText(this.name);
 		return categoryView;
 	}

diff --git a/app/src/main/java/de/ubuntix/android/birthdayreminder/view/adapter/MultiListAdapter.java b/app/src/main/java/de/ubuntix/android/birthdayreminder/view/adapter/MultiListAdapter.java
@@ -2,12 +2,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.SortedSet;
 
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ListAdapter;
 
+import de.ubuntix.android.birthdayreminder.view.helper.BirthContact;
+
 public class MultiListAdapter extends BaseAdapter {
 
 	private final List<ListAdapter> listAdapters = new ArrayList<ListAdapter>();
@@ -47,6 +50,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 		int positionOffset = 0;
 		for (ListAdapter listAdapter : this.listAdapters) {
 			if (position - positionOffset < listAdapter.getCount()) {
+
 				return listAdapter.getView(position - positionOffset, convertView, parent);
 			}
 			positionOffset += listAdapter.getCount();

diff --git a/app/src/main/res/layout/birth_contact.xml b/app/src/main/res/layout/birth_contact.xml
@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+android:layout_width="fill_parent"
+android:layout_height="fill_parent"
+android:background="@color/black"
+android:orientation="vertical"
+android:padding="5dp">
 
-    android:orientation="vertical"
-    android:padding="5dp">
+<TextView
+    android:id="@+id/name"
+    android:textColor="@color/white"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textAppearance="?android:attr/textAppearanceLarge" />
 
-    <TextView
-        android:id="@+id/name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <TextView
-        android:id="@+id/info"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+<TextView
+    android:id="@+id/info"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textColor="@color/lightgreen" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/editor.xml b/app/src/main/res/layout/editor.xml
@@ -2,8 +2,9 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-
-    android:orientation="vertical">
+    android:background="@color/black"
+    android:orientation="vertical"
+    android:gravity="end">
 
     <TextView
         android:id="@+id/editor_name"
@@ -15,6 +16,8 @@
 
     <ListView
         android:id="@+id/editor_list"
+
+        android:background="@color/black"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:scrollbars="vertical" />

diff --git a/app/src/main/res/layout/editor_account.xml b/app/src/main/res/layout/editor_account.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-
+    android:background="@color/black"
     android:orientation="horizontal" >
 
     <ImageView
@@ -16,17 +16,20 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:background="@color/black"
         android:orientation="vertical"
         android:paddingLeft="5dp" >
 
         <TextView
             android:id="@+id/editor_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:textColor="@color/grey"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
             android:id="@+id/editor_name"
+            android:textColor="@color/grey"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -35,7 +38,7 @@
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-
+        android:background="@color/black"
         android:gravity="right|center_vertical" >
 
         <Button

diff --git a/app/src/main/res/layout/editor_dateofbirth.xml b/app/src/main/res/layout/editor_dateofbirth.xml
@@ -4,4 +4,5 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:padding="9dp"
-    android:textAppearance="?android:attr/textAppearanceMedium" />
+    android:textColor="@color/white"
+    android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <string name="preferences_name">Birthday Reminder Einstellungen</string>
+
     <string name="title">%s</string>
     <string name="knownBirthdays">Bevorstehende Geburtstage</string>
     <string name="unknownBirthdays">Geburtstage unbekannt</string>
@@ -28,11 +30,17 @@
 
     <string name="ok">OK</string>
     <string name="cancel">Abbrechen</string>
+    <string name="add_date_of_birth">Geburtstag hinzufügen</string>
+
     <string name="new_birthday">+</string>
     <string name="editor_phone">Telefon</string>
     <string name="no_contacts_permission">Keine Berechtigung zum Lesen und Ändern von Kontakten</string>
-    <string name="daysbefore">Anzahl der Tage vor der Benachrichtigung</string>
-    <string name="hideNotification">Benachrichtigung nach dem öffnen verschwinden lassen</string>
+    <string name="daysbefore">Erinnerung wie viel Tage vorher</string>
+    <string name="hideNotification">Benachrichtigung</string>
     <string name="notificationTime">Zeit der Benachrichtigung</string>
+    <string name="activate_summaryOn">Benachrichtigung ist eingeschaltet</string>
+    <string name="activate_summaryOff">Benachrichtigung ist ausgeschaltet</string>
+    <string name="hideNotification_summaryOff">Die Benachrichtigung wird nicht ausgeblendet</string>
+    <string name="hideNotification_summaryOn">Die Benachrichtigung wird ausgeblendet</string>
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="br_blue_notification">#0d65c0</color>
-</resources>
+    <color name="blue">#0d65c0</color>
+    <color name="black">#000000</color>
+    <color name="grey">#a0a0a0</color>
+    <color name="lightgreen">#22AA22</color>
+    <color name="white">#FFFFFF</color>
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@
     <string name="activate_reminder_service">Activate reminder service</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
-    <string name="account_icon">account icon</string>
+    <string name="account_icon" translatable="false">account icon</string>
     <string name="add_date_of_birth">add date of birth</string>
     <string name="new_birthday">+</string>
     <string name="editor_phone">Phone</string>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    >
 
     <CheckBoxPreference
         android:defaultValue="true"
@@ -30,4 +31,5 @@
         android:summary="You will be notified at @value o&apos;clock"
         android:title="@string/notificationTime" />
 
+
 </PreferenceScreen>