작업 코드 임시 커밋

This commit is contained in:
DESKTOP-1A3P75F\lee
2022-08-18 03:19:04 +09:00
parent cb421d3a36
commit 76d72ae8ae
7 changed files with 73 additions and 9 deletions

View File

@@ -1,5 +1,6 @@
package com.qtagger;
import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AppCompatActivity;
import androidx.room.Room;
@@ -7,22 +8,28 @@ import android.content.Context;
import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.Spinner;
import android.widget.Toast;
import com.qtagger.Activity.AccountAdd;
import com.qtagger.Activity.AccountList;
import com.qtagger.Activity.navitest;
import com.qtagger.Database.Account;
import com.qtagger.Database.AppDatabase;
import com.qtagger.util.DataManager;
import java.util.List;
public class MainActivity extends AppCompatActivity {
private Spinner mSpinner;
private Button btnLogin;
private DataManager dataManager;
private List<Account> accountList;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -30,16 +37,48 @@ public class MainActivity extends AppCompatActivity {
setContentView(R.layout.activity_main);
mSpinner = findViewById(R.id.spinner_account);
dataManager = DataManager.getInstance();
//Intent intent = new Intent(getApplicationContext(), test.class);
//startActivity(intent);
//로그인
findViewById(R.id.button_login).setOnClickListener(new View.OnClickListener() {
@RequiresApi(api = Build.VERSION_CODES.N)
@Override
public void onClick(View v) {
//로그인 정보 확인
//로그인 처리
String selectName= mSpinner.getSelectedItem().toString();
if(selectName.contains(","))
{
String acName = selectName.split(",")[0];
int selid = Integer.parseInt(acName);
Account selectAcc = accountList.stream().filter(x->x.getId() == selid).findAny().orElse(null);
if(selectAcc != null)//로그인 처리
{
dataManager.loginAccount = selectAcc;
Intent intent = new Intent(getApplicationContext(), navitest.class);
startActivity(intent);
}
else
{
Toast.makeText(MainActivity.this, "계정을 선택해 주세요", Toast.LENGTH_SHORT).show();
}
}
else
{
//로그인 정보 획득 실패
Toast.makeText(MainActivity.this, "계정을 선택해 주세요", Toast.LENGTH_SHORT).show();
}
}
});
@@ -82,9 +121,9 @@ public class MainActivity extends AppCompatActivity {
AppDatabase db = Room.databaseBuilder(this,AppDatabase.class,"AccountDB").allowMainThreadQueries().build();
//초기 데이터 세팅
List<Account> accountList = db.accountDao().getAll();
accountList = db.accountDao().getAll();
for (Account ac: accountList) {
aa_items.add(ac.getAccountName());
aa_items.add(Integer.toString( ac.getId())+","+ac.getAccountId());
}
mSpinner.setAdapter(aa_items);

View File

@@ -8,13 +8,16 @@ import android.view.View;
import com.qtagger.Database.Account;
import com.qtagger.Database.AppDatabase;
import com.qtagger.util.DataManager;
public class test extends AppCompatActivity {
private DataManager dataManager;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_test);
dataManager = DataManager.getInstance();
AppDatabase db = Room.databaseBuilder(this,AppDatabase.class,"AccountDB").allowMainThreadQueries().build();

View File

@@ -0,0 +1,16 @@
package com.qtagger.util;
import com.qtagger.Database.Account;
public class DataManager {
private DataManager(){}
public Account loginAccount;
private static class DataManagerHolder{
public static final DataManager INSTANCE = new DataManager();
}
public static DataManager getInstance() {
return DataManagerHolder.INSTANCE;
}
}

View File

@@ -81,14 +81,16 @@
<Button
<android.widget.Button
android:id="@+id/button_save"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_height="56dp"
android:layout_marginStart="16dp"
android:layout_marginTop="100dp"
android:layout_marginEnd="16dp"
android:text="등록"
android:background="@color/black"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

View File

@@ -84,14 +84,16 @@
<Button
<android.widget.Button
android:id="@+id/button_save"
android:layout_width="0dp"
android:layout_height="48dp"
android:layout_height="56dp"
android:layout_marginStart="16dp"
android:layout_marginTop="100dp"
android:layout_marginEnd="16dp"
android:text="수정"
android:background="@color/black"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"

View File

@@ -45,16 +45,17 @@
app:layout_constraintTop_toBottomOf="@+id/textViewTitle"
tools:ignore="SpeakableTextPresentCheck" />
<Button
<android.widget.Button
android:id="@+id/button_login"
android:layout_width="0dp"
android:layout_height="56dp"
android:layout_marginStart="20dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="20dp"
android:background="@color/black"
android:backgroundTint="#000000"
android:text="로그인"
android:background="@color/black"
android:textColor="#FFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"

View File

@@ -2,6 +2,7 @@
<!-- Base application theme. -->
<style name="Theme.QTagger" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">#FF4B4B</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<!-- Status bar color. -->