Skip to content

Commit 1d3c2d0

Browse files
Fr4gorSoftwareFr4gorSoftware
authored
Merge pull request #124 from Fr4gorSoftware/Version-1.2.5
Version 1.2.5
2 parents ad40290 + 62f139c commit 1d3c2d0

36 files changed

Lines changed: 366 additions & 261 deletions

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ The QR-Code Scanner/Generator that cares about your privacy, based on [XZing Lib
2323
- WRITE EXTERNAL STORAGE
2424

2525
## Translators
26+
- German (last change: 1.2.5): [Thore Dankworth](https://github.com/Fr4gorSoftware)
27+
- Slovak (last change: 1.2.5): [Tibor Repček](https://github.com/tiborepcek)
2628
- Hindi (last change: 1.2.4): [imcmjha](https://github.com/imcmjha)
2729
- Italian (last change: 1.2.4): [abonte](https://github.com/abonte) and [ema-pe](https://github.com/ema-pe)
2830
- Russian (last change: 1.2.4): [Vladimir Kosolapov](https://github.com/0x264f)
2931
- Thai (last change: 1.2.4): [Vatunyoo Suwannapisit](https://github.com/kerlos)
3032
- Spanish (last change: 1.2.4): [Coruna](https://github.com/Coruna)
31-
- German (last change: 1.2.1): [Thore Dankworth](https://github.com/Fr4gorSoftware)
3233
- Chinese (last change: 1.2.1): [linsui](https://github.com/linsui) and [Jeff Huang](https://github.com/s8321414)
3334
- Polish (last change: 1.2.1): [Waldemar Stoczkowski](https://github.com/WaldiSt)
3435
- French (Last change: 1.2.1): [Romain Rossi](https://github.com/romainrossi) and [Cédric Frayssinet](https://github.com/bristow)

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
minSdkVersion 17
99
//noinspection ExpiredTargetSdkVersion
1010
targetSdkVersion 25
11-
versionCode 17
12-
versionName "1.2.4"
11+
versionCode 18
12+
versionName "1.2.5"
1313
vectorDrawables.useSupportLibrary = true
1414
}
1515
buildTypes {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,15 @@
5353
<activity
5454
android:name=".activities.generator.GeoGeneratorActivity"
5555
android:label="@string/title_activity_geo_generator"
56-
android:parentActivityName=".activities.generator.GenerateActivity"
57-
android:theme="@style/AppTheme.NoActionBar">
56+
android:parentActivityName=".activities.generator.GenerateActivity">
5857
<meta-data
5958
android:name="android.support.PARENT_ACTIVITY"
6059
android:value="de.t_dankworth.secscanqr.activities.generator.GenerateActivity" />
6160
</activity>
6261
<activity
6362
android:name=".activities.generator.TextGeneratorActivity"
6463
android:label="@string/activity_generate"
65-
android:parentActivityName=".activities.generator.GenerateActivity"
66-
android:theme="@style/AppTheme.NoActionBar">
64+
android:parentActivityName=".activities.generator.GenerateActivity">
6765
<intent-filter>
6866
<action android:name="android.intent.action.SEND" />
6967
<category android:name="android.intent.category.DEFAULT" />
@@ -82,8 +80,7 @@
8280
<activity
8381
android:name=".activities.generator.BarcodeGenerateActivity"
8482
android:label="@string/activity_barcode_generator"
85-
android:parentActivityName=".activities.generator.GenerateActivity"
86-
android:theme="@style/AppTheme.NoActionBar">
83+
android:parentActivityName=".activities.generator.GenerateActivity">
8784
<intent-filter>
8885
<action android:name="android.intent.action.SEND" />
8986

@@ -99,8 +96,7 @@
9996
<activity
10097
android:name=".activities.generator.VCardGeneratorActivity"
10198
android:label="@string/title_activity_vcard_generator"
102-
android:parentActivityName=".activities.generator.GenerateActivity"
103-
android:theme="@style/AppTheme.NoActionBar">
99+
android:parentActivityName=".activities.generator.GenerateActivity">
104100
<meta-data
105101
android:name="android.support.PARENT_ACTIVITY"
106102
android:value="de.t_dankworth.secscanqr.activities.generator.GenerateActivity" />

‎app/src/main/java/de/t_dankworth/secscanqr/activities/HistoryActivity.java‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@
2323

2424
import de.t_dankworth.secscanqr.R;
2525
import de.t_dankworth.secscanqr.util.DatabaseHelper;
26+
import de.t_dankworth.secscanqr.util.HistoryListAdapter;
27+
import de.t_dankworth.secscanqr.util.GeneralHandler;
2628

2729
import static de.t_dankworth.secscanqr.util.ButtonHandler.shareTo;
2830

2931

3032
/**
3133
* Created by Thore Dankworth
32-
* Last Update: 11.12.2019
34+
* Last Update: 12.12.2019
3335
* Last Update by Thore Dankworth
3436
*
3537
* This class is the HistoryActivity and lists all scanned qr-codes
@@ -41,13 +43,16 @@ public class HistoryActivity extends AppCompatActivity {
4143
private static final String TAG = "History";
4244
DatabaseHelper historyDatabaseHelper;
4345
private ListView historyListView;
46+
private GeneralHandler generalHandler;
4447
final Activity activity = this;
4548

4649
@Override
4750
protected void onCreate(Bundle savedInstanceState) {
4851
super.onCreate(savedInstanceState);
4952
getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
5053
WindowManager.LayoutParams.FLAG_SECURE);
54+
generalHandler = new GeneralHandler(this);
55+
generalHandler.loadTheme();
5156
setContentView(R.layout.activity_history);
5257
historyDatabaseHelper = new DatabaseHelper(this);
5358
historyListView = (ListView) findViewById(R.id.listView);
@@ -121,8 +126,11 @@ private void showDataInListView(){
121126
while(data.moveToNext()){
122127
listData.add(data.getString(1)); //column 0 = id; column 1 = code
123128
}
124-
ListAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, listData);
125-
historyListView.setAdapter(adapter);
129+
130+
HistoryListAdapter listAdapter = new HistoryListAdapter(HistoryActivity.this, R.layout.listview_row, listData);
131+
132+
//ListAdapter adapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, listData);
133+
historyListView.setAdapter(listAdapter);
126134

127135
historyListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
128136
@Override

‎app/src/main/java/de/t_dankworth/secscanqr/activities/HistoryDetailsActivity.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import de.t_dankworth.secscanqr.R;
1919
import de.t_dankworth.secscanqr.util.BottomNavigationViewHelper;
2020
import de.t_dankworth.secscanqr.util.DatabaseHelper;
21+
import de.t_dankworth.secscanqr.util.GeneralHandler;
2122

2223
import static de.t_dankworth.secscanqr.util.ButtonHandler.copyToClipboard;
2324
import static de.t_dankworth.secscanqr.util.ButtonHandler.createContact;
@@ -27,7 +28,7 @@
2728

2829
/**
2930
* Created by Thore Dankworth
30-
* Last Update: 11.12.2019
31+
* Last Update: 12.12.2019
3132
* Last Update by Thore Dankworth
3233
*
3334
* This class is the HistoryDetailsActivity shows details and further functionality for the chosen item
@@ -36,6 +37,7 @@
3637
public class HistoryDetailsActivity extends AppCompatActivity {
3738

3839
private static final String TAG = "EditDataActivity";
40+
private GeneralHandler generalHandler;
3941

4042
private TextView tvCode;
4143
private BottomNavigationView action_navigation;
@@ -85,6 +87,8 @@ protected void onCreate(Bundle savedInstanceState) {
8587
super.onCreate(savedInstanceState);
8688
getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
8789
WindowManager.LayoutParams.FLAG_SECURE);
90+
generalHandler = new GeneralHandler(this);
91+
generalHandler.loadTheme();
8892
setContentView(R.layout.activity_history_details);
8993
tvCode = (TextView) findViewById(R.id.tvCodeHD);
9094
action_navigation = (BottomNavigationView) findViewById(R.id.history_action_navigation);

‎app/src/main/java/de/t_dankworth/secscanqr/activities/MainActivity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ public void onSaveInstanceState(Bundle savedInstanceState){
128128
super.onSaveInstanceState(savedInstanceState);
129129
savedInstanceState.putString(STATE_QRCODE, qrcode);
130130
savedInstanceState.putString(STATE_QRCODEFORMAT, qrcodeFormat);
131+
generalHandler.loadTheme();
131132
}
132133

133134
/**

‎app/src/main/java/de/t_dankworth/secscanqr/activities/generator/BarcodeGenerateActivity.java‎

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
package de.t_dankworth.secscanqr.activities.generator;
22

33

4-
import android.app.Activity;
54
import android.content.Intent;
6-
import android.graphics.Bitmap;
75
import android.os.Bundle;
8-
import android.support.design.widget.FloatingActionButton;
96
import android.support.v7.app.AppCompatActivity;
10-
import android.support.v7.widget.Toolbar;
117
import android.view.View;
128
import android.view.WindowManager;
139
import android.widget.AdapterView;
1410
import android.widget.ArrayAdapter;
11+
import android.widget.Button;
1512
import android.widget.EditText;
1613
import android.widget.Spinner;
1714
import android.widget.Toast;
1815

19-
import com.google.zxing.MultiFormatWriter;
20-
2116

2217
import de.t_dankworth.secscanqr.R;
2318
import de.t_dankworth.secscanqr.activities.MainActivity;
19+
import de.t_dankworth.secscanqr.util.GeneralHandler;
2420

2521

2622
/**
2723
* Created by Thore Dankworth
28-
* Last Update: 17.01.2019
24+
* Last Update: 13.12.2019
2925
* Last Update by Thore Dankworth
3026
*
3127
* This class is all about the value to BARCODE Generate Activity. In this Class the functionality of generating a BARCODE Picture is covered.
@@ -36,27 +32,35 @@ public class BarcodeGenerateActivity extends AppCompatActivity implements Adapte
3632
EditText text;
3733
int format;
3834
String text2Barcode;
39-
MultiFormatWriter multiFormatWriter;
40-
Bitmap bitmap;
41-
final Activity activity = this;
35+
Button btnGenerate;
4236
private static final String STATE_TEXT = MainActivity.class.getName();
4337

4438
@Override
4539
protected void onCreate(Bundle savedInstanceState) {
4640
super.onCreate(savedInstanceState);
4741
getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
4842
WindowManager.LayoutParams.FLAG_SECURE);
43+
GeneralHandler generalHandler = new GeneralHandler(this);
44+
generalHandler.loadTheme();
4945
setContentView(R.layout.activity_barcode_generate);
50-
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
51-
setSupportActionBar(toolbar);
5246
text = (EditText) findViewById(R.id.tfBarcode);
53-
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
47+
btnGenerate = (Button) findViewById(R.id.btnGenerateBarcode);
48+
btnGenerate.setOnClickListener(new View.OnClickListener() {
49+
@Override
50+
public void onClick(View view) {
51+
text2Barcode = text.getText().toString().trim();
52+
if(text2Barcode.equals("")){
53+
Toast.makeText(getApplicationContext(), getResources().getText(R.string.error_text_first), Toast.LENGTH_SHORT).show();
54+
} else {
55+
openResultActivity();
56+
}
57+
}
58+
});
5459

5560
//Setup the Spinner Menu for the different formats
5661
Spinner spinner = (Spinner) findViewById(R.id.spinner);
5762
spinner.setOnItemSelectedListener(this);
58-
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
59-
R.array.barcode_formats_array, android.R.layout.simple_spinner_item);
63+
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.barcode_formats_array, R.layout.spinner_item);
6064
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
6165
spinner.setAdapter(adapter);
6266

@@ -77,21 +81,6 @@ protected void onCreate(Bundle savedInstanceState) {
7781
handleSendText(intent); //call method to handle sended text
7882
}
7983
}
80-
81-
//OnClickListener for the "+" Button and functionality
82-
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
83-
fab.setOnClickListener(new View.OnClickListener() {
84-
@Override
85-
public void onClick(View view) {
86-
text2Barcode = text.getText().toString().trim();
87-
if(text2Barcode.equals("")){
88-
Toast.makeText(getApplicationContext(), getResources().getText(R.string.error_text_first), Toast.LENGTH_SHORT).show();
89-
} else {
90-
openResultActivity();
91-
}
92-
93-
}
94-
});
9584
}
9685

9786
/**

‎app/src/main/java/de/t_dankworth/secscanqr/activities/generator/GenerateActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
/**
2121
* Created by Thore Dankworth
22-
* Last Update: 17.01.2019
22+
* Last Update: 12.12.2019
2323
* Last Update by Thore Dankworth
2424
*
2525
* This class is just a forwarding to the specific generators

‎app/src/main/java/de/t_dankworth/secscanqr/activities/generator/GeoGeneratorActivity.java‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@
55

66
import android.content.Intent;
77
import android.os.Bundle;
8-
import android.support.design.widget.FloatingActionButton;
98
import android.support.v7.app.AppCompatActivity;
10-
import android.support.v7.widget.Toolbar;
119
import android.view.View;
1210
import android.view.WindowManager;
1311
import android.widget.AdapterView;
1412
import android.widget.ArrayAdapter;
13+
import android.widget.Button;
1514
import android.widget.CheckBox;
1615
import android.widget.EditText;
1716
import android.widget.Spinner;
@@ -21,10 +20,11 @@
2120

2221
import de.t_dankworth.secscanqr.R;
2322
import de.t_dankworth.secscanqr.activities.MainActivity;
23+
import de.t_dankworth.secscanqr.util.GeneralHandler;
2424

2525
/**
2626
* Created by Thore Dankworth
27-
* Last Update: 16.01.2019
27+
* Last Update: 13.12.2019
2828
* Last Update by Thore Dankworth
2929
*
3030
* This class is all about the geo location to QR-Code Generate Activity. In this Class the functionality of generating a QR-Code Picture is covered.
@@ -35,6 +35,7 @@ public class GeoGeneratorActivity extends AppCompatActivity implements AdapterVi
3535
CheckBox cbLatitude, cbLongtitude;
3636
Boolean north = true, east = true;
3737
int format;
38+
Button btnGenerate;
3839
String latitude, longtitude, geo;
3940
MultiFormatWriter multiFormatWriter;
4041

@@ -50,42 +51,15 @@ protected void onCreate(Bundle savedInstanceState) {
5051
super.onCreate(savedInstanceState);
5152
getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
5253
WindowManager.LayoutParams.FLAG_SECURE);
54+
GeneralHandler generalHandler = new GeneralHandler(this);
55+
generalHandler.loadTheme();
5356
setContentView(R.layout.activity_geo_generator);
54-
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
55-
setSupportActionBar(toolbar);
5657
tfLatitude = (EditText) findViewById(R.id.tfLatitude);
5758
tfLongtitude = (EditText) findViewById(R.id.tfLongtitude);
5859
cbLatitude = (CheckBox) findViewById(R.id.cbLatitude);
5960
cbLongtitude = (CheckBox) findViewById(R.id.cbLongtitude);
60-
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
61-
62-
//Setup the Spinner Menu for the different formats
63-
Spinner spinner = (Spinner) findViewById(R.id.spinner);
64-
spinner.setOnItemSelectedListener(this);
65-
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
66-
R.array.formats_geo_array, android.R.layout.simple_spinner_item);
67-
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
68-
spinner.setAdapter(adapter);
69-
70-
//If the device were rotated then restore information
71-
if(savedInstanceState != null){
72-
latitude = (String) savedInstanceState.get(STATE_LATITUDE);
73-
tfLatitude.setText(latitude);
74-
longtitude = (String) savedInstanceState.get(STATE_LONGTITUDE);
75-
tfLongtitude.setText(longtitude);
76-
north = (Boolean) savedInstanceState.get(STATE_NORTH);
77-
if(!north){
78-
cbLatitude.setChecked(false);
79-
}
80-
east = (Boolean) savedInstanceState.get(STATE_EAST);
81-
if(!east){
82-
cbLongtitude.setChecked(false);
83-
}
84-
}
85-
86-
//OnClickListener for the "+" Button and functionality
87-
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
88-
fab.setOnClickListener(new View.OnClickListener() {
61+
btnGenerate = (Button) findViewById(R.id.btnGenerateGeo);
62+
btnGenerate.setOnClickListener(new View.OnClickListener() {
8963
@Override
9064
public void onClick(View view) {
9165
latitude = tfLatitude.getText().toString().trim();
@@ -111,6 +85,29 @@ public void onClick(View view) {
11185
}
11286
}
11387
});
88+
89+
//Setup the Spinner Menu for the different formats
90+
Spinner spinner = (Spinner) findViewById(R.id.spinner);
91+
spinner.setOnItemSelectedListener(this);
92+
ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this, R.array.formats_geo_array, R.layout.spinner_item);
93+
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
94+
spinner.setAdapter(adapter);
95+
96+
//If the device were rotated then restore information
97+
if(savedInstanceState != null){
98+
latitude = (String) savedInstanceState.get(STATE_LATITUDE);
99+
tfLatitude.setText(latitude);
100+
longtitude = (String) savedInstanceState.get(STATE_LONGTITUDE);
101+
tfLongtitude.setText(longtitude);
102+
north = (Boolean) savedInstanceState.get(STATE_NORTH);
103+
if(!north){
104+
cbLatitude.setChecked(false);
105+
}
106+
east = (Boolean) savedInstanceState.get(STATE_EAST);
107+
if(!east){
108+
cbLongtitude.setChecked(false);
109+
}
110+
}
114111
}
115112

116113
/**

0 commit comments

Comments
 (0)