mirror of
https://github.com/jfoucry/Pilldroid.git
synced 2024-11-22 04:29:22 +01:00
rename layout, names must content only [a-z][0-9] and underscore
This commit is contained in:
parent
6390b7977c
commit
5d8d859d15
8 changed files with 4 additions and 4 deletions
|
@ -38,7 +38,7 @@ public class CustomScannerActivity extends Activity implements DecoratedBarcodeV
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
setContentView(R.layout.CustomScannerActivty);
|
setContentView(R.layout.custom_scanner_activty);
|
||||||
|
|
||||||
//barcodeScannerView.setTorchListener(this);
|
//barcodeScannerView.setTorchListener(this);
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ public class DrugDetailActivity extends AppCompatActivity {
|
||||||
aMedic = (Medic) bundle.get("medic");
|
aMedic = (Medic) bundle.get("medic");
|
||||||
Log.d(TAG, "aMedic == " + aMedic);
|
Log.d(TAG, "aMedic == " + aMedic);
|
||||||
|
|
||||||
setContentView(R.layout.DrugDetailActivity);
|
setContentView(R.layout.drug_detail_activity);
|
||||||
Toolbar toolbar = findViewById(detail_toolbar);
|
Toolbar toolbar = findViewById(detail_toolbar);
|
||||||
|
|
||||||
if (toolbar != null) {
|
if (toolbar != null) {
|
||||||
|
|
|
@ -108,7 +108,7 @@ public class DrugListActivity extends AppCompatActivity {
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
// Set view content
|
// Set view content
|
||||||
setContentView(R.layout.DrugListActivity);
|
setContentView(R.layout.drug_list_activity);
|
||||||
|
|
||||||
Toolbar toolbar = findViewById(R.id.toolbar);
|
Toolbar toolbar = findViewById(R.id.toolbar);
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ public class WelcomeActivity extends AppCompatActivity {
|
||||||
}
|
}
|
||||||
|
|
||||||
prefManager.setFirstTimeLaunch(false);
|
prefManager.setFirstTimeLaunch(false);
|
||||||
setContentView(R.layout.WelcomeActivity);
|
setContentView(R.layout.welcome_activity);
|
||||||
|
|
||||||
setFullScreen();
|
setFullScreen();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue